From 05d056802b9644ff6e5ca5f79e39d471b5ffe635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com>
Date: Tue, 7 Jul 2026 00:18:26 +0800
Subject: [PATCH] 1

---
 .../GameConfig_SubClass/ChessConfig.cs        |   3 +
 .../aa/UI/Game/ChineseChess/1District.prefab  |  21 +-
 .../ChineseChess/UIChineseChessDistrict.cs    | 133 +++++---
 .../MyGame/aa/UI/Home/Sub/MYSelectSit.prefab  |  86 ++++-
 .../Home/Sub/UIHome_BY_MySelectRoomPanel.cs   |  22 +-
 Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab  | 317 +++++++++++++-----
 .../MyGame/aa/UI/Home/Sub/ZhanLing_Panel.cs   |   3 +-
 Assets/MyGame/aa/UI/Home/UIHomeMain.cs        |   2 +-
 8 files changed, 437 insertions(+), 150 deletions(-)

diff --git a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs
index 35e4b162d..7ceb707ac 100644
--- a/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs
+++ b/Assets/MyGame/Scripts/Net/APIResponses/GameConfig_SubClass/ChessConfig.cs
@@ -17,5 +17,8 @@ namespace Assets.MyGame.Scripts.Net.API.GameConfig_SubClass
 
         /// <summary>投注金币限制列表</summary>
         public List<long> betGoldLimits;
+
+        /// <summary>分区数量</summary>
+        public int districtCount;
     }
 }
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab b/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
index 6f3b2a380..b44a5c988 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/1District.prefab
@@ -34,7 +34,7 @@ RectTransform:
   m_Father: {fileID: 358166129368429010}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -597,6 +597,9 @@ MonoBehaviour:
   panel_RoomItemParent: {fileID: 7647910538216301643}
   scroll: {fileID: 2011368224300036240}
   tmp_CurrGold: {fileID: 7375904467643721525}
