From 485db99b5c51a971c173664cf6e808dc8424b0a0 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期五, 17 十月 2025 17:19:51 +0800
Subject: [PATCH] 136 子 【挑战】战锤秘境 / 【挑战】战锤秘境-客户端 移除错误接入

---
 Main/System/Battle/Skill/SkillBase.cs |  844 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 656 insertions(+), 188 deletions(-)

diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 71f78b2..57bd849 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,237 +1,705 @@
 using System.Collections.Generic;
 using UnityEngine;
-using System;
 using DG.Tweening;
 using Spine;
-
+using System.Linq;
+using System;
 
 public class SkillBase
 {
-	protected H0604_tagUseSkillAttack tagUseSkillAttack;
+    const float moveTime = 0.5f;
 
-	protected SkillConfig skillConfig;
+    protected SkillEffect skillEffect;
+    protected HB427_tagSCUseSkill tagUseSkillAttack;
+    public SkillConfig skillConfig;
+    protected bool isFinished = false;
+    protected BattleField battleField = null; // 鎴樺満
+    protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+    protected BattleObject caster = null; // 鏂芥硶鑰�
+    protected List<GameNetPackBasic> packList;
+    protected List<SkillRecordAction> otherSkillActionList = new List<SkillRecordAction>();
+    protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+    protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+    protected bool moveFinished = false;
+    public int fromSkillId;
+    public bool isPlay = false;
 
-	protected bool isFinished = false;
+    private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
+    private Dictionary<int, HB422_tagMCTurnFightObjDead> tempDeadPackList = new Dictionary<int, HB422_tagMCTurnFightObjDead>();
 
-	protected BattleField battleField = null; // 鎴樺満
+    // 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
+    public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
+    {
+        caster = _caster;
+        if (null == caster)
+        {
+            throw new Exception("SkillBase caster is null ");
+        }
+        skillConfig = _skillCfg;
+        tagUseSkillAttack = vNetData;
+        battleField = _battleField;
+        packList = _packList;
+    }
 
-	protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+    // 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
+    public virtual void Run()
+    {
+        if (skillEffect != null)
+        {
+            if (skillEffect.IsFinished())
+            {
+                skillEffect = null;
+                OnSkillFinished();
+            }
+            else
+            {
+                skillEffect.Run();
+            }
+            return;
+        }
 
-	protected BattleObject caster = null; // 鏂芥硶鑰�
+        if (otherSkillActionList.Count > 0)
+        {
+            for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
+            {
+                var action = otherSkillActionList[i];
+                if (action.IsFinished())
+                {
+                    otherSkillActionList.RemoveAt(i);
+                    OnSkillFinished();
+                }
+                else if (moveFinished)
+                {
+                    action.Run();
+                }
+            }
+        }
+    }
 
-	protected bool startCounting = false;
+    // 鎶�鑳介噴鏀句富閫昏緫锛氬箍鎾簨浠躲�侀珮浜洰鏍囥�佹墽琛岄噴鏀�
+    public virtual void Cast()
+    {
+        // 骞挎挱鎶�鑳介噴鏀句簨浠�
+        string guid = battleField.guid;
+        TeamHero teamHero = caster.teamHero;
+        EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, guid, skillConfig, teamHero);
 
-	protected bool pauseState = false;
+        // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
+        HighLightAllTargets();
 
-	protected int curFrame = 0;
+        // 鏍规嵁閲婃斁妯″紡鎵ц鐩稿簲閫昏緫
+        switch (skillConfig.castMode)
+        {
+            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 List<int> triggerFrames = new List<int>();
+    // 鍐叉挒鏀诲嚮妯″紡锛堝緟瀹炵幇锛�
+    protected void DashCast(Action _onComplete)
+    {
+        Debug.LogError("DashCast 杩樻病瀹炵幇");
+        ForceFinished();
+    }
 
-	public SkillBase(BattleObject _caster, SkillConfig _skillCfg, H0604_tagUseSkillAttack vNetData, BattleField _battleField = null)
-	{
-		caster = _caster;
-		skillConfig = _skillCfg;
-		tagUseSkillAttack = vNetData;
-		battleField = _battleField;
+    // 瀵规晫鏂归噴鏀炬妧鑳斤細绉诲姩鍒版晫鏂瑰尯鍩熻繘琛屾敾鍑�
+    protected void CastToEnemy()
+    {
+        RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+        ExecuteMoveAndCastSequence(target, () =>
+        {
+            MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, OnAttackFinish, 750F);
+        });
+    }
 
-		triggerFrames.Clear();
-		triggerFrames.AddRange(skillConfig.TriggerFrames);
-	}
+    // 瀵规寚瀹氱洰鏍囬噴鏀炬妧鑳斤細绉诲姩鍒颁富瑕佺洰鏍囦綅缃繘琛屾敾鍑�
+    protected void CastToTarget()
+    {
+        if (tagUseSkillAttack.HurtCount <= 0)
+        {
+            Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+            OnSkillFinished();
+            return;
+        }
 
-	public virtual void Run()
-	{
-		if (startCounting)
-		{
-			curFrame++;
+        int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+        BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+        RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
 
-			if (triggerFrames.Contains(curFrame))
-			{
-				OnTriggerEvent(triggerFrames.IndexOf(curFrame), curFrame);
-			}
-		}
-	}
+        ExecuteMoveAndCastSequence(targetTrans, () =>
+        {
+            RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum);
+            MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish, 750F);
+        });
+    }
 
