From 04ffe31b6a2b2fbcfecc83abb44a8aa233f2e53f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 02 二月 2026 18:45:57 +0800
Subject: [PATCH] 54 【淘金】切后台淘金完成 时间显示负数

---
 Main/System/Battle/Skill/SkillBase.cs | 2014 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 1,509 insertions(+), 505 deletions(-)

diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index a3c580b..8f6daea 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,617 +1,1621 @@
 using System.Collections.Generic;
 using UnityEngine;
-using System;
 using DG.Tweening;
 using Spine;
 using System.Linq;
-using PlasticGui.WorkspaceWindow.BranchExplorer;
-
+using System;
 
 public class SkillBase
 {
-	const float moveTime = 0.5f;
+    const float moveTime = 0.5f;
 
-	protected SkillEffect skillEffect;
+    private static readonly Color colorGreen = new Color(33f / 255f,
+                                                        133f / 255f,
+                                                        6f / 255f);
+    private static readonly Color colorBlue = new Color(40f / 255f,
+                                                        87f / 255f,
+                                                        189f / 255f);
 
-	protected HB427_tagSCUseSkill tagUseSkillAttack;
+    protected SkillEffect skillEffect;
+    public HB427_tagSCUseSkill tagUseSkillAttack;
+    public SkillConfig skillConfig;
+    protected bool isFinished = false;
+    protected BattleField battleField = null; // 鎴樺満
+    protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+    public BattleObject caster = null; // 鏂芥硶鑰�
+    protected List<GameNetPackBasic> packList;
 
-	protected SkillConfig skillConfig;
+    protected List<RecordAction> currentWaitingSkill = new List<RecordAction>();
 
-	protected bool isFinished = false;
+    protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+    protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
 
-	protected BattleField battleField = null; // 鎴樺満
+    protected bool moveFinished = false;
+    public SkillBase fromSkill;
+    public bool isPlay = false;
 
-	protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+    //  鐖禦ecordAction锛圫killRecordAction锛夛紝鐢ㄤ簬瀛愭妧鑳藉缓绔嬬埗瀛愬叧绯�
+    protected SkillRecordAction ownRecordAction;
+    
+    //  鎶�鑳藉姩鐢绘槸鍚︽挱鏀惧畬鎴愶紙閽堝鏈夊姩鐢荤殑鎶�鑳斤級
+    protected bool isMotionCompleted = false;
 
-	protected BattleObject caster = null; // 鏂芥硶鑰�
+    private float MoveSpeed = 750f;
 
-	protected bool startCounting = false;
+    private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
+    private Dictionary<int, BattleDeadPack> tempDeadPackList = new Dictionary<int, BattleDeadPack>();
 
-	protected bool pauseState = false;
+    // Buff鐩稿叧鍖呴泦鍚堬紝鏀寔 HB428(鍒锋柊) 鍜� HB429(鍒犻櫎)
+    protected List<GameNetPackBasic> buffPackCollections = new List<GameNetPackBasic>();
 
-	protected int curFrame = 0;
 
-	protected List<GameNetPackBasic> packList;
+    // 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
+    public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
+    {
+        caster = _caster;
+        skillConfig = _skillCfg;
+        tagUseSkillAttack = vNetData;
+        battleField = _battleField;
+        packList = _packList;
 
-	protected SkillRecordAction otherSkillAction;
+        // 娉ㄥ唽姝e湪閲婃斁鐨勬妧鑳�
+        if (battleField != null && caster != null)
+        {
+            battleField.AddCastingSkill(caster.ObjID, this);
+        }
 
-	protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+        SafetyCheck();
+    }
 
-	protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+    public virtual void AfterAddToQueue()
+    {
+        
+    }
 
-	public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
-	{
-		caster = _caster;
-		skillConfig = _skillCfg;
-		tagUseSkillAttack = vNetData;
-		battleField = _battleField;
-		packList = _packList;
+    //  璁剧疆鐖禦ecordAction
+    public void SetOwnRecordAction(SkillRecordAction recordAction)
+    {
+        ownRecordAction = recordAction;
+    }
 
-	}
+#if UNITY_EDITOR
+    public static Dictionary<string, string> changeListDict = new Dictionary<string, string>();
+#endif
+    private void PinrtHB427Hp()
+    {
+#if UNITY_EDITOR
+        string skillDetail = "SkillCaster : " + tagUseSkillAttack.ObjID + " -> cast SkillID: " + skillConfig.SkillID + "\n";
+        
+        skillDetail += "------------------ HurtList ------------------\n";
+        for (int i = 0; i < tagUseSkillAttack.HurtCount; i++)
+        {
+            var Hurt = tagUseSkillAttack.HurtList[i];
+            BattleObject battleObject = caster.battleField.battleObjMgr.GetBattleObject((int)Hurt.ObjID);
+            
+            string targetName = battleObject != null ? battleObject.GetName() : "Unknown";
+            long hurtHp = GeneralDefine.GetFactValue(Hurt.HurtHP, Hurt.HurtHPEx);
+            long curHp = GeneralDefine.GetFactValue(Hurt.CurHP, Hurt.CurHPEx);
+            
+            skillDetail += $"  [{i}] Target: {targetName} (ObjID:{Hurt.ObjID})\n";
+            skillDetail += $"      HurtHP: {hurtHp}\n";
+            skillDetail += $"      CurHP: {curHp}\n";
+            skillDetail += $"      SuckHP: {Hurt.SuckHP}\n";
+            skillDetail += $"      BounceHP: {Hurt.BounceHP}\n";
+            skillDetail += $"      AttackTypes: {Hurt.AttackTypes}\n";
+            
+            if (Hurt.HurtListEx != null && Hurt.HurtListEx.Length > 0)
+            {
+                skillDetail += $"      HurtListEx ({Hurt.HurtListEx.Length}):\n";
+                for (int j = 0; j < Hurt.HurtListEx.Length; j++)
+                {
+                    var hurtEx = Hurt.HurtListEx[j];
+                    long hurtExHp = GeneralDefine.GetFactValue(hurtEx.HurtHP, hurtEx.HurtHPEx);
+                    long curExHp = GeneralDefine.GetFactValue(hurtEx.CurHP, hurtEx.CurHPEx);
+                    
+                    skillDetail += $"        [{j}] ObjID:{hurtEx.ObjID} HurtHP:{hurtExHp} CurHP:{curExHp} SuckHP:{hurtEx.SuckHP} AttackTypes:{hurtEx.AttackTypes}\n";
+                }
+            }
+        }
 
-	public virtual void Run()
-	{
-		if (startCounting)
-		{
-			curFrame++;
-		}
+        skillDetail += "------------------ HurtListEx ------------------\n";
+        if (tagUseSkillAttack.HurtListEx != null)
+        {
+            for (int i = 0; i < tagUseSkillAttack.HurtListEx.Length; i++)
+            {
+                var HurtEx = tagUseSkillAttack.HurtListEx[i];
+                BattleObject battleObject = caster.battleField.battleObjMgr.GetBattleObject((int)HurtEx.ObjID);
+                
+                string targetName = battleObject != null ? battleObject.GetName() : "Unknown";
+                long hurtHp = GeneralDefine.GetFactValue(HurtEx.HurtHP, HurtEx.HurtHPEx);
+                long curHp = GeneralDefine.GetFactValue(HurtEx.CurHP, HurtEx.CurHPEx);
+                
+                skillDetail += $"  [{i}] Target: {targetName} (ObjID:{HurtEx.ObjID})\n";
+                skillDetail += $"      HurtHP: {hurtHp}\n";
+                skillDetail += $"      CurHP: {curHp}\n";
+                skillDetail += $"      SuckHP: {HurtEx.SuckHP}\n";
+                skillDetail += $"      AttackTypes: {HurtEx.AttackTypes}\n";
+            }
+        }
 
-		if (null != skillEffect)
-		{
-			skillEffect.Run();
-		}
+        skillDetail += "------------------ END ------------------\n";
 
-		if (otherSkillAction != null)
-		{
-			if (otherSkillAction.IsFinished())
-			{
-				otherSkillAction = null;
-				OnSkillFinished();
-			}
-			else
-			{
-				otherSkillAction.Run();
-			}
-		}
-	}
+        if (changeListDict.ContainsKey(caster.battleField.guid))
+        {
+            string origin = changeListDict[caster.battleField.guid];
+            origin += skillDetail;
+            changeListDict[caster.battleField.guid] = origin;
+            
+        }
+        else
+            changeListDict.Add(caster.battleField.guid, skillDetail);
 
+        Debug.LogError("skillDetail : " + skillDetail);
+#endif
+    }
 
+    private void SafetyCheck()
+    {
+#if UNITY_EDITOR
+        if (Launch.Instance.isOpenSkillLogFile)
+        {
+            PinrtHB427Hp();
+        }
+#endif
 
-	public void Pause()
-	{
-		pauseState = startCounting;
-		startCounting = false;
-	}
+        bool safety = caster != null 
+                        && skillConfig != null 
+                        && tagUseSkillAttack != null 
+                        && battleField != null;
 
-	public void Resume()
-	{
-		startCounting = pauseState;
-	}
+        
+        if (!safety)
+        {
+            Debug.LogError("SkillBase SafetyCheck failed! Caster or SkillConfig or TagUseSkillAttack or BattleField is null, or Caster is dead.");
+            ForceFinished();
+        }
 
+        
+    }
 
-	// 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
-	// 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
-	public virtual void Cast()
-	{
-		EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, battleField.guid, skillConfig, caster.teamHero);
+    // 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
+    public virtual void Run()
+    {
+        if (skillEffect != null)
+        {
+            if (skillEffect.IsFinished())
+            {
+                skillEffect = null;
+                OnSkillFinished();
+            }
+            else
+            {
+                skillEffect.Run();
+            }
+            return;
+        }
 
-		BattleDebug.LogError(GetType().Name + " Skill Cast Start");
-		//	楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
-		HighLightAllTargets();
+
+    }
+
+    protected void ShadowIllutionCreate(bool create)
+    {
+        if (create)
+        {
+            Color color = Color.white;
+            //1-杩炲嚮锛�2-鍙嶅嚮锛�3-杩藉嚮
+            //  鍙嶅嚮钃濊壊
+            //  杩藉嚮杩炲嚮缁胯壊
+            bool change = false;
+            if (tagUseSkillAttack.BattleType == 1)
+            {
+                color = colorGreen;
+                change = true;
+            }
+            else if (tagUseSkillAttack.BattleType == 2)
+            {
+                color = colorBlue;
+                change = true;
+            }
+            else if (tagUseSkillAttack.BattleType == 3)
+            {
+                color = colorGreen;
+                change = true;
+            }
+            
+            if (change)
+            {
+                MoveSpeed = 1125f;
+                caster.ShowIllusionShadow(true, color);
+            }
+        }
+        else
+        {
+            MoveSpeed = 750f;
+            caster.ShowIllusionShadow(false);
+        }
+    }
+
+    // 鎶�鑳介噴鏀句富閫昏緫锛氬箍鎾簨浠躲�侀珮浜洰鏍囥�佹墽琛岄噴鏀�
+    public virtual void Cast()
+    {
+        // 骞挎挱鎶�鑳介噴鏀句簨浠�
+        string guid = battleField.guid;
+        // 鑾峰彇閲婃斁鑰呮暟鎹細Hero 浼犻�� teamHero锛孧ingge 浼犻�� null锛堝洜涓轰簨浠剁洃鍚櫒鍙鐞� Hero 鏁版嵁锛�
+        TeamHero teamHero = null;
+        if (caster is HeroBattleObject heroBattleObject)
+        {
+            teamHero = heroBattleObject.teamHero;
+        }
+        // 鍛芥牸閲婃斁鎶�鑳芥椂 teamHero 涓� null锛岀洃鍚櫒浼氭纭鐞嗭紙宸叉湁 null 妫�鏌ワ級
+        EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, guid, skillConfig, teamHero);
+
+        if (skillConfig.SkinllSFX1 != 0)
+        {
+            battleField.soundManager.PlayEffectSound(skillConfig.SkinllSFX1, false);
+        }
+
+        if (caster != null)
+        {
+            // 鎴樻枟绫诲瀷 0-甯歌锛�1-杩炲嚮锛�2-鍙嶅嚮锛�3-杩藉嚮锛�4-瀛愭妧鑳斤紱5-琚姩瑙﹀彂鐨�
+            DamageNumConfig hintConfig = null;
+            if (tagUseSkillAttack.BattleType == 1)
+            {
+                hintConfig = DamageNumConfig.Get(BattleConst.BattleComboAttack);
+            }
+            else if (tagUseSkillAttack.BattleType == 2)
+            {
+                hintConfig = DamageNumConfig.Get(BattleConst.BattleCounterAttack);
+            }
+            else if (tagUseSkillAttack.BattleType == 3)
+            {
+                hintConfig = DamageNumConfig.Get(BattleConst.BattleChaseAttack);
+            }
+            
+            Hint(caster, hintConfig);
+
+
+        }
+
+        // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
+        HighLightAllTargets();
+
+        // 鏍规嵁閲婃斁妯″紡鎵ц鐩稿簲閫昏緫
+        switch (skillConfig.castMode)
+        {
+            case SkillCastMode.None:
+            case SkillCastMode.Self:
+                CastImpl(OnAttackFinish);
+                break;
+            case SkillCastMode.Enemy:
+                CastToEnemy();
+                break;
+            case SkillCastMode.Target:
+                CastToTarget();
+                break;
+            case SkillCastMode.Allies:
+                CastToAllies();
+                break;
+            case SkillCastMode.DashCast:
+                DashCast(OnAttackFinish);
+                break;
+            default:
+                Debug.LogError("寮哄埗缁撴潫鎶�鑳� 鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹俻lease鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
+                ForceFinished();
+                break;
+        }
+    }
+
+    protected void Hint(BattleObject battleObject, DamageNumConfig hintConfig)
+    {
+        if (hintConfig != null)
+        {
+            battleObject.ShowTips(((char)hintConfig.prefix).ToString(), true, false, 1.25f);
+        }
+    }
+
+    // 鍐叉挒鏀诲嚮妯″紡锛堝緟瀹炵幇锛�
+    protected void DashCast(Action _onComplete)
+    {
+        Debug.LogError("DashCast 杩樻病瀹炵幇");
+        ForceFinished();
+    }
+
+    // 瀵规晫鏂归噴鏀炬妧鑳斤細绉诲姩鍒版晫鏂瑰尯鍩熻繘琛屾敾鍑�
+    protected void CastToEnemy()
+    {
+        RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+        ExecuteMoveAndCastSequence(target, () =>
+        {
+            if (skillConfig.ClientTriggerTiming == 1)
+            {
+                OnAttackFinish();
+            }
+            else
+            {
+                // ShadowIllutionCreate(true);
+                MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.GetPositionNum()), Vector2.zero, () =>
+                {
+                    // ShadowIllutionCreate(false);
+                    OnAttackFinish();
+                }, MoveSpeed);   
+            }
+        });
+    }
+
+    // 瀵规寚瀹氱洰鏍囬噴鏀炬妧鑳斤細绉诲姩鍒颁富瑕佺洰鏍囦綅缃繘琛屾敾鍑�
+    protected void CastToTarget()
+    {
+        if (tagUseSkillAttack.HurtCount <= 0)
+        {
+            Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+            OnSkillFinished();
+            return;
+        }
+
+        int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(this, caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+        BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+        RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
+
+        ExecuteMoveAndCastSequence(targetTrans, () =>
+        {
+            RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.GetPositionNum());
+            // ShadowIllutionCreate(true);
+            MoveToTarget(rectTransform, Vector2.zero, () =>
+            {
+                // ShadowIllutionCreate(false);
+                OnAttackFinish();
+            }, MoveSpeed);
+        });
+    }
+
+    // 瀵瑰弸鏂归噴鏀炬妧鑳斤細绉诲姩鍒板弸鏂瑰尯鍩熻繘琛屾不鐤楁垨澧炵泭
+    protected void CastToAllies()
+    {
+        RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+        ExecuteMoveAndCastSequence(target, () =>
+        {
+            if (skillConfig.ClientTriggerTiming == 1)
+            {
+                OnAttackFinish();
+            }
+            else
+            {
+                // ShadowIllutionCreate(true);
+                MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.GetPositionNum()), Vector2.zero, () =>
+                {
+                    // ShadowIllutionCreate(false);
+                    OnAttackFinish();
+                }, MoveSpeed);   
+            }
+        });
+    }
+
+    // 鎵ц绉诲姩-鏂芥硶-杩斿洖搴忓垪锛氶�氱敤鐨勭Щ鍔ㄦ敾鍑绘祦绋�
+    private void ExecuteMoveAndCastSequence(RectTransform target, Action onReturnComplete)
+    {
+        ShadowIllutionCreate(true);
+        MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+        {
+            if (skillConfig.CastDistance < 9999 && skillConfig.SkinllSFX2 != 0)
+            {
+                battleField.soundManager.PlayEffectSound(skillConfig.SkinllSFX2, false);
+            }
+
+            TurnBack(() =>
+            {
+                ShadowIllutionCreate(false);
+                
+                CastImpl(() =>
+                {
+                    TurnBack(() => 
+                    {
+                        try
+                        {
+                            onReturnComplete?.Invoke(); // 娣诲姞寮傚父澶勭悊闃叉鍥炶皟寮傚父瀵艰嚧鐘舵�佷笉瀹屾暣
+                        }
+                        catch (Exception ex)
+                        {
+                            Debug.LogError($"ExecuteMoveAndCastSequence鍥炶皟寮傚父: {ex.Message}");
+                            throw;
+                        }
+                    }, -1f);
+                });
+            }, -1f);
+        });
+    }
+
+    // 绉诲姩鍒扮洰鏍囦綅缃細澶勭悊瑙掕壊鐨勭Щ鍔ㄥ姩鐢诲拰閫昏緫
+    protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 750f)
+    {
+        if (skillConfig.CastDistance >= 9999)
+        {
+            _onComplete?.Invoke();
+            return;
+        }
+
+        caster.PlayAnimation(MotionName.run, true);
+        var tweener = BattleUtility.MoveToTarget(caster.GetRectTransform(), target, offset, () =>
+        {
+            caster.PlayAnimation(MotionName.idle, true);
+            _onComplete?.Invoke();
+        }, speed);
+        battleField.battleTweenMgr.OnPlayTween(tweener);
+    }
+
+    // 杞韩閫昏緫锛氭牴鎹妧鑳介厤缃鐞嗚鑹茶浆鍚�
+    protected void TurnBack(Action _onComplete, float forward)
+    {
+        if (skillConfig.CastDistance < 0)
+        {
+            caster.SetFacing(forward);
+        }
+        _onComplete?.Invoke();
+    }
+
+    // 鏀诲嚮瀹屾垚鍚庣殑澶勭悊锛氳浆韬�佹仮澶嶇姸鎬併�佹挱鏀惧緟鏈哄姩鐢�
+    protected void OnAttackFinish()
+    {
+        TurnBack(null, 1f);
+        OnAllAttackMoveFinished();
+        caster.PlayAnimation(MotionName.idle, true);
+    }
+
+    // 鎵�鏈夋敾鍑荤Щ鍔ㄥ畬鎴愬悗鐨勫鐞嗭細鎭㈠UI鏄剧ず鐘舵��
+    protected virtual void OnAllAttackMoveFinished()
+    {
+        moveFinished = true;
+        List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>();
+        foreach (BattleObject bo in allList)
+        {
+            bo.layerMgr.SetFront();
+            bo.GetHeroInfoBar()?.SetActive(true);
+        }
+        battleField.battleRootNode.skillMaskNode.SetActive(false);
+    }
+
+    // 鎵ц鎶�鑳介噴鏀惧姩鐢诲拰閫昏緫锛氭挱鏀炬柦娉曞姩浣滃苟鎻愪緵鍥炶皟
+    protected TrackEntry CastImpl(Action onComplete = null)
+    {
+        return caster.PlaySkillAnimation(skillConfig, this, tagUseSkillAttack.BattleType == 4, onComplete);
+    }
+
+    // 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
+    public void OnSkillStart()
+    {
+        if (isPlay)
+        {
+            Debug.LogError(" play twice OnSkillStart skillId :" + skillConfig.SkillID);
+            return;
+        }
+
+        //  鍏堟妸姝讳骸鍖呮敹闆嗕簡
+        HandleDead();
+
+        //  鍐嶅鐞� 鍐呭祵鎶�鑳�
+        ProcessSubSkill();
+
+        skillEffect = SkillEffectFactory.CreateSkillEffect(this, caster, skillConfig, tagUseSkillAttack);
+        skillEffect.Play(OnHitTargets);
+        
+
+        isPlay = true;
+    }
+
+    protected void ProcessSubSkill()
+    {
+        // 鎸塸ackUID鎺掑簭鎵�鏈夊瓙鎶�鑳�
+        var allSubSkills = new List<(ulong packUID, SkillRecordAction action)>();
+        
+        List<GameNetPackBasic> removePackList = new List<GameNetPackBasic>();
+
+        foreach (var pack in packList)
+        {
+            if (pack is HB427_tagSCUseSkill skillPack)
+            {
+                SkillConfig ssc = SkillConfig.Get((int)skillPack.SkillID);
+                if (!string.IsNullOrEmpty(ssc.SkillMotionName))
+                {
+                    break;
+                }
+                if (ssc.SkillType == 8)
+                {
+                    break;
+                }
+                SkillRecordAction skillRecordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, new List<GameNetPackBasic> { skillPack });
+                allSubSkills.Add((skillPack.packUID, skillRecordAction));
+                removePackList.Add(pack);
+            }
+            else if (pack is HB422_tagMCTurnFightObjDead dead)
+            {
+                break;
+            }
+            else if (pack is CustomHB426CombinePack combinePack)
+            {
+                HB427_tagSCUseSkill sp = combinePack.GetMainHB427SkillPack();
+                SkillConfig ssc = SkillConfig.Get((int)sp.SkillID);
+
+                if (!string.IsNullOrEmpty(ssc.SkillMotionName))
+                {
+                    break;
+                }
+
+                if (ssc.SkillType == 8)
+                {
+                    break;
+                }
+                
+                SkillRecordAction skillRecordAction = combinePack.CreateSkillAction();
+                allSubSkills.Add((sp.packUID, skillRecordAction));
+                removePackList.Add(pack);
+
+                if (skillRecordAction.useParentRecordPlayer)
+                {
+                    break;
+                }
+            }
+        }
+
+        for (int i = 0; i < removePackList.Count; i++)
+        {
+            packList.Remove(removePackList[i]);
+        }
+
+        // 鎸塸ackUID鎺掑簭
+        allSubSkills.Sort((a, b) => a.packUID.CompareTo(b.packUID));
+
+        foreach (var (packUID, recordAction) in allSubSkills)
+        {
+            if (recordAction.useParentRecordPlayer)
+            {
+                ownRecordAction.GetInnerRecordPlayer().PlayRecord(recordAction, ownRecordAction);
+            }
+            else
+            {
+                ownRecordAction.GetInnerRecordPlayer().ImmediatelyPlay(recordAction);
+            }
+        }
+    }
+
+    // 鎶�鑳藉墠鎽囩粨鏉熷洖璋�
+    public virtual void OnStartSkillFrameEnd() { }
+
+    // 鎶�鑳戒腑鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囧紑濮�
+    public virtual void OnMiddleFrameStart(int times)
+    {
+        skillEffect?.OnMiddleFrameStart(times); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
+
+    // 鎶�鑳戒腑鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囩粨鏉�
+    public virtual void OnMiddleFrameEnd(int times, int hitIndex)
+    {
+        skillEffect?.OnMiddleFrameEnd(times, hitIndex); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
+
+    // 鎶�鑳藉悗鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囧紑濮�
+    public virtual void OnFinalFrameStart()
+    {
+        skillEffect?.OnFinalFrameStart(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
+
+    // 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
+    public virtual void OnFinalFrameEnd()
+    {
+        //  鏍囪鍔ㄧ敾鎾斁瀹屾垚
+        isMotionCompleted = true;
+        BattleDebug.LogError($"SkillBase.OnFinalFrameEnd: 鎶�鑳� {skillConfig?.SkillID} 鍔ㄧ敾鎾斁瀹屾垚");
+        
+        skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
+
+    // 楂樹寒鎵�鏈夌浉鍏崇洰鏍囷細璁剧疆鏂芥硶鑰呭拰鐩爣鐨勬樉绀哄眰绾�
+    protected void HighLightAllTargets()
+    {
+        caster.layerMgr.SetSortingOrder(BattleConst.SkillMaskOrder + BattleConst.BattleActiveHeroOffset);
+
+        if (skillConfig.FuncType != 2)
+            return;
+
+        // 鏀堕泦鎵�鏈夌洰鏍囷紙鍖呭惈 HurtList銆佹瘡涓� Hurt 鐨� HurtListEx銆佷互鍙婇《灞� HurtListEx锛�
+        var targetSet = new HashSet<BattleObject>();
+        if (tagUseSkillAttack != null)
+        {
+            // 涓荤洰鏍囧垪琛�
+            if (tagUseSkillAttack.HurtList != null)
+            {
+                foreach (var hurt in tagUseSkillAttack.HurtList)
+                {
+                    var bo = battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
+                    if (bo != null) targetSet.Add(bo);
+
+                    // 涓荤洰鏍囩殑棰濆鐩爣锛堝脊灏�/骞虫憡锛�
+                    if (hurt.HurtListEx != null)
+                    {
+                        foreach (var hurtEx in hurt.HurtListEx)
+                        {
+                            var exBo = battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+                            if (exBo != null) targetSet.Add(exBo);
+                        }
+                    }
+                }
+            }
+
+            // 鎶�鑳藉寘椤跺眰鐨� HurtListEx锛堝婧呭皠銆侀《灞傚钩鎽婏級
+            if (tagUseSkillAttack.HurtListEx != null)
+            {
+                foreach (var hurtEx in tagUseSkillAttack.HurtListEx)
+                {
+                    var exBo = battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+                    if (exBo != null) targetSet.Add(exBo);
+                }
+            }
+        }
+
+        // 纭繚鏂芥硶鑰呬篃琚珮浜紙鍘熼�昏緫锛�
+        var highlightList = new List<BattleObject>(targetSet) { caster };
+
+        var allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList();
+
+        // 鏋勯�犻泦鍚堜究浜庡垽鏂�
+        var targetSetLookup = new HashSet<BattleObject>(targetSet);
+        var highlightSet = new HashSet<BattleObject>(highlightList);
+
+        // 鍏堟妸鏂芥硶鑰呯殑 InfoBar 闅愯棌锛堝師閫昏緫淇濈暀锛�
+        caster.GetHeroInfoBar()?.SetActive(false);
+
+        foreach (BattleObject bo in allList)
+        {
+            bool isHighlight = highlightSet.Contains(bo);
+            bool isTarget = targetSetLookup.Contains(bo);
+
+            if (isHighlight)
+            {
+                bo.layerMgr.SetFront();
+            }
+            else
+            {
+                bo.layerMgr.SetBack();
+            }
+
+            // 鐩爣锛堝惈 HurtListEx锛夐兘搴旀樉绀� InfoBar
+            bo.GetHeroInfoBar()?.SetActive(isTarget);
+        }
+
+        battleField.battleRootNode.skillMaskNode.SetActive(true);
+    }
+
+
+    // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍囷紙鍖呮嫭涓荤洰鏍囥�佸脊灏勭洰鏍囥�佹簠灏勭洰鏍囷級
+    protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
+    {
+        // Debug.LogError($"Skill {skillConfig.SkillID} hit targets _hitIndex: {_hitIndex} hit {string.Join(", ", hitList.Select(h => h.ObjID + ":" + battleField.battleObjMgr.GetBattleObject((int)h.ObjID)?.GetName()))}");
+
+        //  閫犳垚浼ゅ鍓嶅厛澶勭悊琛�閲忓埛鏂板寘
+        HandleRefreshHP();
+
+        bool suckHp = true;
+
+        // 澶勭悊涓荤洰鏍囧垪琛�
+        foreach (var hurt in hitList)
+        { 
+            BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
+            if (target == null)
+            {
+                Debug.LogError("鐩爣涓虹┖ target == null ObjId : " + hurt.ObjID);
+                continue;
+            }
+
+            OnHitEachTarget(_hitIndex, target, hurt, suckHp);
+
+            suckHp = false;
+
+            // 澶勭悊璇ョ洰鏍囩殑棰濆鐩爣鍒楄〃锛堝寮瑰皠浼ゅ鐨勫钩鎽婄洰鏍囷級
+            if (hurt.HurtListEx != null && hurt.HurtListEx.Length > 0)
+            {
+                foreach (var hurtEx in hurt.HurtListEx)
+                {
+                    BattleObject exTarget = caster.battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+                    if (exTarget == null)
+                    {
+                        Debug.LogError($"棰濆鐩爣涓虹┖ HurtListEx target == null ObjId : {hurtEx.ObjID}");
+                        continue;
+                    }
+
+                    OnHitEachTargetEx(_hitIndex, exTarget, hurtEx);
+                }
+            }
+        }
+
+        // 澶勭悊鎶�鑳藉寘椤跺眰鐨勯澶栫洰鏍囧垪琛紙濡傛簠灏勪激瀹炽�佸钩鎽婁激瀹筹級
+        if (tagUseSkillAttack.HurtListEx != null && tagUseSkillAttack.HurtListEx.Length > 0)
+        {
+            foreach (var hurtEx in tagUseSkillAttack.HurtListEx)
+            {
+                BattleObject exTarget = caster.battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+                if (exTarget == null)
+                {
+                    Debug.LogError($"椤跺眰棰濆鐩爣涓虹┖ tagUseSkillAttack.HurtListEx target == null ObjId : {hurtEx.ObjID}");
+                    continue;
+                }
+
+                OnHitEachTargetEx(_hitIndex, exTarget, hurtEx);
+            }
+        }
+
+        HandleHint(_hitIndex, hitList);
+    }
+
+    protected void HandleHint(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
+    {
+        if (0 == _hitIndex)
+        {
+            bool needhint = false;
+
+            for (int i = 0; i < hitList.Count; i++)
+            {
+                var hurt = hitList[i];
+
+                //8-鍑绘檿
+                if ((hurt.AttackTypes & (int)DamageType.Stunned) == (int)DamageType.Stunned)
+                {
+                    needhint = true;
+                    break;
+                }
+
+                for (int j = 0; j < hurt.HurtListEx?.Length; j++)
+                {
+                    var hurtex = hurt.HurtListEx[j];
+                    //8-鍑绘檿
+                    if ((hurtex.AttackTypes & (int)ServerDamageType.Stunned) == (int)ServerDamageType.Stunned)
+                    {
+                        needhint = true;
+                        break;
+                    }
+                }
+
+                if (needhint)
+                    break;
+            }
+
+            if (needhint)
+            {
+                DamageNumConfig hintConfig = DamageNumConfig.Get(BattleConst.BattleStun);
+                Hint(caster, hintConfig);
+            }
+
+            for (int i = 0; i < hitList.Count; i++)
+            {
+                var hurt = hitList[i];
+
+                if ((hurt.AttackTypes & (int)DamageType.BreakArmor) == (int)DamageType.BreakArmor)
+                {
+                    BattleObject battleObject = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
+                    if (battleObject != null)
+                    {
+                        DamageNumConfig hintConfig = DamageNumConfig.Get(BattleConst.BreakArmor);
+                        Hint(battleObject, hintConfig);
+                        battleField.battleEffectMgr.PlayEffect(battleObject, 
+                            BattleConst.BreakArmorEffectID, battleObject.GetRectTransform(), battleObject.Camp, 
+                            battleObject.GetModelScale());
+                    }
+                }
+                else if ((hurt.AttackTypes & (int)DamageType.Parry) == (int)DamageType.Parry)
+                {
+                    BattleObject battleObject = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
+                    if (battleObject != null)
+                    {
+                        DamageNumConfig hintConfig = DamageNumConfig.Get(BattleConst.Parry);
+                        Hint(battleObject, hintConfig);
+                        battleField.battleEffectMgr.PlayEffect(battleObject, 
+                            BattleConst.ParryEffectID, battleObject.GetRectTransform(), battleObject.Camp, 
+                            battleObject.GetModelScale());
+                    }
+                }
+            }
+        }
+    }
+
+    // 澶勭悊鍗曚釜鐩爣琚懡涓�:搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
+    protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, bool suckHp)
+    {
+        // ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜$瓑) ============
+        int objID = (int)target.ObjID;
+        tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
+        tempDeadPackList.TryGetValue(objID, out BattleDeadPack deadPack);
+
+        // 濡傛灉鐩爣姝e湪閲婃斁鎶�鑳斤紝璺宠繃姝讳骸澶勭悊锛堝欢杩熷埌鎶�鑳界粨鏉燂級
+        if (battleField != null && battleField.IsCastingSkill(target.ObjID))
+        {
+            deadPack = null;
+        }
+
+        // ============ 鍙傛暟鎵撳寘 ============
+        BattleHurtParam hurtParam = BattleUtility.CalcBattleHurtParam(this, _hitIndex, target, hurt, battleDrops, deadPack, suckHp);
+#if UNITY_EDITOR
+        PrintHurtParamDebugInfo(hurtParam);
+#endif
+
+        // 鍏堣皟鐢ㄧ洰鏍囧彈浼�
+        DeathRecordAction recordAc = target.Hurt(hurtParam, ownRecordAction);
+
+        if (null != recordAc)
+        {
+            tempDeadPackList.Remove(hurtParam.hurter.hurtObj.ObjID);
+            ownRecordAction.GetInnerRecordPlayer().ImmediatelyPlay(recordAc, ownRecordAction, true);
+            currentWaitingSkill.Add(recordAc);
+        }
+        
+        // 鍐嶈皟鐢ㄦ柦娉曡�呭惛琛�/鍙嶄激
+        caster.OnHurtTarget(hurtParam);
+    }
+
+    // 澶勭悊棰濆鐩爣琚懡涓紙HurtListEx锛夛細婧呭皠銆佸脊灏勩�佸钩鎽婁激瀹崇瓑
+    protected virtual void OnHitEachTargetEx(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurtEx hurtEx)
+    {
+        // ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜$瓑) ============
+        int objID = (int)target.ObjID;
+        tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
+
+        tempDeadPackList.TryGetValue(objID, out BattleDeadPack deadPack);
+
+        // 濡傛灉鐩爣姝e湪閲婃斁鎶�鑳斤紝璺宠繃姝讳骸澶勭悊锛堝欢杩熷埌鎶�鑳界粨鏉燂級
+        if (battleField != null && battleField.IsCastingSkill(target.ObjID))
+        {
+            deadPack = null;
+        }
+        // ============ 鍙傛暟鎵撳寘锛堝皢 tagSCUseSkillHurtEx 杞崲涓� tagSCUseSkillHurt锛�============
+        HB427_tagSCUseSkill.tagSCUseSkillHurt hurt = new HB427_tagSCUseSkill.tagSCUseSkillHurt
+        {
+            ObjID = hurtEx.ObjID,
+            AttackTypes = hurtEx.AttackTypes,
+            HurtHP = hurtEx.HurtHP,
+            HurtHPEx = hurtEx.HurtHPEx,
+            CurHP = hurtEx.CurHP,
+            CurHPEx = hurtEx.CurHPEx,
+            SuckHP = 0,//hurtEx.SuckHP, 鑾峰彇鍏ㄩ儴鍚歌鏃跺凡缁忚绠楄繃 杩欓噷灏变笉鍐嶈绠�
+            BounceHP = 0, // HurtEx 娌℃湁鍙嶄激瀛楁
+            HurtCountEx = 0,
+            HurtListEx = null
+        };
+
+        OnHitEachTarget(_hitIndex, target, hurt, false);//鑾峰彇鍏ㄩ儴鍚歌鏃跺凡缁忚绠楄繃 杩欓噷灏变笉鍐嶈绠�
+    }
+
+#if UNITY_EDITOR
+    private void PrintHurtParamDebugInfo(BattleHurtParam hurtParam)
+    {
+        bool isLastHit = hurtParam.hitIndex >= hurtParam.skillConfig.DamageDivide.Length - 1;
+        
+        long currentHitDamage = hurtParam.hurter.damageList != null ? hurtParam.hurter.damageList.Sum() : 0;
+        long currentHitSuckHp = hurtParam.caster.suckHpList != null ? hurtParam.caster.suckHpList.Sum() : 0;
+        long currentHitReflectHp = hurtParam.caster.reflectHpList != null ? hurtParam.caster.reflectHpList.Sum() : 0;
+        
+        long totalDamage = GeneralDefine.GetFactValue(hurtParam.hurt.HurtHP, hurtParam.hurt.HurtHPEx);
+        long totalSuckHp = BattleUtility.GetSuckHp(tagUseSkillAttack);
+        long totalReflectHp = hurtParam.hurt.BounceHP;
+        
+        BattleDebug.LogError(
+            (hurtParam.caster.casterObj.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ�� ") +
+            $"鏀诲嚮鑰�: {hurtParam.caster.casterObj.GetName()} (ObjID:{hurtParam.caster.casterObj.ObjID})\n" +
+            $"鐩爣: {hurtParam.hurter.hurtObj.GetName()} (ObjID:{hurtParam.hurter.hurtObj.ObjID})\n" +
+            $"鎶�鑳�: {hurtParam.skillConfig.SkillName} (ID:{hurtParam.skillConfig.SkillID})\n" +
+            $"鍑绘暟: 绗瑊hurtParam.hitIndex + 1}鍑� / 鍏眥hurtParam.skillConfig.DamageDivide.Length}鍑�" + (isLastHit ? " [鏈�鍚庝竴鍑籡" : " [涓棿鍑籡") + "\n" +
+            $"\n" +
+            $"========== 鐩爣鍙椾激鏁版嵁 ==========\n" +
+            $"浼ゅ: {currentHitDamage} / 鎬讳激瀹�: {totalDamage}\n" +
+            $"浼ゅ鍒嗘: [{string.Join(", ", hurtParam.hurter.damageList ?? new List<long>())}]\n" +
+            $"鐩爣琛�閲�: {hurtParam.hurter.fromHp} -> {hurtParam.hurter.toHp} (鏈�澶�:{hurtParam.hurter.maxHp})\n" +
+            $"鐩爣鎶ょ浘: {hurtParam.hurter.fromShieldValue} -> {hurtParam.hurter.toShieldValue}\n" +
+            $"鏀诲嚮绫诲瀷: {hurtParam.hurt.AttackTypes}\n" +
+            $"\n" +
+            $"========== 鏂芥硶鑰呮暟鎹� ==========\n" +
+            $"鍚歌: {currentHitSuckHp} / 鎬诲惛琛�: {totalSuckHp}\n" +
+            $"鍚歌鍒嗘: [{string.Join(", ", hurtParam.caster.suckHpList ?? new List<long>())}]\n" +
+            $"鍙嶄激: {currentHitReflectHp} / 鎬诲弽浼�: {totalReflectHp}\n" +
+            $"鍙嶄激鍒嗘: [{string.Join(", ", hurtParam.caster.reflectHpList ?? new List<long>())}]\n" +
+            $"鏂芥硶鑰呰閲�: {hurtParam.caster.fromHp} -> {hurtParam.caster.toHp} (鏈�澶�:{hurtParam.caster.maxHp})\n" +
+            $"鏂芥硶鑰呮姢鐩�: {hurtParam.caster.fromShieldValue} -> {hurtParam.caster.toShieldValue}\n"
+        );
+    }
+#endif
+
+    // 澶勭悊HP鍒锋柊鍖咃紙绠�鍖栭�昏緫锛�
+    private void HandleRefreshHP()
+    {
+        // 鏌ユ壘HP鍒锋柊鍖�
+        HB419_tagSCObjHPRefresh refreshPack = BattleUtility.FindObjHPRefreshPack(packList);
+
+        if (refreshPack != null)
+        {
+            // 鍒嗗彂HP鍒锋柊鍖�
+            // 銆愪娇鐢� parentRecordAction.innerRecordPlayer銆�
+            // 鍘熷洜锛欻P鍒锋柊鍖呮槸鎶�鑳藉唴閮ㄤ骇鐢熺殑锛屽簲璇ョ敱褰撳墠SkillRecordAction鐨刬nnerRecordPlayer绠$悊
+            // 杩欐牱鍙互纭繚HP鍒锋柊涓庢妧鑳界殑鐢熷懡鍛ㄦ湡缁戝畾锛孎orceFinish鏃朵竴骞跺鐞�
+            PackageRegeditEx.DistributeToRecordAction(refreshPack, ownRecordAction);
+            packList.Remove(refreshPack);
+        }
+    }
+
+    // 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
+    protected void HandleDead()
+    {
+        List<BattleDeadPack> deadPackList = BattleUtility.FindDeadPack(packList);
+        if (deadPackList.Count <= 0) return;
+
+        foreach (var deadPack in deadPackList)
+        {
+            packList.Remove(deadPack.deadPack);
+            packList.Remove(deadPack.deadTriggerSkill);
+        }
+
+        // 鎵惧埌鏈�澶х殑姝讳骸鍖� packUID
+        BattleDeadPack lastBattleDeadPack = null;
+        ulong maxDeathPackUID = 0;
+        foreach (var deadPack in deadPackList)
+        {
+            if (deadPack.deadPack != null && deadPack.deadPack.packUID > maxDeathPackUID)
+            {
+                maxDeathPackUID = deadPack.deadPack.packUID;
+                lastBattleDeadPack = deadPack;
+            }
+        }
+        
+        // 濡傛灉鎵惧埌浜嗘浜″寘锛屾敹闆嗘墍鏈� packUID > maxDeathPackUID 鐨勫寘
+        if (maxDeathPackUID > 0 && lastBattleDeadPack != null)
+        {
+            BattleDebug.LogError($"SkillBase.HandleDead: 鎵惧埌姝讳骸鍖咃紝maxDeathPackUID = {maxDeathPackUID}锛屽紑濮嬫敹闆嗘浜″悗鐨勫寘");
+            
+            // 1. 鏀堕泦 packList 涓� packUID 澶т簬姝讳骸鍖呯殑鍖咃紙鎺掗櫎缁忛獙鍖呭拰鎺夎惤鍖咃紝瀹冧滑闇�瑕佸湪褰撳墠鎶�鑳戒腑澶勭悊锛�
+            List<GameNetPackBasic> packsToRemove = new List<GameNetPackBasic>();
+            foreach (var pack in packList)
+            {
+                ulong packUID = GetPackUID(pack);
+                if (packUID > maxDeathPackUID)
+                {
+                    // 鎺掗櫎缁忛獙鍖呭拰鎺夎惤鍖咃紝瀹冧滑灞炰簬褰撳墠姝讳骸浜嬩欢鐨勪竴閮ㄥ垎锛屼笉鏄�"姝讳骸鍚�"鐨勫寘
+                    if (pack is HB405_tagMCAddExp expPack && expPack.Source == 2 || 
+                        (pack is H0704_tagRolePackRefresh h0704 && h0704.PackType == (byte)PackType.DropItem && h0704.IsBind == 1))
+                    {
+                        continue; // 璺宠繃缁忛獙鍖呭拰鎺夎惤鍖咃紝璁� CheckAfterDeadhPack() 澶勭悊瀹冧滑
+                    }
+                    
+                    BattleDebug.LogError($"SkillBase.HandleDead: 浠巔ackList鏀堕泦姝讳骸鍚庣殑鍖� - Type: {pack.GetType().Name}, UID: {packUID}");
+                    lastBattleDeadPack.packListAfterDeath.Add(pack);
+                    packsToRemove.Add(pack);
+                }
+            }
 
-		//	璺濈閰嶆垚璐熸暟瑕佽浆韬� TurnBack
-		BattleDebug.LogError(GetType().Name + " Skill CastMode : " + skillConfig.castMode);
-		switch (skillConfig.castMode)
-		{
-			case SkillCastMode.Self:
-				CastImpl();
-				break;
-			case SkillCastMode.Enemy:
-				CastToEnemy();
-				break;
-			case SkillCastMode.Target:
-				CastToTarget();
-				break;
-			case SkillCastMode.Allies:
-				CastToAllies();
-				break;
-			// case SkillCastMode.DashCast:
-			// 	DashToTarget(() => BackToOrigin(OnSkillFinished));
-			// 	break;
-			default:
-				BattleDebug.LogError("鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
-				OnSkillFinished();
-				break;
-		}
-	}
+            packList.RemoveAll(p => packsToRemove.Contains(p));
+        }
 
-	protected void MoveToTarget(RectTransform target, Vector2 offset, float duration, Action onComplete = null)
-	{
-		BattleDebug.LogError("Move to target , target is " + target.name);
-		//	鍘熷湴閲婃斁
-		if (skillConfig.CastDistance >= 9999)
-		{
-			onComplete?.Invoke();
-			return;
-		}
+        CheckAfterDeadhPack();
 
-		caster.motionBase.PlayAnimation(MotionName.run, true);
-		var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, duration, () =>
-		{
-			caster.motionBase.PlayAnimation(MotionName.idle, true);
-			onComplete?.Invoke();
-		});
-		battleField.battleTweenMgr.OnPlayTween(tweener);
-	}
+        // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀归泦鍚�
+        var dropPacksToRemove = new List<H0704_tagRolePackRefresh>(dropPackList);
+        foreach (var _dropPack in dropPacksToRemove)
+        {
+            // 銆愪娇鐢� parentRecordAction.innerRecordPlayer銆�
+            // 鍘熷洜锛氭帀钀藉寘鏄妧鑳芥晥鏋滅殑涓�閮ㄥ垎锛屽簲璇ョ敱褰撳墠SkillRecordAction绠$悊
+            // 鎺夎惤鍖呯殑鍒嗗彂涓庢妧鑳藉畬鎴愮粦瀹氾紝纭繚鍦ㄦ妧鑳紽orceFinish鏃舵纭鐞�
+            PackageRegeditEx.DistributeToRecordAction(_dropPack, ownRecordAction);
+            packList.Remove(_dropPack);
+        }
 
-	protected void TurnBack(Action _onComplete, float forward)
-	{
-		if (skillConfig.CastDistance < 0)
-		{
-			//	杞韩
-			Vector3 scale = caster.heroGo.transform.localScale;
-			scale.x = Mathf.Abs(scale.x) * forward;
-			caster.heroGo.transform.localScale = scale;
-		}
-		_onComplete?.Invoke();
-	}
+        // 鑾峰彇骞跺垎閰嶆帀钀界墿鍝佸拰缁忛獙
+        var dropPack = PackManager.Instance.GetSinglePack(PackType.DropItem);
+        var itemDict = dropPack.GetAllItems();
+        List<ItemModel> itemList = new List<ItemModel>(itemDict.Values.Where(item => item != null && item.isAuction));
 
-	protected void CastToEnemy()
-	{
+        var dropAssign = AssignDrops(itemList, deadPackList.Count);
+        var expAssign = AssignExp(expPackList, deadPackList.Count);
 
-		RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+        // 鏋勯�燘attleDrops骞剁紦瀛�
+        for (int i = 0; i < deadPackList.Count; i++)
+        {
+            BattleDeadPack bdp = deadPackList[i];
+            int objID = (int)bdp.deadPack.ObjID;
+            BattleObject deadTarget = battleField.battleObjMgr.GetBattleObject(objID);
+            
+            // 淇锛氭坊鍔犵┖鍊兼鏌�
+            if (deadTarget == null)
+            {
+                Debug.LogError($"鎵句笉鍒版浜$洰鏍囷紝ObjID: {objID}");
+                continue;
+            }
+            
+            List<int> itemIndexList = dropAssign[i].Select(item => item.gridIndex).ToList();
+            
+            BattleDrops battleDrops = new BattleDrops()
+            {
+                rectTransform = deadTarget.GetRectTransform(),
+                dropItemPackIndex = itemIndexList,
+                expDrops = expAssign[i]
+            };
 
-		MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), moveTime, () =>
-		{
-			//	鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
-			TurnBack(() =>
-			{
-				//	鍒拌揪鐩爣浣嶇疆
-				CastImpl(() =>
-				{
-					TurnBack(
-						() =>
-						{
-							//	鍥炲埌鍘熸潵鐨勪綅缃�
-							MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, moveTime, () =>
-							{
-								TurnBack(null, 1f);
-								caster.motionBase.PlayAnimation(MotionName.idle, true);
-								OnAllAttackMoveFinished();
-							});
-						}
-					, -1f);
-				});
-			}, -1f);
-		});
-	}
+            // 淇锛氶伩鍏嶅瓧鍏搁敭鍐茬獊锛屼娇鐢ㄥ畨鍏ㄧ殑娣诲姞鏂瑰紡
+            if (!tempDropList.ContainsKey(objID))
+            {
+                tempDropList.Add(objID, battleDrops);
+            }
+            else
+            {
+                Debug.LogWarning($"tempDropList涓凡瀛樺湪ObjID={objID}鐨勮褰曪紝灏嗚鐩栧師鍊�");
+                tempDropList[objID] = battleDrops; // 瑕嗙洊鐜版湁鍊�
+            }
 
+            if (!tempDeadPackList.ContainsKey(objID))
+            {
+                tempDeadPackList.Add(objID, deadPackList[i]);
+            }
+            else
+            {
+                Debug.LogWarning($"tempDeadPackList涓凡瀛樺湪ObjID={objID}鐨勮褰曪紝灏嗚鐩栧師鍊�");
+                tempDeadPackList[objID] = deadPackList[i]; // 瑕嗙洊鐜版湁鍊�
+            }
+        }
 
+        // 淇锛氶伩鍏嶅湪閬嶅巻鏃朵慨鏀归泦鍚堬紝鍏堟敹闆嗗悗鍒犻櫎
+        var deadPacksToRemove = new List<GameNetPackBasic>(deadPackList.Select(d => d.deadPack));
+        deadPacksToRemove.AddRange(deadPackList.Where(d => d.deadTriggerSkill != null).Select(d => d.deadTriggerSkill));
+        foreach (var deadPack in deadPacksToRemove)
+        {
+            packList.Remove(deadPack);
+        }
+    }
 
-	protected void CastToTarget()
-	{
-		// 鐩爣鏄晫鏂逛富鐩爣
-		if (tagUseSkillAttack.HurtCount <= 0)
-		{
-			BattleDebug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
-			OnSkillFinished();
-			return;
-		}
+    // 鍒嗛厤鎺夎惤鐗╁搧锛氬皢鎺夎惤鐗╁搧骞冲潎鍒嗛厤缁欐浜″璞�
+    protected List<List<ItemModel>> AssignDrops(List<ItemModel> itemList, int deadCount)
+    {
+        var dropAssign = new List<List<ItemModel>>();
+        for (int i = 0; i < deadCount; i++)
+            dropAssign.Add(new List<ItemModel>());
+        for (int i = 0; i < itemList.Count; i++)
+            dropAssign[i % deadCount].Add(itemList[i]);
+        return dropAssign;
+    }
 
-		var mainHurt = tagUseSkillAttack.HurtList[0];
+    // 鑾峰彇鍖呯殑 packUID
+    protected ulong GetPackUID(GameNetPackBasic pack)
+    {
+        if (pack == null) return 0;
+        
+        if (pack is HB422_tagMCTurnFightObjDead deadPack)
+            return deadPack.packUID;
+        
+        if (pack is CustomHB426CombinePack combinePack)
+        {
+            var mainSkillPack = combinePack.GetMainHB427SkillPack();
+            return mainSkillPack?.packUID ?? 0;
+        }
+        
+        if (pack is HB427_tagSCUseSkill skillPack)
+            return skillPack.packUID;
+        
+        if (pack is HB428_tagSCBuffRefresh buffRefresh)
+            return buffRefresh.packUID;
+        
+        if (pack is HB429_tagSCBuffDel buffDel)
+            return buffDel.packUID;
+        
+        if (pack is HB419_tagSCObjHPRefresh hpRefresh)
+            return hpRefresh.packUID;
+        
+        if (pack is HB405_tagMCAddExp expPack)
+            return expPack.packUID;
+        
+        if (pack is H0704_tagRolePackRefresh dropPack)
+            return dropPack.packUID;
+        
+        // 灏濊瘯閫氳繃鍙嶅皠鑾峰彇 packUID
+        var packUIDField = pack.GetType().GetField("packUID");
+        if (packUIDField != null)
+        {
+            return (ulong)packUIDField.GetValue(pack);
+        }
+        
+        return 0;
+    }
 
-		BattleObject mainTarget = battleField.battleObjMgr.GetBattleObject((int)mainHurt.ObjID);
-		if (mainTarget == null)
-		{
-			BattleDebug.LogError("鐩爣涓虹┖ mainTarget == null ObjID : " + mainHurt.ObjID);
-			OnSkillFinished();
-			return;
-		}
+    // 鍒嗛厤缁忛獙鍊硷細灏嗙粡楠屽寘骞冲潎鍒嗛厤缁欐瘡涓浜″璞�
+    protected List<List<HB405_tagMCAddExp>> AssignExp(List<HB405_tagMCAddExp> expList, int deadCount)
+    {
+        var expAssign = new List<List<HB405_tagMCAddExp>>();
+        for (int i = 0; i < deadCount; i++)
+            expAssign.Add(new List<HB405_tagMCAddExp>());
 
-		MoveToTarget(mainTarget.heroRectTrans, new Vector2(skillConfig.CastDistance, 0), moveTime, () =>
-		{
-			//	鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
-			TurnBack(() =>
-			{
-				//	鍒拌揪鐩爣浣嶇疆
-				CastImpl(() =>
-				{
-					TurnBack(
-						() =>
-						{
-							//	鍥炲埌鍘熸潵鐨勪綅缃�
-							MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, moveTime, () =>
-							{
-								TurnBack(null, 1f);
-								caster.motionBase.PlayAnimation(MotionName.idle, true);
-								OnAllAttackMoveFinished();
-							});
-						}
-					, -1f);
-				});
-			}, -1f);
-		});
-	}
+        // 淇锛氭鏌ラ櫎闆堕闄�
+        if (deadCount == 0)
+        {
+            Debug.LogWarning("AssignExp: deadCount涓�0锛屾棤娉曞垎閰嶇粡楠�");
+            return expAssign;
+        }
 
-	protected virtual void OnAllAttackMoveFinished()
-	{
-		
-	}
+        // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀筽ackList
+        var expPacksToRemove = new List<HB405_tagMCAddExp>();
 
-	protected void CastToAllies()
-	{
-		RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+        foreach (var expPack in expList)
+        {
+            long totalExp = GeneralDefine.GetFactValue(expPack.Exp, expPack.ExpPoint);
+            long avgExp = totalExp / deadCount;
+            long remain = totalExp % deadCount;
 
-		MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), moveTime, () =>
-		{
-			//	鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
-			TurnBack(() =>
-			{
-				//	鍒拌揪鐩爣浣嶇疆
-				CastImpl(() =>
-				{
-					TurnBack(
-						() =>
-						{
-							//	鍥炲埌鍘熸潵鐨勪綅缃�
-							MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, moveTime, () =>
-							{
-								TurnBack(null, 1f);
-								caster.motionBase.PlayAnimation(MotionName.idle, true);
-								OnAllAttackMoveFinished();
-							});
-						}
-					, -1f);
-				});
-			}, -1f);
-		});
-	}
+            for (int i = 0; i < deadCount; i++)
+            {
+                long assignExp = avgExp + (i < remain ? 1 : 0);
+                var newPack = new HB405_tagMCAddExp
+                {
+                    Exp = (uint)(assignExp % Constants.ExpPointValue),
+                    ExpPoint = (uint)(assignExp / Constants.ExpPointValue),
+                    Source = expPack.Source
+                };
+                expAssign[i].Add(newPack);
+            }
+            expPacksToRemove.Add(expPack);
+        }
+        
+        // 缁熶竴鍒犻櫎鏀堕泦鐨勫寘
+        foreach (var pack in expPacksToRemove)
+        {
+            packList.Remove(pack);
+        }
 
