yyl
2025-12-22 7124d5404ae57ed56548ec8186ea038a0cb85e2e
Main/System/Battle/Skill/SkillBase.cs
@@ -36,7 +36,8 @@
    private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
    private Dictionary<int, BattleDeadPack> tempDeadPackList = new Dictionary<int, BattleDeadPack>();
    protected List<HB428_tagSCBuffRefresh> buffCollections = new List<HB428_tagSCBuffRefresh>();
    // Buff相关包集合,支持 HB428(刷新) 和 HB429(删除)
    protected List<GameNetPackBasic> buffPackCollections = new List<GameNetPackBasic>();
    // 构造函数:初始化技能基础数据
@@ -1113,9 +1114,6 @@
            {
                caster.motionBase?.ResetForReborn(false);
            }
            // 清理动画回调
            caster.motionBase?.CancelControledAnimation();
        }
        // 5. 恢复 UI 状态
@@ -1144,12 +1142,9 @@
        isPlay = true;
        // 6. 处理所有剩余包(包括 buff 包)
        // 先处理 buffCollections
        foreach (var buff in buffCollections)
        {
            PackageRegedit.Distribute(buff);
        }
        buffCollections.Clear();
        // 先处理 buffPackCollections
        DistributeBuffPacks(buffPackCollections);
        buffPackCollections.Clear();
        // 处理剩余的 packList
        while (packList.Count > 0)
@@ -1245,16 +1240,16 @@
                otherSkillActionList.Add(otherSkillAction);
                return false;
            }
            else if (pack is HB428_tagSCBuffRefresh buffRefresh)
            else if (IsBuffPack(pack))
            {
                //   从找到第一个HB428开始 找出连续的HB428_tagSCBuffRefresh包 如果找到一个B428后 之后碰到非HB428包就停止
                buffCollections.Add(buffRefresh);
                // 从找到第一个 Buff 包开始,收集连续的 HB428/HB429 包
                buffPackCollections.Add(pack);
                while (packList.Count > 0)
                {
                    var nextPack = packList[0];
                    if (nextPack is HB428_tagSCBuffRefresh nextBuffRefresh)
                    if (IsBuffPack(nextPack))
                    {
                        buffCollections.Add(nextBuffRefresh);
                        buffPackCollections.Add(nextPack);
                        packList.RemoveAt(0);
                    }
                    else
@@ -1263,18 +1258,11 @@
                    }
                }
                // 同时刷新所有对象的buff,不分组
                foreach (var buff in buffCollections)
                {
                    BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buff.ObjID);
                    if (battleObj != null)
                    {
                        battleObj.buffMgr.RefreshBuff(buff, true);
                    }
                }
                // 处理所有收集到的 buff 包
                ProcessBuffPacks(buffPackCollections);
                // 清空已处理的buff集合
                buffCollections.Clear();
                // 清空已处理的 buff 集合
                buffPackCollections.Clear();
                continue;
            }
@@ -1299,9 +1287,63 @@
        otherSkillActionList?.Clear();
        dropPackList?.Clear();
        expPackList?.Clear();
        buffPackCollections?.Clear();
        
        skillEffect = null;
        packList = null;
    }
    #region Buff包处理
    /// <summary>
    /// 判断是否为 Buff 相关的包(HB428 或 HB429)
    /// </summary>
    protected bool IsBuffPack(GameNetPackBasic pack)
    {
        return pack is HB428_tagSCBuffRefresh || pack is HB429_tagSCBuffDel;
    }
    /// <summary>
    /// 处理收集到的 Buff 包列表(HB428 刷新 和 HB429 删除)
    /// </summary>
    protected void ProcessBuffPacks(List<GameNetPackBasic> buffPacks)
    {
        if (buffPacks == null || buffPacks.Count == 0) return;
        foreach (var pack in buffPacks)
        {
            if (pack is HB428_tagSCBuffRefresh buffRefresh)
            {
                BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buffRefresh.ObjID);
                if (battleObj != null)
                {
                    battleObj.buffMgr.RefreshBuff(buffRefresh, true);
                }
            }
            else if (pack is HB429_tagSCBuffDel buffDel)
            {
                BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buffDel.ObjID);
                if (battleObj != null)
                {
                    battleObj.buffMgr.RemoveBuff(buffDel);
                }
            }
        }
    }
    /// <summary>
    /// 强制分发 Buff 包(用于 ForceFinished 场景)
    /// </summary>
    protected void DistributeBuffPacks(List<GameNetPackBasic> buffPacks)
    {
        if (buffPacks == null || buffPacks.Count == 0) return;
        foreach (var pack in buffPacks)
        {
            PackageRegedit.Distribute(pack);
        }
    }
    #endregion
}