-	protected virtual void OnTriggerEvent(int triggerIndex, int triggerFrame)
-	{
+    // 瀵瑰弸鏂归噴鏀炬妧鑳斤細绉诲姩鍒板弸鏂瑰尯鍩熻繘琛屾不鐤楁垨澧炵泭
+    protected void CastToAllies()
+    {
+        RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+        ExecuteMoveAndCastSequence(target, () =>
+        {
+            MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, OnAttackFinish, 750F);
+        });
+    }
 
-	}
+    // 鎵ц绉诲姩-鏂芥硶-杩斿洖搴忓垪锛氶�氱敤鐨勭Щ鍔ㄦ敾鍑绘祦绋�
+    private void ExecuteMoveAndCastSequence(RectTransform target, Action onReturnComplete)
+    {
+        MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+        {
+            TurnBack(() =>
+            {
+                CastImpl(() =>
+                {
+                    TurnBack(() => 
+                    {
+                        try
+                        {
+                            onReturnComplete?.Invoke(); // 娣诲姞寮傚父澶勭悊闃叉鍥炶皟寮傚父瀵艰嚧鐘舵�佷笉瀹屾暣
+                        }
+                        catch (Exception ex)
+                        {
+                            Debug.LogError($"ExecuteMoveAndCastSequence鍥炶皟寮傚父: {ex.Message}");
+                            throw;
+                        }
+                    }, -1f);
+                });
+            }, -1f);
+        });
+    }
 
-	public void Pause()
-	{
-		pauseState = startCounting;
-		startCounting = false;
-	}
+    // 绉诲姩鍒扮洰鏍囦綅缃細澶勭悊瑙掕壊鐨勭Щ鍔ㄥ姩鐢诲拰閫昏緫
+    protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 500f)
+    {
+        if (skillConfig.CastDistance >= 9999)
+        {
+            _onComplete?.Invoke();
+            return;
+        }
 
-	public void Resume()
-	{
-		startCounting = pauseState;
-	}
+        caster.motionBase.PlayAnimation(MotionName.run, true);
+        var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, () =>
+        {
+            caster.motionBase.PlayAnimation(MotionName.idle, true);
+            _onComplete?.Invoke();
+        }, speed);
+        battleField.battleTweenMgr.OnPlayTween(tweener);
+    }
 
-	// 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
-	// 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
-	public virtual void Cast()
-	{
-		//	楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
-		HighLightAllTargets();
+    // 杞韩閫昏緫锛氭牴鎹妧鑳介厤缃鐞嗚鑹茶浆鍚�
+    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();
+    }
 