+        return expAssign;
+    }
 
-	//	鎵胯浇鎶�鑳藉ぇ閮ㄥ垎鐨勯�昏緫
-	protected TrackEntry CastImpl(Action onComplete = null)
-	{
-		// 鎾斁鏂芥硶鍔ㄤ綔
-		//	onComplete鏄寚鏂芥硶鍔ㄤ綔鎾斁瀹岀殑鍥炶皟 涓嶄唬琛ㄦ槸鎶�鑳界粨鏉�
-		//	鍏蜂綋鎶�鑳界粨鏉熺殑鏃堕棿搴旇鐪嬫妧鑳藉搴旂殑閫昏緫
-		//	杩欓噷鍙彁渚�6涓姩浣滅浉鍏崇殑鍑芥暟
-		// OnSkillStart 鍔ㄤ綔绗竴甯�
-		// OnStartSkillFrameEnd 鍓嶆憞缁撴潫
-		// OnMiddleFrameStart 涓憞寮�濮�
-		// OnMiddleFrameEnd 涓憞缁撴潫
-		// OnFinalFrameStart 鍚庢憞寮�濮�
-		// OnFinalFrameEnd 鍚庢憞缁撴潫
-		return caster.motionBase.PlaySkillAnimation(skillConfig, this, onComplete);
-	}
+    // 妫�鏌ユ浜″悗鐨勫寘澶勭悊锛氬鐞嗘妧鑳藉寘銆佹帀钀藉寘銆佺粡楠屽寘
+    protected void CheckAfterDeadhPack()
+    {
+        List<int> removeIndexList = new List<int>();
+        
+        for (int i = 0; i < packList.Count; i++)
+        {
+            var pack = packList[i];
 
-	//	鎶�鑳藉紑濮�
-	public virtual void OnSkillStart()
-	{
-		skillEffect = SkillEffectFactory.CreateSkillEffect(
-				caster,
-				skillConfig,
-				tagUseSkillAttack
-			);
-		if (skillEffect != null)
-		{
-			skillEffect.Play(OnHitTargets);
-		}
-	}
+            // 澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
+            if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+                break;
+                
+            if (pack is H0704_tagRolePackRefresh h0704Pack && h0704Pack.PackType == (byte)PackType.DropItem && h0704Pack.IsBind == 1)
+            {
+                dropPackList.Add(h0704Pack);
+                removeIndexList.Add(i);
+            }
+            
+            if (pack is HB405_tagMCAddExp h405Pack && h405Pack.Source == 2)
+            {
+                expPackList.Add(h405Pack);
+                removeIndexList.Add(i);
+            }
+        }
 
-	//	鎶�鑳藉墠鎽囧抚缁撴潫
-	public virtual void OnStartSkillFrameEnd()
-	{
+        for (int i = removeIndexList.Count - 1; i >= 0; i--)
+            packList.RemoveAt(removeIndexList[i]);
+    }
 
-	}
 
