1

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: a263e71fce79f2f4cb5b5f1fa6b7291a
   m_currentHash:
     serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: e88239bd385df7eeb8432db63ac72d7d
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_BundleLocalCatalog: 0
@@ -138,6 +138,7 @@ MonoBehaviour:
     - ZGXQ
     - PTCBZS
     - MainUI
+    - Font
   m_SchemaTemplates: []
   m_GroupTemplateObjects:
   - {fileID: 11400000, guid: f8bdd136efb211442bda19725e55eefa, type: 2}
@@ -168,7 +169,7 @@ MonoBehaviour:
           m_Key: HostingServiceUploadSpeed
         - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
           m_ClassName: System.String
-          m_Data: Library/com.unity.addressables/aa/Windows/StandaloneWindows64
+          m_Data: Library/com.unity.addressables/aa/Android/Android
           m_Key: ContentRoot
         - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
           m_ClassName: System.Boolean

Assets/Art/FengLei/Fish/25.prefab

@@ -95,6 +95,9 @@ MonoBehaviour:
   needLockEvent: 0
   createVideoClip: {fileID: 0}
   rotationPY: 60
+  useMirrorCompensate: 1
+  useRollSignFlip: 0
+  useRouteFlipX: 0
   baseMmove: 0
   isRotate: 1
   isNot1: 0
@@ -102,6 +105,9 @@ MonoBehaviour:
   depthOffset: 500
   is2DFish: 0
   sortOrder2D: 0
+  drawMoveLine: 0
+  drawLineSegments: 60
+  drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!58 &6080882259930068445
 CircleCollider2D:
   m_ObjectHideFlags: 0

Assets/MyGame/Scripts/Net/WebSocketManager_Message.cs

@@ -174,6 +174,8 @@ namespace Assets.MyGame.Scripts.Net
                                 {
                                     roomMainPanel.subUIManager.ShowAsync(UIPanel.ZGXQDefeated);
                                 }
+                                // 结算后按结果实时更新房间双方金币显示
+                                roomMainPanel.ApplySettlementGold(va);
                             }
 
                             break;
@@ -270,6 +272,8 @@ namespace Assets.MyGame.Scripts.Net
                                     roomMainPanel.subUIManager.ShowAsync(UIPanel.ZGXQWin);
                                 else
                                     roomMainPanel.subUIManager.ShowAsync(UIPanel.ZGXQDefeated);
+                                // 结算后按结果实时更新房间双方金币显示
+                                roomMainPanel.ApplySettlementGold(winUserId);
                             }
                             break;
 

Assets/MyGame/aa/Game/FLZY/BOSS/BWX/1614.prefab

@@ -88,7 +88,7 @@ PrefabInstance:
     - target: {fileID: 235769973576240634, guid: 18de46de860592b41811159997387914,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 235769973576240634, guid: 18de46de860592b41811159997387914,
         type: 3}

Assets/MyGame/aa/Game/FLZY/BOSS/DLY/6012.prefab

@@ -393,7 +393,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1894159486133772, guid: bf0e0c56b3551b84ab0b2bab19b162c1, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1894159486133772, guid: bf0e0c56b3551b84ab0b2bab19b162c1, type: 3}
       propertyPath: m_TagString

Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/PW_Enemy_6000.prefab

@@ -16,6 +16,18 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 7
+      objectReference: {fileID: 0}
     - target: {fileID: 4705490297895623, guid: 9a0f98ba992183c48b8412576ab5f9e8, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -1694,6 +1706,7 @@ MonoBehaviour:
   createVideoClip: {fileID: 0}
   rotationPY: 60
   useMirrorCompensate: 0
+  useRollSignFlip: 0
   useRouteFlipX: 0
   baseMmove: 0
   isRotate: 0
@@ -1702,6 +1715,9 @@ MonoBehaviour:
   depthOffset: -30
   is2DFish: 0
   sortOrder2D: 0
+  drawMoveLine: 0
+  drawLineSegments: 60
+  drawLineColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
   bossName: "\u5E78\u8FD0\u8F6E"
   isToUI: 1
   tMP_CurrBossScore: {fileID: 0}

Assets/MyGame/aa/Game/XJMH/Boss/XingYunLun/XingYunLun_BOSS.cs

@@ -64,7 +64,7 @@ public class XingYunLun_BOSS : MonsterControl_BossBase
         _killNotice = obj;
 
         // 音效：幸运大转盘死亡（PW_FortuneWheel_Die）
-        AudioManager.Instance.PlayerFXByName("PW_FortuneWheel_Die");
+        //AudioManager.Instance.PlayerFXByName("PW_FortuneWheel_Die");  //泰语声音暂时先不要
 
         // 停止移动，切到 idle
         isMove = false;

Assets/MyGame/aa/UI/Game/ChineseChess/ChineseChessMainPanel.cs

@@ -328,6 +328,43 @@ public class ChineseChessMainPanel : GameMainPanel_Base
         }
     }
 
