From 0792ab377b82eed196ecdfd34dab84311bddf7a1 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 九月 2025 17:06:20 +0800
Subject: [PATCH] 0312 加载场景
---
Main/System/Battle/Skill/SkillBase.cs | 545 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 344 insertions(+), 201 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index a0604ba..2ce14ec 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -4,11 +4,14 @@
using DG.Tweening;
using Spine;
using System.Linq;
-using PlasticGui.WorkspaceWindow.BranchExplorer;
public class SkillBase
{
+ const float moveTime = 0.5f;
+
+ protected SkillEffect skillEffect;
+
protected HB427_tagSCUseSkill tagUseSkillAttack;
protected SkillConfig skillConfig;
@@ -35,6 +38,8 @@
protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+ protected bool moveFinished = false;
+
public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
{
caster = _caster;
@@ -43,6 +48,8 @@
battleField = _battleField;
packList = _packList;
+
+
}
public virtual void Run()
@@ -50,6 +57,11 @@
if (startCounting)
{
curFrame++;
+ }
+
+ if (null != skillEffect)
+ {
+ skillEffect.Run();
}
if (otherSkillAction != null)
@@ -68,7 +80,6 @@
-
public void Pause()
{
pauseState = startCounting;
@@ -80,119 +91,284 @@
startCounting = pauseState;
}
+
// 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
// 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
public virtual void Cast()
{
+ EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, battleField.guid, skillConfig, caster.teamHero);
+
// 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
HighLightAllTargets();
// 璺濈閰嶆垚璐熸暟瑕佽浆韬� TurnBack
-
switch (skillConfig.castMode)
{
case SkillCastMode.Self:
- PlayCastAnimation(() => DoSkillLogic(OnSkillFinished));
+ CastImpl(OnAttackFinish);
break;
case SkillCastMode.Enemy:
- MoveToTarget(caster.GetEnemyCamp(), skillConfig, _onComplete: () => TurnBack(() => PlayCastAnimation(() => DoSkillLogic(() => { BackToOrigin(OnSkillFinished); }))));
+ CastToEnemy();
break;
case SkillCastMode.Target:
- // 鐩爣鏄晫鏂逛富鐩爣
- if (tagUseSkillAttack.HurtCount <= 0)
- {
- Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
- OnSkillFinished();
- return;
- }
-
- var mainHurt = tagUseSkillAttack.HurtList[0];
-
- 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); }))));
+ CastToTarget();
break;
case SkillCastMode.Allies:
- MoveToTarget(caster.Camp, skillConfig, _onComplete: () => TurnBack(() => PlayCastAnimation(() => DoSkillLogic(() => { BackToOrigin(OnSkillFinished); }))));
+ CastToAllies();
break;
- // case SkillCastMode.DashCast:
- // DashToTarget(() => BackToOrigin(OnSkillFinished));
- // break;
+ case SkillCastMode.DashCast:
+ DashCast(OnAttackFinish);
+ break;
default:
- Debug.LogError("鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝" + skillConfig.SkillID);
- OnSkillFinished();
+ Debug.LogError("寮哄埗缁撴潫鎶�鑳� 鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
+ ForceFinished();
break;
}
- }
-
- // 杩欓噷鍏跺疄鏄妧鑳藉悗鎽囩粨鏉熺殑鍦版柟
- protected virtual void DoSkillLogic(Action _onComplete = null)
- {
}
- protected TrackEntry PlayCastAnimation(Action onComplete = null)
+ // 鍐叉挒鏀诲嚮
+ protected void DashCast(Action _onComplete)
{
- // 鎾斁鏂芥硶鍔ㄤ綔
- return caster.motionBase.PlaySkillAnimation(skillConfig, onComplete,
- OnStartSkillFrame,//鏀诲嚮鍓嶆憞缁撴潫
- OnActiveSkillFrame);//鏀诲嚮涓憞缁撴潫
+ Debug.LogError("DashCast 杩樻病瀹炵幇");
+ ForceFinished();
+ // YYL TODO
+
+ // var entry = caster.motionBase.PlayAnimation(skillConfig.GetMotionName(), false);
+ // float animationTime = entry.AnimationTime;
+
+ // int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+
+ // BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+
+ // RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
+
+ // var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, targetTrans, new Vector2(skillConfig.CastDistance, 0), animationTime * 0.9f, () =>
+ // {
+ // caster.motionBase.PlayAnimation(MotionName.idle, true);
+ // _onComplete?.Invoke();
+ // });
+ // battleField.battleTweenMgr.OnPlayTween(tweener);
}
- public void MoveToTarget(BattleCamp camp, BattleObject target, float duration = 0.2f, Action _onComplete = null)
+ protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null)
{
- targetNode = battleField.GetTeamNode(camp, target);
+ // 鍘熷湴閲婃斁
+ if (skillConfig.CastDistance >= 9999)
+ {
+ _onComplete?.Invoke();
+ return;
+ }
- Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
- RectTransform selfRect = caster.heroRectTrans;
- RectTransform targetRect = targetNode;
-
- var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
+ caster.motionBase.PlayAnimation(MotionName.run, true);
+ var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, () =>
+ {
+ caster.motionBase.PlayAnimation(MotionName.idle, true);
+ _onComplete?.Invoke();
+ });
battleField.battleTweenMgr.OnPlayTween(tweener);
}
- public void MoveToTarget(BattleCamp camp, SkillConfig skillCfg, float duration = 0.2f, Action _onComplete = null)
- {
- targetNode = battleField.GetTeamNode(camp, skillCfg);
-
- Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
- RectTransform selfRect = caster.heroRectTrans;
- RectTransform targetRect = targetNode;
-
- var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
- battleField.battleTweenMgr.OnPlayTween(tweener);
- }
-
- public void TurnBack(Action _onComplete)
+ protected void TurnBack(Action _onComplete, float forward)
{
if (skillConfig.CastDistance < 0)
{
// 杞韩
- caster.heroGo.transform.localScale = new Vector3(-1, 1, 1);
+ Vector3 scale = caster.heroGo.transform.localScale;
+ scale.x = Mathf.Abs(scale.x) * forward;
+ caster.heroGo.transform.localScale = scale;
}
_onComplete?.Invoke();
}
- public void BackToOrigin(Action _onComplete = null)
+ protected void CastToEnemy()
{
- 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();
- });
- battleField.battleTweenMgr.OnPlayTween(tween);
+ RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
+
+ MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+ {
+ // 鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
+ TurnBack(() =>
+ {
+ // 鍒拌揪鐩爣浣嶇疆
+ CastImpl(() =>
+ {
+ TurnBack(
+ () =>
+ {
+ // 鍥炲埌鍘熸潵鐨勪綅缃�
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero,
+ OnAttackFinish);
+ }
+ , -1f);
+ });
+ }, -1f);
+ });
}
+
+
+
+ protected void CastToTarget()
+ {
+ // 鐩爣鏄晫鏂逛富鐩爣
+ if (tagUseSkillAttack.HurtCount <= 0)
+ {
+ Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+ OnSkillFinished();
+ return;
+ }
+
+ int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+
+ BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
+
+ RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
+
+ MoveToTarget(targetTrans, new Vector2(skillConfig.CastDistance, 0), () =>
+ {
+ // 鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
+ TurnBack(() =>
+ {
+ // 鍒拌揪鐩爣浣嶇疆
+ CastImpl(() =>
+ {
+ TurnBack(
+ () =>
+ {
+ RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum);
+ // 鍥炲埌鍘熸潵鐨勪綅缃�
+ MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish);
+ }
+ , -1f);
+ });
+ }, -1f);
+ });
+ }
+
+ protected virtual void OnAllAttackMoveFinished()
+ {
+ moveFinished = true;
+ }
+
+ protected void CastToAllies()
+ {
+ RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
+
+ MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
+ {
+ // 鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
+ TurnBack(() =>
+ {
+ // 鍒拌揪鐩爣浣嶇疆
+ CastImpl(() =>
+ {
+ TurnBack(
+ () =>
+ {
+ // 鍥炲埌鍘熸潵鐨勪綅缃�
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum),
+ Vector2.zero, OnAttackFinish);
+ }
+ , -1f);
+ });
+ }, -1f);
+ });
+ }
+
+ protected void OnAttackFinish()
+ {
+ TurnBack(null, 1f);
+ OnAllAttackMoveFinished();
+ caster.motionBase.PlayAnimation(MotionName.idle, true);
+ }
+
+
+ // 鎵胯浇鎶�鑳藉ぇ閮ㄥ垎鐨勯�昏緫
+ protected TrackEntry CastImpl(Action onComplete = null)
+ {
+ // 鎾斁鏂芥硶鍔ㄤ綔
+ // onComplete鏄寚鏂芥硶鍔ㄤ綔鎾斁瀹岀殑鍥炶皟 涓嶄唬琛ㄦ槸鎶�鑳界粨鏉�
+ // 鍏蜂綋鎶�鑳界粨鏉熺殑鏃堕棿搴旇鐪嬫妧鑳藉搴旂殑閫昏緫
+ // 杩欓噷鍙彁渚�6涓姩浣滅浉鍏崇殑鍑芥暟
+ // OnSkillStart 鍔ㄤ綔绗竴甯�
+ // OnStartSkillFrameEnd 鍓嶆憞缁撴潫
+ // OnMiddleFrameStart 涓憞寮�濮�
+ // OnMiddleFrameEnd 涓憞缁撴潫
+ // OnFinalFrameStart 鍚庢憞寮�濮�
+ // OnFinalFrameEnd 鍚庢憞缁撴潫
+ return caster.motionBase.PlaySkillAnimation(skillConfig, this, onComplete);
+ }
+
+ // 鎶�鑳藉紑濮�
+ public 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)
+ {
+ // if (skillEffect != null)
+ {
+ skillEffect.OnMiddleFrameStart(times);
+ }
+ }
+
+ public virtual void OnMiddleFrameEnd(int times, int hitIndex)
+ {
+ // if (skillEffect != null)
+ {
+ skillEffect.OnMiddleFrameEnd(times, hitIndex);
+ }
+ }
+
+ /// <summary>
+ /// 鍚庢憞寮�濮�
+ /// </summary>
+ public virtual void OnFinalFrameStart()
+ {
+ // if (skillEffect != null)
+ {
+ skillEffect.OnFinalFrameStart();
+ }
+ }
+
+ /// <summary>
+ /// 鍚庢憞缁撴潫
+ /// </summary>
+ public virtual void OnFinalFrameEnd()
+ {
+ // if (skillEffect != null)
+ {
+ skillEffect.OnFinalFrameEnd();
+ }
+
+ HandleDead();
+ }
+
+
+
protected void HighLightAllTargets()
{
@@ -200,7 +376,7 @@
HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
highlightList.Add(caster);
-
+ // caster.battleField.skillMask
// 鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
// YYL TODO
}
@@ -219,23 +395,52 @@
continue;
}
- // 浼ゅ鍒嗗竷 (涓囧垎姣�)
- int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
-
- long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
-
- // 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
- List<long> damageList = DivideDamageToList(damageDivide, totalDamage);
-
- OnHitEachTarget(target, totalDamage, damageList, ref hurt);
+ OnHitEachTarget(_hitIndex, target, hurt);
}
-
- HandleDead();
+
}
+
+
+ protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
+ {
+ // 浼ゅ鍒嗗竷 (涓囧垎姣�)
+ // Debug.LogError("skillConfig.DamageDivide.Count " + skillConfig.DamageDivide.Length + " _hitIndex " + _hitIndex);
+ int[] damageDivide = skillConfig.DamageDivide[_hitIndex];
+
+ long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
+
+ // 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
+ List<long> damageList = BattleUtility.DivideDamageToList(damageDivide, totalDamage);
+ // public uint ObjID;
+ // public uint AttackTypes; // 椋樿绫诲瀷姹囨�伙紝鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
+ // public uint HurtHP; // 椋樿鍊硷紝姹備綑浜块儴鍒�
+ // public uint HurtHPEx; // 椋樿鍊硷紝鏁撮櫎浜块儴鍒�
+ // public uint CurHP; // 鏇存柊鍓╀綑琛�閲忥紝姹備綑浜块儴鍒�
+ // public uint CurHPEx; // 鏇存柊鍓╀綑琛�閲忥紝鏁撮櫎浜块儴鍒�
+ // public uint SuckHP; // 鏈浼ゅ杞寲鐨勫惛琛�閲�
+ // public uint BounceHP; // 鏈浼ゅ鍙嶅脊鐨勪激瀹抽噺
+
+
+ // TODO YYL AttackTypes 瑕佽〃鐜版垚浠�涔堟牱鍛紵 鏀寔澶氱绫诲瀷骞跺瓨锛屽鏃犺闃插尽涓旀毚鍑诲悓鏃惰鏍兼尅锛屼簩杩涘埗鎴栬繍绠楁渶缁堝�硷紱0-澶辫触锛�1-鏅�氾紱2-鍥炶锛�5-鏍兼尅锛�6-鏃犺闃插尽锛�7-鏆村嚮锛�9-闂伩
+ target.Hurt(damageList, totalDamage, hurt, skillConfig);
+
+ // TODO YYL 杩欓噷鏄鍋氱粺涓�璁＄畻鍚庡啀hurt璺焥uckhp杩樻槸鎬庢牱
+ caster.SuckHp(hurt.SuckHP, skillConfig);// 鍚歌
+ caster.HurtByReflect(hurt.BounceHP, skillConfig);// 鍙嶅脊浼ゅ
+ }
+
protected void HandleDead()
{
- var deadPackList = FindDeadPack();
+ var deadPackList = BattleUtility.FindDeadPack(packList);
+ int deadCount = deadPackList.Count;
+
+ if (deadCount <= 0)
+ {
+ // 濡傛灉娌℃浜″氨涓嶇敤绠�
+ return;
+ }
+
CheckAfterDeadhPack();
// 澶勭悊鎺夎惤鍖� 鎻愬墠distribute涔嬪悗 PackManager鎵嶆湁鎺夎惤鐗� 鎵�浠ヤ笉璺焌ssignexp涓�鏍穌istribute
@@ -253,7 +458,7 @@
where item != null && item.isAuction
select item);
- int deadCount = deadPackList.Count;
+
// 鍒嗛厤鎺夎惤鍜岀粡楠�
var dropAssign = AssignDrops(itemList, deadCount);
@@ -265,7 +470,7 @@
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);
+ from item in itemModelDrops select item.gridIndex);
BattleDrops battleDrops = new BattleDrops()
{
rectTransform = deadTarget.heroRectTrans,
@@ -276,13 +481,15 @@
}
// 鍒嗗彂姝讳骸鍖�
+
+ battleField.OnObjsDead(new List<HB422_tagMCTurnFightObjDead>(deadPackList));
foreach (var deadPack in deadPackList)
{
- PackageRegedit.Distribute(deadPack);
packList.Remove(deadPack);
}
deadPackList.Clear();
}
+
// 鍒嗛厤鎺夎惤
@@ -327,99 +534,7 @@
return expAssign;
}
- /// <summary>
- /// 淇濊瘉鎵�鏈夊垎閰嶉」鍔犺捣鏉ョ瓑浜巘otalDamage锛岄伩鍏嶅洜鏁撮櫎瀵艰嚧鐨勮宸�
- /// </summary>
- protected List<long> DivideDamageToList(int[] damageDivide, long totalDamage)
- {
- List<long> fixedDamageList = new List<long>();
- long assigned = 0;
- int count = damageDivide.Length;
- 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;
- }
-
- protected virtual void OnHitEachTarget(BattleObject target, long totalDamage, List<long> damageList, ref HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
- {
- target.Hurt(damageList, totalDamage, hurt.AttackTypes);
-
- // 鍑讳腑鐩爣鐨勬椂鍊�,涓嶇杩戞垬杩滅▼ 閮界‘璁や竴涓嬫槸鍚︽湁鐖嗙偢鐗规晥 鐒跺悗鎾斁
- if (skillConfig.ExplosionEffectId > 0)
- {
- // 鎾斁鐖嗙偢鐗规晥
- target.battleField.battleEffectMgr.PlayEffect(
- target.ObjID,
- skillConfig.ExplosionEffectId,
- target.heroGo.transform
- );
- }
- }
-
- 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;
- }
-
- protected List<HB422_tagMCTurnFightObjDead> FindDeadPack()
- {
- List<HB422_tagMCTurnFightObjDead> deadPacks = new List<HB422_tagMCTurnFightObjDead>();
- for (int i = 0; i < packList.Count; i++)
- {
- var pack = packList[i];
- // 瀵绘壘姝讳骸鍖� 鎵惧埌姝讳骸鍖呬箣鍚庤鎵炬帀钀藉寘 涓嶈兘瓒呰繃鎶�鑳藉寘
- if (pack is HB422_tagMCTurnFightObjDead)
- {
- var deadPack = pack as HB422_tagMCTurnFightObjDead;
- deadPacks.Add(deadPack);
- }
- else if (pack is CustomHB426CombinePack)
- {
- // 鎵炬浜″寘涓嶈瓒婅繃鎶�鑳藉寘
- var combinePack = pack as CustomHB426CombinePack;
- if (combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- break;
- }
- }
- }
- return deadPacks;
- }
protected void CheckAfterDeadhPack()
{
@@ -477,16 +592,28 @@
}
public virtual bool IsFinished()
{
- return isFinished;
+ if (skillEffect != null)
+ {
+ if (!skillEffect.IsFinished())
+ {
+ return false;
+ }
+ else
+ {
+ OnSkillFinished();
+ skillEffect = null;
+ }
+ }
+
+ return isFinished && moveFinished;
}
public virtual void ForceFinished()
{
+ skillEffect?.ForceFinished();
isFinished = true;
- }
+ moveFinished = true;
- public void OnSkillFinished()
- {
while (packList.Count > 0)
{
var pack = packList[0];
@@ -497,30 +624,46 @@
var combinePack = pack as CustomHB426CombinePack;
if (combinePack.startTag.Tag.StartsWith("Skill_"))
{
+ BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
+ otherSkillAction = combinePack.CreateSkillAction();
+
+ // 寮哄埗缁撴潫鍏朵粬鎶�鑳�
+ otherSkillAction.ForceFinish();
+ return;
+ }
+ }
+ PackageRegedit.Distribute(pack);
+ }
+ }
+
+ public void OnSkillFinished()
+ {
+ if (skillEffect != null)
+ {
+ if (!skillEffect.IsFinished())
+ {
+ return;
+ }
+ }
+
+ 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_"))
+ {
+ BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
otherSkillAction = combinePack.CreateSkillAction();
return;
}
}
-
PackageRegedit.Distribute(pack);
}
isFinished = true;
- }
-
-
- protected virtual void OnActiveSkillFrame()
- {
-
- }
-
- protected virtual void OnStartSkillFrame()
- {
-
- }
-
- protected virtual void OnEndSkillFrame()
- {
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0