-	/// <summary>
-	/// 涓憞寮�濮� times=绗嚑娆″惊鐜� 浠�0寮�濮�
-	/// </summary>
-	/// <param name="times"></param>
-	public virtual void OnMiddleFrameStart(int times)
-	{
-		skillEffect.OnMiddleFrameStart(times);
-	}
+    public virtual bool IsActionCompleted()
+    {
+        if (!isPlay) return false;
 
-	public virtual void OnMiddleFrameEnd(int times, int hitIndex)
-	{
-		skillEffect.OnMiddleFrameEnd(times, hitIndex);
-	}
+        if (skillEffect != null)
+        {
+            if (!skillEffect.IsFinished()) return false;
+        }
 
-	/// <summary>
-	/// 鍚庢憞寮�濮�
-	/// </summary>
-	public virtual void OnFinalFrameStart()
-	{
+        if (moveFinished)
+        {
+            //  濡傛灉鎶�鑳芥湁鍔ㄧ敾锛圫killMotionName涓嶄负绌猴級锛岄渶瑕佺瓑寰呭姩鐢绘挱鏀惧畬鎴�
+            if (skillConfig != null && !string.IsNullOrEmpty(skillConfig.SkillMotionName))
+            {
+                if (!isMotionCompleted)
+                {
+                    BattleDebug.LogError($"SkillBase.IsActionCompleted: 鎶�鑳� {skillConfig.SkillID} 绛夊緟鍔ㄧ敾鎾斁瀹屾垚");
+                    return false;
+                }
+            }
 
-	}
+            return true;
+        }
 
-	/// <summary>
-	/// 鍚庢憞缁撴潫
-	/// </summary>
-	public virtual void OnFinalFrameEnd()
-	{
+        return false;
+    }
 
-	}
+    // 妫�鏌ユ妧鑳芥槸鍚﹀畬鎴愶細缁煎悎妫�鏌ユ墍鏈夊畬鎴愭潯浠�
+    public virtual bool IsFinished()
+    {
+        if (!isPlay) return false;
+        
+        bool tempRetValue = true;
 
+        // 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
+        if (skillEffect != null)
+        {
+            if (!skillEffect.IsFinished()) return false;
+            skillEffect = null;
+            OnSkillFinished();
+            tempRetValue = false;
+        }
 
+        // 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
+        if (currentWaitingSkill.Count > 0)
+        {
+            if (currentWaitingSkill.Any(s => s.IsFinished()))
+            {
+                currentWaitingSkill.RemoveAll(s => s.IsFinished());
+                OnSkillFinished();
+            }
+            else
+            {
+                tempRetValue = false;
+            }
+        }
 
+        if (!tempRetValue)
+        {
+            return false;
+        }
 
-	protected void HighLightAllTargets()
-	{
-		// 楂樹寒鎵�鏈夌洰鏍�
-		HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
-		highlightList.Add(caster);
 
+        // 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
+        if (isFinished && moveFinished)
+        {
+            if (packList.Count > 0)
+            {
+                OnSkillFinished();
+                return false;
+            }
 
-		//	鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
-		//	YYL TODO
-	}
+            //  濡傛灉鑷繁鍐呴儴鐨剅ecora action鐨� inner record player杩樻湁娌℃墽琛屽畬鐨勫寘 涔熸槸杩斿洖false
+            if (ownRecordAction != null && ownRecordAction.GetInnerRecordPlayer().IsPlaying())
+            {
+                return false;
+            }
 
-	//	鍛戒腑鐩爣鍚庣殑鍥炶皟 姝e父鏄互鍚勬妧鑳界殑鏂瑰紡鏉ュ鐞嗙殑
-	protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
-	{
-		for (int i = 0; i < hitList.Count; i++)
-		{
-			HB427_tagSCUseSkill.tagSCUseSkillHurt hurt = hitList[i];
+            // 鎶�鑳藉畬鍏ㄧ粨鏉燂紝绉婚櫎鎶�鑳芥敞鍐屽苟瑙﹀彂寤惰繜鐨勬浜″垽瀹�
+            if (battleField != null && caster != null)
+            {
+                battleField.RemoveCastingSkill(caster.ObjID, this);
+                
+                //  浼犻�抪arentRecordAction锛岃姝讳骸鎶�鑳界瓑寰呭綋鍓嶆妧鑳藉畬鎴�
+                DeathRecordAction recordAction = battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values), null, ownRecordAction);
+                if (null != recordAction)
+                {
+                    ownRecordAction.GetInnerRecordPlayer().ImmediatelyPlay(recordAction);
+                    tempDeadPackList.Clear();
+                    return false;
+                }
+            }
 
-			BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
-			if (target == null)
-			{
-				BattleDebug.LogError("鐩爣涓虹┖ target == null ObjId : " + hurt.ObjID);
-				continue;
-			}
+            return !ownRecordAction.GetInnerRecordPlayer().IsPlaying();
+        }
 
-			OnHitEachTarget(_hitIndex, target, hurt);
-		}
+        return false;
+    }
 
