feat: 🐛 add ArgumentOptions.spectator to determine whether spectator is allowed

logic/Server/ArgumentOption.cs

@@ -28,7 +28,10 @@ namespace Server
         public ushort TrickerCount { get; set; } = 1;
 
         [Option("maxStudentCount", Required = false, HelpText = "The max number of students, 4 by default")]
-        public ushort MaxStudentCount { get; set; } = 4;
+        public ushort MaxStudentCount { get; } = 4;
+
+        [Option("maxTrickerCount", Required = false, HelpText = "The max number of trickers, 1 by default")]
+        public ushort MaxTrickerCount { get; } = 1;
 
         [Option('g', "gameTimeInSecond", Required = false, HelpText = "The time of the game in second, 10 minutes by default")]
         public uint GameTimeInSecond { get; set; } = 10 * 60;
@@ -36,6 +39,9 @@ namespace Server
         [Option('f', "fileName", Required = false, HelpText = "The file to store playback file or to read file.")]
         public string FileName { get; set; } = DefaultArgumentOptions.FileName;
 
+        [Option('s', "spectator", Required = false, HelpText = "Whether allow a spectator to watch the game.")]
+        public bool spectator { get; set; } = true;
+
         [Option('b', "playback", Required = false, HelpText = "Whether open the server in a playback mode.")]
         public bool Playback { get; set; } = false;
 

logic/Server/GameServer.cs

@@ -40,10 +40,10 @@ namespace Server
         public void StartGame()
         {
             if (game.GameMap.Timer.IsGaming) return;
-            /*foreach (var id in communicationToGameID)
+            foreach (var id in communicationToGameID)
             {
                 if (id == GameObj.invalidID) return;     //如果有未初始化的玩家，不开始游戏
-            }*/ //测试时人数不够
+            }
             Console.WriteLine("Game starts!");
             game.StartGame((int)options.GameTimeInSecond * 1000);
             Thread.Sleep(1);
@@ -319,7 +319,11 @@ namespace Server
             currentMapMsg = MapMsg(game.GameMap.ProtoGameMap);
             communicationToGameID = new long[options.MaxStudentCount + options.TrickerCount];
             //创建server时先设定待加入人物都是invalid
-            for (int i = 0; i < communicationToGameID.GetLength(0); i++)
+            for (int i = 0; i < options.StudentCount; i++)
+            {
+                communicationToGameID[i] = GameObj.invalidID;
+            }
+            for (int i = options.MaxStudentCount; i < options.MaxStudentCount + options.TrickerCount; i++)
             {
                 communicationToGameID[i] = GameObj.invalidID;
             }

logic/Server/PlaybackServer.cs

@@ -192,7 +192,7 @@ namespace Server
                                         if (item.StudentMessage != null)
                                             teamScore[0, item.StudentMessage.PlayerId] = item.StudentMessage.Score;
                                         if (item.TrickerMessage != null)
-                                            teamScore[1, item.TrickerMessage.PlayerId - mr.playerCount] = item.TrickerMessage.Score;
+                                            teamScore[1, item.TrickerMessage.PlayerId - options.MaxStudentCount] = item.TrickerMessage.Score; // 这里默认 Tricker 的 PlayerId 从 MaxStudentCount = 4 开始
                                     }
                                 }
 

logic/Server/RpcServices.cs

@@ -56,7 +56,7 @@ namespace Server
         {
 
             Console.WriteLine($"AddPlayer: {request.PlayerId}");
-            if (request.PlayerId >= spectatorMinPlayerID)
+            if (request.PlayerId >= spectatorMinPlayerID && options.spectator == true)
             {
                 // 观战模式
                 uint tp = (uint)request.PlayerId;