+  tra_DaQuParent: {fileID: 5504888745145859652}
+  tra_FenQuItem: {fileID: 2362633876095317134}
+  maxDistrict: 10
 --- !u!114 &2024476905427852506
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1857,7 +1860,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5073449037799569824
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1873,9 +1876,9 @@ RectTransform:
   - {fileID: 6712131649239169743}
   m_Father: {fileID: 5504888745145859652}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 130.045, y: -120}
   m_SizeDelta: {x: 200.09, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7631087481949522533
@@ -2501,7 +2504,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7424860594244896561
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2517,9 +2520,9 @@ RectTransform:
   - {fileID: 1686468845713917608}
   m_Father: {fileID: 5504888745145859652}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 130.045, y: -40}
   m_SizeDelta: {x: 200.09, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8573315565771256190
diff --git a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
index 41d7862f7..119e5bdb1 100644
--- a/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
+++ b/Assets/MyGame/aa/UI/Game/ChineseChess/UIChineseChessDistrict.cs
@@ -1,4 +1,4 @@
-using Assets.MyGame.Scripts.Net;
+using Assets.MyGame.Scripts.Net;
 using Assets.MyGame.Scripts.Net.WebResponses;
 using Newtonsoft.Json;
 using System.Collections;
@@ -14,31 +14,46 @@ public class UIChineseChessDistrict : SubUIBase
     public Transform panel_RoomItemParent;
     public ScrollRect scroll;
     public TextMeshProUGUI tmp_CurrGold;
-    //public Dictionary<Transform, List<Transform>> itemListDic=new Dictionary<Transform, List<Transform>>();
     public Dictionary<string, Transform> itemListDic = new Dictionary<string, Transform>();
     float horizontalNormalizedPosition;
-    
+
+    public Transform tra_DaQuParent;
+    public Transform tra_FenQuItem;  // child0=Toggle, child0.child0=TextMeshProUGUI（象棋n区）
+    public int maxDistrict = 10;     // 最大分区数
+
+    private bool _tabsBuilt = false;
+
     public override void Awake()
     {
         base.Awake();
-        //btn_Close.onClick.AddListener(() =>
-        //{
-        //    UIManager.Instance.Close(UIPanel.MainGamePanelZGXQ);
-        //    UIManager.Instance.ShowAsync(UIPanel.HomeMainPanel);
-        //});
-
-
-
     }
+
     private void Update()
     {
         scroll.horizontalNormalizedPosition = Mathf.Lerp(scroll.horizontalNormalizedPosition, horizontalNormalizedPosition, 0.5f);
     }
+
     public override void Hide()
     {
         base.Hide();
-        
     }
+
+    protected override void OnShow(object args = null)
+    {
+        base.OnShow(args);
+        tmp_CurrGold.text = GameManager.Instance.user.assets.gold.ToString();
+
+        // 从后端配置读取分区数
+        maxDistrict = GameManager.Instance?.gameConfig?.chessConfig?.districtCount ?? 10;
+        if (maxDistrict <= 0) maxDistrict = 1;
+
+        if (!_tabsBuilt)
+        {
+            BuildChessFenQuTabs();
+            _tabsBuilt = true;
+        }
+    }
+
     public override void Show(object args = null)
     {
         base.Show(args);
@@ -48,17 +63,14 @@ public class UIChineseChessDistrict : SubUIBase
         {
             int i = 0;
             var v = JsonConvert.DeserializeObject<WebSocketResponseBase<List<ChessGameRoom>>>(args.ToString());
-            //var v = args as List<GetRoomList>;
             var basePanel = (ChineseChessMainPanel)uIManager.parentUIBase;
             foreach (var item in v.arguments[0])
             {
-                //itemListDic.Add Instantiate(panel_RoomItemPrefab, itemPage[(int)(i/15)-1]);
                 var tran = Instantiate(panel_RoomItemPrefab.gameObject, panel_RoomItemParent).transform;
 
                 tran.GetComponent<Button>().onClick.AddListener(() =>
                 {
-                    //GameManager.Instance.StartGame();
-                    switch (ChineseChessMainPanel.dic_RoomData[ item.roomId].state)
+                    switch (ChineseChessMainPanel.dic_RoomData[item.roomId].state)
                     {
                         case 1:
                             int temp = ChineseChessMainPanel.dic_RoomData[item.roomId].users.Count;
@@ -70,17 +82,12 @@ public class UIChineseChessDistrict : SubUIBase
                             {
                                 uIManager.ShowAsync(UIPanel.ZGXQJoinGame, item);
                             }
-                                
-                            
-
-
-
                             break;
-                            case 2:
+                        case 2:
                             UIManager.Instance.ShowBoardError("房间已经开始");
                             break;
-                            case 3:
-                            case 0:
+                        case 3:
+                        case 0:
                             uIManager.ShowAsync(UIPanel.ZGXQCreateRoom, item);
                             break;
                         default:
@@ -88,46 +95,94 @@ public class UIChineseChessDistrict : SubUIBase
                     }
                 });
                 tran.name = item.roomId;
-                itemListDic.Add(item.roomId, tran);
-                ChineseChessMainPanel.dic_RoomData[item.roomId]=(item);
+                itemListDic[item.roomId] = tran;
+                ChineseChessMainPanel.dic_RoomData[item.roomId] = item;
+
                 var slider = tran.transform.GetChild(0).GetComponent<Slider>();
                 int allPlayerCount = item.users.Count;
-                //int allPlayerCount = item.currentOnlinePlayerCount + item.robotCount;
                 slider.value = (float)allPlayerCount / 2;
                 if (allPlayerCount == 2)
-                {
                     slider.fillRect.GetChild(0).gameObject.SetActive(true);
-                }
                 else
-                {
                     slider.fillRect.GetChild(0).gameObject.SetActive(false);
-                }
+
                 tran.transform.GetChild(1).GetComponent<TextMeshProUGUI>().text = allPlayerCount + "/" + 2;
                 tran.transform.GetChild(2).GetComponent<TextMeshProUGUI>().text = item.roomId.Substring(2).ToString();
                 i++;
             }
             scroll.horizontalNormalizedPosition = 0;
         }
-
     }
+
+    // ==================== 分区 Tab ====================
+
+    private void BuildChessFenQuTabs()
+    {
+        if (tra_DaQuParent == null || tra_FenQuItem == null) return;
+
+        // 清空旧列表
+        for (int i = panel_RoomItemParent.childCount - 1; i >= 0; i--)
+            Destroy(panel_RoomItemParent.GetChild(i).gameObject);
+        itemListDic.Clear();
+
+        for (int d = 1; d <= maxDistrict; d++)
+        {
+            var tab = Instantiate(tra_FenQuItem, tra_DaQuParent);
+            // child0 = Toggle容器, child0.child0 = TextMeshProUGUI
+            if (tab.childCount > 0 && tab.GetChild(0) != null && tab.GetChild(0).childCount > 0)
+                tab.GetChild(0).GetChild(0).GetComponent<TextMeshProUGUI>().text = "象棋" + ToChineseNumber(d) + "区";
+
+            int district = d;
+            var toggle = tab.GetChild(0).GetComponent<Toggle>();
+            if (toggle != null)
+            {
+                toggle.onValueChanged.AddListener((isOn) =>
+                {
+                    if (!isOn) return;
+
+                    // 手动单选
+                    for (int i = 0; i < tra_DaQuParent.childCount; i++)
+                    {
+                        var t = tra_DaQuParent.GetChild(i).GetChild(0).GetComponent<Toggle>();
+                        if (t != null && t != toggle)
+                            t.SetIsOnWithoutNotify(false);
+                    }
+
+                    // 清空房间列表
+                    for (int i = panel_RoomItemParent.childCount - 1; i >= 0; i--)
+                        Destroy(panel_RoomItemParent.GetChild(i).gameObject);
+                    itemListDic.Clear();
+
+                    WebSocketSendList.GetRoomListChineseChess(district);
+                });
+            }
+        }
+    }
+
+    private static string ToChineseNumber(int n)
+    {
+        if (n <= 0) return n.ToString();
+        if (n <= 10)
+        {
+            string[] units = { "", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十" };
+            return units[n];
+        }
+        return n.ToString();
+    }
+
     public void UpdataRoom(ChessGameRoom item)
     {
-        string roomID= item.roomId;
+        string roomID = item.roomId;
         ChineseChessMainPanel.dic_RoomData[roomID] = item;
-        
 
-        var tran=itemListDic[roomID];
+        var tran = itemListDic[roomID];
         var slider = tran.transform.GetChild(1).GetComponent<Slider>();
         int allPlayerCount = item.users.Count;
         slider.value = (float)allPlayerCount / 2;
         if (allPlayerCount == 2)
-        {
             slider.fillRect.GetChild(0).gameObject.SetActive(true);
-        }
         else
-        {
             slider.fillRect.GetChild(0).gameObject.SetActive(false);
-        }
         tran.transform.GetChild(2).GetComponent<TextMeshProUGUI>().text = allPlayerCount + "/" + 2;
     }
 }
diff --git a/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab b/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
index 9990f52a4..56e5ad4e0 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/MYSelectSit.prefab
@@ -306,7 +306,7 @@ RectTransform:
   m_Father: {fileID: 3092220127254483930}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1178,6 +1178,81 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &3256528625727943362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6281801687287768869}