-		HandleDead();
-	}
 
+    // 寮哄埗缁撴潫鎶�鑳斤細绔嬪嵆缁撴潫鎵�鏈夋妧鑳界浉鍏崇殑澶勭悊
+    public virtual void ForceFinished()
+    {
+        if (isFinished)
+            return;
 
-	protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
-	{
-		// 浼ゅ鍒嗗竷 (涓囧垎姣�)
-		int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
+        // 绉婚櫎鎶�鑳芥敞鍐�
+        if (battleField != null && caster != null)
+        {
+            battleField.RemoveCastingSkill(caster.ObjID, this);
+        }
 
-		long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+        //  浼犻�抪arentRecordAction锛岃姝讳骸鎶�鑳界瓑寰呭綋鍓嶆妧鑳藉畬鎴�
+        RecordAction rc = battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values));
+        if (null != rc)
+        {
+            ownRecordAction.GetInnerRecordPlayer().ImmediatelyPlay(rc);
+        }
+        tempDeadPackList.Clear();
 
-		// 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
-		List<long> damageList = BattleUtility.DivideDamageToList(damageDivide, totalDamage);
-		// public uint ObjID;
-		// public uint AttackTypes;        // 椋樿绫诲瀷姹囨�伙紝鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
-		// public uint HurtHP;        // 椋樿鍊硷紝姹備綑浜块儴鍒�
-		// public uint HurtHPEx;        // 椋樿鍊硷紝鏁撮櫎浜块儴鍒�
-		// public uint CurHP;        // 鏇存柊鍓╀綑琛�閲忥紝姹備綑浜块儴鍒�
-		// public uint CurHPEx;        // 鏇存柊鍓╀綑琛�閲忥紝鏁撮櫎浜块儴鍒�
-		// public uint SuckHP;        // 鏈浼ゅ杞寲鐨勫惛琛�閲�
-		// public uint BounceHP;        // 鏈浼ゅ鍙嶅脊鐨勪激瀹抽噺
+        // 1. 寮哄埗缁撴潫鎶�鑳芥晥鏋�
+        skillEffect?.ForceFinished();
+        skillEffect = null;
+        
+        // 2. 寮哄埗缁撴潫鎵�鏈夊瓙鎶�鑳藉姩浣�
+        if (currentWaitingSkill.Count > 0)
+        {
+            foreach (var skill in currentWaitingSkill)
+            {
+                skill.ForceFinish();
+            }
+            currentWaitingSkill.Clear();
+        }
 
