Merge pull request #138 from Timothy-LiuXuefeng/timothy

Change the result in final game to comma seperated and fix bugs

logic/LocalUI/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "LocalUI": {
+      "commandName": "Project",
+      "commandLineArgs": ".\\Logic.Server\\bin\\Debug\\netcoreapp3.1\\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=4 -g 600"
+    }
+  }
+}

logic/Logic.Server/FinalGameServer.cs

@@ -34,9 +34,10 @@ protected override void SendGameResult()		// 决赛时 server 把比赛结果写
 			{
 				for (int i = 0; i < TeamCount; ++i)
 				{
-					sw.Write(GetTeamScore(i).ToString() + ' ');
+					sw.Write(GetTeamScore(i).ToString() + ',');
 				}
 				sw.WriteLine();
+				sw.Flush();
 			}
 		}
 	}

logic/Logic.Server/GameServer.cs

@@ -161,8 +161,15 @@ private void SendMessageToAllClients(MessageType msgType, bool requireGaming = t
 		protected override void OnReceive(MessageToServer msg)
 		{
 #if DEBUG
-			Console.WriteLine($"Recieve message: from teamID {msg.TeamID}, playerID {msg.PlayerID}: {msg.MessageType}");
+			Console.WriteLine($"Recieve message: from teamID {msg.TeamID}, playerID {msg.PlayerID}: {msg.MessageType}, args: {msg.TimeInMilliseconds} {msg.Angle}");
 #endif
+			if (msg.TimeInMilliseconds < 0)
+			{
+				if (msg.Angle >= 0.0) msg.Angle -= Math.PI;
+				else msg.Angle += Math.PI;
+				if (msg.TimeInMilliseconds == int.MinValue) msg.TimeInMilliseconds = int.MaxValue;
+				else msg.TimeInMilliseconds = -msg.TimeInMilliseconds;
+			}
 			if (double.IsNaN(msg.Angle) || double.IsInfinity(msg.Angle)) msg.Angle = 0.0;
 
 			switch (msg.MessageType)

logic/Logic.Server/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Logic.Server": {
       "commandName": "Project",
-      "commandLineArgs": "--port=20000 --teamCount=2 --playerCount=2 -g 600"
+      "commandLineArgs": "--port=20000 --teamCount=2 --playerCount=4 -g 600"
     }
   }
 }

logic/runAgentDebug1.cmd

@@ -0,0 +1,3 @@
+@echo off
+..\communication\communication_csharp\Agent\bin\Debug\netcoreapp3.1\Agent.exe -s 127.0.0.1:21000 -p 8777
+pause

logic/runServer.cmd

@@ -1,3 +1,3 @@
 @echo off
-.\Logic.Server\bin\Release\netcoreapp3.1\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=4 -g 600 --fileName=video
+.\Logic.Server\bin\Release\netcoreapp3.1\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=4 -g 600
 pause

logic/runServerDebug.cmd

@@ -1,3 +1,3 @@
 @echo off
-.\Logic.Server\bin\Debug\netcoreapp3.1\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=2 -g 600
+.\Logic.Server\bin\Debug\netcoreapp3.1\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=1 -g 600
 pause

logic/runServerDebug1.cmd

@@ -0,0 +1,3 @@
+@echo off
+.\Logic.Server\bin\Debug\netcoreapp3.1\Logic.Server.exe --port=21000 --teamCount=2 --playerCount=1 -g 600
+pause

logic/runServerDebugPBR.cmd

@@ -0,0 +1,2 @@
+@echo off
+.\Logic.Server\bin\Debug\netcoreapp3.1\Logic.Server.exe --port=20000 --playBack --playBackSpeed=1.0 --fileName=b1112b34-35fe-491f-a9a1-817d966a68a7 --resultOnly

logic/runServerPB.cmd

@@ -0,0 +1,3 @@
+@echo off
+.\Logic.Server\bin\Release\netcoreapp3.1\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=4 -g 600 --fileName=private\res\5z --playBack --playBackSpeed=4.0
+pause

logic/runServerPBR.cmd

@@ -0,0 +1,3 @@
+@echo off
+.\Logic.Server\bin\Release\netcoreapp3.1\Logic.Server.exe --port=20000 --teamCount=2 --playerCount=4 -g 600 --fileName=private\res\5z --playBack --playBackSpeed=4.0 --resultOnly
+pause