From 1fdef60f2611d01bf658e8a2e4f69bfa251de95b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 17 十二月 2025 21:17:13 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

---
 Main/System/Battle/BattleField/BattleField.cs |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/Main/System/Battle/BattleField/BattleField.cs b/Main/System/Battle/BattleField/BattleField.cs
index dcc0fda..0c7e101 100644
--- a/Main/System/Battle/BattleField/BattleField.cs
+++ b/Main/System/Battle/BattleField/BattleField.cs
@@ -131,6 +131,20 @@
 
         LoadMap(MapID);
 
+        // 娓呯┖褰撳墠鎴樺満鐨勮閲忚褰曪紙闃叉涓嶅悓鎴樻枟涔嬮棿鐨勬暟鎹贩涔憋級
+        if (BattleHeroInfoBar.largestPackUID.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUID.Remove(guid);
+        }
+        if (BattleHeroInfoBar.largestPackUIDAllObjectsToHp.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUIDAllObjectsToHp.Remove(guid);
+        }
+        if (BattleHeroInfoBar.largestPackUIDAllObjectsMaxHp.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUIDAllObjectsMaxHp.Remove(guid);
+        }
+
         // battleRootNode.SetBackground(ResManager.Instance.LoadAsset<Texture>("Texture/FullScreenBg", "mainui_img_277"));
 
         SetBattleStartState();
@@ -259,6 +273,20 @@
 
         // 娓呯悊姝讳骸澶勭悊璁板綍
         processingDeathObjIds.Clear();
+        
+        // 娓呯┖褰撳墠鎴樺満鐨勮閲忚褰�
+        if (BattleHeroInfoBar.largestPackUID.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUID.Remove(guid);
+        }
+        if (BattleHeroInfoBar.largestPackUIDAllObjectsToHp.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUIDAllObjectsToHp.Remove(guid);
+        }
+        if (BattleHeroInfoBar.largestPackUIDAllObjectsMaxHp.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUIDAllObjectsMaxHp.Remove(guid);
+        }
     }
 
     public virtual void Run()
@@ -394,7 +422,7 @@
         if (State == 4)
         {
             //宸茬粡缁撴潫骞剁粨绠�
-            Debug.Log("鎴樻枟缁撴潫");
+            // Debug.Log("鎴樻枟缁撴潫");
             rejectNewPackage = true;
             OnBattleEnd(turnFightStateData);
             return;
@@ -405,12 +433,12 @@
         {
             if (State == 2)
             {
-                Debug.Log("鎴樻枟寮�濮�");
+                // Debug.Log("鎴樻枟寮�濮�");
             }
         }
         else
         {
-            Debug.Log("鎴樻枟鍥炲悎 : " + turnNum + "锛岀姸鎬� " + State);
+            // Debug.Log("鎴樻枟鍥炲悎 : " + turnNum + "锛岀姸鎬� " + State);
         }
 
         DistributeNextPackage();
@@ -454,14 +482,14 @@
                 // 妫�鏌ユ槸鍚﹀凡缁忓湪澶勭悊姝讳骸
                 if (processingDeathObjIds.Contains(objID))
                 {
-                    Debug.LogWarning($"OnObjsDead: 瑙掕壊姝ｅ湪澶勭悊姝讳骸锛屽拷鐣ラ噸澶嶆浜℃秷鎭� ObjID={objID}");
+                    // Debug.LogWarning($"OnObjsDead: 瑙掕壊姝ｅ湪澶勭悊姝讳骸锛屽拷鐣ラ噸澶嶆浜℃秷鎭� ObjID={objID}");
                     continue;
                 }
                 
                 BattleObject battleObj = battleObjMgr.GetBattleObject((int)objID);
                 if (battleObj == null)
                 {
-                    Debug.LogWarning($"OnObjsDead: 鎵句笉鍒拌鑹� ObjID={objID}");
+                    Debug.LogError($"OnObjsDead: 鎵句笉鍒拌鑹� ObjID={objID}");
                     continue;
                 }
                 
@@ -673,6 +701,20 @@
         
         // 娓呯悊姝讳骸澶勭悊璁板綍
         processingDeathObjIds.Clear();
+        
+        // 娓呯┖褰撳墠鎴樺満鐨勮閲忚褰�
+        if (BattleHeroInfoBar.largestPackUID.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUID.Remove(guid);
+        }
+        if (BattleHeroInfoBar.largestPackUIDAllObjectsToHp.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUIDAllObjectsToHp.Remove(guid);
+        }
+        if (BattleHeroInfoBar.largestPackUIDAllObjectsMaxHp.ContainsKey(guid))
+        {
+            BattleHeroInfoBar.largestPackUIDAllObjectsMaxHp.Remove(guid);
+        }
 
         // ===== 鏂板锛氬嵏杞借摑闃熻祫婧� =====
         BattleResManager.Instance.UnloadBattleResources(guid);

--
Gitblit v1.8.0