+        // 3. 娓呯悊 DOTween 鍔ㄧ敾锛堥槻姝㈢Щ鍔ㄥ洖璋冨湪鎴樻枟缁撴潫鍚庢墽琛岋級
+        if (caster != null)
+        {
+            caster.StopMoveAnimation();
+        }
 
-		//	TODO YYL AttackTypes  瑕佽〃鐜版垚浠�涔堟牱鍛紵 鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
-		target.Hurt(damageList, totalDamage, hurt.AttackTypes);
+        // 4. 閲嶇疆鏂芥硶鑰呯姸鎬�
+        if (caster != null)
+        {
+            // 閲嶇疆浣嶇疆鍒板師鐐�
+            caster.ResetPosition();
+            
+            // 閲嶇疆鏈濆悜
+            caster.ResetFacing();
 
-		//	TODO YYL 杩欓噷鏄鍋氱粺涓�璁$畻鍚庡啀hurt璺焥uckhp杩樻槸鎬庢牱
-		// caster.SuckHp(hurt.SuckHP);//	鍚歌
-		// caster.HurtByReflect(hurt.BounceHP);// 鍙嶅脊浼ゅ
-	}
+            // 鍙栨秷骞诲奖鏁堟灉
+            caster.ShowIllusionShadow(false);
+        }
 