+  - component: {fileID: 698141959142575679}
+  - component: {fileID: 677262242175948269}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6281801687287768869
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256528625727943362}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.3, y: 1.3, z: 1.3}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 8201949866724581361}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -77.7, y: 10.5}
+  m_SizeDelta: {x: 41, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &698141959142575679
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256528625727943362}
+  m_CullTransparentMesh: 1
+--- !u!114 &677262242175948269
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256528625727943362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: a8db9522a14eaa049820584e27bbcd63, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3782295641295282854
 GameObject:
   m_ObjectHideFlags: 0
@@ -1525,7 +1600,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4010011476213996972
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2785,8 +2860,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30.71
-  m_fontSizeBase: 30.71
+  m_fontSize: 25
+  m_fontSizeBase: 25
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -3087,7 +3162,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6281801687287768869}
   m_Father: {fileID: 4330457617603868989}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs
index dec1c584f..f6864db59 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_MySelectRoomPanel.cs
@@ -20,7 +20,7 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
     public Transform itemPageParent;
 
     public Transform tra_DaQuParent;
-    public Transform tra_FenQuItem;   // child0=背景, child1=场次名, child2=分区n
+    public Transform tra_FenQuItem;   // child1=场次名, child2=分区n
 
     public Dictionary<string, Transform> itemListDic = new Dictionary<string, Transform>();
 
