From 305cf83e881f244b4558e58a875d5e456ae71c60 Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:35:09 +0800 Subject: [PATCH 1/8] Update ArgumentOption.cs --- logic/Server/ArgumentOption.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/logic/Server/ArgumentOption.cs b/logic/Server/ArgumentOption.cs index 641e7d3..3cd0dea 100644 --- a/logic/Server/ArgumentOption.cs +++ b/logic/Server/ArgumentOption.cs @@ -74,5 +74,8 @@ namespace Server [Option("startLockFile", Required = false, HelpText = "Whether to create a file that identifies whether the game has started")] public string StartLockFile { get; set; } = DefaultArgumentOptions.FileName; + + [Option("mode", Required = false, HelpText = "Whether to run final competition")] + public bool Mode { get; set; } = false; } -} \ No newline at end of file +} From 02682479a8aeaaaa11901d44d20548c9afb82c8d Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:39:47 +0800 Subject: [PATCH 2/8] Update GameServer.cs --- logic/Server/GameServer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logic/Server/GameServer.cs b/logic/Server/GameServer.cs index 68e65c6..45d4242 100644 --- a/logic/Server/GameServer.cs +++ b/logic/Server/GameServer.cs @@ -102,10 +102,9 @@ namespace Server } } } - protected void SendGameResult() // 天梯的 Server 给网站发消息记录比赛结果 + protected void SendGameResult(int[] scores, bool mode) // 天梯的 Server 给网站发消息记录比赛结果 { - int[] scores = GetScore(); - httpSender?.SendHttpRequest(scores).Wait(); + httpSender?.SendHttpRequest(scores, mode).Wait(); } private void OnGameEnd() @@ -114,7 +113,8 @@ namespace Server mwr?.Flush(); if (options.ResultFileName != DefaultArgumentOptions.FileName) SaveGameResult(options.ResultFileName.EndsWith(".json") ? options.ResultFileName : options.ResultFileName + ".json"); - SendGameResult(); + int[] scores = GetScore(); + SendGameResult(scores, options.Mode); this.endGameSem.Release(); } public void ReportGame(GameState gameState, bool requiredGaming = true) From d5e7227e5e3aa4af3321adb8484df3d3cdab2ce4 Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:40:54 +0800 Subject: [PATCH 3/8] Update HttpSender.cs --- logic/Server/HttpSender.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logic/Server/HttpSender.cs b/logic/Server/HttpSender.cs index 59442ae..a750c02 100644 --- a/logic/Server/HttpSender.cs +++ b/logic/Server/HttpSender.cs @@ -20,7 +20,7 @@ namespace Server // { // this.SendHttpRequest(new()).Wait(); // } - public async Task SendHttpRequest(int[] scores) + public async Task SendHttpRequest(int[] scores, int mode) { try { @@ -33,7 +33,7 @@ namespace Server new TeamScore() { team_id = 0, score = scores[0], }, new TeamScore() { team_id = 1, score = scores[1], }, }, - mode = 0 + mode = mode }))) { Console.WriteLine("Send to web successfully!"); From 39dfdc9b86c18f176592adeb7826ff7e333234d7 Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:41:11 +0800 Subject: [PATCH 4/8] Update GameServer.cs --- logic/Server/GameServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logic/Server/GameServer.cs b/logic/Server/GameServer.cs index 45d4242..afebe2f 100644 --- a/logic/Server/GameServer.cs +++ b/logic/Server/GameServer.cs @@ -102,7 +102,7 @@ namespace Server } } } - protected void SendGameResult(int[] scores, bool mode) // 天梯的 Server 给网站发消息记录比赛结果 + protected void SendGameResult(int[] scores, int mode) // 天梯的 Server 给网站发消息记录比赛结果 { httpSender?.SendHttpRequest(scores, mode).Wait(); } From 7772cba391875e5f96b28162b4dca10835fc4bea Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:41:43 +0800 Subject: [PATCH 5/8] Update ArgumentOption.cs --- logic/Server/ArgumentOption.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logic/Server/ArgumentOption.cs b/logic/Server/ArgumentOption.cs index 3cd0dea..120c686 100644 --- a/logic/Server/ArgumentOption.cs +++ b/logic/Server/ArgumentOption.cs @@ -76,6 +76,6 @@ namespace Server public string StartLockFile { get; set; } = DefaultArgumentOptions.FileName; [Option("mode", Required = false, HelpText = "Whether to run final competition")] - public bool Mode { get; set; } = false; + public int Mode { get; set; } = 0; } } From 7055f73569b4cb99774eae4e16a2e773d49034fa Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:45:50 +0800 Subject: [PATCH 6/8] Update HttpSender.cs --- logic/Server/HttpSender.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logic/Server/HttpSender.cs b/logic/Server/HttpSender.cs index a750c02..b9bfb2d 100644 --- a/logic/Server/HttpSender.cs +++ b/logic/Server/HttpSender.cs @@ -33,7 +33,7 @@ namespace Server new TeamScore() { team_id = 0, score = scores[0], }, new TeamScore() { team_id = 1, score = scores[1], }, }, - mode = mode + mode = mode }))) { Console.WriteLine("Send to web successfully!"); From 6862010fe9b43222741af838abfe9d46d703a6fc Mon Sep 17 00:00:00 2001 From: Changli Tang <84725343+TCL606@users.noreply.github.com> Date: Sat, 27 May 2023 02:47:46 +0800 Subject: [PATCH 7/8] Update run.sh --- dependency/shell/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependency/shell/run.sh b/dependency/shell/run.sh index 71ae4ab..d92f766 100644 --- a/dependency/shell/run.sh +++ b/dependency/shell/run.sh @@ -5,10 +5,10 @@ python_main_dir=/usr/local/PlayerCode/CAPI/python playback_dir=/usr/local/playback if [ $EXPOSED -eq 1 ]; then - nice -10 ./Server --port 8888 --studentCount 4 --trickerCount 1 --resultFileName $playback_dir/result --gameTimeInSecond $TIME --mapResource $MAP --url $URL --token $TOKEN --fileName $playback_dir/video --startLockFile $playback_dir/start.lock > $playback_dir/server.log 2>&1 & + nice -10 ./Server --port 8888 --studentCount 4 --trickerCount 1 --resultFileName $playback_dir/result --gameTimeInSecond $TIME --mode $MODE --mapResource $MAP --url $URL --token $TOKEN --fileName $playback_dir/video --startLockFile $playback_dir/start.lock > $playback_dir/server.log 2>&1 & server_pid=$! else - nice -10 ./Server --port 8888 --studentCount 4 --trickerCount 1 --resultFileName $playback_dir/result --gameTimeInSecond $TIME --mapResource $MAP --notAllowSpectator --url $URL --token $TOKEN --fileName $playback_dir/video --startLockFile $playback_dir/start.lock > $playback_dir/server.log 2>&1 & + nice -10 ./Server --port 8888 --studentCount 4 --trickerCount 1 --resultFileName $playback_dir/result --gameTimeInSecond $TIME --mode $MODE --mapResource $MAP --notAllowSpectator --url $URL --token $TOKEN --fileName $playback_dir/video --startLockFile $playback_dir/start.lock > $playback_dir/server.log 2>&1 & server_pid=$! fi sleep 5 From 9ea7f9caaf56d76d443540c04df9880e50d784e5 Mon Sep 17 00:00:00 2001 From: TCL <1620508360@qq.com> Date: Sat, 27 May 2023 02:51:50 +0800 Subject: [PATCH 8/8] chore: format --- logic/Server/ArgumentOption.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logic/Server/ArgumentOption.cs b/logic/Server/ArgumentOption.cs index 120c686..dbd6efd 100644 --- a/logic/Server/ArgumentOption.cs +++ b/logic/Server/ArgumentOption.cs @@ -74,7 +74,7 @@ namespace Server [Option("startLockFile", Required = false, HelpText = "Whether to create a file that identifies whether the game has started")] public string StartLockFile { get; set; } = DefaultArgumentOptions.FileName; - + [Option("mode", Required = false, HelpText = "Whether to run final competition")] public int Mode { get; set; } = 0; }