+        // 5. 鎭㈠ UI 鐘舵��
+        if (battleField != null)
+        {
+            // 鎭㈠鎵�鏈夎鑹茬殑鏄剧ず灞傜骇鍜岃鏉�
+            var allList = battleField.battleObjMgr?.allBattleObjDict?.Values;
+            if (allList != null)
+            {
+                foreach (BattleObject bo in allList)
+                {
+                    bo.layerMgr?.SetFront();
+                    bo.GetHeroInfoBar()?.SetActive(true);
+                }
+            }
+            
+            // 鍏抽棴鎶�鑳介伄缃�
+            if (battleField.battleRootNode != null && battleField.battleRootNode.skillMaskNode != null)
+            {
+                battleField.battleRootNode.skillMaskNode.SetActive(false);
+            }
+        }
 
-	protected void HandleDead()
-	{
-		var deadPackList = BattleUtility.FindDeadPack(packList);
-		int deadCount = deadPackList.Count;
+        isFinished = true;
+        moveFinished = true;
+        isPlay = true;
+        
+        //  寮哄埗缁撴潫鏃讹紝鏃犺鏄惁鏈夊姩鐢伙紝閮芥爣璁板姩鐢诲畬鎴�
+        isMotionCompleted = true;
 
-		if (deadCount <= 0)
-		{
-			//	濡傛灉娌℃浜″氨涓嶇敤绠�
-			return;
-		}
+        // 6. 澶勭悊鎵�鏈夊墿浣欏寘锛堝寘鎷� buff 鍖咃級
+        // 鍏堝鐞� buffPackCollections
+        DistributeBuffPacks(buffPackCollections);
+        buffPackCollections.Clear();
 
-		CheckAfterDeadhPack();
+        // 澶勭悊鍓╀綑鐨� packList
+        while (packList.Count > 0)
+        {
+            var pack = packList[0];
+            packList.RemoveAt(0);
 
-		// 澶勭悊鎺夎惤鍖� 鎻愬墠distribute涔嬪悗 PackManager鎵嶆湁鎺夎惤鐗� 鎵�浠ヤ笉璺焌ssignexp涓�鏍穌istribute
-		foreach (var _dropPack in dropPackList)
-		{
-			BattleDebug.LogError("distribute pack " + _dropPack.GetType().Name);
-			PackageRegedit.Distribute(_dropPack);
-			packList.Remove(_dropPack);
-		}
+            if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+            {
+                var otherSkillAction = combinePack.CreateSkillAction();
+                otherSkillAction.fromSkill = this;
+                otherSkillAction.ForceFinish();
+            }
+            else
+            {
+                // 銆愪娇鐢� parentRecordAction.innerRecordPlayer銆�
+                // 鍘熷洜锛欶orceFinished鏃跺墿浣欑殑鍖呬篃鏄妧鑳藉唴閮ㄤ骇鐢熺殑锛屽簲璇ョ敱innerRecordPlayer绠$悊
+                // 杩欐牱鍙互纭繚鍗充娇寮哄埗缁撴潫锛屽寘鐨勫鐞嗕篃鍦ㄦ纭殑涓婁笅鏂囦腑
+                PackageRegedit.Distribute(pack);
+            }
+        }
+    }
 