-		switch (skillConfig.castMode)
-		{
-			case SkillCastMode.StandCast:
-				PlayCastAnimation(() => DoSkillLogic(OnSkillFinished));
-				break;
-			case SkillCastMode.MoveToTarget:
-				MoveToTarget(_onComplete: () => TurnBack(() => PlayCastAnimation(() => DoSkillLogic(() => { BackToOrigin(OnSkillFinished); }))));
-				break;
-			case SkillCastMode.DashCast:
-				DashToTarget(() => BackToOrigin(OnSkillFinished));
-				break;
-			default:
-				Debug.LogError("鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝");
-				break;
-		}
-	}
+    // 鏀诲嚮瀹屾垚鍚庣殑澶勭悊锛氳浆韬�佹仮澶嶇姸鎬併�佹挱鏀惧緟鏈哄姩鐢�
+    protected void OnAttackFinish()
+    {
+        TurnBack(null, 1f);
+        OnAllAttackMoveFinished();
+        caster.motionBase.PlayAnimation(MotionName.idle, true);
+    }
 
-	//	鍐插埡鐨勬妧鑳� 鍔ㄤ綔 璺熺Щ鍔� 鏄悓鏃惰繘琛岀殑 绉诲姩鍒扮洰鏍囩殑涓�鐬棿灏辫杩涜鎶�鑳介�昏緫
-	protected void DashToTarget(Action _onComplete)
-	{
-		TrackEntry entry = PlayCastAnimation();
-		//	鍋氫竴涓井寰殑鎻愬墠
-		MoveToTarget(entry.TrackTime - 0.05f, () => DoSkillLogic(_onComplete));
-	}
+    // 鎵�鏈夋敾鍑荤Щ鍔ㄥ畬鎴愬悗鐨勫鐞嗭細鎭㈠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.heroInfoBar.SetActive(true);
+        }
+        battleField.battleRootNode.skillMaskNode.SetActive(false);
+    }
 
