Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

18 小时以前 1fdef60f2611d01bf658e8a2e4f69bfa251de95b

 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);