+    /// <summary>
+    /// 用户数据变化回调（结算/领奖/邮件等触发 LoginHub AssetUpdated → GetUser → 此处）
+    /// 用账户金币实时校准房间内自己的金币显示（账户金币是权威数据）
+    /// </summary>
+    private void OnUserDataChangedHandler()
+    {
+        if (roomData?.users == null) return;
+        var assets = GameManager.Instance?.user?.assets;
+        if (assets == null) return;
+        string myId = GameManager.Instance.user.BaseInfo.number;
+        var mine = roomData.users.Find(u => u.userId == myId);
+        if (mine == null || mine.gold == assets.gold) return;
+        mine.gold = assets.gold;
+        if (tmp_CoinCount_Bottom != null) tmp_CoinCount_Bottom.text = FormatGold(mine.gold);
+    }
+
+    /// <summary>
+    /// 结算后实时刷新房间双方金币：按服务端结果本地预更新（赢家 +底分，输家 -底分）
+    /// （对方的账户变化客户端收不到推送，只能按底分本地算；
+    ///   自己的金币随后由 AssetUpdated → OnUserDataChangedHandler 用账户数据校准）
+    /// winUserId：赢家 userId；空 = 和棋（金币不变）
+    /// </summary>
+    public void ApplySettlementGold(string winUserId)
+    {
+        if (string.IsNullOrEmpty(winUserId)) return; // 和棋不动金币
+        if (roomData?.users == null || roomData.users.Count < 2) return;
+
+        long bet = roomData.gold;
+        for (int i = 0; i < roomData.users.Count; i++)
+        {
+            var u = roomData.users[i];
+            if (u.userId == winUserId) u.gold += bet;
+            else u.gold = u.gold > bet ? u.gold - bet : 0;
+        }
+        UpdateUserData(roomData);
+    }
+
     public override void Awake()
     {
         base.Awake();
@@ -343,6 +380,9 @@ public class ChineseChessMainPanel : GameMainPanel_Base
     protected override void OnShow(object args = null)
     {
         base.OnShow(args);
+        // 订阅用户数据变化：结算/领奖后 LoginHub AssetUpdated 会触发，实时刷新房间金币
+        GameManager.Instance.OnUserDataChanged -= OnUserDataChangedHandler;
+        GameManager.Instance.OnUserDataChanged += OnUserDataChangedHandler;
         // 回到选房间界面时显示等待中（连带父对象）
         SetDengDaiZhongActive(true);
         subUIManager.ShowAsync(UIPanel.ZGXQDistrict, args);
@@ -727,6 +767,8 @@ public class ChineseChessMainPanel : GameMainPanel_Base
     protected override void OnHide()
     {
         base.OnHide();
+        // 退订用户数据变化
+        GameManager.Instance.OnUserDataChanged -= OnUserDataChangedHandler;
         // 清理象棋对局
         ClearChessGame();
         // 退出：播放 Close 动画后禁用 Spine

Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab

@@ -4699,6 +4699,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1760138386056995660, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1760138386056995660, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1760138386056995660, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2032096458303231653, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4754,6 +4769,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2744990988094366670, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2744990988094366670, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2744990988094366670, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2840537249908178071, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4874,6 +4904,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4738988900425292525, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738988900425292525, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738988900425292525, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4774532991665997069, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4899,6 +4944,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4977026541056167392, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4977026541056167392, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4977026541056167392, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5125748186056324427, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5125748186056324427, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5125748186056324427, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5272359302783846682, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4969,6 +5044,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6186423367639033915, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6186423367639033915, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6186423367639033915, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6291988559347468148, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5198,7 +5288,7 @@ PrefabInstance:
     - target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
@@ -5208,7 +5298,7 @@ PrefabInstance:
     - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5494969937974881520, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
@@ -5499,6 +5589,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2925422125526734773, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5584,6 +5689,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3745304765716925570, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3745304765716925570, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3745304765716925570, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828036928016589604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828036928016589604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828036928016589604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3941184975665757053, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5594,6 +5729,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3975632670945500047, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3975632670945500047, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3975632670945500047, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4050916237064905887, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5739,6 +5889,21 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6063412306933429665, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6063412306933429665, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6063412306933429665, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6149144159244937976, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5819,6 +5984,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7660903435642352931, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7660903435642352931, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7660903435642352931, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7814522285136084044, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6624,6 +6804,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2999281627023095586, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2999281627023095586, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2999281627023095586, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3104286066734504045, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6709,6 +6904,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4131193648195162873, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4131193648195162873, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4131193648195162873, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4280479205220723282, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4280479205220723282, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4280479205220723282, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4325286122475464214, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6719,6 +6944,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4431899043194701300, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4431899043194701300, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4431899043194701300, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4469696790760741396, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6834,6 +7074,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6511408171727109335, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6511408171727109335, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6511408171727109335, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6570360898787435406, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6899,6 +7154,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7217094752249396309, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7217094752249396309, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7217094752249396309, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7498870704429108313, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -7160,6 +7430,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1138529054820578357, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -7240,6 +7525,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1826553991223224748, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1826553991223224748, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1826553991223224748, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1936530329675396684, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -7265,6 +7565,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2287596303847097866, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2287596303847097866, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2287596303847097866, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2415706757311968769, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -7385,6 +7715,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4679302615706898445, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4679302615706898445, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4679302615706898445, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4948902458849928676, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -7730,6 +8075,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9116788283336265871, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9116788283336265871, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9116788283336265871, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9156988015001918806, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer

Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab

@@ -2784,6 +2784,8 @@ MonoBehaviour:
   toggle_Lock: {fileID: 6681897813473983596}
   toggle_Three: {fileID: 4500888554953033243}
   toggle_Shuang: {fileID: 8388135261867480132}
+  lockPathMin: 0.1
+  lockPathMax: 0.9
   currShuangTime: 0
   toggle_BaoZou: {fileID: 8051146137760919780}
   tmp_BaoZouCount: {fileID: 5201812512495119800}
@@ -4646,6 +4648,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1760138386056995660, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1760138386056995660, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1760138386056995660, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2032096458303231653, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4696,6 +4713,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2744990988094366670, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2744990988094366670, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2744990988094366670, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2840537249908178071, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4811,6 +4843,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4738988900425292525, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738988900425292525, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4738988900425292525, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4774532991665997069, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4836,6 +4883,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4977026541056167392, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4977026541056167392, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4977026541056167392, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5125748186056324427, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5125748186056324427, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5125748186056324427, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5272359302783846682, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4846,6 +4923,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5361464974345637714, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5361464974345637714, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5361464974345637714, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5370919125733460380, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -4891,6 +4983,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6186423367639033915, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6186423367639033915, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6186423367639033915, guid: 78d0ab279487b3d449ab990658edac74,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6291988559347468148, guid: 78d0ab279487b3d449ab990658edac74,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5167,6 +5274,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 956991969047616378, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1138529054820578357, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5247,6 +5369,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1826553991223224748, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1826553991223224748, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1826553991223224748, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1936530329675396684, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5272,6 +5409,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2129234106690109089, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2287596303847097866, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2287596303847097866, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2287596303847097866, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2415706757311968769, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5402,6 +5569,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4679302615706898445, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4679302615706898445, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4679302615706898445, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4948902458849928676, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5692,6 +5874,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9116788283336265871, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9116788283336265871, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9116788283336265871, guid: c9c177e60fd350e49844955f7e8a5874,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9156988015001918806, guid: c9c177e60fd350e49844955f7e8a5874,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5918,6 +6115,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2999281627023095586, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2999281627023095586, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2999281627023095586, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3104286066734504045, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5968,6 +6180,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3900889159259115595, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900889159259115595, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3900889159259115595, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3913351820721565161, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5988,6 +6215,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4131193648195162873, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4131193648195162873, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4131193648195162873, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4280479205220723282, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4280479205220723282, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4280479205220723282, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4325286122475464214, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -5998,6 +6255,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4431899043194701300, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4431899043194701300, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4431899043194701300, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4469696790760741396, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6108,6 +6380,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6511408171727109335, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6511408171727109335, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6511408171727109335, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6570360898787435406, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6168,6 +6455,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7217094752249396309, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7217094752249396309, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7217094752249396309, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7498870704429108313, guid: 94d3fc7f95c28da4ca340a4f561c8b5d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6474,6 +6776,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2875316202554539604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2925422125526734773, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6554,6 +6871,36 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3745304765716925570, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3745304765716925570, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3745304765716925570, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828036928016589604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828036928016589604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828036928016589604, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3941184975665757053, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6564,11 +6911,41 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3975632670945500047, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3975632670945500047, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3975632670945500047, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4050916237064905887, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4060562825933674813, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4060562825933674813, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4060562825933674813, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4086152315555094515, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6689,6 +7066,21 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6063412306933429665, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6063412306933429665, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6063412306933429665, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6149144159244937976, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -6764,6 +7156,21 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7660903435642352931, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7660903435642352931, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7660903435642352931, guid: 509192cd5f627cf409a54e9be694a24d,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7814522285136084044, guid: 509192cd5f627cf409a54e9be694a24d,
         type: 3}
       propertyPath: m_SortingLayer
@@ -7197,7 +7604,7 @@ PrefabInstance:
     - target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
@@ -7207,7 +7614,7 @@ PrefabInstance:
     - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
         type: 3}

Assets/MyGame/aa/UI/Home/MainPanel.prefab

@@ -2867,7 +2867,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 546.56573, y: -47}
+  m_AnchoredPosition: {x: 546.56573, y: -55}
   m_SizeDelta: {x: 250, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3222381102658342430
@@ -11870,7 +11870,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 893.4002, y: -47}
+  m_AnchoredPosition: {x: 893.4002, y: -55}
   m_SizeDelta: {x: 266.8004, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4364771594772233180

Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangItem.cs

@@ -18,6 +18,9 @@ public class ChouJiangItem : MonoBehaviour
     [Tooltip("本格子的位置编号 = prizeId 后两位（如 588203 → 3），初始化时奖品按它对号入座")]
     public int itemId;
 
+    [Tooltip("本格子的跑马灯方块预制体：抽奖动效经过/停在本格子时点亮，大小自动设成格子（背景）大小")]
+    public GameObject prefab_DrawEffect;
+
     [Header("动态生成参数")]
     [Tooltip("图标占格子短边的比例")]
     public float iconRatio = 0.85f;
@@ -44,6 +47,7 @@ public class ChouJiangItem : MonoBehaviour
     private Image img_Icon;             // 动态生成的图标
     private TextMeshProUGUI tmp_Count; // 动态生成的数量文本
     private GameObject maskObj;        // 动态生成的遮罩蒙版（不规则裁剪用）
+    private GameObject effectObj;      // 本格子的跑马灯方块实例（懒创建）
 
     // 金币/钻石本地图标（Resources 根目录，与 BackPackPropItem 同一套），静态缓存避免重复加载
     private static Sprite _goldSprite;
@@ -92,6 +96,33 @@ public class ChouJiangItem : MonoBehaviour
             img_Icon.color = drawn ? drawnColor : Color.white;
     }
 
