新增字段MaxQuestionCount

hsyhhssyy · Jun 21, 2024 · cca06d2 · cca06d2
1 parent 6d57cdb
commit cca06d2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/AmiyaBotPlayerRatingServer/GameLogic/CypherChallenge/CypherChallengeGame.cs b/AmiyaBotPlayerRatingServer/GameLogic/CypherChallenge/CypherChallengeGame.cs
@@ -39,6 +39,7 @@ public class Question
         }
 
         public int CurrentQuestionIndex { get; set; } = 0;
+        public int MaxQuestionCount { get; set; } = 10;
 
         public List<Question> QuestionList { get; set; } = new();
         public Dictionary<String, double> PlayerScore { get; set; } = new();

diff --git a/AmiyaBotPlayerRatingServer/GameLogic/CypherChallenge/CypherChallengeManager.cs b/AmiyaBotPlayerRatingServer/GameLogic/CypherChallenge/CypherChallengeManager.cs
@@ -29,6 +29,7 @@ public class CypherChallengeManager(ArknightsMemoryCache memoryCache, GameManage
             var game= new CypherChallengeGame();
             game.GameType="CypherChallenge";
 
+            game.MaxQuestionCount = 10;
             while (game.QuestionList.Count<10)
             {
                 var randomIndex = random.Next(0, operatorIdList.Count);

diff --git a/AmiyaBotPlayerRatingServer/GameLogic/Game.cs b/AmiyaBotPlayerRatingServer/GameLogic/Game.cs
@@ -28,6 +28,7 @@ public interface IScorable
     public interface ISequentialQuestionGame<TQuestion>
     {
         public int CurrentQuestionIndex { get; set; }
+        public int MaxQuestionCount { get; set; }
 
         public List<TQuestion> QuestionList { get; set; }
 

diff --git a/AmiyaBotPlayerRatingServer/GameLogic/IGameManager.cs b/AmiyaBotPlayerRatingServer/GameLogic/IGameManager.cs
@@ -21,15 +21,13 @@ public class RequestHintOrGiveUpResult
         }
 #pragma warning restore CS8618
 
-        public Task<Game?> CreateNewGame(Dictionary<String, object> param);
-
         public Task<object> GetGamePayload(Game rawGame);
-        public Task<double> GetScore(Game game, string player);
 
+        public Task<Game?> CreateNewGame(Dictionary<String, object> param);
         public Task<object> GetGameStartPayload(Game game);
+        public Task<double> GetScore(Game game, string player);
 
         public Task<object> HandleMove(Game game, string playerId, string move);
-
         public Task<RequestHintOrGiveUpResult> GiveUp(Game game, string appUserId);
         public Task<RequestHintOrGiveUpResult> RequestHint(Game game, string appUserId);
 

diff --git a/AmiyaBotPlayerRatingServer/GameLogic/SkinGuess/SkinGuessGame.cs b/AmiyaBotPlayerRatingServer/GameLogic/SkinGuess/SkinGuessGame.cs
@@ -31,6 +31,7 @@ public class Question
         }
 
         public int CurrentQuestionIndex { get; set; }
+        public int MaxQuestionCount { get; set; }
 
         public List<Question> QuestionList { get; set; }
 

diff --git a/AmiyaBotPlayerRatingServer/GameLogic/SkinGuess/SkinGuessManager.cs b/AmiyaBotPlayerRatingServer/GameLogic/SkinGuess/SkinGuessManager.cs
@@ -65,7 +65,9 @@ private SkinGuessGame GenerateRealGame()
             var max = operatorIdList.Count;
             var random = new Random();
 
-            while(game.QuestionList.Count<16)
+            game.MaxQuestionCount = 20;
+
+            while(game.QuestionList.Count< 20)
             {
                 var rand = random.Next(0, max);
                 var charId = operatorIdList[rand];
@@ -75,6 +77,13 @@ private SkinGuessGame GenerateRealGame()
                 }
 
                 var charName = charMaps[charId];
+
+                if (charName.Contains("阿米娅"))
+                {
+                    //阿米娅不参与，升变太烦人了
+                    continue;
+                }
+
                 var skinList = (skinUrls[charId] as JObject)?.Properties().Select(p=>p.Value).ToList();
 
                 if (skinList==null||skinList.Count <= 1)
@@ -103,7 +112,7 @@ private SkinGuessGame GenerateRealGame()
 
         private bool IsOperatorName(string name)
         {
-            var charDataJson = arknightsMemoryCache.GetJson("character_names.json")?.ToObject<Dictionary<String,String>>();
+            var charDataJson = arknightsMemoryCache.GetJson("character_names.json")?.ToObject<Dictionary<String, String>>();
             if (charDataJson == null)
             {
                 //ERROR
@@ -152,6 +161,7 @@ private object FormatGame(SkinGuessGame game)
 
                 QuestionList = questionList,
                 CurrentQuestionIndex = game.CurrentQuestionIndex,
+                MaxQuestionCount = game.MaxQuestionCount,
             };
         }