-	protected void GetTargetNode()
-	{
-		targetNode = null;
+    // 鎵ц鎶�鑳介噴鏀惧姩鐢诲拰閫昏緫锛氭挱鏀炬柦娉曞姩浣滃苟鎻愪緵鍥炶皟
+    protected TrackEntry CastImpl(Action onComplete = null)
+    {
+        return caster.motionBase.PlaySkillAnimation(skillConfig, this, tagUseSkillAttack.BattleType == 4, onComplete);
+    }
 
-		if (skillConfig.castMode == SkillCastMode.StandCast)
-		{
-			//	鍘熷湴鏂芥硶
-			targetNode = caster.heroGo.transform as RectTransform;
-		}
-		else if (skillConfig.castMode == SkillCastMode.MoveToTarget || skillConfig.castMode == SkillCastMode.DashCast)
-		{
-			if (tagUseSkillAttack.AttackID <= 0)
-			{
-				Debug.LogError("鎶�鑳芥病鏈夋寚瀹氱洰鏍�");
-				return;
-			}
+    // 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
+    public void OnSkillStart()
+    {
+        HandleDead();
+        skillEffect = SkillEffectFactory.CreateSkillEffect(caster, skillConfig, tagUseSkillAttack);
+        skillEffect.Play(OnHitTargets);
+        foreach (var subSkillPack in tagUseSkillAttack.subSkillList)
+        {
+            SkillRecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, new List<GameNetPackBasic>() { subSkillPack });
+            otherSkillActionList.Add(recordAction);
+            battleField.recordPlayer.ImmediatelyPlay(recordAction);
+        }
+        isPlay = true;
+    }
 
-			//	绉诲姩鍒扮洰鏍囦綅缃柦娉�
-			BattleObject _mainTarget = battleField.battleObjMgr.GetBattleObject((int)tagUseSkillAttack.AttackID);
-			if (_mainTarget == null)
-			{
-				Debug.LogError("鎶�鑳芥寚瀹氱殑鐩爣涓嶅瓨鍦�");
-				return;
-			}
+    // 鎶�鑳藉墠鎽囩粨鏉熷洖璋�
+    public virtual void OnStartSkillFrameEnd() { }
 
-			targetNode = _mainTarget.heroGo.transform as RectTransform;
-		}
-		else if (skillConfig.castMode == SkillCastMode.MoveToFormation)
-		{
-			//	TODO YYL
-			targetNode = /*caster.GetEnemyTeamNode();*/ battleField.GetTeamNode(caster.Camp == BattleCamp.Blue ? BattleCamp.Red : BattleCamp.Blue);
-		}
-		else
-		{
-			Debug.LogError("鏈煡鐨勬柦娉曟柟寮� 鎶�鑳絠d锛�" + skillConfig.SkillID);
-			return;
-		}
-	}
+    // 鎶�鑳戒腑鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囧紑濮�
+    public virtual void OnMiddleFrameStart(int times)
+    {
+        skillEffect?.OnMiddleFrameStart(times); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
 
-	protected List<BattleObject> GetTargetList()
-	{
-		return battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack);
-	}
+    // 鎶�鑳戒腑鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囩粨鏉�
+    public virtual void OnMiddleFrameEnd(int times, int hitIndex)
+    {
+        skillEffect?.OnMiddleFrameEnd(times, hitIndex); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
 
-	protected virtual void DoSkillLogic(Action _onComplete = null)
-	{
-		//	瀛愮被瀹炵幇鍏蜂綋鐨勬妧鑳介�昏緫
-	}
+    // 鎶�鑳藉悗鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囧紑濮�
+    public virtual void OnFinalFrameStart()
+    {
+        skillEffect?.OnFinalFrameStart(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
 
-	protected TrackEntry PlayCastAnimation(Action onComplete = null)
-	{
-		// 鎾斁鏂芥硶鍔ㄤ綔
-		MotionName motionName = skillConfig.GetMotionName();
-		TrackEntry trackEntry = caster.motionBase.PlayAnimation(motionName, false, onComplete);
-		return trackEntry;
-	}
+    // 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
+    public virtual void OnFinalFrameEnd()
+    {
+        skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+    }
 
-	public void MoveToTarget(float duration = 0.2f, Action _onComplete = null)
-	{
-		GetTargetNode();
-		Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
-		RectTransform selfRect = caster.heroGo.transform as RectTransform;
-		RectTransform targetRect = targetNode;
+    // 楂樹寒鎵�鏈夌浉鍏崇洰鏍囷細璁剧疆鏂芥硶鑰呭拰鐩爣鐨勬樉绀哄眰绾�
+    protected void HighLightAllTargets()
+    {
+        caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
 
-		var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
-		battleField.battleTweenMgr.OnPlayTween(tweener);
-	}
+        if (skillConfig.FuncType != 2)
+            return;
 
-	public void TurnBack(Action _onComplete)
-	{
-		if (skillConfig.CastDistance < 0)
-		{
-			caster.heroGo.transform.localScale = new Vector3(-1, 1, 1);
-		}
-		_onComplete?.Invoke();
-	}
+        List<BattleObject> targetList = battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack);
+        List<BattleObject> highlightList = new List<BattleObject>(targetList) { caster };
+        List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>();
+        
+        // 淇锛氫娇鐢℉ashSet浼樺寲鎬ц兘锛岄伩鍏嶉噸澶嶈缃�
+        var targetSet = new HashSet<BattleObject>(targetList);
+        var highlightSet = new HashSet<BattleObject>(highlightList);
+        
+        caster.heroInfoBar.SetActive(false);
 
-	public void BackToOrigin(Action _onComplete = null)
-	{
-		RectTransform selfRect = caster.heroGo.transform as RectTransform;
-		Vector2 targetAnchoredPos = Vector2.zero;
-		var tween = selfRect.DOAnchorPos(targetAnchoredPos, 0.2f)
-			.SetEase(Ease.Linear)
-			.OnComplete(() =>
-			{
-				caster.heroGo.transform.localScale = Vector3.one;
-				_onComplete?.Invoke();
-			});
+        foreach (BattleObject bo in allList)
+        {
+            bool isHighlight = highlightSet.Contains(bo);
+            bool isTarget = targetSet.Contains(bo);
+            
+            if (isHighlight)
+            {
+                bo.layerMgr.SetFront();
+            }
+            else
+            {
+                bo.layerMgr.SetBack();
+            }
 
-		battleField.battleTweenMgr.OnPlayTween(tween);
-	}
+            bo.heroInfoBar.SetActive(isTarget);
+        }
 
-	protected void HighLightAllTargets()
-	{
-		// 楂樹寒鎵�鏈夌洰鏍�
-		HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
-		highlightList.Add(caster);
+        battleField.battleRootNode.skillMaskNode.SetActive(true);
+        battleField.battleRootNode.SetSortingOrder();
+    }
 
-		
+    // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍�
+    protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
+    {
+        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;
+            }
 
-		//	鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
-		//	YYL TODO
-	}
+            OnHitEachTarget(_hitIndex, target, hurt);
+        }
+    }
 