-		// 鑾峰彇鎺夎惤鐗╁搧
-		var dropPack = PackManager.Instance.GetSinglePack(PackType.DropItem);
-		var itemDict = dropPack.GetAllItems();
-		List<ItemModel> itemList = new List<ItemModel>(
-			from item in itemDict.Values
-			where item != null && item.isAuction
-			select item);
+    // 鎶�鑳藉畬鎴愬鐞嗭細姝e父瀹屾垚鏃剁殑娓呯悊宸ヤ綔
+    public void OnSkillFinished()
+    {
+        // 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
+        // try
+        // {
+        while (true)
+        {
+            // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
+            if (skillEffect != null && !skillEffect.IsFinished())
+                return;
 
+            if (skillEffect != null)
+            {
+                skillEffect = null;
+                continue; // 浣跨敤continue浠f浛閫掑綊璋冪敤
+            }
 
+            // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
+            if (currentWaitingSkill.Count > 0)
+            {
+                bool hasFinishedAction = currentWaitingSkill.All(s => s.IsFinished());
 
-		// 鍒嗛厤鎺夎惤鍜岀粡楠�
-		var dropAssign = AssignDrops(itemList, deadCount);
-		var expAssign = AssignExp(expPackList, deadCount);
+                if (hasFinishedAction)
+                {
+                    // 淇姝诲惊鐜細瀹屾垚鍚庨渶瑕佹竻绌� currentWaitingSkill
+                    currentWaitingSkill.Clear();
+                    continue; // 浣跨敤continue浠f浛閫掑綊璋冪敤
+                }
+                return;
+            }
 
-		// 鏋勯�� BattleDrops 骞跺垎閰�
-		for (int i = 0; i < deadCount; i++)
-		{
-			BattleObject deadTarget = battleField.battleObjMgr.GetBattleObject((int)deadPackList[i].ObjID);
-			List<ItemModel> itemModelDrops = dropAssign[i];
-			List<int> itemModelDropsIndexList = new List<int>(
-				from item in itemModelDrops select item.gridIndex);
-			BattleDrops battleDrops = new BattleDrops()
-			{
-				rectTransform = deadTarget.heroRectTrans,
-				dropItemPackIndex = itemModelDropsIndexList,
-				expDrops = expAssign[i]
-			};
-			deadTarget.PushDropItems(battleDrops);
-		}
+            break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+        }
 
-		// 鍒嗗彂姝讳骸鍖�
+        // 澶勭悊鍓╀綑鍖�
+        if (!ResolvePackList())
+        {
+            return;
+        }
+            // }
+            // catch (Exception ex)
+            // {
+            //     Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
+            //     // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
+            //     isFinished = true;
+            //     throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
+            // }
 
-		battleField.OnObjsDead(new List<HB422_tagMCTurnFightObjDead>(deadPackList));
-		foreach (var deadPack in deadPackList)
-		{
-			packList.Remove(deadPack);
-		}
-		deadPackList.Clear();
+        isFinished = true;
+    }
+    
+    protected virtual bool ResolvePackList()
+    {
+        if (currentWaitingSkill.Count > 0)
+        {
+            return false;
+        }
 
+        while (packList.Count > 0)
+        {
+            var pack = packList[0];
+            packList.RemoveAt(0);
 
-	}
 
+            if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+            {
+                var skillRecordAction = combinePack.CreateSkillAction();
+                skillRecordAction.fromSkill = this;
+                currentWaitingSkill.Add(skillRecordAction);
 
+                //  闇�瑕佺粰鐪熸parent鎾殑
+                if (skillRecordAction.useParentRecordPlayer && skillRecordAction.parentSkillAction != null)
+                {
+                    skillRecordAction.parentSkillAction.GetInnerRecordPlayer().PlayRecord(skillRecordAction);
+                }
+                else
+                {
+                    ownRecordAction.GetInnerRecordPlayer().PlayRecord(skillRecordAction);
+                }
 
-	// 鍒嗛厤鎺夎惤
-	protected List<List<ItemModel>> AssignDrops(List<ItemModel> itemList, int deadCount)
-	{
-		var dropAssign = new List<List<ItemModel>>(deadCount);
-		for (int i = 0; i < deadCount; i++)
-			dropAssign.Add(new List<ItemModel>());
-		for (int i = 0; i < itemList.Count; i++)
-			dropAssign[i % deadCount].Add(itemList[i]);
-		return dropAssign;
-	}
+                return false;
+            }
+            else if (IsBuffPack(pack))
+            {
+                // 浠庢壘鍒扮涓�涓� Buff 鍖呭紑濮嬶紝鏀堕泦杩炵画鐨� HB428/HB429 鍖�
+                buffPackCollections.Add(pack);
+                while (packList.Count > 0)
+                {
+                    var nextPack = packList[0];
+                    if (IsBuffPack(nextPack))
+                    {
+                        buffPackCollections.Add(nextPack);
+                        packList.RemoveAt(0);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
 
-	// 鍒嗛厤缁忛獙锛氭瘡涓師濮嬪寘閮藉钩鍧囧垎閰嶅埌姣忎釜姝讳骸瀵硅薄
-	protected List<List<HB405_tagMCAddExp>> AssignExp(List<HB405_tagMCAddExp> expList, int deadCount)
-	{
-		var expAssign = new List<List<HB405_tagMCAddExp>>(deadCount);
-		for (int i = 0; i < deadCount; i++)
-			expAssign.Add(new List<HB405_tagMCAddExp>());
+                // 澶勭悊鎵�鏈夋敹闆嗗埌鐨� buff 鍖�
+                ProcessBuffPacks(buffPackCollections);
 
-		foreach (var expPack in expList)
-		{
-			long totalExp = GeneralDefine.GetFactValue(expPack.Exp, expPack.ExpPoint);
-			long avgExp = totalExp / deadCount;
-			long remain = totalExp % deadCount;
+                // 娓呯┖宸插鐞嗙殑 buff 闆嗗悎
+                buffPackCollections.Clear();
+                continue;
+            }
+            else
+            {
+                // 銆愪娇鐢� parentRecordAction.innerRecordPlayer銆�
+                // 鍘熷洜锛氭妧鑳芥墽琛岃繃绋嬩腑鐨勫寘锛圔uff銆佸睘鎬у埛鏂扮瓑锛夋槸鎶�鑳芥晥鏋滅殑涓�閮ㄥ垎
+                // 搴旇鐢盨killRecordAction鐨刬nnerRecordPlayer绠$悊锛岀‘淇濅笌鎶�鑳界敓鍛藉懆鏈熶竴鑷�
+                PackageRegeditEx.DistributeToRecordAction(pack, ownRecordAction);
+            }
+        }
 
-			for (int i = 0; i < deadCount; i++)
-			{
-				long assignExp = avgExp + (i < remain ? 1 : 0);
-				long expPoint = assignExp / 100000000;
-				long exp = assignExp % 100000000;
-				var newPack = new HB405_tagMCAddExp
-				{
-					Exp = (uint)exp,
-					ExpPoint = (uint)expPoint,
-					Source = expPack.Source // 淇濇寔鍘熷寘鏉ユ簮
-				};
-				expAssign[i].Add(newPack);
-			}
-			packList.Remove(expPack);
-		}
-		return expAssign;
-	}
+        return true;
+    }
 
+    // 娣诲姞娓呯悊鏂规硶锛氶槻姝㈠唴瀛樻硠婕�
+    public virtual void Cleanup()
+    {
+        tempDropList?.Clear();
+        tempDeadPackList?.Clear();
+        currentWaitingSkill?.Clear();
+        dropPackList?.Clear();
+        expPackList?.Clear();
+        buffPackCollections?.Clear();
+        
+        skillEffect = null;
+        packList = null;
+    }
 
+    #region Buff鍖呭鐞�
 
-	protected void CheckAfterDeadhPack()
-	{
-		List<int> removeIndexList = new List<int>();
-		for (int i = 0; i < packList.Count; i++)
-		{
-			var pack = packList[i];
+    /// <summary>
+    /// 鍒ゆ柇鏄惁涓� Buff 鐩稿叧鐨勫寘锛圚B428 鎴� HB429锛�
+    /// </summary>
+    protected bool IsBuffPack(GameNetPackBasic pack)
+    {
+        return pack is HB428_tagSCBuffRefresh || pack is HB429_tagSCBuffDel;
+    }
 
-			// 	澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
-			if (pack is CustomHB426CombinePack)
-			{
-				var combinePack = pack as CustomHB426CombinePack;
-				if (combinePack.startTag.Tag.StartsWith("Skill_"))
-				{
-					break; // 鎵惧埌鎶�鑳藉寘灏变笉闇�瑕佸啀澶勭悊浜�
-				}
-			}
-			else if (pack is H0704_tagRolePackRefresh)
-			{
-				var h0704Pack = pack as H0704_tagRolePackRefresh;
-				if (h0704Pack.PackType == (byte)PackType.DropItem)
-				{
-					//	鎺夎惤鐨�
-					if (h0704Pack.IsBind == 1)
-					{
-						//	鎺夎惤鐨勭墿鍝�
-						dropPackList.Add(h0704Pack);
-						removeIndexList.Add(i);
-					}
-					else if (h0704Pack.IsBind == 0)
-					{
-						//	鏇挎崲鐨�
-					}
-				}
-			}
-			else if (pack is HB405_tagMCAddExp)
-			{
-				var h405Pack = pack as HB405_tagMCAddExp;
+    /// <summary>
+    /// 澶勭悊鏀堕泦鍒扮殑 Buff 鍖呭垪琛紙HB428 鍒锋柊 鍜� HB429 鍒犻櫎锛�
+    /// </summary>
+    protected void ProcessBuffPacks(List<GameNetPackBasic> buffPacks)
+    {
+        if (buffPacks == null || buffPacks.Count == 0) return;
 
-				//B4 05 鑾峰緱缁忛獙 #tagMCAddExp 閫氱煡鑾峰緱鐨勭粡楠岋紝
-				//鍙敤浜庡仛缁忛獙鑾峰緱琛ㄧ幇 Source = 2 鏃朵负涓荤嚎鍑绘潃鎬墿鑾峰緱缁忛獙
-				if (h405Pack.Source == 2)
-				{
-					expPackList.Add(h405Pack);
-					removeIndexList.Add(i);
-				}
-			}
+        foreach (var pack in buffPacks)
+        {
+            if (pack is HB428_tagSCBuffRefresh buffRefresh)
+            {
+                BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buffRefresh.ObjID);
+                if (battleObj != null)
+                {
+                    var buffMgr = battleObj.GetBuffMgr();
+                    if (buffMgr != null) // 鍛芥牸涓嶆湁 buff 绠$悊鍣�
+                    {
+                        buffMgr.RefreshBuff(buffRefresh, true);
+                    }
+                }
+            }
+            else if (pack is HB429_tagSCBuffDel buffDel)
+            {
+                BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buffDel.ObjID);
+                if (battleObj != null)
+                {
+                    var buffMgr = battleObj.GetBuffMgr();
+                    if (buffMgr != null) // 鍛芥牸涓嶆湁 buff 绠$悊鍣�
+                    {
+                        buffMgr.RemoveBuff(buffDel, false);
+                    }
+                }
+            }
+        }
+    }
 
-		}
+    /// <summary>
+    /// 寮哄埗鍒嗗彂 Buff 鍖咃紙鐢ㄤ簬 ForceFinished 鍦烘櫙锛�
+    /// </summary>
+    protected void DistributeBuffPacks(List<GameNetPackBasic> buffPacks)
+    {
+        if (buffPacks == null || buffPacks.Count == 0) return;
 
-		for (int i = removeIndexList.Count - 1; i >= 0; i--)
-		{
-			packList.RemoveAt(removeIndexList[i]);
-		}
-	}
-	public virtual bool IsFinished()
-	{
-		if (skillEffect != null)
-		{
-			if (!skillEffect.IsFinished())
-			{
-				return false;
-			}
-			else
-			{
-				OnSkillFinished();
-				skillEffect = null;
-			}
-		}
+        foreach (var pack in buffPacks)
+        {
+            // 銆愪娇鐢� parentRecordAction.innerRecordPlayer銆�
+            // 鍘熷洜锛欱uff鍖呮槸鎶�鑳芥晥鏋滅殑鏍稿績缁勬垚閮ㄥ垎锛屽簲璇ョ敱SkillRecordAction绠$悊
+            // 鍗充娇鏄己鍒跺垎鍙戠殑鎯呭喌锛屼篃瑕佷繚鎸佸湪姝g‘鐨凴ecordAction涓婁笅鏂囦腑
+            PackageRegeditEx.DistributeToRecordAction(pack, ownRecordAction);
+        }
+    }
 
