From f5794dc392d61a664668926e5edf06dbe06d4fc9 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 12 十一月 2025 11:24:21 +0800
Subject: [PATCH] 262 优化修复切换服务器报错

---
 Main/System/Battle/BattleConst.cs |   93 ++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/Main/System/Battle/BattleConst.cs b/Main/System/Battle/BattleConst.cs
index 713473a..daf90bc 100644
--- a/Main/System/Battle/BattleConst.cs
+++ b/Main/System/Battle/BattleConst.cs
@@ -8,6 +8,18 @@
     {
         typeof(BattleWin),
         typeof(StoryBossBattleWin),
+        typeof(ArenaBattleWin),
+        typeof(BoneFieldBattleWin),
+        typeof(TianziBillboradBattleWin),
+    };
+
+    public static Dictionary<string, string> battleNameToWinName = new Dictionary<string, string>()
+    {
+        { "StoryBattleField", "BattleWin" },
+        { "StoryBossBattleField", "StoryBossBattleWin" },
+        { "ArenaBattleField", "ArenaBattleWin" },
+        { "BoneBattleField", "BoneFieldBattleWin" },
+        { "TianziBillboradBattleField", "TianziBillboradBattleWin" },
     };
 
     public const int BattleStartEffectID = 1001; // Example effect ID for battle start
@@ -20,6 +32,13 @@
 
     public const int BattleTotalRecoverType = 100002; // 鎬绘不鐤楃被鍨婭D
 
+    public const int BattleComboAttack = 100003; // 杩炲嚮
+
+    public const int BattleCounterAttack = 100004; // 鍙嶅嚮
+
+    public const int BattleChaseAttack = 100005; // 杩藉嚮
+
+    public const int BattleStun = 100006; // 鍑绘檿
 
     //  1000~10000涔嬮棿鐨勬垬鏂楀眰绾�
     //  闇�瑕佽�冭檻鏍规嵁UI 鐗规晥 鎴樻枟瑙掕壊涓夋柟鐨勫眰绾у叧绯�
@@ -37,9 +56,13 @@
 
     // 婵�娲昏嫳闆勫悗鐗规晥|婵�娲昏嫳闆剕婵�娲昏嫳闆勫墠鐗规晥
 
-    public const int BattleBlackTransparentMaskOffset = 100;
+    //  ---------------------2025銆�10.23鏇存柊
+    //  鐜板湪鏈熸湜 钂欑増涓嶈鍘嬩綇UI 鏇存敼绛栫暐
+    //  閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝e父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
 
 
+
+    //閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>[姝e父UI]>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
     public static int BattleWinSortingOrder
     {
         get
@@ -73,12 +96,12 @@
         }
     }
 
-    // 闈炴縺娲昏嫳闆勭殑灞傜骇
-    public static int UnactiveHeroSortingOrder
+    //  閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝e父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>[搴曞浘]
+    public static int BattleBackgroundOrder
     {
         get
         {
-            return BattleWinSortingOrder + BattleBlackTransparentMaskOffset - 50;
+            return BattleWinSortingOrder - 10;
         }
     }
 
@@ -87,7 +110,18 @@
     {
         get
         {
-            return UnactiveHeroSortingOrder - 1;
+            return BattleBackgroundOrder + 1;
+        }
+    }
+
+
+    //閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝e父UI>榛戣壊钂欑増>[鏈彈褰卞搷鑻遍泟]>搴曞浘
+    // 闈炴縺娲昏嫳闆勭殑灞傜骇
+    public static int UnactiveHeroSortingOrder
+    {
+        get
+        {
+            return UnactiveHeroBackSortingOrder + 1;
         }
     }
 
@@ -100,7 +134,8 @@
         }
     }
 
-    // 鎸℃澘鐨勫眰绾�
+    //閲婃斁鎶�鑳借嫳闆�>鍙楀奖鍝嶈嫳闆�>姝e父UI>[榛戣壊钂欑増]>鏈彈褰卞搷鑻遍泟>搴曞浘
+    // 榛戣壊钂欑増鐨勫眰绾�
     public static int BlockerSortingOrder
     {
         get
@@ -109,15 +144,26 @@
         }
     }
 
+    // 婵�娲昏嫳闆勭殑鍚庣壒鏁�
+    public static int ActiveHeroBackSortingOrder
+    {
+        get
+        {
+            return BlockerSortingOrder + 1;
+        }
+    }
+
+    //閲婃斁鎶�鑳借嫳闆�>[鍙楀奖鍝嶈嫳闆刔>姝e父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
     // 婵�娲昏嫳闆勭殑灞傜骇
     public static int ActiveHeroSortingOrder
     {
         get
         {
-            return BattleWinSortingOrder + BattleBlackTransparentMaskOffset + 50;
+            return ActiveHeroBackSortingOrder + 1;
         }
     }
 
+    //[閲婃斁鎶�鑳借嫳闆刔>鍙楀奖鍝嶈嫳闆�>姝e父UI>榛戣壊钂欑増>鏈彈褰卞搷鑻遍泟>搴曞浘
     //  閲婃斁鎶�鑳介挓鐨勮嫳闆勫眰绾�
     public static int ActiveHeroActionSortingOrder
     {
@@ -127,21 +173,34 @@
         }
     }
 
-    // 婵�娲昏嫳闆勭殑鍚庣壒鏁�
-    public static int ActiveHeroBackSortingOrder
-    {
-        get
-        {
-            return ActiveHeroSortingOrder - 1;
-        }
-    }
-
     // 婵�娲昏嫳闆勭殑鍓嶇壒鏁�
     public static int ActiveHeroFrontSortingOrder
     {
         get
         {
-            return ActiveHeroSortingOrder + 1;
+            return ActiveHeroActionSortingOrder + 1;
         }
     }
+
+
+    public const int HardControlGroup = 1;
+
+    public const int SoftControlGroup = 2;
+
+    public const int NormalAttackLimitGroup = 3;
+
+    public const int RageAttackLimitGroup = 4;
+
+    public const int PassiveSkillLimitGroup = 5;
+
+    public static readonly int[] BuffLimitGroups = new int[]
+    {
+        HardControlGroup,
+        SoftControlGroup,
+        NormalAttackLimitGroup,
+        RageAttackLimitGroup,
+        PassiveSkillLimitGroup,
+    };
+
+    public const int ShieldBuffAttackType = 1003;//鎶ょ浘鍚告敹浼ゅ绫诲瀷ID
 }
\ No newline at end of file

--
Gitblit v1.8.0