+    /// <summary>
+    /// 显示/隐藏本格子的跑马灯方块：第一次点亮时用 prefab_DrawEffect 创建实例，
+    /// 大小自动设成格子（背景）大小、压在最上层。
+    /// </summary>
+    public void ShowEffect(bool show)
+    {
+        if (show && effectObj == null && prefab_DrawEffect != null)
+        {
+            RectTransform rt = transform as RectTransform;
+            if (rt != null)
+            {
+                effectObj = Instantiate(prefab_DrawEffect, rt, false);
+                RectTransform er = effectObj.transform as RectTransform;
+                if (er != null)
+                {
+                    er.anchorMin = er.anchorMax = er.pivot = Vector2.one * 0.5f;
+                    er.anchoredPosition = Vector2.zero;
+                    er.localScale = Vector3.one;
+                    er.sizeDelta = new Vector2(rt.rect.width, rt.rect.height);  // 方块大小 = 背景大小
+                }
+                effectObj.transform.SetAsLastSibling();
+            }
+        }
+        if (effectObj != null)
+            effectObj.SetActive(show);
+    }
+
     /// <summary>清掉动态生成的 UI（重复 Init 复用前调用）</summary>
     public void ClearUI()
     {

Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangPanel.cs

@@ -49,11 +49,16 @@ public class ChouJiangPanel : SubUIBase
     public TextMeshProUGUI tmp_DrawCount;      // 已抽次数/上限
     public TextMeshProUGUI tmp_EndTime;        // 活动结束时间/状态
 
+    [Tooltip("抽奖花费的货币类型：1=金币，3=人民币（￥），其他=钻石")]
+    public int costPayType = 1;
+
     /// <summary>当前展示/抽奖的奖池分组</summary>
     public LotteryPoolType currPoolType { get; private set; }
 
     private LotteryActivityConfig config;      // 活动配置
     private LotteryUserStatus userStatus;      // 用户抽奖状态（次数决定花费与上限）
+    /// <summary>已抽中的奖项ID（兜底重抽 + 跑马灯只跳未抽的格子）</summary>
+    private readonly HashSet<string> drawnIds = new HashSet<string>();
     private bool isDrawing;                    // 防连点
 
     public override void Awake()
@@ -132,6 +137,11 @@ public class ChouJiangPanel : SubUIBase
         {
             if (this == null) return;
             userStatus = status;
+            if (status != null && status.drawnPrizeIds != null)
+            {
+                for (int i = 0; i < status.drawnPrizeIds.Count; i++)
+                    drawnIds.Add(status.drawnPrizeIds[i]);
+            }
             UpdateDrawUI();
         });
     }