-		return isFinished;
-	}
+    public virtual bool CanStartExecution()
+    {
+        if (null == caster)
+        {
+            return false;
+        }
 
-	public virtual void ForceFinished()
-	{
-		isFinished = true;
-	}
+        if (null == skillConfig)
+        {
+            return false;
+        }
 
-	public void OnSkillFinished()
-	{
-		if (skillEffect != null)
-		{
-			if (!skillEffect.IsFinished())
-			{
-				return;
-			}
-		}
+        if (string.IsNullOrEmpty(skillConfig.SkillMotionName))
+        {
+            return true;
+        }
 
-		BattleDebug.LogError(GetType().Name + " Skill Finished");
-		while (packList.Count > 0)
-		{
-			var pack = packList[0];
-			packList.RemoveAt(0);
+        return !battleField.IsCastingSkill(caster.ObjID);
+    }
 
-			if (pack is CustomHB426CombinePack)
-			{
-				var combinePack = pack as CustomHB426CombinePack;
-				if (combinePack.startTag.Tag.StartsWith("Skill_"))
-				{
-					otherSkillAction = combinePack.CreateSkillAction();
-					return;
-				}
-			}
-			BattleDebug.LogError("distribute pack " + pack.GetType().Name);
-			PackageRegedit.Distribute(pack);
-		}
+    #endregion
 
-		isFinished = true;
-	}
 }
\ No newline at end of file

--
Gitblit v1.8.0