From 61b188e1d59af9a1e3b4f005bd4b9211b2db97d8 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 09 十月 2025 15:46:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/Skill/SkillBase.cs | 401 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 290 insertions(+), 111 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 9535875..a10eec9 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,10 +1,9 @@
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
@@ -15,7 +14,7 @@
protected HB427_tagSCUseSkill tagUseSkillAttack;
- protected SkillConfig skillConfig;
+ public SkillConfig skillConfig;
protected bool isFinished = false;
@@ -25,12 +24,6 @@
protected BattleObject caster = null; // 鏂芥硶鑰�
- protected bool startCounting = false;
-
- protected bool pauseState = false;
-
- protected int curFrame = 0;
-
protected List<GameNetPackBasic> packList;
protected SkillRecordAction otherSkillAction;
@@ -39,26 +32,42 @@
protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
- public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
+ protected bool moveFinished = false;
+
+ public int fromSkillId;
+
+ public bool isPlay = 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;
+ // Debug.LogError("start a skill id " + skillConfig.SkillID + " caster " + caster.teamHero.heroId + " pos " + caster.teamHero.positionNum + " camp " + caster.Camp);
+
}
public virtual void Run()
{
- if (startCounting)
- {
- curFrame++;
- }
-
if (null != skillEffect)
{
- skillEffect.Run();
+ if (skillEffect.IsFinished())
+ {
+ skillEffect = null;
+ OnSkillFinished();
+ }
+ else
+ {
+ skillEffect.Run();
+ }
+ return;
}
if (otherSkillAction != null)
@@ -70,41 +79,32 @@
}
else
{
- otherSkillAction.Run();
+ if (moveFinished)
+ {
+ otherSkillAction.Run();
+ }
}
+ return;
}
}
-
-
-
- public void Pause()
- {
- pauseState = startCounting;
- startCounting = false;
- }
-
- public void Resume()
- {
- startCounting = pauseState;
- }
-
// 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
// 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
public virtual void Cast()
{
- EventBroadcast.Instance.Broadcast<string, SkillConfig>(EventName.BATTLE_CAST_SKILL, battleField.guid, skillConfig);
+ // Debug.LogError("Cast skill " + skillConfig.SkillID + " cast position " + skillConfig.CastPosition + " cast mode " + skillConfig.castMode);
+ string guid = battleField.guid;
+ TeamHero teamHero = caster.teamHero;
+ EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, guid, skillConfig, teamHero);
- BattleDebug.LogError(GetType().Name + " Skill Cast Start");
// 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
HighLightAllTargets();
// 璺濈閰嶆垚璐熸暟瑕佽浆韬� TurnBack
- BattleDebug.LogError(GetType().Name + " Skill CastMode : " + skillConfig.castMode);
switch (skillConfig.castMode)
{
case SkillCastMode.Self:
- CastImpl();
+ CastImpl(OnAttackFinish);
break;
case SkillCastMode.Enemy:
CastToEnemy();
@@ -115,33 +115,59 @@
case SkillCastMode.Allies:
CastToAllies();
break;
- // case SkillCastMode.DashCast:
- // DashToTarget(() => BackToOrigin(OnSkillFinished));
- // break;
+ case SkillCastMode.DashCast:
+ DashCast(OnAttackFinish);
+ break;
default:
- BattleDebug.LogError("鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
- OnSkillFinished();
+ Debug.LogError("寮哄埗缁撴潫鎶�鑳� 鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹傝鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
+ ForceFinished();
break;
}
+
}
- protected void MoveToTarget(RectTransform target, Vector2 offset, float duration, Action onComplete = null)
+ // 鍐叉挒鏀诲嚮
+ protected void DashCast(Action _onComplete)
{
- BattleDebug.LogError("Move to target , target is " + target.name);
+ 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);
+ }
+
+ protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 500f)
+ {
// 鍘熷湴閲婃斁
if (skillConfig.CastDistance >= 9999)
{
- onComplete?.Invoke();
+ _onComplete?.Invoke();
return;
}
caster.motionBase.PlayAnimation(MotionName.run, true);
- var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, duration, () =>
+ var tweener = BattleUtility.MoveToTarget(caster.heroRectTrans, target, offset, () =>
{
caster.motionBase.PlayAnimation(MotionName.idle, true);
- onComplete?.Invoke();
- });
+ _onComplete?.Invoke();
+ }, speed);
battleField.battleTweenMgr.OnPlayTween(tweener);
+
+ // Debug.LogError("move to tarrget " + target.name + " offset " + offset + " speed " + speed + " time " + tweener.Duration());
}
protected void TurnBack(Action _onComplete, float forward)
@@ -161,7 +187,7 @@
RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
- MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), moveTime, () =>
+ MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
{
// 鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
TurnBack(() =>
@@ -173,12 +199,8 @@
() =>
{
// 鍥炲埌鍘熸潵鐨勪綅缃�
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, moveTime, () =>
- {
- TurnBack(null, 1f);
- caster.motionBase.PlayAnimation(MotionName.idle, true);
- OnAllAttackMoveFinished();
- });
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero,
+ OnAttackFinish, 750F);
}
, -1f);
});
@@ -193,22 +215,18 @@
// 鐩爣鏄晫鏂逛富鐩爣
if (tagUseSkillAttack.HurtCount <= 0)
{
- BattleDebug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
+ Debug.LogError("鎶�鑳芥敾鍑诲寘娌℃湁鐩爣 HurtCount <= 0");
OnSkillFinished();
return;
}
- var mainHurt = tagUseSkillAttack.HurtList[0];
+ int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
- BattleObject mainTarget = battleField.battleObjMgr.GetBattleObject((int)mainHurt.ObjID);
- if (mainTarget == null)
- {
- BattleDebug.LogError("鐩爣涓虹┖ mainTarget == null ObjID : " + mainHurt.ObjID);
- OnSkillFinished();
- return;
- }
+ BattleCamp battleCamp = skillConfig.TagFriendly != 0 ? caster.Camp : caster.GetEnemyCamp();
- MoveToTarget(mainTarget.heroRectTrans, new Vector2(skillConfig.CastDistance, 0), moveTime, () =>
+ RectTransform targetTrans = battleField.GetTeamNode(battleCamp, mainTargetPosNum);
+
+ MoveToTarget(targetTrans, new Vector2(skillConfig.CastDistance, 0), () =>
{
// 鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
TurnBack(() =>
@@ -219,13 +237,9 @@
TurnBack(
() =>
{
+ RectTransform rectTransform = battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum);
// 鍥炲埌鍘熸潵鐨勪綅缃�
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, moveTime, () =>
- {
- TurnBack(null, 1f);
- caster.motionBase.PlayAnimation(MotionName.idle, true);
- OnAllAttackMoveFinished();
- });
+ MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish, 750F);
}
, -1f);
});
@@ -235,14 +249,24 @@
protected virtual void OnAllAttackMoveFinished()
{
-
+ moveFinished = true;
+ List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>();
+ for (int i = 0; i < allList.Count; i++)
+ {
+ BattleObject bo = allList[i];
+ bo.layerMgr.SetFront();
+ // bo.heroRectTrans.SetParent(battleField.GetTeamNode(bo.Camp, bo.teamHero.positionNum), true);
+ bo.heroInfoBar.SetActive(true);
+ }
+ battleField.battleRootNode.skillMaskNode.SetActive(false);
+ // Debug.LogError("OnAllAttackMoveFinished skill " + skillConfig.SkillID + " cast position " + skillConfig.CastPosition + " cast mode " + skillConfig.castMode);
}
protected void CastToAllies()
{
RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
- MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), moveTime, () =>
+ MoveToTarget(target, new Vector2(skillConfig.CastDistance, 0), () =>
{
// 鍒颁綅缃浆韬�(涓嶄竴瀹氶潪瑕佽浆韬� 浣嗘槸娴佺▼瑕佸啓)
TurnBack(() =>
@@ -254,17 +278,20 @@
() =>
{
// 鍥炲埌鍘熸潵鐨勪綅缃�
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, moveTime, () =>
- {
- TurnBack(null, 1f);
- caster.motionBase.PlayAnimation(MotionName.idle, true);
- OnAllAttackMoveFinished();
- });
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum),
+ Vector2.zero, OnAttackFinish, 750F);
}
, -1f);
});
}, -1f);
});
+ }
+
+ protected void OnAttackFinish()
+ {
+ TurnBack(null, 1f);
+ OnAllAttackMoveFinished();
+ caster.motionBase.PlayAnimation(MotionName.idle, true);
}
@@ -281,27 +308,28 @@
// OnMiddleFrameEnd 涓憞缁撴潫
// OnFinalFrameStart 鍚庢憞寮�濮�
// OnFinalFrameEnd 鍚庢憞缁撴潫
+
return caster.motionBase.PlaySkillAnimation(skillConfig, this, onComplete);
}
// 鎶�鑳藉紑濮�
- public virtual void OnSkillStart()
+ public void OnSkillStart()
{
skillEffect = SkillEffectFactory.CreateSkillEffect(
caster,
skillConfig,
tagUseSkillAttack
);
- if (skillEffect != null)
- {
- skillEffect.Play(OnHitTargets);
- }
+
+ skillEffect.Play(OnHitTargets);
+ isPlay = true;
+
}
// 鎶�鑳藉墠鎽囧抚缁撴潫
public virtual void OnStartSkillFrameEnd()
{
-
+
}
/// <summary>
@@ -323,15 +351,17 @@
/// </summary>
public virtual void OnFinalFrameStart()
{
-
+ skillEffect.OnFinalFrameStart();
}
/// <summary>
/// 鍚庢憞缁撴潫
/// </summary>
public virtual void OnFinalFrameEnd()
- {
+ {
+ skillEffect.OnFinalFrameEnd();
+ HandleDead();
}
@@ -339,11 +369,51 @@
protected void HighLightAllTargets()
{
+ caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
+
+ if (skillConfig.FuncType != 2)
+ return;
+
// 楂樹寒鎵�鏈夌洰鏍�
- HashSet<BattleObject> highlightList = new HashSet<BattleObject>(battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack));
+ List<BattleObject> targetList = battleField.battleObjMgr.GetBattleObjList(tagUseSkillAttack);
+ List<BattleObject> highlightList = new List<BattleObject>(targetList);
highlightList.Add(caster);
+ List<BattleObject> allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList<BattleObject>();
+ caster.heroInfoBar.SetActive(false);
+
+
+
+ for (int i = 0; i < allList.Count; i++)
+ {
+ BattleObject bo = allList[i];
+ if (highlightList.Contains(bo))
+ {
+ bo.layerMgr.SetFront();
+ bo.heroInfoBar.SetActive(true);
+ // bo.heroRectTrans.SetParent(battleField.battleRootNode.skillFrontNode, true);
+ }
+ else
+ {
+ bo.layerMgr.SetBack();
+ // bo.heroRectTrans.SetParent(battleField.battleRootNode.skillBackNode, true);
+ }
+
+ if (targetList.Contains(bo))
+ {
+ bo.heroInfoBar.SetActive(true);
+ }
+ else
+ {
+ bo.heroInfoBar.SetActive(false);
+ }
+ }
+
+
+ battleField.battleRootNode.skillMaskNode.SetActive(true);
+ battleField.battleRootNode.SetSortingOrder();
+ // caster.battleField.skillMask
// 鎶婅繖浜汢O鍏ㄩ珮浜� 鎴栬�呰鎶婇櫎浜嗚繖浜涚殑閮芥斁鍦ㄩ伄缃╁悗闈�
// YYL TODO
}
@@ -358,23 +428,50 @@
BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
if (target == null)
{
- BattleDebug.LogError("鐩爣涓虹┖ target == null ObjId : " + hurt.ObjID);
+ Debug.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);
+ 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);
+ bool isLastHit = _hitIndex >= skillConfig.DamageDivide.Length - 1;
+ 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-闂伩
+
+ List<HB422_tagMCTurnFightObjDead> deadPacks = BattleUtility.FindDeadPack(packList);
+ bool isTargetDead = deadPacks.Exists(p => p.ObjID == target.ObjID);
+
+ bool playAnimation = !(isLastHit && isTargetDead);
+ target.Hurt(damageList, totalDamage, hurt, skillConfig, playAnimation);
+
+ // TODO YYL 杩欓噷鏄鍋氱粺涓�璁＄畻鍚庡啀hurt璺焥uckhp杩樻槸鎬庢牱
+ caster.SuckHp(hurt.SuckHP, skillConfig);// 鍚歌
+ caster.HurtByReflect(hurt.BounceHP, skillConfig);// 鍙嶅脊浼ゅ
+ }
+
protected void HandleDead()
{
@@ -392,7 +489,6 @@
// 澶勭悊鎺夎惤鍖� 鎻愬墠distribute涔嬪悗 PackManager鎵嶆湁鎺夎惤鐗� 鎵�浠ヤ笉璺焌ssignexp涓�鏍穌istribute
foreach (var _dropPack in dropPackList)
{
- BattleDebug.LogError("distribute pack " + _dropPack.GetType().Name);
PackageRegedit.Distribute(_dropPack);
packList.Remove(_dropPack);
}
@@ -435,8 +531,6 @@
packList.Remove(deadPack);
}
deadPackList.Clear();
-
-
}
@@ -484,12 +578,6 @@
}
-
- protected virtual void OnHitEachTarget(BattleObject target, long totalDamage, List<long> damageList, ref HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
- {
- target.Hurt(damageList, totalDamage, hurt.AttackTypes);
-
- }
protected void CheckAfterDeadhPack()
{
@@ -547,6 +635,11 @@
}
public virtual bool IsFinished()
{
+ if (!isPlay)
+ {
+ return false;
+ }
+
if (skillEffect != null)
{
if (!skillEffect.IsFinished())
@@ -555,17 +648,78 @@
}
else
{
- OnSkillFinished();
skillEffect = null;
+ OnSkillFinished();
+ return false;
}
}
- return isFinished;
+ if (otherSkillAction != null)
+ {
+ if (!otherSkillAction.IsFinished())
+ {
+ return false;
+ }
+ else
+ {
+ otherSkillAction = null;
+ OnSkillFinished();
+ return false;
+ }
+ }
+
+
+ if (isFinished && moveFinished)
+ {
+ if (packList.Count > 0)
+ {
+ OnSkillFinished();
+ return false;
+ }
+
+ return true;
+ }
+ else
+ {
+ return false;
+ }
}
public virtual void ForceFinished()
{
+ skillEffect?.ForceFinished();
+ if (otherSkillAction != null)
+ {
+ otherSkillAction.ForceFinish();
+ otherSkillAction = null;
+ }
+ HandleDead();
isFinished = true;
+ moveFinished = true;
+ isPlay = true;
+
+ while (packList.Count > 0)
+ {
+ var pack = packList[0];
+ packList.RemoveAt(0);
+
+ if (pack is CustomHB426CombinePack combinePack)
+ {
+ if (combinePack.startTag.Tag.StartsWith("Skill_"))
+ {
+ otherSkillAction = combinePack.CreateSkillAction();
+ otherSkillAction.fromSkillId = skillConfig.SkillID;
+ // 寮哄埗缁撴潫鍏朵粬鎶�鑳�
+ otherSkillAction.ForceFinish();
+ continue;
+ }
+ }
+ else if (pack is CustomB421ActionPack actionPack)
+ {
+ actionPack.Distribute();
+ }
+ PackageRegedit.Distribute(pack);
+ }
}
public void OnSkillFinished()
@@ -576,9 +730,27 @@
{
return;
}
+ else
+ {
+ skillEffect = null;
+ OnSkillFinished();
+ }
+
}
- BattleDebug.LogError(GetType().Name + " Skill Finished");
+ if (otherSkillAction != null)
+ {
+ if (!otherSkillAction.IsFinished())
+ {
+ return;
+ }
+ else
+ {
+ otherSkillAction = null;
+ OnSkillFinished();
+ }
+ }
+
while (packList.Count > 0)
{
var pack = packList[0];
@@ -589,11 +761,18 @@
var combinePack = pack as CustomHB426CombinePack;
if (combinePack.startTag.Tag.StartsWith("Skill_"))
{
+ BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
otherSkillAction = combinePack.CreateSkillAction();
+ otherSkillAction.fromSkillId = skillConfig.SkillID;
return;
}
}
- BattleDebug.LogError("distribute pack " + pack.GetType().Name);
+ else if (pack is CustomB421ActionPack actionPack)
+ {
+ actionPack.Distribute();
+ }
+
+ // Debug.LogError("Distribute pack " + pack.GetType().ToString());
PackageRegedit.Distribute(pack);
}
--
Gitblit v1.8.0