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 | 1120 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 619 insertions(+), 501 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 605ede7..57bd849 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,587 +1,705 @@
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;
+ 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 HB427_tagSCUseSkill tagUseSkillAttack;
+ private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
+ private Dictionary<int, HB422_tagMCTurnFightObjDead> tempDeadPackList = new Dictionary<int, HB422_tagMCTurnFightObjDead>();
- protected SkillConfig skillConfig;
+ // 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
+ 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 bool isFinished = false;
+ // 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
+ public virtual void Run()
+ {
+ if (skillEffect != null)
+ {
+ if (skillEffect.IsFinished())
+ {
+ skillEffect = null;
+ OnSkillFinished();
+ }
+ else
+ {
+ skillEffect.Run();
+ }
+ return;
+ }
- protected BattleField battleField = 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 RectTransform targetNode = null; // 鐩爣鑺傜偣
+ // 鎶�鑳介噴鏀句富閫昏緫锛氬箍鎾簨浠躲�侀珮浜洰鏍囥�佹墽琛岄噴鏀�
+ 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 BattleObject caster = null; // 鏂芥硶鑰�
+ // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
+ HighLightAllTargets();
- protected bool startCounting = false;
+ // 鏍规嵁閲婃斁妯″紡鎵ц鐩稿簲閫昏緫
+ 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 bool pauseState = false;
+ // 鍐叉挒鏀诲嚮妯″紡锛堝緟瀹炵幇锛�
+ protected void DashCast(Action _onComplete)
+ {
+ Debug.LogError("DashCast 杩樻病瀹炵幇");
+ ForceFinished();
+ }
- protected int curFrame = 0;
+ // 瀵规晫鏂归噴鏀炬妧鑳斤細绉诲姩鍒版晫鏂瑰尯鍩熻繘琛屾敾鍑�
+ protected void CastToEnemy()
+ {
+ RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+ ExecuteMoveAndCastSequence(target, () =>
+ {
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, OnAttackFinish, 750F);
+ });
+ }
- protected List<GameNetPackBasic> packList;
+ // 瀵规寚瀹氱洰鏍囬噴鏀炬妧鑳斤細绉诲姩鍒颁富瑕佺洰鏍囦綅缃繘琛屾敾鍑�
+ protected void CastToTarget()
+ {
+ if (tagUseSkillAttack.HurtCount <= 0)
+ {
+ Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+ OnSkillFinished();
+ return;
+ }
- protected SkillRecordAction otherSkillAction;
+ int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+ BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+ RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
- protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+ ExecuteMoveAndCastSequence(targetTrans, () =>
+ {
+ RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum);
+ MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish, 750F);
+ });
+ }
- protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+ // 瀵瑰弸鏂归噴鏀炬妧鑳斤細绉诲姩鍒板弸鏂瑰尯鍩熻繘琛屾不鐤楁垨澧炵泭
+ protected void CastToAllies()
+ {
+ RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+ ExecuteMoveAndCastSequence(target, () =>
+ {
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, OnAttackFinish, 750F);
+ });
+ }
- 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;
+ // 鎵ц绉诲姩-鏂芥硶-杩斿洖搴忓垪锛氶�氱敤鐨勭Щ鍔ㄦ敾鍑绘祦绋�
+ 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);
+ });
+ }
- }
+ // 绉诲姩鍒扮洰鏍囦綅缃細澶勭悊瑙掕壊鐨勭Щ鍔ㄥ姩鐢诲拰閫昏緫
+ protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 500f)
+ {
+ if (skillConfig.CastDistance >= 9999)
+ {
+ _onComplete?.Invoke();
+ return;
+ }
- public virtual void Run()
- {
- if (startCounting)
- {
- curFrame++;
- }
+ 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);
+ }
- if (null != skillEffect)
- {
- skillEffect.Run();
- }
+ // 杞韩閫昏緫锛氭牴鎹妧鑳介厤缃鐞嗚鑹茶浆鍚�
+ 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();
+ }
- if (otherSkillAction != null)
- {
- if (otherSkillAction.IsFinished())
- {
- otherSkillAction = null;
- OnSkillFinished();
- }
- else
- {
- otherSkillAction.Run();
- }
- }
- }
+ // 鏀诲嚮瀹屾垚鍚庣殑澶勭悊锛氳浆韬�佹仮澶嶇姸鎬併�佹挱鏀惧緟鏈哄姩鐢�
+ protected void OnAttackFinish()
+ {
+ TurnBack(null, 1f);
+ OnAllAttackMoveFinished();
+ caster.motionBase.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.heroInfoBar.SetActive(true);
+ }
+ battleField.battleRootNode.skillMaskNode.SetActive(false);
+ }
+ // 鎵ц鎶�鑳介噴鏀惧姩鐢诲拰閫昏緫锛氭挱鏀炬柦娉曞姩浣滃苟鎻愪緵鍥炶皟
+ protected TrackEntry CastImpl(Action onComplete = null)
+ {
+ return caster.motionBase.PlaySkillAnimation(skillConfig, this, tagUseSkillAttack.BattleType == 4, onComplete);
+ }
- public void Pause()
- {
- pauseState = startCounting;
- startCounting = false;
- }
+ // 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
+ 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;
+ }
- public void Resume()
- {
- startCounting = pauseState;
- }
+ // 鎶�鑳藉墠鎽囩粨鏉熷洖璋�
+ public virtual void OnStartSkillFrameEnd() { }
+ // 鎶�鑳戒腑鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囧紑濮�
+ public virtual void OnMiddleFrameStart(int times)
+ {
+ skillEffect?.OnMiddleFrameStart(times); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- // 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
- // 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
- public virtual void Cast()
- {
- BattleDebug.LogError(GetType().Name + " Skill Cast Start");
- // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
- HighLightAllTargets();
+ // 鎶�鑳戒腑鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囩粨鏉�
+ public virtual void OnMiddleFrameEnd(int times, int hitIndex)
+ {
+ skillEffect?.OnMiddleFrameEnd(times, hitIndex); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- // 璺濈閰嶆垚璐熸暟瑕佽浆韬� 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;
- }
- }
+ // 鎶�鑳藉悗鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囧紑濮�
+ public virtual void OnFinalFrameStart()
+ {
+ skillEffect?.OnFinalFrameStart(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- 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;
- }
+ // 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
+ public virtual void OnFinalFrameEnd()
+ {
+ skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- 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);
- }
+ // 楂樹寒鎵�鏈夌浉鍏崇洰鏍囷細璁剧疆鏂芥硶鑰呭拰鐩爣鐨勬樉绀哄眰绾�
+ protected void HighLightAllTargets()
+ {
+ caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
- 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();
- }
+ if (skillConfig.FuncType != 2)
+ return;
- protected void CastToEnemy()
- {
+ 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);
- RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+ foreach (BattleObject bo in allList)
+ {
+ bool isHighlight = highlightSet.Contains(bo);
+ bool isTarget = targetSet.Contains(bo);
+
+ if (isHighlight)
+ {
+ bo.layerMgr.SetFront();
+ }
+ else
+ {
+ bo.layerMgr.SetBack();
+ }
- 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);
- });
- }
+ bo.heroInfoBar.SetActive(isTarget);
+ }
+ 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;
+ }
- protected void CastToTarget()
- {
- // 鐩爣鏄晫鏂逛富鐩爣
- if (tagUseSkillAttack.HurtCount <= 0)
- {
- BattleDebug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
- OnSkillFinished();
- return;
- }
+ OnHitEachTarget(_hitIndex, target, hurt);
+ }
+ }
- var mainHurt = tagUseSkillAttack.HurtList[0];
+ // 澶勭悊鍗曚釜鐩爣琚懡涓細搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
+ 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();
+ }
+ }
- BattleObject mainTarget = battleField.battleObjMgr.GetBattleObject((int)mainHurt.ObjID);
- if (mainTarget == null)
- {
- BattleDebug.LogError("鐩爣涓虹┖ mainTarget == null ObjID : " + mainHurt.ObjID);
- OnSkillFinished();
- return;
- }
+ // 浼ゅ鍒嗗竷璁＄畻鍜屽簲鐢�
+ long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+ List<long> damageList = BattleUtility.DivideDamageToList(damageDivide.ToArray(), totalDamage);
- 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);
- });
- }
+ // 鑾峰彇涓存椂鏁版嵁骞跺簲鐢ㄤ激瀹�
+ 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);
- protected virtual void OnAllAttackMoveFinished()
- {
-
- }
+ // 澶勭悊鏂芥硶鑰呯浉鍏虫晥鏋�
+ caster.SuckHp(hurt.SuckHP, skillConfig);
+ caster.HurtByReflect(hurt.BounceHP, skillConfig);
+ }
- protected void CastToAllies()
- {
- RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+ // 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
+ protected void HandleDead()
+ {
+ var deadPackList = BattleUtility.FindDeadPack(packList);
+ if (deadPackList.Count <= 0) return;
- 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);
- });
- }
+ CheckAfterDeadhPack();
+ // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀归泦鍚�
+ var dropPacksToRemove = new List<H0704_tagRolePackRefresh>(dropPackList);
+ foreach (var _dropPack in dropPacksToRemove)
+ {
+ PackageRegedit.Distribute(_dropPack);
+ packList.Remove(_dropPack);
+ }
- // 鎵胯浇鎶�鑳藉ぇ閮ㄥ垎鐨勯�昏緫
- protected TrackEntry CastImpl(Action onComplete = null)
- {
- // 鎾斁鏂芥硶鍔ㄤ綔
- // onComplete鏄寚鏂芥硶鍔ㄤ綔鎾斁瀹岀殑鍥炶皟 涓嶄唬琛ㄦ槸鎶�鑳界粨鏉�
- // 鍏蜂綋鎶�鑳界粨鏉熺殑鏃堕棿搴旇鐪嬫妧鑳藉搴旂殑閫昏緫
- // 杩欓噷鍙彁渚�6涓姩浣滅浉鍏崇殑鍑芥暟
- // OnSkillStart 鍔ㄤ綔绗竴甯�
- // OnStartSkillFrameEnd 鍓嶆憞缁撴潫
- // OnMiddleFrameStart 涓憞寮�濮�
- // OnMiddleFrameEnd 涓憞缁撴潫
- // OnFinalFrameStart 鍚庢憞寮�濮�
- // OnFinalFrameEnd 鍚庢憞缁撴潫
- return caster.motionBase.PlaySkillAnimation(skillConfig, this, onComplete);
- }
-
- // 鎶�鑳藉紑濮�
- public virtual void OnSkillStart()
- {
- skillEffect = SkillEffectFactory.CreateSkillEffect(
- caster,
- skillConfig,
- tagUseSkillAttack
- );
- if (skillEffect != null)
- {
- skillEffect.Play(OnHitTargets);
- }
- }
-
- // 鎶�鑳藉墠鎽囧抚缁撴潫
- public virtual void OnStartSkillFrameEnd()
- {
-
- }
-
- /// <summary>
- /// 涓憞寮�濮� times=绗嚑娆″惊鐜� 浠�0寮�濮�
- /// </summary>
- /// <param name="times"></param>
- public virtual void OnMiddleFrameStart(int times)
- {
- skillEffect.OnMiddleFrameStart(times);
- }
-
- public virtual void OnMiddleFrameEnd(int times, int hitIndex)
- {
- skillEffect.OnMiddleFrameEnd(times, hitIndex);
- }
-
- /// <summary>
- /// 鍚庢憞寮�濮�
- /// </summary>
- public virtual void OnFinalFrameStart()
- {
-
- }
-
- /// <summary>
- /// 鍚庢憞缁撴潫
- /// </summary>
- public virtual void OnFinalFrameEnd()
- {
-
- }
-
-
-
-
- protected void HighLightAllTargets()
- {
- // 楂樹寒鎵�鏈夌洰鏍�
- HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
- highlightList.Add(caster);
-
-
- // 鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
- // YYL TODO
- }
-
- // 鍛戒腑鐩爣鍚庣殑鍥炶皟 姝ｅ父鏄互鍚勬妧鑳界殑鏂瑰紡鏉ュ鐞嗙殑
- 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];
-
- BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
- if (target == null)
- {
- BattleDebug.LogError("鐩爣涓虹┖ target == null ObjId : " + hurt.ObjID);
- continue;
- }
-
- // 浼ゅ鍒嗗竷 (涓囧垎姣�)
- int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
-
- long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
-
- // 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
- List<long> damageList = BattleUtility.DivideDamageToList(damageDivide, totalDamage);
-
- OnHitEachTarget(target, totalDamage, damageList, ref hurt);
- }
+ // 鑾峰彇骞跺垎閰嶆帀钀界墿鍝佸拰缁忛獙
+ 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));
- HandleDead();
- }
+ var dropAssign = AssignDrops(itemList, deadPackList.Count);
+ var expAssign = AssignExp(expPackList, deadPackList.Count);
- protected void HandleDead()
- {
- var deadPackList = BattleUtility.FindDeadPack(packList);
- int deadCount = 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 (deadCount <= 0)
- {
- // 濡傛灉娌℃浜″氨涓嶇敤绠�
- return;
- }
+ // 淇锛氶伩鍏嶅瓧鍏搁敭鍐茬獊锛屼娇鐢ㄥ畨鍏ㄧ殑娣诲姞鏂瑰紡
+ if (!tempDropList.ContainsKey(objID))
+ {
+ tempDropList.Add(objID, battleDrops);
+ }
+ else
+ {
+ Debug.LogWarning($"tempDropList涓凡瀛樺湪ObjID={objID}鐨勮褰曪紝灏嗚鐩栧師鍊�");
+ tempDropList[objID] = battleDrops; // 瑕嗙洊鐜版湁鍊�
+ }
- CheckAfterDeadhPack();
+ if (!tempDeadPackList.ContainsKey(objID))
+ {
+ tempDeadPackList.Add(objID, deadPackList[i]);
+ }
+ else
+ {
+ Debug.LogWarning($"tempDeadPackList涓凡瀛樺湪ObjID={objID}鐨勮褰曪紝灏嗚鐩栧師鍊�");
+ tempDeadPackList[objID] = deadPackList[i]; // 瑕嗙洊鐜版湁鍊�
+ }
+ }
- // 澶勭悊鎺夎惤鍖� 鎻愬墠distribute涔嬪悗 PackManager鎵嶆湁鎺夎惤鐗� 鎵�浠ヤ笉璺焌ssignexp涓�鏍穌istribute
- foreach (var _dropPack in dropPackList)
- {
- BattleDebug.LogError("distribute pack " + _dropPack.GetType().Name);
- PackageRegedit.Distribute(_dropPack);
- packList.Remove(_dropPack);
- }
+ // 淇锛氶伩鍏嶅湪閬嶅巻鏃朵慨鏀归泦鍚堬紝鍏堟敹闆嗗悗鍒犻櫎
+ var deadPacksToRemove = new List<GameNetPackBasic>(deadPackList.Cast<GameNetPackBasic>());
+ foreach (var deadPack in deadPacksToRemove)
+ {
+ packList.Remove(deadPack);
+ }
+ }
- // 鑾峰彇鎺夎惤鐗╁搧
- 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);
+ // 鍒嗛厤鎺夎惤鐗╁搧锛氬皢鎺夎惤鐗╁搧骞冲潎鍒嗛厤缁欐浜″璞�
+ 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;
+ }
- // 鍒嗛厤鎺夎惤鍜岀粡楠�
- var dropAssign = AssignDrops(itemList, deadCount);
- var expAssign = AssignExp(expPackList, deadCount);
+ // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀筽ackList
+ var expPacksToRemove = new List<HB405_tagMCAddExp>();
- // 鏋勯�� 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);
- }
+ 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);
+ }
- battleField.OnObjsDead(new List<HB422_tagMCTurnFightObjDead>(deadPackList));
- foreach (var deadPack in deadPackList)
- {
- packList.Remove(deadPack);
- }
- deadPackList.Clear();
+ 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;
+
- // 鍒嗛厤鎺夎惤
- 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;
- }
+ // 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
+ if (skillEffect != null)
+ {
+ if (!skillEffect.IsFinished()) return false;
+ skillEffect = null;
+ OnSkillFinished();
+ return false;
+ }
- // 鍒嗛厤缁忛獙锛氭瘡涓師濮嬪寘閮藉钩鍧囧垎閰嶅埌姣忎釜姝讳骸瀵硅薄
- 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>());
+ // 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
+ 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;
+ }
- foreach (var expPack in expList)
- {
- long totalExp = GeneralDefine.GetFactValue(expPack.Exp, expPack.ExpPoint);
- long avgExp = totalExp / deadCount;
- long remain = totalExp % deadCount;
+ // 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
+ if (isFinished && moveFinished)
+ {
+ if (packList.Count > 0)
+ {
+ OnSkillFinished();
+ return false;
+ }
- 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;
+ }
+ return false;
+ }
- protected virtual void OnHitEachTarget(BattleObject target, long totalDamage, List<long> damageList, ref HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
- {
- target.Hurt(damageList, totalDamage, hurt.AttackTypes);
+ // 寮哄埗缁撴潫鎶�鑳斤細绔嬪嵆缁撴潫鎵�鏈夋妧鑳界浉鍏崇殑澶勭悊
+ public virtual void ForceFinished()
+ {
+ skillEffect?.ForceFinished();
+
+ otherSkillActionList.ForEach(action => action.ForceFinish());
+ otherSkillActionList.Clear();
- }
+ isFinished = true;
+ moveFinished = true;
+ isPlay = true;
- protected void CheckAfterDeadhPack()
- {
- List<int> removeIndexList = new List<int>();
- for (int i = 0; i < packList.Count; i++)
- {
- var pack = packList[i];
+ // 澶勭悊鎵�鏈夊墿浣欏寘
+ while (packList.Count > 0)
+ {
+ var pack = packList[0];
+ packList.RemoveAt(0);
- // 澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
- 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;
+ 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);
+ }
+ }
+ }
- //B4 05 鑾峰緱缁忛獙 #tagMCAddExp 閫氱煡鑾峰緱鐨勭粡楠岋紝
- //鍙敤浜庡仛缁忛獙鑾峰緱琛ㄧ幇 Source = 2 鏃朵负涓荤嚎鍑绘潃鎬墿鑾峰緱缁忛獙
- if (h405Pack.Source == 2)
- {
- expPackList.Add(h405Pack);
- removeIndexList.Add(i);
- }
- }
+ // 鎶�鑳藉畬鎴愬鐞嗭細姝ｅ父瀹屾垚鏃剁殑娓呯悊宸ヤ綔
+ public void OnSkillFinished()
+ {
+ // 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
+ try
+ {
+ while (true)
+ {
+ // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
+ if (skillEffect != null && !skillEffect.IsFinished())
+ return;
+
+ if (skillEffect != null)
+ {
+ skillEffect = null;
+ continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
+ }
- }
+ // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
+ 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浠ｆ浛閫掑綊璋冪敤
+ }
+ 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;
- }
- }
+ break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ }
- return isFinished;
- }
+ // 澶勭悊鍓╀綑鍖�
+ while (packList.Count > 0)
+ {
+ var pack = packList[0];
+ packList.RemoveAt(0);
- public virtual void ForceFinished()
- {
- isFinished = true;
- }
+ 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;
+ }
- public void OnSkillFinished()
- {
- BattleDebug.LogError(GetType().Name + " Skill Finished");
- while (packList.Count > 0)
- {
- var pack = packList[0];
- packList.RemoveAt(0);
+ if (pack is CustomB421ActionPack actionPack)
+ actionPack.Distribute();
+ PackageRegedit.Distribute(pack);
+ }
+ }
+ catch (Exception ex)
+ {
+ Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
+ // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
+ isFinished = true;
+ throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
+ }
- 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);
- }
+ isFinished = true;
+ }
- 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