Merge branch 'main' of http://10.27.16.144:3000/kawagiri/TH1 into main

Unity/Assets/Scripts/Data/MapData.cs

@@ -1001,7 +1001,7 @@ namespace RuntimeData
             gameRecord.CityCount = (uint)cityList.Count;
             gameRecord.MapWidth = MapConfig.Width;
             gameRecord.MapHeight = MapConfig.Height;
-            gameRecord.PlayerCount = MapConfig.PlayerCount - 1;
+            gameRecord.PlayerCount = MapConfig.PlayerCount;
             return gameRecord;
         }
         

Unity/Assets/Scripts/UI/ChooseUI.cs

@@ -162,9 +162,9 @@ public class ChooseUI
 
         AIDifficult diff = diffS switch
         {
-            "NORMAL" => AIDifficult.NORMAL,
-            "HARD" => AIDifficult.HARD,
-            "LUNATIC" => AIDifficult.LUNATIC,
+            "ButtonNormal" => AIDifficult.NORMAL,
+            "ButtonHard" => AIDifficult.HARD,
+            "ButtonLunatic" => AIDifficult.LUNATIC,
             _ => AIDifficult.EASY
         };
         //if (_mapData != null) _mapData.MapConfig.AIDiff = diff;

Unity/Assets/Scripts/UI/WinUI.cs

@@ -52,7 +52,7 @@ public class WinUI
             if(_frontBG != null)
                 _frontBG.color = Color.white;
             _ROWinUI.transform.Find("MsgList/Row1/Value").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Id).ToString();
-            _ROWinUI.transform.Find("MsgList/Row2/Value").GetComponent<TextMeshProUGUI>().text = _mapData.GetCityCount(_mapData.PlayerMap.SelfPlayerData.Turn).ToString();
+            _ROWinUI.transform.Find("MsgList/Row2/Value").GetComponent<TextMeshProUGUI>().text = _mapData.PlayerMap.SelfPlayerData.Turn.ToString();
             _ROWinUI.transform.Find("MsgList/Row3/Value").GetComponent<TextMeshProUGUI>().text = _mapData.PlayerMap.SelfPlayerData.PlayerScore.ToString();
             Show();
             _main.GameLogic.ChangeState(GameState.Finished);