From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式
---
Main/System/Battle/Skill/SkillBase.cs | 1225 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 816 insertions(+), 409 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 4325c92..8cf3584 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,488 +1,895 @@
using System.Collections.Generic;
using UnityEngine;
-using System;
using DG.Tweening;
using Spine;
-
+using System.Linq;
+using System;
public class SkillBase
{
- protected HB427_tagSCUseSkill tagUseSkillAttack;
+ const float moveTime = 0.5f;
- protected SkillConfig skillConfig;
+ 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 bool isFinished = false;
+ 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 BattleField battleField = null; // 鎴樺満
+ private float MoveSpeed = 750f;
- protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+ private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
+ private Dictionary<int, HB422_tagMCTurnFightObjDead> tempDeadPackList = new Dictionary<int, HB422_tagMCTurnFightObjDead>();
- protected BattleObject caster = null; // 鏂芥硶鑰�
+ protected List<HB428_tagSCBuffRefresh> buffCollections = new List<HB428_tagSCBuffRefresh>();
- protected bool startCounting = false;
- protected bool pauseState = false;
+ // 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
+ 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 int curFrame = 0;
+ // 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
+ public virtual void Run()
+ {
+ if (skillEffect != null)
+ {
+ if (skillEffect.IsFinished())
+ {
+ skillEffect = null;
+ OnSkillFinished();
+ }
+ else
+ {
+ skillEffect.Run();
+ }
+ return;
+ }
- protected List<GameNetPackBasic> packList;
+ 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 SkillRecordAction otherSkillAction;
+ 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.motionBase.ShowIllusionShadow(true, color);
+ }
+ }
+ else
+ {
+ MoveSpeed = 750f;
+ caster.motionBase.ShowIllusionShadow(false);
+ }
+ }
- protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+ // 鎶�鑳介噴鏀句富閫昏緫锛氬箍鎾簨浠躲�侀珮浜洰鏍囥�佹墽琛岄噴鏀�
+ 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 List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+ 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);
+ }
+
+ if (hintConfig != null)
+ {
+ caster.heroInfoBar.ShowTips(((char)hintConfig.prefix).ToString(), true, false, 1.25f);
+ // Debug.Break();
+ }
+ }
- 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;
+ // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
+ 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;
+ }
+ }
- public virtual void Run()
- {
- if (startCounting)
- {
- curFrame++;
- }
+ // 鍐叉挒鏀诲嚮妯″紡锛堝緟瀹炵幇锛�
+ protected void DashCast(Action _onComplete)
+ {
+ Debug.LogError("DashCast 杩樻病瀹炵幇");
+ ForceFinished();
+ }
- if (otherSkillAction != null)
- {
- if (otherSkillAction.IsFinished())
- {
- otherSkillAction = null;
- OnSkillFinished();
- }
- else
- {
- otherSkillAction.Run();
- }
- }
- }
+ // 瀵规晫鏂归噴鏀炬妧鑳斤細绉诲姩鍒版晫鏂瑰尯鍩熻繘琛屾敾鍑�
+ protected void CastToEnemy()
+ {
+ RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+ ExecuteMoveAndCastSequence(target, () =>
+ {
+ // ShadowIllutionCreate(true);
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
+ });
+ }
+ // 瀵规寚瀹氱洰鏍囬噴鏀炬妧鑳斤細绉诲姩鍒颁富瑕佺洰鏍囦綅缃繘琛屾敾鍑�
+ protected void CastToTarget()
+ {
+ if (tagUseSkillAttack.HurtCount <= 0)
+ {
+ Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+ OnSkillFinished();
+ return;
+ }
- protected virtual void OnActiveSkillFrame()
- {
+ int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(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.teamHero.positionNum);
+ // ShadowIllutionCreate(true);
+ MoveToTarget(rectTransform, Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
+ });
+ }
- protected virtual void OnStartSkillFrame()
- {
+ // 瀵瑰弸鏂归噴鏀炬妧鑳斤細绉诲姩鍒板弸鏂瑰尯鍩熻繘琛屾不鐤楁垨澧炵泭
+ protected void CastToAllies()
+ {
+ RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+ ExecuteMoveAndCastSequence(target, () =>
+ {
+ // ShadowIllutionCreate(true);
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
+ });
+ }
- }
+ // 鎵ц绉诲姩-鏂芥硶-杩斿洖搴忓垪锛氶�氱敤鐨勭Щ鍔ㄦ敾鍑绘祦绋�
+ private void ExecuteMoveAndCastSequence(RectTransform target, Action onReturnComplete)
+ {
+ ShadowIllutionCreate(true);
+ MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+ {
+ TurnBack(() =>
+ {
+ ShadowIllutionCreate(false);
+ CastImpl(() =>
+ {
+ TurnBack(() =>
+ {
+ try
+ {
+ onReturnComplete?.Invoke(); // 娣诲姞寮傚父澶勭悊闃叉鍥炶皟寮傚父瀵艰嚧鐘舵�佷笉瀹屾暣
+ }
+ catch (Exception ex)
+ {
+ Debug.LogError($"ExecuteMoveAndCastSequence鍥炶皟寮傚父: {ex.Message}");
+ throw;
+ }
+ }, -1f);
+ });
+ }, -1f);
+ });
+ }
- protected virtual void OnEndSkillFrame()
- {
-
- }
+ // 绉诲姩鍒扮洰鏍囦綅缃細澶勭悊瑙掕壊鐨勭Щ鍔ㄥ姩鐢诲拰閫昏緫
+ protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 750f)
+ {
+ if (skillConfig.CastDistance >= 9999)
+ {
+ _onComplete?.Invoke();
+ return;
+ }
- public void Pause()
- {
- pauseState = startCounting;
- startCounting = false;
- }
+ 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);
+ }
- public void Resume()
- {
- startCounting = pauseState;
- }
+ // 杞韩閫昏緫锛氭牴鎹妧鑳介厤缃鐞嗚鑹茶浆鍚�
+ 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();
+ }
- // 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
- // 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
- public virtual void Cast()
- {
- // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
- HighLightAllTargets();
+ // 鏀诲嚮瀹屾垚鍚庣殑澶勭悊锛氳浆韬�佹仮澶嶇姸鎬併�佹挱鏀惧緟鏈哄姩鐢�
+ protected void OnAttackFinish()
+ {
+ TurnBack(null, 1f);
+ OnAllAttackMoveFinished();
+ caster.motionBase.PlayAnimation(MotionName.idle, true);
+ }
- // 璺濈閰嶆垚璐熸暟瑕佽浆韬� TurnBack
+ // 鎵�鏈夋敾鍑荤Щ鍔ㄥ畬鎴愬悗鐨勫鐞嗭細鎭㈠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);
+ }
- switch (skillConfig.castMode)
- {
- case SkillCastMode.Self:
- PlayCastAnimation(() => DoSkillLogic(OnSkillFinished));
- break;
- case SkillCastMode.Enemy:
- MoveToTarget(caster.GetEnemyCamp(), skillConfig, _onComplete: () => TurnBack(() => PlayCastAnimation(() => DoSkillLogic(() => { BackToOrigin(OnSkillFinished); }))));
- break;
- case SkillCastMode.Target:
- // 鐩爣鏄晫鏂逛富鐩爣
- if (tagUseSkillAttack.HurtCount <= 0)
- {
- Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
- OnSkillFinished();
- return;
- }
+ // 鎵ц鎶�鑳介噴鏀惧姩鐢诲拰閫昏緫锛氭挱鏀炬柦娉曞姩浣滃苟鎻愪緵鍥炶皟
+ protected TrackEntry CastImpl(Action onComplete = null)
+ {
+ return caster.motionBase.PlaySkillAnimation(skillConfig, this, tagUseSkillAttack.BattleType == 4, onComplete);
+ }
- var mainHurt = tagUseSkillAttack.HurtList[0];
+ // 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
+ 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)mainHurt.ObjID);
- if (mainTarget == null)
- {
- Debug.LogError("鐩爣涓虹┖ mainTarget == null ObjID : " + mainHurt.ObjID);
- OnSkillFinished();
- return;
- }
- MoveToTarget(mainTarget.Camp, mainTarget, _onComplete: () => TurnBack(() => PlayCastAnimation(() => DoSkillLogic(() => { BackToOrigin(OnSkillFinished); }))));
- break;
- case SkillCastMode.Allies:
- MoveToTarget(caster.Camp, skillConfig, _onComplete: () => TurnBack(() => PlayCastAnimation(() => DoSkillLogic(() => { BackToOrigin(OnSkillFinished); }))));
- break;
- // case SkillCastMode.DashCast:
- // DashToTarget(() => BackToOrigin(OnSkillFinished));
- // break;
- default:
- Debug.LogError("鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝" + skillConfig.SkillID);
- OnSkillFinished();
- break;
- }
- }
+ // 鎶�鑳藉墠鎽囩粨鏉熷洖璋�
+ public virtual void OnStartSkillFrameEnd() { }
- // 鍐插埡鐨勬妧鑳� 鍔ㄤ綔 璺熺Щ鍔� 鏄悓鏃惰繘琛岀殑 绉诲姩鍒扮洰鏍囩殑涓�鐬棿灏辫杩涜鎶�鑳介�昏緫
- // protected void DashToTarget(Action _onComplete)
- // {
- // TrackEntry entry = PlayCastAnimation();
- // BattleObject mainTarget = battleField.battleObjMgr.GetBattleObject((int)tagUseSkillAttack.AttackID);
- // if (mainTarget == null)
- // {
- // Debug.LogError("鐩爣涓虹┖ mainTarget == null AttackID : " + tagUseSkillAttack.AttackID);
- // _onComplete?.Invoke();
- // return;
- // }
+ // 鎶�鑳戒腑鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囧紑濮�
+ public virtual void OnMiddleFrameStart(int times)
+ {
+ skillEffect?.OnMiddleFrameStart(times); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- // // 鍋氫竴涓井寰殑鎻愬墠
- // MoveToTarget(mainTarget.Camp, mainTarget.teamHero.positionNum, entry.AnimationEnd - 0.05f, () => DoSkillLogic(_onComplete));
- // }
+ // 鎶�鑳戒腑鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囩粨鏉�
+ 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(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
+
+ // 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
+ public virtual void OnFinalFrameEnd()
+ {
+
+ skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
+
+ // 楂樹寒鎵�鏈夌浉鍏崇洰鏍囷細璁剧疆鏂芥硶鑰呭拰鐩爣鐨勬樉绀哄眰绾�
+ protected void HighLightAllTargets()
+ {
+ caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
+
+ if (skillConfig.FuncType != 2)
+ return;
+
+ 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);
+
+ foreach (BattleObject bo in allList)
+ {
+ bool isHighlight = highlightSet.Contains(bo);
+ bool isTarget = targetSet.Contains(bo);
+
+ if (isHighlight)
+ {
+ bo.layerMgr.SetFront();
+ }
+ else
+ {
+ bo.layerMgr.SetBack();
+ }
+
+ bo.heroInfoBar.SetActive(isTarget);
+ }
+
+ battleField.battleRootNode.skillMaskNode.SetActive(true);
+ // battleField.battleRootNode.SetSortingOrder();
+ }
+
+ // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍�
+ protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
+ {
+ // 閫犳垚浼ゅ鍓嶅厛澶勭悊琛�閲忓埛鏂板寘
+ HandleRefreshHP();
+
+ 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);
+ }
+ }
+
+ // 澶勭悊鍗曚釜鐩爣琚懡涓�:搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
+ 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();
+ }
+ }
+
+ // 璁＄畻鎬讳激瀹冲拰鍒嗘浼ゅ鍒楄〃
+ long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+ List<long> damageList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalDamage);
+
+ // ============ 绗簩姝�:鍒锋柊瀹為檯琛�閲� ============
+ long fromHp = target.teamHero.curHp;
+
+ // 璁＄畻褰撳墠杩欎竴鍑荤殑瀹為檯浼ゅ(鎵�鏈夊垎娈典激瀹充箣鍜�)
+ long currentHitDamage = 0;
+ foreach (long dmg in damageList)
+ {
+ currentHitDamage += dmg;
+ }
+
+ long toHp = Math.Max(0, fromHp - currentHitDamage);
+
+ // 鏇存柊鐩爣琛�閲�
+ target.teamHero.curHp = toHp;
+
+#if UNITY_EDITOR
+ BattleDebug.LogError(
+ (caster.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ��") + "\n" +
+ $"鏀诲嚮鑰�: {caster.teamHero.name}\n" +
+ $"鐩爣: {target.teamHero.name}\n" +
+ $"鎶�鑳�: {skillConfig.SkillName} (绗瑊_hitIndex}鍑�)\n" +
+ $"浼ゅ: {currentHitDamage} (鎬讳激瀹�: {totalDamage})\n" +
+ $"琛�閲忓彉鍖�: {fromHp} -> {toHp}"
+ );
+#endif
+
+
+ bool isLastHit = _hitIndex >= skillConfig.DamageDivide.Length - 1;
+
+ // ============ 绗笁姝�:鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
+ 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, fromHp, toHp);
+
+ // ============ 绗簲姝�:澶勭悊鏂芥硶鑰呯浉鍏虫晥鏋� ============
+ caster.SuckHp(hurt.SuckHP, skillConfig);
+ caster.HurtByReflect(hurt.BounceHP, skillConfig);
+ }
+
+ // 澶勭悊HP鍒锋柊鍖咃紙绠�鍖栭�昏緫锛�
+ private void HandleRefreshHP()
+ {
+ // 鏌ユ壘HP鍒锋柊鍖�
+ HB419_tagSCObjHPRefresh refreshPack = BattleUtility.FindObjHPRefreshPack(packList);
+
+ if (refreshPack != null)
+ {
+ // 鍒嗗彂HP鍒锋柊鍖�
+ PackageRegedit.Distribute(refreshPack);
+ packList.Remove(refreshPack);
+ }
+ }
+
+ // 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
+ protected void HandleDead()
+ {
+ var deadPackList = BattleUtility.FindDeadPack(packList);
+ if (deadPackList.Count <= 0) return;
+
+ CheckAfterDeadhPack();
+
+ // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀归泦鍚�
+ var dropPacksToRemove = new List<H0704_tagRolePackRefresh>(dropPackList);
+ foreach (var _dropPack in dropPacksToRemove)
+ {
+ PackageRegedit.Distribute(_dropPack);
+ packList.Remove(_dropPack);
+ }
- protected TrackEntry PlayCastAnimation(Action onComplete = null)
- {
- // 鎾斁鏂芥硶鍔ㄤ綔
- return caster.motionBase.PlaySkillAnimation(skillConfig, onComplete,
- OnStartSkillFrame,//鏀诲嚮鍓嶆憞缁撴潫
- OnActiveSkillFrame);//鏀诲嚮涓憞缁撴潫
- }
+ // 鑾峰彇骞跺垎閰嶆帀钀界墿鍝佸拰缁忛獙
+ 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));
- public void MoveToTarget(BattleCamp camp, BattleObject target, float duration = 0.2f, Action _onComplete = null)
- {
- targetNode = battleField.GetTeamNode(camp, target);
+ var dropAssign = AssignDrops(itemList, deadPackList.Count);
+ var expAssign = AssignExp(expPackList, deadPackList.Count);
- Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
- RectTransform selfRect = caster.heroRectTrans;
- RectTransform targetRect = targetNode;
+ // 鏋勯�燘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]
+ };
- var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
- battleField.battleTweenMgr.OnPlayTween(tweener);
- }
+ // 淇锛氶伩鍏嶅瓧鍏搁敭鍐茬獊锛屼娇鐢ㄥ畨鍏ㄧ殑娣诲姞鏂瑰紡
+ if (!tempDropList.ContainsKey(objID))
+ {
+ tempDropList.Add(objID, battleDrops);
+ }
+ else
+ {
+ Debug.LogWarning($"tempDropList涓凡瀛樺湪ObjID={objID}鐨勮褰曪紝灏嗚鐩栧師鍊�");
+ tempDropList[objID] = battleDrops; // 瑕嗙洊鐜版湁鍊�
+ }
- public void MoveToTarget(BattleCamp camp, SkillConfig skillCfg, float duration = 0.2f, Action _onComplete = null)
- {
- targetNode = battleField.GetTeamNode(camp, skillCfg);
+ if (!tempDeadPackList.ContainsKey(objID))
+ {
+ tempDeadPackList.Add(objID, deadPackList[i]);
+ }
+ else
+ {
+ Debug.LogWarning($"tempDeadPackList涓凡瀛樺湪ObjID={objID}鐨勮褰曪紝灏嗚鐩栧師鍊�");
+ tempDeadPackList[objID] = deadPackList[i]; // 瑕嗙洊鐜版湁鍊�
+ }
+ }
- Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
- RectTransform selfRect = caster.heroRectTrans;
- RectTransform targetRect = targetNode;
+ // 淇锛氶伩鍏嶅湪閬嶅巻鏃朵慨鏀归泦鍚堬紝鍏堟敹闆嗗悗鍒犻櫎
+ var deadPacksToRemove = new List<GameNetPackBasic>(deadPackList.Cast<GameNetPackBasic>());
+ foreach (var deadPack in deadPacksToRemove)
+ {
+ packList.Remove(deadPack);
+ }
+ }
- var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
- battleField.battleTweenMgr.OnPlayTween(tweener);
- }
+ // 鍒嗛厤鎺夎惤鐗╁搧锛氬皢鎺夎惤鐗╁搧骞冲潎鍒嗛厤缁欐浜″璞�
+ 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;
+ }
- public void TurnBack(Action _onComplete)
- {
- if (skillConfig.CastDistance < 0)
- {
- // 杞韩
- caster.heroGo.transform.localScale = new Vector3(-1, 1, 1);
- }
- _onComplete?.Invoke();
- }
+ // 鍒嗛厤缁忛獙鍊硷細灏嗙粡楠屽寘骞冲潎鍒嗛厤缁欐瘡涓浜″璞�
+ 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>());
- public void BackToOrigin(Action _onComplete = null)
- {
- RectTransform selfRect = caster.heroRectTrans;
- Vector2 targetAnchoredPos = Vector2.zero;
- var tween = selfRect.DOAnchorPos(targetAnchoredPos, 0.2f)
- .SetEase(Ease.Linear)
- .OnComplete(() =>
- {
- // 杞垚姝ｇ‘鏂瑰悜
- caster.heroGo.transform.localScale = Vector3.one;
- _onComplete?.Invoke();
- });
+ // 淇锛氭鏌ラ櫎闆堕闄�
+ if (deadCount == 0)
+ {
+ Debug.LogWarning("AssignExp: deadCount涓�0锛屾棤娉曞垎閰嶇粡楠�");
+ return expAssign;
+ }
- battleField.battleTweenMgr.OnPlayTween(tween);
- }
+ // 淇锛氬厛鏀堕泦瑕佸垹闄ょ殑鍖咃紝閬垮厤鍦╢oreach涓慨鏀筽ackList
+ var expPacksToRemove = new List<HB405_tagMCAddExp>();
- protected void HighLightAllTargets()
- {
- // 楂樹寒鎵�鏈夌洰鏍�
- HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
- highlightList.Add(caster);
-
+ foreach (var expPack in expList)
+ {
+ long totalExp = GeneralDefine.GetFactValue(expPack.Exp, expPack.ExpPoint);
+ long avgExp = totalExp / deadCount;
+ long remain = totalExp % deadCount;
- // 鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
- // YYL TODO
- }
+ 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);
+ }
- // 鍛戒腑鐩爣鍚庣殑鍥炶皟 姝ｅ父鏄互鍚勬妧鑳界殑鏂瑰紡鏉ュ鐞嗙殑
- 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];
+ return expAssign;
+ }
- BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
- if (target == null)
- {
- Debug.LogError("鐩爣涓虹┖ target == null ObjId : " + hurt.ObjID);
- continue;
- }
+ // 妫�鏌ユ浜″悗鐨勫寘澶勭悊锛氬鐞嗘妧鑳藉寘銆佹帀钀藉寘銆佺粡楠屽寘
+ protected void CheckAfterDeadhPack()
+ {
+ List<int> removeIndexList = new List<int>();
+
+ for (int i = 0; i < packList.Count; i++)
+ {
+ var pack = packList[i];
- // 浼ゅ鍒嗗竷 (涓囧垎姣�)
- int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
+ // 澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
+ 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);
+ }
+ }
- long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+ for (int i = removeIndexList.Count - 1; i >= 0; i--)
+ packList.RemoveAt(removeIndexList[i]);
+ }
- // 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
- List<long> damageList = DivideDamageToList(damageDivide, totalDamage);
+ // 妫�鏌ユ妧鑳芥槸鍚﹀畬鎴愶細缁煎悎妫�鏌ユ墍鏈夊畬鎴愭潯浠�
+ public virtual bool IsFinished()
+ {
+ if (!isPlay) return false;
+
- OnHitEachTarget(target, totalDamage, damageList, ref hurt);
- }
- }
+ // 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
+ if (skillEffect != null)
+ {
+ if (!skillEffect.IsFinished()) return false;
+ skillEffect = null;
+ OnSkillFinished();
+ return false;
+ }
- /// <summary>
- /// 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
- /// </summary>
- protected List<long> DivideDamageToList(int[] damageDivide, long totalDamage)
- {
- List<long> fixedDamageList = new List<long>();
- long assigned = 0;
- int count = damageDivide.Length;
+ // 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
+ 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;
+ }
- for (int i = 0; i < count; i++)
- {
- long damage;
- if (i == count - 1)
- {
- // 鏈�鍚庝竴涓垎閰嶉」淇涓哄墿浣�
- damage = totalDamage - assigned;
- }
- else
- {
- damage = (totalDamage * damageDivide[i] + 5000) / 10000; // 鍥涜垗浜斿叆
- assigned += damage;
- }
- fixedDamageList.Add(damage);
- }
- return fixedDamageList;
- }
+ // 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
+ if (isFinished && moveFinished)
+ {
+ if (packList.Count > 0)
+ {
+ OnSkillFinished();
+ return false;
+ }
- protected virtual void OnHitEachTarget(BattleObject target, long totalDamage, List<long> damageList, ref HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
- {
- target.Hurt(damageList, totalDamage, hurt.AttackTypes);
+ return true;
+ }
- // 鍑讳腑鐩爣鐨勬椂鍊�,涓嶇杩戞垬杩滅▼ 閮界‘璁や竴涓嬫槸鍚︽湁鐖嗙偢鐗规晥 鐒跺悗鎾斁
- if (skillConfig.ExplosionEffectId > 0)
- {
- // 鎾斁鐖嗙偢鐗规晥
- target.battleField.battleEffectMgr.PlayEffect(
- target.ObjID,
- skillConfig.ExplosionEffectId,
- target.heroGo.transform
- );
- }
+ return false;
+ }
- // 鍙椾激涔嬪悗杈ㄥ埆姝讳骸鐘舵�� 姝讳骸鍖呭叾瀹炲墠鍚庡抚浼氬娆¤Е鍙� 搴旇瑕佸嵆鏃秗emove鍏朵粬鐨勫寘鏉ヤ繚璇佷笉閲嶅
- if (target.IsDead())
- {
- // SkillRecordAction閲岀殑drop浜嬩欢鍓嶇Щ鍒癲ead涔嬪悗
- HB422_tagMCTurnFightObjDead deadPack = FindDeadPack(target);
- CheckAfterDeadhPack(target, deadPack);
- if (deadPack != null)
- {
- // 澶勭悊鎺夎惤鍖�
- for (int i = 0; i < dropPackList.Count; i++)
- {
- PackageRegedit.Distribute(dropPackList[i]);
- }
- dropPackList.Clear();
+ // 寮哄埗缁撴潫鎶�鑳斤細绔嬪嵆缁撴潫鎵�鏈夋妧鑳界浉鍏崇殑澶勭悊
+ public virtual void ForceFinished()
+ {
+ skillEffect?.ForceFinished();
+
+ otherSkillActionList.ForEach(action => action.ForceFinish());
+ otherSkillActionList.Clear();
- target.PushExpPackList(new List<HB405_tagMCAddExp>(expPackList));
+ isFinished = true;
+ moveFinished = true;
+ isPlay = true;
- expPackList.Clear();
+ // 澶勭悊鎵�鏈夊墿浣欏寘
+ while (packList.Count > 0)
+ {
+ var pack = packList[0];
+ packList.RemoveAt(0);
- // 澶勭悊姝讳骸鍖�
- PackageRegedit.Distribute(deadPack);
- packList.Remove(deadPack);
- }
-
- // 澶嶆椿鍖呮殏鏃朵笉绠� 鍙兘鏄妧鑳界殑鍖�
- // HB423_tagMCTurnFightObjReborn rebornPack = FindRebornPack(target);
- // if (rebornPack != null)
- // {
- // // 澶勭悊澶嶆椿鍖�
- // PackageRegedit.Distribute(rebornPack);
- // packList.Remove(rebornPack);
- // }
- }
- }
+ 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);
+ }
+ }
+ }
- protected HB423_tagMCTurnFightObjReborn FindRebornPack(BattleObject target)
- {
- HB423_tagMCTurnFightObjReborn rebornPack = null;
- for (int i = 0; i < packList.Count; i++)
- {
- var pack = packList[i];
- if (pack is HB423_tagMCTurnFightObjReborn)
- {
- rebornPack = pack as HB423_tagMCTurnFightObjReborn;
- if (rebornPack.ObjID == target.ObjID)
- {
- return rebornPack;
- }
- }
- else if (pack is CustomHB426CombinePack)
- {
- var combinePack = pack as CustomHB426CombinePack;
- if (combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- break; // 鎵惧埌鎶�鑳藉寘灏变笉闇�瑕佸啀澶勭悊浜�
- }
- }
- }
- return null;
- }
+ // 鎶�鑳藉畬鎴愬鐞嗭細姝ｅ父瀹屾垚鏃剁殑娓呯悊宸ヤ綔
+ public void OnSkillFinished()
+ {
+ // 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
+ // try
+ // {
+ while (true)
+ {
+ // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
+ if (skillEffect != null && !skillEffect.IsFinished())
+ return;
- protected HB422_tagMCTurnFightObjDead FindDeadPack(BattleObject target)
- {
- HB422_tagMCTurnFightObjDead deadPack = null;
- for (int i = 0; i < packList.Count; i++)
- {
- var pack = packList[i];
- // 瀵绘壘姝讳骸鍖� 鎵惧埌姝讳骸鍖呬箣鍚庤鎵炬帀钀藉寘 涓嶈兘瓒呰繃鎶�鑳藉寘
- if (pack is HB422_tagMCTurnFightObjDead)
- {
- deadPack = pack as HB422_tagMCTurnFightObjDead;
- if (deadPack.ObjID == target.ObjID)
- {
- return deadPack;
- }
- }
- else if (pack is CustomHB426CombinePack)
- {
- // 鎵炬浜″寘涓嶈瓒婅繃鎶�鑳藉寘
- var combinePack = pack as CustomHB426CombinePack;
- if (combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- break;
- }
- }
- }
- return null;
- }
+ if (skillEffect != null)
+ {
+ skillEffect = null;
+ continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
+ }
- protected void CheckAfterDeadhPack(BattleObject target, HB422_tagMCTurnFightObjDead deadPack)
- {
- if (null == deadPack)
- {
- return;
- }
- var deadPackIndex = packList.IndexOf(deadPack);
- if (deadPackIndex < 0)
- {
- return;
- }
- List<int> removeIndexList = new List<int>();
- for (int i = deadPackIndex + 1; i < packList.Count; i++)
- {
- var pack = packList[i];
+ // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
+ 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;
+ }
- // 澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
- 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;
+ break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ }
- //B4 05 鑾峰緱缁忛獙 #tagMCAddExp 閫氱煡鑾峰緱鐨勭粡楠岋紝
- //鍙敤浜庡仛缁忛獙鑾峰緱琛ㄧ幇 Source = 2 鏃朵负涓荤嚎鍑绘潃鎬墿鑾峰緱缁忛獙
- if (h405Pack.Source == 2)
- {
- expPackList.Add(h405Pack);
- removeIndexList.Add(i);
- }
- }
+ // 澶勭悊鍓╀綑鍖�
+ if (!ResolvePackList())
+ {
+ return;
+ }
+ // }
+ // catch (Exception ex)
+ // {
+ // Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
+ // // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
+ // isFinished = true;
+ // throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
+ // }
- }
+ isFinished = true;
+ }
+
+ protected virtual bool ResolvePackList()
+ {
+ while (packList.Count > 0)
+ {
+ var pack = packList[0];
+ packList.RemoveAt(0);
- for (int i = removeIndexList.Count - 1; i >= 0; i--)
- {
- packList.RemoveAt(removeIndexList[i]);
- }
- }
- public virtual bool IsFinished()
- {
- return isFinished;
- }
+ 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 false;
+ }
+ else if (pack is HB428_tagSCBuffRefresh buffRefresh)
+ {
+ // 浠庢壘鍒扮涓�涓狧B428寮�濮� 鎵惧嚭杩炵画鐨凥B428_tagSCBuffRefresh鍖� 濡傛灉鎵惧埌涓�涓狟428鍚� 涔嬪悗纰板埌闈濰B428鍖呭氨鍋滄
+ buffCollections.Add(buffRefresh);
+ while (packList.Count > 0)
+ {
+ var nextPack = packList[0];
+ if (nextPack is HB428_tagSCBuffRefresh nextBuffRefresh)
+ {
+ buffCollections.Add(nextBuffRefresh);
+ packList.RemoveAt(0);
+ }
+ else
+ {
+ break;
+ }
+ }
- public virtual void ForceFinished()
- {
- isFinished = true;
- }
+ // 鍚屾椂鍒锋柊鎵�鏈夊璞＄殑buff锛屼笉鍒嗙粍
+ foreach (var buff in buffCollections)
+ {
+ BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buff.ObjID);
+ if (battleObj != null)
+ {
+ battleObj.buffMgr.RefreshBuff(buff, true);
+ }
+ }
- public void OnSkillFinished()
- {
- while (packList.Count > 0)
- {
- var pack = packList[0];
- packList.RemoveAt(0);
+ // 娓呯┖宸插鐞嗙殑buff闆嗗悎
+ buffCollections.Clear();
+ continue;
+ }
- if (pack is CustomHB426CombinePack)
- {
- var combinePack = pack as CustomHB426CombinePack;
- if (combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- otherSkillAction = combinePack.CreateSkillAction();
- return;
- }
- }
+ if (pack is CustomB421ActionPack actionPack)
+ {
+ actionPack.Distribute();
+ }
+ else
+ {
+ PackageRegedit.Distribute(pack);
+ }
+ }
- PackageRegedit.Distribute(pack);
- }
+ return 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