@@ -90,7 +90,6 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
         int gameType = (int)GameManager.Instance.gameData.currGameType;
         int leave = GetCurrentLeave();
 
-        // 找到当前等级的分区数
         int partitionCount = 1;
         foreach (var c in cfg)
         {
@@ -105,10 +104,8 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
         {
             var tab = Instantiate(tra_FenQuItem, tra_DaQuParent);
 
-            // child1 = 场次名
             if (tab.childCount > 1 && tab.GetChild(1) != null)
                 tab.GetChild(1).GetComponent<TextMeshProUGUI>().text = LevelNameFor(leave);
-            // child2 = 分区n
             if (tab.childCount > 2 && tab.GetChild(2) != null)
                 tab.GetChild(2).GetComponent<TextMeshProUGUI>().text = "分区" + d;
 
@@ -116,22 +113,21 @@ public class UIHome_BY_MySelectRoomPanel : SubUIBase
             var toggle = tab.GetComponent<Toggle>();
             if (toggle != null)
             {
-                // 加入父对象 ToggleGroup 实现单选
-                toggle.group = tra_DaQuParent.GetComponent<ToggleGroup>();
-
                 toggle.onValueChanged.AddListener((isOn) =>
                 {
                     if (!isOn) return;
+
+                    for (int i = 0; i < tra_DaQuParent.childCount; i++)
+                    {
+                        var t = tra_DaQuParent.GetChild(i).GetComponent<Toggle>();
+                        if (t != null && t != toggle)
+                            t.SetIsOnWithoutNotify(false);
+                    }
+
                     ClearRoomPages();
                     WebSocketSendList.GetRoomListFish(leave, district);
                 });
             }
-
-            // 默认选中分区1并加载
-            if (d == 1 && toggle != null)
-            {
-                toggle.isOn = true;
-            }
         }
     }
 
diff --git a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
index bed9d1fff..60b973e44 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing.prefab
@@ -6454,6 +6454,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5819530290030904558}
+  - {fileID: 1526306285610352702}
   - {fileID: 5742761906453184358}
   m_Father: {fileID: 2752996038523846061}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8189,6 +8190,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4003099421882621838}
+  - {fileID: 8230163496629471652}
   - {fileID: 7556914784711549435}
   m_Father: {fileID: 2752996038523846061}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13816,6 +13818,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5694483222549672346}
+  - {fileID: 6676205671305646240}
   - {fileID: 8646204489318105564}
   m_Father: {fileID: 2752996038523846061}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18277,6 +18280,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5074335061163804236
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1526306285610352702}
+  - component: {fileID: 9184538472848635984}
+  - component: {fileID: 3312806528341153741}
+  m_Layer: 0
+  m_Name: jinbi 02_3_1 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1526306285610352702
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5074335061163804236}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6002141775210654504}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -39.00006, y: 4}
+  m_SizeDelta: {x: 31, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9184538472848635984
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5074335061163804236}
+  m_CullTransparentMesh: 1
+--- !u!114 &3312806528341153741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5074335061163804236}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1dff50aa1b065734ca307430dbcd39b7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5075285936693929630
 GameObject:
   m_ObjectHideFlags: 0
@@ -19001,7 +19079,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1193554226455504856
 RectTransform:
   m_ObjectHideFlags: 0
@@ -21098,6 +21176,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5810747292875386108
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6676205671305646240}
+  - component: {fileID: 5957158501201580861}
+  - component: {fileID: 5130656147263242947}
+  m_Layer: 0
+  m_Name: 20000000 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6676205671305646240
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5810747292875386108}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2137311242781486064}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 9.499992, y: 1.5}
+  m_SizeDelta: {x: 84, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5957158501201580861
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5810747292875386108}
+  m_CullTransparentMesh: 1
+--- !u!114 &5130656147263242947
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5810747292875386108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: d399e48845effcf44baeb30f400932c7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5814057741264267498
 GameObject:
   m_ObjectHideFlags: 0
@@ -22390,7 +22543,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5366394745832628699}
   - {fileID: 8840634808729238892}
   m_Father: {fileID: 6975780243845784479}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -22663,10 +22815,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2360076807807989969}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 13.000084, y: 3.7896}
-  m_SizeDelta: {x: 71, y: 31.5793}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4538868999722096207
 CanvasRenderer:
@@ -22716,7 +22868,7 @@ MonoBehaviour:
     bottomLeft: {r: 1, g: 1, b: 1, a: 1}
     bottomRight: {r: 1, g: 1, b: 1, a: 1}
   m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
+  m_spriteAsset: {fileID: 11400000, guid: a50c2d68004a30a4a949fd0014586cfb, type: 2}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
   m_TextStyleHashCode: -1183493901
@@ -26670,6 +26822,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   btn_Close: {fileID: 9091669723915166725}
   uIEffect: 0
+  toggle_MoRenShowZhnaLingJiangLi: {fileID: 788404979731359148}
   tmp_Level: {fileID: 8900623682585849961}
   tmp_Exp: {fileID: 1047680223030018608}
   slider_LevelExp: {fileID: 4660069166699375746}
@@ -29257,6 +29410,81 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7584700848340063373
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8230163496629471652}
+  - component: {fileID: 3489249859064539518}
+  - component: {fileID: 5130010159584605668}
+  m_Layer: 0
+  m_Name: 2000000 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8230163496629471652
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7584700848340063373}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 330717421543202524}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 10.0000305, y: 1.5}
+  m_SizeDelta: {x: 73, y: 15}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3489249859064539518
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7584700848340063373}
+  m_CullTransparentMesh: 1
+--- !u!114 &5130010159584605668
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7584700848340063373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: f8db7b9ce7cec20418522c278635b611, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7590830142887828686
 GameObject:
   m_ObjectHideFlags: 0
@@ -34390,81 +34618,6 @@ MonoBehaviour:
           m_BoolArgument: 0
         m_CallState: 2
   m_IsOn: 1
---- !u!1 &8657039108448181209
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5366394745832628699}
-  - component: {fileID: 2485389099921018546}
-  - component: {fileID: 6741329517352476585}
-  m_Layer: 0
-  m_Name: jinbi 02_3
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5366394745832628699
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8657039108448181209}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2360076807807989969}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -50.99995, y: 3}
-  m_SizeDelta: {x: 31, y: 28}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2485389099921018546
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8657039108448181209}
-  m_CullTransparentMesh: 1
---- !u!114 &6741329517352476585
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8657039108448181209}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 196d5b8816950924597e68b5b8759133, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8670907404715093543
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing_Panel.cs b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing_Panel.cs
index 17702dc61..95c139cf2 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/ZhanLing_Panel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/ZhanLing_Panel.cs
@@ -12,6 +12,7 @@ using UnityEngine.UI;
 
 public class ZhanLing_Panel : SubUIBase
 {
+    public Toggle toggle_MoRenShowZhnaLingJiangLi;
     [Header("战令等级奖励页面")]
     public TextMeshProUGUI tmp_Level;
     public TextMeshProUGUI tmp_Exp;
@@ -67,7 +68,7 @@ public class ZhanLing_Panel : SubUIBase
         {
             case UIPanel.ActivityPenel:
                 toggle_HD.isOn = true;
-
+                toggle_MoRenShowZhnaLingJiangLi.isOn = true;
                 break;
            
             case UIPanel.AnnouncementPanel:
diff --git a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs
index 821d17fc3..e247f85b1 100644
--- a/Assets/MyGame/aa/UI/Home/UIHomeMain.cs
+++ b/Assets/MyGame/aa/UI/Home/UIHomeMain.cs
@@ -92,7 +92,7 @@ public class UIHomeMain : UIBase
         {
         //subUIManager.ShowAsync(UIPanel.SelectRoomPenel, GameType.ZGXQ);
         WebSocketManager.Instance.Connect(SocketType.chess, () =>{
-            WebSocketSendList.GetRoomListChineseChess(1);
+            // WebSocketManager.OnOpen 已处理首次 GetRoomList，这里不再重复调用
         });
             
         });