-	public virtual bool IsFinished()
-	{
-		return isFinished;
-	}
+    // 澶勭悊鍗曚釜鐩爣琚懡涓細搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
+    protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
+    {
+        List<int> damageDivide = new List<int>();
+        if (_hitIndex == 0 && skillConfig.DamageDivide.Length <= 0)
+        {
+            damageDivide.Add(10000);
+        }
+        else
+        {
+            if (skillConfig.DamageDivide.Length <= _hitIndex)
+            {
+                Debug.LogError("鎶�鑳戒激瀹冲垎甯冮厤缃敊璇� skillId: " + skillConfig.SkillID + " hitIndex: " + _hitIndex);
+                damageDivide.Add(10000);
+            }
+            else
+            {
+                damageDivide = skillConfig.DamageDivide[_hitIndex].ToList();
+            }
+        }
 
-	public virtual void ForceFinished()
-	{
-		isFinished = true;
-	}
+        // 浼ゅ鍒嗗竷璁$畻鍜屽簲鐢�
+        long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+        List<long> damageList = BattleUtility.DivideDamageToList(damageDivide.ToArray(), totalDamage);
 
-	public void OnSkillFinished()
-	{
-		isFinished = true;
-	}
+        // 鑾峰彇涓存椂鏁版嵁骞跺簲鐢ㄤ激瀹�
+        int objID = (int)target.ObjID;
+        tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
+        tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
+        target.Hurt(damageList, totalDamage, hurt, skillConfig, _hitIndex, battleDrops, deadPack);
 
-#if UNITY_EDITOR_STOP_USING
-	public virtual List<BattleObject> GetTargetList(BattleField _battleField)
-	{
-		SkillTargetType targetType = SkillTargetType.Enemy;
-		SkillTargetRangeType rangeType = SkillTargetRangeType.LowestHP;
+        // 澶勭悊鏂芥硶鑰呯浉鍏虫晥鏋�
+        caster.SuckHp(hurt.SuckHP, skillConfig);
+        caster.HurtByReflect(hurt.BounceHP, skillConfig);
+    }
 
-		List<BattleObject> affectList = _battleField.battleObjMgr.GetTargetList(caster, targetType, rangeType);
-		return affectList;
-	}
+    // 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
+    protected void HandleDead()
+    {
+        var deadPackList = BattleUtility.FindDeadPack(packList);
+        if (deadPackList.Count <= 0) return;
 
-	public virtual List<Dictionary<int, List<int>>> GetDamageList(BattleField _battleField)
-	{
-		Debug.LogError("SkillBase GetDamageList should be overridden by derived class");
-		return null;
-	}
-#endif
+        CheckAfterDeadhPack();
+
+        // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀归泦鍚�
+        var dropPacksToRemove = new List<H0704_tagRolePackRefresh>(dropPackList);
+        foreach (var _dropPack in dropPacksToRemove)
+        {
+            PackageRegedit.Distribute(_dropPack);
+            packList.Remove(_dropPack);
+        }
+
+        // 鑾峰彇骞跺垎閰嶆帀钀界墿鍝佸拰缁忛獙
+        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));
+
+        var dropAssign = AssignDrops(itemList, deadPackList.Count);
+        var expAssign = AssignExp(expPackList, deadPackList.Count);
+
+        // 鏋勯�燘attleDrops骞剁紦瀛�
+        for (int i = 0; i < deadPackList.Count; i++)
+        {
+            int objID = (int)deadPackList[i].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.heroRectTrans,
+                dropItemPackIndex = itemIndexList,
+                expDrops = expAssign[i]
+            };
+
+            // 淇锛氶伩鍏嶅瓧鍏搁敭鍐茬獊锛屼娇鐢ㄥ畨鍏ㄧ殑娣诲姞鏂瑰紡
+            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.Cast<GameNetPackBasic>());
+        foreach (var deadPack in deadPacksToRemove)
+        {
+            packList.Remove(deadPack);
+        }
+    }
+
+    // 鍒嗛厤鎺夎惤鐗╁搧锛氬皢鎺夎惤鐗╁搧骞冲潎鍒嗛厤缁欐浜″璞�
+    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;
+    }
+
+    // 鍒嗛厤缁忛獙鍊硷細灏嗙粡楠屽寘骞冲潎鍒嗛厤缁欐瘡涓浜″璞�
+    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>());
+
+        // 淇锛氭鏌ラ櫎闆堕闄�
+        if (deadCount == 0)
+        {
+            Debug.LogWarning("AssignExp: deadCount涓�0锛屾棤娉曞垎閰嶇粡楠�");
+            return expAssign;
+        }
+
+        // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀筽ackList
+        var expPacksToRemove = new List<HB405_tagMCAddExp>();
+
+        foreach (var expPack in expList)
+        {
+            long totalExp = GeneralDefine.GetFactValue(expPack.Exp, expPack.ExpPoint);
+            long avgExp = totalExp / deadCount;
+            long remain = totalExp % deadCount;
+
+            for (int i = 0; i < deadCount; i++)
+            {
+                long assignExp = avgExp + (i < remain ? 1 : 0);
+                var newPack = new HB405_tagMCAddExp
+                {
+                    Exp = (uint)(assignExp % 100000000),
+                    ExpPoint = (uint)(assignExp / 100000000),
+                    Source = expPack.Source
+                };
+                expAssign[i].Add(newPack);
+            }
+            expPacksToRemove.Add(expPack);
+        }
+        
+        // 缁熶竴鍒犻櫎鏀堕泦鐨勫寘
+        foreach (var pack in expPacksToRemove)
+        {
+            packList.Remove(pack);
+        }
+
+        return expAssign;
+    }
+
+    // 妫�鏌ユ浜″悗鐨勫寘澶勭悊锛氬鐞嗘妧鑳藉寘銆佹帀钀藉寘銆佺粡楠屽寘
+    protected void CheckAfterDeadhPack()
+    {
+        List<int> removeIndexList = new List<int>();
+        
+        for (int i = 0; i < packList.Count; i++)
+        {
+            var pack = packList[i];
+
+            // 澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
+            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);
+            }
+        }
+
+        for (int i = removeIndexList.Count - 1; i >= 0; i--)
+            packList.RemoveAt(removeIndexList[i]);
+    }
+
+    // 妫�鏌ユ妧鑳芥槸鍚﹀畬鎴愶細缁煎悎妫�鏌ユ墍鏈夊畬鎴愭潯浠�
+    public virtual bool IsFinished()
+    {
+        if (!isPlay) return false;
+        
+
+        // 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
+        if (skillEffect != null)
+        {
+            if (!skillEffect.IsFinished()) return false;
+            skillEffect = null;
+            OnSkillFinished();
+            return false;
+        }
+
+        // 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
+        if (otherSkillActionList.Count > 0)
+        {
+            for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
+            {
+                var action = otherSkillActionList[i];
+                if (action.IsFinished())
+                {
+                    otherSkillActionList.RemoveAt(i);
+                    OnSkillFinished();
+                }
+            }
+            if (otherSkillActionList.Count > 0) return false;
+        }
+
+        // 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
+        if (isFinished && moveFinished)
+        {
+            if (packList.Count > 0)
+            {
+                OnSkillFinished();
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    // 寮哄埗缁撴潫鎶�鑳斤細绔嬪嵆缁撴潫鎵�鏈夋妧鑳界浉鍏崇殑澶勭悊
+    public virtual void ForceFinished()
+    {
+        skillEffect?.ForceFinished();
+        
+        otherSkillActionList.ForEach(action => action.ForceFinish());
+        otherSkillActionList.Clear();
+
+        isFinished = true;
+        moveFinished = true;
+        isPlay = true;
+
+        // 澶勭悊鎵�鏈夊墿浣欏寘
+        while (packList.Count > 0)
+        {
+            var pack = packList[0];
+            packList.RemoveAt(0);
+
+            if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+            {
+                var otherSkillAction = combinePack.CreateSkillAction();
+                otherSkillAction.fromSkillId = skillConfig.SkillID;
+                otherSkillAction.ForceFinish();
+            }
+            else
+            {
+                if (pack is CustomB421ActionPack actionPack)
+                    actionPack.Distribute();
+                PackageRegedit.Distribute(pack);
+            }
+        }
+    }
+
+    // 鎶�鑳藉畬鎴愬鐞嗭細姝e父瀹屾垚鏃剁殑娓呯悊宸ヤ綔
+    public void OnSkillFinished()
+    {
+        // 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
+        try
+        {
+            while (true)
+            {
+                // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
+                if (skillEffect != null && !skillEffect.IsFinished()) 
+                    return;
+                    
+                if (skillEffect != null)
+                {
+                    skillEffect = null;
+                    continue; // 浣跨敤continue浠f浛閫掑綊璋冪敤
+                }
+
+                // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
+                if (otherSkillActionList.Count > 0)
+                {
+                    bool hasFinishedAction = false;
+                    for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
+                    {
+                        var action = otherSkillActionList[i];
+                        if (action.IsFinished())
+                        {
+                            otherSkillActionList.RemoveAt(i);
+                            hasFinishedAction = true;
+                        }
+                    }
+                    if (hasFinishedAction)
+                    {
+                        continue; // 浣跨敤continue浠f浛閫掑綊璋冪敤
+                    }
+                    return;
+                }
+
+                break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+            }
+
+            // 澶勭悊鍓╀綑鍖�
+            while (packList.Count > 0)
+            {
+                var pack = packList[0];
+                packList.RemoveAt(0);
+
+                if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+                {
+                    BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
+                    var otherSkillAction = combinePack.CreateSkillAction();
+                    otherSkillAction.fromSkillId = skillConfig.SkillID;
+                    otherSkillActionList.Add(otherSkillAction);
+                    return;
+                }
+
+                if (pack is CustomB421ActionPack actionPack)
+                    actionPack.Distribute();
+                PackageRegedit.Distribute(pack);
+            }
+        }
+        catch (Exception ex)
+        {
+            Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
+            // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
+            isFinished = true;
+            throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
+        }
+
+        isFinished = true;
+    }
+
+    // 娣诲姞娓呯悊鏂规硶锛氶槻姝㈠唴瀛樻硠婕�
+    public virtual void Cleanup()
+    {
+        tempDropList?.Clear();
+        tempDeadPackList?.Clear();
+        otherSkillActionList?.Clear();
+        dropPackList?.Clear();
+        expPackList?.Clear();
+        
+        skillEffect = null;
+        packList = null;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0