@@ -142,6 +152,14 @@ public class ChouJiangPanel : SubUIBase
         APIRequestList.GetLotteryDrawnPrizes(ids =>
         {
             if (this == null || toggles == null) return;
+
+            drawnIds.Clear();
+            if (ids != null)
+            {
+                for (int i = 0; i < ids.Count; i++)
+                    drawnIds.Add(ids[i]);
+            }
+
             for (int i = 0; i < toggles.Count; i++)
             {
                 if (toggles[i] != null)
@@ -218,7 +236,15 @@ public class ChouJiangPanel : SubUIBase
         int drawn = userStatus != null ? userStatus.totalDrawCount : 0;
 
         if (tmp_Cost != null)
-            tmp_Cost.text = GetNextCost().ToString();
+        {
+            long cost = GetNextCost();
+            tmp_Cost.text = costPayType switch
+            {
+                1 => $"<sprite name=\"金币\">{cost}",
+                3 => $"￥{cost}",
+                _ => $"<sprite name=\"钻石\">{cost}",
+            };
+        }
 
         if (tmp_DrawCount != null)
             tmp_DrawCount.text = config != null && config.userMaxDraw > 0
@@ -259,36 +285,150 @@ public class ChouJiangPanel : SubUIBase
         return true;
     }
 
-    /// <summary>抽奖：GET /api/Lottery/Draw?poolType=当前分组</summary>
+    /// <summary>取当前展示/抽奖的分组 toggle 面板</summary>
+    private ChouJiangToggle GetCurrentToggle()
+    {
+        if (toggles == null) return null;
+        for (int i = 0; i < toggles.Count; i++)
+        {
+            if (toggles[i] != null && toggles[i].poolType == currPoolType)
+                return toggles[i];
+        }
+        return null;
+    }
+
+    /// <summary>已抽中奖项兜底重抽的最大次数（服务端正常排除时不会触发）</summary>
+    private const int MaxDrawRetries = 3;
+
+    /// <summary>抽奖：GET /api/Lottery/Draw?poolType=当前分组，结果出来后跑马灯停在抽中的格子</summary>
     private void OnDrawClick()
     {
         if (isDrawing || !CanDraw()) return;
         isDrawing = true;
         UpdateDrawButtonState();
 
-        bool done = false;
-        APIRequestList.LotteryDraw(new LotteryDrawParam { poolType = (int)currPoolType }, res =>
+        bool netDone = false;      // 网络完成
+        bool effectDone = true;    // 动效完成（默认无动效即完成）
+        DrawWithRetry(0, res =>
         {
-            done = true;
-            if (this == null) return;
+            netDone = true;
+            if (this == null || res == null) return;
+
+            // 记下本次抽中，同一轮后续抽奖不再要它
+            drawnIds.Add(res.prizeId);
 
             // 抽中结果（结算 UI 摆好后在这里接入）
             Debug.Log($"[ChouJiangPanel] 抽中：{res.name} x{res.count}（type={res.type}，消耗={res.cost}，分组={(LotteryPoolType)res.poolType}）");
 
-            // 花费随次数增长、已抽奖项要置灰，重拉状态刷新
-            RefreshUserStatus();
-            RefreshDrawnPrizes();
+            // 跑马灯动效：跳到抽中的格子上停住，结束后刷新状态解锁按钮（方块预制体在各 ChouJiangItem 格子上）
+            ChouJiangToggle cur = GetCurrentToggle();
+            if (cur != null)
+            {
+                effectDone = false;
+                cur.PlayDrawEffect(res.prizeId, () =>
+                {
+                    if (this == null) return;
+                    effectDone = true;
+                    isDrawing = false;
+                    RefreshUserStatus();      // 花费随次数增长
+                    RefreshDrawnPrizes();     // 已抽奖项置灰
+                    UpdateDrawButtonState();
+                    ShowReward(res);         // 领取奖励：弹获得面板
+                });
+            }
+
+            // 没有当前面板或动效没启动（没预制体等）时直接解锁
+            if (effectDone)
+            {
+                isDrawing = false;
+                RefreshUserStatus();
+                RefreshDrawnPrizes();
+                UpdateDrawButtonState();
+                ShowReward(res);
+            }
         });
 
-        // code!=0 时 APIManager 只弹错误不回调，超时兜底解锁防连点锁死
-        StartCoroutine(IEWaitDrawDone(() => done));
+        // code!=0 时 APIManager 只弹错误不回调，超时兜底解锁防连点锁死（网络+动效时间）
+        StartCoroutine(IEWaitDrawDone(() => netDone && effectDone));
     }
 
-    /// <summary>等待抽奖回调完成（最多 10 秒），结束解锁按钮</summary>
+    /// <summary>
+    /// 领取奖励：用 UIManager.ShowHuoDe 弹获得面板。
+    /// type：1=金币 2=钻石 3=道具 4=道具碎片（碎片按道具展示）。
+    /// Draw 接口不返回 product/icon，用 prizeId 回活动配置里查奖项详情。
+    /// </summary>
+    private void ShowReward(LotteryDrawResponse res)
+    {
+        if (res == null) return;
+
+        bool isProp = res.type == 3 || res.type == 4;   // 道具/碎片走下载图标
+        LotteryPrize prize = isProp ? FindPrizeById(res.prizeId) : null;
+        // icon 优先（实际数据是完整 URL），product.imageUrl 兜底；相对路径才拼 baseURL，避免拼出双地址
+        string imgUrl = prize != null
+            ? (string.IsNullOrEmpty(prize.icon) ? prize.product?.imageUrl : prize.icon)
+            : "";
+        if (!string.IsNullOrEmpty(imgUrl) && !imgUrl.StartsWith("http"))
+            imgUrl = APIManager.baseURL + imgUrl;
+
+        var data = new List<BackPackPropItemData>
+        {
+            new BackPackPropItemData
+            {
+                giftType = isProp ? 3 : res.type,
+                count = (int)res.count,
+                url = isProp ? imgUrl : "",
+                propEnum = isProp ? (PropEnum)(prize?.product?.type ?? 0) : PropEnum.none,
+            },
+        };
+        UIManager.Instance.ShowHuoDe(data);
+    }
+
+    /// <summary>用 prizeId 在活动配置的所有奖池里找奖项详情</summary>
+    private LotteryPrize FindPrizeById(string prizeId)
+    {
+        if (config == null || config.pools == null || string.IsNullOrEmpty(prizeId)) return null;
+        for (int i = 0; i < config.pools.Count; i++)
+        {
+            LotteryPoolLevel pool = config.pools[i];
+            if (pool == null || pool.prizeList == null) continue;
+            for (int j = 0; j < pool.prizeList.Count; j++)
+            {
+                if (pool.prizeList[j] != null && pool.prizeList[j].prizeId == prizeId)
+                    return pool.prizeList[j];
+            }
+        }
+        return null;
+    }
+
+    /// <summary>
+    /// 抽奖（带兜底重抽）：已经抽到过的奖项不再要——服务端按设计应排除已抽中的
+    /// prizeId（swagger：prizeId 用于唯一性控制，同一用户不能重复抽中），
+    /// 没排除时客户端重抽兜底，最多 MaxDrawRetries 次（注意：每次重抽服务端照常计费扣次数，
+    /// 根本解决要在后端 Draw 里排除 drawnPrizeIds）。
+    /// </summary>
+    private void DrawWithRetry(int attempt, Action<LotteryDrawResponse> onFinal)
+    {
+        APIRequestList.LotteryDraw(new LotteryDrawParam { poolType = (int)currPoolType }, res =>
+        {
+            if (this == null) return;
+
+            if (res != null && !string.IsNullOrEmpty(res.prizeId)
+                && drawnIds.Contains(res.prizeId) && attempt < MaxDrawRetries)
+            {
+                Debug.LogWarning($"[ChouJiangPanel] 抽到已中过的 {res.prizeId}，兜底重抽（{attempt + 1}/{MaxDrawRetries}）");
+                DrawWithRetry(attempt + 1, onFinal);
+                return;
+            }
+
+            onFinal?.Invoke(res);
+        });
+    }
+
+    /// <summary>等待网络+动效完成（最多 15 秒），结束解锁按钮</summary>
     private IEnumerator IEWaitDrawDone(Func<bool> done)
     {
         float t = 0f;
-        while (!done() && t < 10f)
+        while (!done() && t < 15f)
         {
             t += Time.deltaTime;
             yield return null;

Assets/MyGame/aa/UI/Home/Sub/Activity/ChouJiangToggle.cs

@@ -1,4 +1,6 @@
 using Assets.MyGame.Scripts.Net.API.GameConfig_SubClass;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -21,6 +23,16 @@ public class ChouJiangToggle : MonoBehaviour
     [Tooltip("C级（小奖）item，按展示顺序拖")]
     public List<ChouJiangItem> items_C;
 
+    [Header("抽奖动效参数")]
+    [Tooltip("跑马灯圈数：跳完这些圈再停到目标格")]
+    public int effectLoops = 2;
+    [Tooltip("单步最快间隔（秒）")]
+    public float effectStepFast = 0.07f;
+    [Tooltip("单步最慢间隔（秒）：开头/结尾慢，中间快")]
+    public float effectStepSlow = 0.30f;
+
+    private Coroutine effectCo;     // 跑马灯协程
+
     /// <summary>
     /// 初始化：筛出本组（poolType）的全部奖池，同等级合并后，
     /// A/B/C 级的奖品各自按 prizeId 后两位（itemId）找到自己的格子。
@@ -60,11 +72,38 @@ public class ChouJiangToggle : MonoBehaviour
             if (pool.prizeList != null) list.AddRange(pool.prizeList);
         }
 
+        // 兜底：没手填 itemId 的列表按拖入顺序自动编 1..n（手填过的列表不受影响）
+        AutoNumberItems(items_A);
+        AutoNumberItems(items_B);
+        AutoNumberItems(items_C);
+
         FillLevel("A", items_A, prizesByLevel);
         FillLevel("B", items_B, prizesByLevel);
         FillLevel("C", items_C, prizesByLevel);
     }
 
+    /// <summary>
+    /// 兜底编号：整列表都没手填 itemId（全为 0）时按列表拖入顺序自动编 1..n；
+    /// 只要有一个格子手填过编号，该列表就完全按手填的来。
+    /// </summary>
+    private static void AutoNumberItems(List<ChouJiangItem> items)
+    {
+        if (items == null || items.Count == 0) return;
+
+        bool anySet = false;
+        for (int i = 0; i < items.Count; i++)
+        {
+            if (items[i] != null && items[i].itemId != 0) { anySet = true; break; }
+        }
+        if (anySet) return;
+
+        for (int i = 0; i < items.Count; i++)
+        {
+            if (items[i] != null) items[i].itemId = i + 1;
+        }
+        Debug.Log($"[ChouJiangToggle] 列表未手填 itemId，按拖入顺序自动编号 1..{items.Count}");
+    }
+
     /// <summary>按已抽奖项列表置灰本面板所有 item（奖励不重复）</summary>
     public void RefreshDrawnState(List<string> drawnPrizeIds)
     {
@@ -131,6 +170,120 @@ public class ChouJiangToggle : MonoBehaviour
         }
     }
 
+    // ============================================================
+    #region 抽奖跑马灯动效
+    // ============================================================
+
+    /// <summary>
+    /// 播放抽奖动效：跑马灯在格子间 加速→匀速→减速 跳动，最后停在 prizeId 对应的格子上。
+    /// 方块是各格子自己的 prefab_DrawEffect（ChouJiangItem 上拖），经过/停留时点亮。
+    /// 完成后回调 onComplete；没有任何格子配方块/找不到目标格时立即回调。
+    /// </summary>
+    public void PlayDrawEffect(string prizeId, Action onComplete)
+    {
+        // 停掉上一次
+        if (effectCo != null) { StopCoroutine(effectCo); effectCo = null; }
+
+        List<ChouJiangItem> path = BuildEffectPath();
+        ChouJiangItem target = FindItemByPrizeId(prizeId);
+
+        bool anyEffect = false;
+        for (int i = 0; i < path.Count; i++)
+        {
+            if (path[i].prefab_DrawEffect != null) { anyEffect = true; break; }
+        }
+
+        if (!anyEffect || path.Count == 0 || target == null || !path.Contains(target))
+        {
+            onComplete?.Invoke();
+            return;
+        }
+
+        effectCo = StartCoroutine(IEPlayEffect(path, target, onComplete));
+    }
+
+    /// <summary>动效路径：A → B → C 三个列表的格子，各自按 itemId 升序（只含有奖品且未抽中的格子——已经抽到的不再跳）</summary>
+    private List<ChouJiangItem> BuildEffectPath()
+    {
+        List<ChouJiangItem> path = new List<ChouJiangItem>();
+        AppendPath(items_A, path);
+        AppendPath(items_B, path);
+        AppendPath(items_C, path);
+        return path;
+    }
+
+    private static void AppendPath(List<ChouJiangItem> items, List<ChouJiangItem> path)
+    {
+        if (items == null) return;
+        List<ChouJiangItem> sorted = new List<ChouJiangItem>();
+        for (int i = 0; i < items.Count; i++)
+        {
+            ChouJiangItem it = items[i];
+            if (it != null && it.prize != null && !it.IsDrawn) sorted.Add(it);  // 已抽中（置灰）的跳过
+        }
+        sorted.Sort((a, b) => a.itemId.CompareTo(b.itemId));
+        path.AddRange(sorted);
+    }
+
+    /// <summary>按 prizeId 找本面板的 item</summary>
+    private ChouJiangItem FindItemByPrizeId(string prizeId)
+    {
+        if (string.IsNullOrEmpty(prizeId)) return null;
+        ChouJiangItem r = FindInList(items_A, prizeId);
+        if (r == null) r = FindInList(items_B, prizeId);
+        if (r == null) r = FindInList(items_C, prizeId);
+        return r;
+    }
+
+    private static ChouJiangItem FindInList(List<ChouJiangItem> items, string prizeId)
+    {
+        if (items == null) return null;
+        for (int i = 0; i < items.Count; i++)
+        {
+            if (items[i] != null && items[i].prize != null && items[i].prize.prizeId == prizeId)
+                return items[i];
+        }
+        return null;
+    }
+
+    private IEnumerator IEPlayEffect(List<ChouJiangItem> path, ChouJiangItem target, Action onComplete)
+    {
+        int count = path.Count;
+        int targetIdx = path.IndexOf(target);
+        int cur = 0;
+
+        // 全部先熄灭（含上一次中奖格上亮着的方块），点亮起点
+        for (int i = 0; i < count; i++) path[i].ShowEffect(false);
+        path[0].ShowEffect(true);
+
+        // 总步数 = 圈数 × 格子数 + 到目标格的距离，保证最后一步正好落在目标格
+        int totalSteps = effectLoops * count + (targetIdx - cur + count) % count;
+
+        for (int step = 0; step < totalSteps; step++)
+        {
+            float p = (float)step / totalSteps;
+            yield return new WaitForSeconds(GetStepDuration(p));
+            path[cur].ShowEffect(false);   // 熄灭当前格
+            cur = (cur + 1) % count;
+            path[cur].ShowEffect(true);    // 点亮下一格
+        }
+
+        // 停在目标格上停留一下再回调（中奖格的方块保持亮着）
+        yield return new WaitForSeconds(0.6f);
+
+        onComplete?.Invoke();
+    }
+
+    /// <summary>单步时长：前 25% 加速 → 中间匀速 → 后 30% 减速（先快后慢的抽奖手感）</summary>
+    private float GetStepDuration(float p)
+    {
+        if (p < 0.25f) return Mathf.Lerp(effectStepSlow, effectStepFast, p / 0.25f);
+        if (p < 0.70f) return effectStepFast;
+        return Mathf.Lerp(effectStepFast, effectStepSlow, (p - 0.70f) / 0.30f);
+    }
+
+    #endregion
+
     private void ClearItems(List<ChouJiangItem> items)
     {
         if (items == null) return;

Assets/TextMesh Pro/Resources_moved.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0c423e76c66c95449baa51fbd5d99474
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: