Merge pull request #136 from BowmanChow/dev

server现在能够正常退出
eesast · May 16, 2020 · 2c70954 · 2c70954
2 parents 9204a92 + e09452b
commit 2c70954
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/logic/Logic.Server/Properties/launchSettings.json b/logic/Logic.Server/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Logic.Server": {
       "commandName": "Project",
-      "commandLineArgs": " --port 20000 --debugLevel 1 --playerCount 2 --agentCount 1 --gameTime 600"
+      "commandLineArgs": " --port 20000 --debugLevel 1 --playerCount 1 --agentCount 1 --gameTime 600"
     },
     "Docker": {
       "commandName": "Docker"

diff --git a/logic/THUnity2D/GameObject.cs b/logic/THUnity2D/GameObject.cs
@@ -197,6 +197,7 @@ public Vector Velocity
                                 }
                             }
                         });
+                    _movingThread.IsBackground = true;
                     _movingThread.Start();
                 }
                 lock (_velocityLock)

diff --git a/runAgent.bat b/runAgent.bat
@@ -1 +1 @@
-communication\Agent\bin\Release\netcoreapp3.0\Communication.Agent.exe --server 127.0.0.1:20000 --port 30000 --debugLevel 0 --playercount 2 --timelimit 25
+communication\Agent\bin\Release\netcoreapp3.0\Communication.Agent.exe --server 127.0.0.1:20000 --port 30000 --debugLevel 0 --playercount 1 --timelimit 25
diff --git a/runServer.bat b/runServer.bat
@@ -1 +1 @@
-logic\Logic.Server\bin\Release\netcoreapp3.0\Logic.Server.exe --port 20000 --debugLevel 1 --playerCount 2 --agentCount 2 --gameTime 600
+logic\Logic.Server\bin\Release\netcoreapp3.0\Logic.Server.exe --port 20000 --debugLevel 1 --playerCount 1 --agentCount 1 --gameTime 600
-Original file line number
+Diff line change
@@ Expand Up / @@ -197,6 +197,7 @@ public Vector Velocity @@
                                     }
                                 }
                             });
+                        _movingThread.IsBackground = true;
                         _movingThread.Start();
                     }
                     lock (_velocityLock)
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		communication\Agent\bin\Release\netcoreapp3.0\Communication.Agent.exe --server 127.0.0.1:20000 --port 30000 --debugLevel 0 --playercount 2 --timelimit 25
		communication\Agent\bin\Release\netcoreapp3.0\Communication.Agent.exe --server 127.0.0.1:20000 --port 30000 --debugLevel 0 --playercount 1 --timelimit 25
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		logic\Logic.Server\bin\Release\netcoreapp3.0\Logic.Server.exe --port 20000 --debugLevel 1 --playerCount 2 --agentCount 2 --gameTime 600
		logic\Logic.Server\bin\Release\netcoreapp3.0\Logic.Server.exe --port 20000 --debugLevel 1 --playerCount 1 --agentCount 1 --gameTime 600