From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Battle/Skill/SkillBase.cs | 710 +++++++++++++++++++++++-----------------------------------
1 files changed, 286 insertions(+), 424 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 4325c92..ac4ac2f 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -1,488 +1,350 @@
-using System.Collections.Generic;
+锘縰sing System.Collections.Generic;
using UnityEngine;
-using System;
using DG.Tweening;
using Spine;
+using System.Linq;
+using System;
+using Cysharp.Threading.Tasks;
-
-public class SkillBase
+// SkillBase锛氭妧鑳借繍琛屾椂鍩虹被銆�
+// 鏈被浣跨敤 partial 鎷嗗垎涓哄涓枃浠讹紝鎸夎亴璐ｅ垎缁勶細
+// SkillBase.cs 瀛楁銆佹瀯閫犮�佸叕鍏卞叆鍙ｏ紙Cast/Run/OnSkillStart/鍚� Frame 鍥炶皟 绛夛級
+// SkillBase.Cast.cs 鏂芥硶闃舵锛氱Щ鍔ㄣ�佸姩鐢汇�佹畫褰便�侀珮浜�佹敾鍑诲洖鍚堢粨鏉�
+// SkillBase.Hit.cs 鍛戒腑闃舵锛歄nHit 鍒嗗彂鍒颁富鐩爣 / 婧呭皠鐩爣 / 鍛戒腑鎻愮ず
+// SkillBase.SubSkill.cs 鍓嶇疆鍐呭祵瀛愭妧鑳界殑鏀堕泦涓庢姇閫�
+// SkillBase.Death.cs 姝讳骸鍖呬笌鎺夎惤/缁忛獙鍒嗛厤
+// SkillBase.Buff.cs Buff 鍖咃紙HB428/HB429锛夌殑鏀堕泦涓庡垎鍙�
+// SkillBase.Finish.cs 瀹屾垚鍒ゅ畾涓庡己鍒剁粨鏉�
+public partial 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;
+ // ===== 鏍稿績寮曠敤 =====
+ public HB427_tagSCUseSkill tagUseSkillAttack;
+ public SkillConfig skillConfig;
+ public SkillSkinConfig skillSkinConfig;
+ public BattleObject caster = null; // 鏂芥硶鑰�
+ protected BattleField battleField = null; // 鎴樺満
+ protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+ protected List<GameNetPackBasic> packList;
- protected BattleField battleField = null; // 鎴樺満
+ // ===== 鍛戒腑鏁堟灉 =====
+ protected SkillEffect skillEffect;
- protected RectTransform targetNode = null; // 鐩爣鑺傜偣
+ // ===== 瀛愭妧鑳�/瀛愬姩浣滅瓑寰呭垪琛� =====
+ protected List<RecordAction> currentWaitingSkill = new List<RecordAction>();
- protected BattleObject caster = null; // 鏂芥硶鑰�
+ // ===== 姝讳骸鐩稿叧涓存椂鏁版嵁 =====
+ protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+ protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+ private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
+ private Dictionary<int, BattleDeadPack> tempDeadPackList = new Dictionary<int, BattleDeadPack>();
- protected bool startCounting = false;
+ // ===== Buff 鐩稿叧鍖呴泦鍚堬紝鏀寔 HB428(鍒锋柊) 鍜� HB429(鍒犻櫎) =====
+ protected List<GameNetPackBasic> buffPackCollections = new List<GameNetPackBasic>();
- protected bool pauseState = false;
+ // ===== 鐢熷懡鍛ㄦ湡鐘舵�侊紙4 涓苟琛岄噷绋嬬浣嶏紝鍚堝苟鍒板悓涓� Flags 瀛楁锛� =====
+ // Started : 宸茶繘鍏ユ柦娉曢樁娈碉紙OnSkillStart 璋冪敤鍚庯級
+ // MoveCompleted : 浣嶇Щ宸叉敹灏撅紙OnAllAttackMoveFinished锛�
+ // MotionCompleted: 鎶�鑳藉姩鐢诲凡鎾斁瀹岋紙OnFinalFrameEnd锛�
+ // Finished : 鍖呭垪琛ㄥ凡澶勭悊瀹岋紙OnSkillFinished / ForceFinished 缁撳熬锛�
+ // 4 涓噷绋嬬鐩镐簰鐙珛锛岄潪绾挎�ч樁娈碉紝涓嶈兘鐢ㄥ崟涓� state 琛ㄨ揪銆�
+ [System.Flags]
+ protected enum SkillStateFlags
+ {
+ None = 0,
+ Started = 1 << 0,
+ MoveCompleted = 1 << 1,
+ MotionCompleted = 1 << 2,
+ Finished = 1 << 3,
+ }
- protected int curFrame = 0;
+ private SkillStateFlags _stateFlags = SkillStateFlags.None;
- protected List<GameNetPackBasic> packList;
+ /// <summary>褰撳墠鎶�鑳界姸鎬佷綅锛堝彧璇伙紝璋冭瘯鐢級銆�</summary>
+ protected SkillStateFlags StateFlags => _stateFlags;
- protected SkillRecordAction otherSkillAction;
+#if UNITY_EDITOR
+ /// <summary>渚涘閮ㄨ皟璇�/璇婃柇鎵撳嵃鐢紝闈炵紪杈戝櫒涓嬩笉缂栬瘧銆�</summary>
+ public string StateFlagsForDebug => _stateFlags.ToString();
+#endif
- protected List<H0704_tagRolePackRefresh> dropPackList = new List<H0704_tagRolePackRefresh>();
+ /// <summary>鏄惁宸茶繘鍏ユ柦娉曢樁娈碉紙OnSkillStart 璋冪敤鍚庝负 true锛夈��</summary>
+ public bool isPlay
+ {
+ get => (_stateFlags & SkillStateFlags.Started) != 0;
+ set => SetFlag(SkillStateFlags.Started, value);
+ }
- protected List<HB405_tagMCAddExp> expPackList = new List<HB405_tagMCAddExp>();
+ /// <summary>鍖呭垪琛ㄦ槸鍚﹀凡鍏ㄩ儴澶勭悊瀹屻��</summary>
+ protected bool isFinished
+ {
+ get => (_stateFlags & SkillStateFlags.Finished) != 0;
+ set => SetFlag(SkillStateFlags.Finished, value);
+ }
- 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;
+ /// <summary>浣嶇Щ鏄惁宸叉敹灏俱��</summary>
+ protected bool moveFinished
+ {
+ get => (_stateFlags & SkillStateFlags.MoveCompleted) != 0;
+ set => SetFlag(SkillStateFlags.MoveCompleted, value);
+ }
- }
+ /// <summary>鎶�鑳藉姩鐢绘槸鍚﹀凡鎾斁瀹屻��</summary>
+ protected bool isMotionCompleted
+ {
+ get => (_stateFlags & SkillStateFlags.MotionCompleted) != 0;
+ set => SetFlag(SkillStateFlags.MotionCompleted, value);
+ }
- public virtual void Run()
- {
- if (startCounting)
- {
- curFrame++;
- }
+ private void SetFlag(SkillStateFlags flag, bool value)
+ {
+#if UNITY_EDITOR
+ // 璁板綍鐘舵�佸彉鏇达細鍗℃/鍗℃椿鐨勬帓鏌ュ埄鍣ㄣ��
+ // 缂栬緫鍣ㄤ笅鍙湪鍊肩湡姝ｅ彂鐢熸敼鍙樻椂鎵撳嵃锛岄伩鍏嶅埛灞忋��
+ bool oldValue = (_stateFlags & flag) != 0;
+ if (oldValue != value)
+ {
+ int skillId = skillConfig != null ? skillConfig.SkillID : 0;
+ ulong casterId = tagUseSkillAttack != null ? tagUseSkillAttack.ObjID : 0UL;
+ BattleDebug.LogError(
+ $"SkillBase.StateFlags 鍙樻洿:skillId={skillId} caster={casterId} " +
+ $"{flag}: {oldValue} -> {value} (before={_stateFlags})");
+ }
+#endif
- if (otherSkillAction != null)
- {
- if (otherSkillAction.IsFinished())
- {
- otherSkillAction = null;
- OnSkillFinished();
- }
- else
- {
- otherSkillAction.Run();
- }
- }
- }
+ if (value) _stateFlags |= flag;
+ else _stateFlags &= ~flag;
+ }
+ // ===== 鐖跺瓙鍏崇郴 =====
+ public SkillBase fromSkill;
+ // 鐖禦ecordAction锛圫killRecordAction锛夛紝鐢ㄤ簬瀛愭妧鑳藉缓绔嬬埗瀛愬叧绯�
+ protected SkillRecordAction ownRecordAction;
- protected virtual void OnActiveSkillFrame()
- {
+ // ===== 绉诲姩閫熷害锛堟畫褰卞姞閫熸椂浼氭敼鍙橈級 =====
+ private float MoveSpeed = 750f;
- }
+#if UNITY_EDITOR
+ public static Dictionary<string, string> changeListDict = new Dictionary<string, string>();
+#endif
- protected virtual void OnStartSkillFrame()
- {
+ // 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
+ 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;
- }
+ if (_caster is HeroBattleObject heroBattleObject)
+ {
+ skillSkinConfig = skillConfig.GetSkillSkinConfig(heroBattleObject.teamHero.SkinID);
- protected virtual void OnEndSkillFrame()
- {
-
- }
+ if (null == skillSkinConfig)
+ {
+ Debug.LogError("鎵句笉鍒版妧鑳界毊鑲よ〃 " + "skillId: " + skillConfig.SkillID + " skinId: " + heroBattleObject.teamHero.SkinID);
+ }
+ }
+ else
+ {
+ skillSkinConfig = skillConfig.GetOriginSkinConfig();
+ }
- public void Pause()
- {
- pauseState = startCounting;
- startCounting = false;
- }
- public void Resume()
- {
- startCounting = pauseState;
- }
+ // 娉ㄥ唽姝ｅ湪閲婃斁鐨勬妧鑳�
+ if (battleField != null && caster != null)
+ {
+ battleField.AddCastingSkill(caster.ObjID, this);
+ }
- // 0路绉诲姩鍒拌窛绂荤洰鏍噉鐮侊紝鐨勮窛绂婚噴鏀撅紙鍙厤缃紝9999鍗冲師鍦伴噴鏀撅紝璐熸暟鍒欐槸绉诲姩鍒颁汉鐗╄儗闈紝浜虹墿瑕佽浆韬級
- // 1路绉诲姩鍒拌窛绂婚樀瀹逛綅缃畁鐮佺殑璺濈锛堝2鍙蜂綅锛�5鍙蜂綅锛夐噴鏀撅紙鍗虫垬鍦轰腑澶绫伙級
- public virtual void Cast()
- {
- // 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
- HighLightAllTargets();
+ SafetyCheck();
+ }
- // 璺濈閰嶆垚璐熸暟瑕佽浆韬� TurnBack
+ public virtual void AfterAddToQueue()
+ {
- 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;
- }
+ }
- var mainHurt = tagUseSkillAttack.HurtList[0];
+ // 璁剧疆鐖禦ecordAction
+ public void SetOwnRecordAction(SkillRecordAction recordAction)
+ {
+ ownRecordAction = recordAction;
+ }
- 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;
- }
- }
+ private void PinrtHB427Hp()
+ {
+#if UNITY_EDITOR
+ string skillDetail = "SkillCaster : " + tagUseSkillAttack.ObjID + " -> cast SkillID: " + skillConfig.SkillID + "\n";
- // 鍐插埡鐨勬妧鑳� 鍔ㄤ綔 璺熺Щ鍔� 鏄悓鏃惰繘琛岀殑 绉诲姩鍒扮洰鏍囩殑涓�鐬棿灏辫杩涜鎶�鑳介�昏緫
- // 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;
- // }
+ skillDetail += "------------------ HurtList ------------------\n";
+ for (int i = 0; i < tagUseSkillAttack.HurtCount; i++)
+ {
+ var Hurt = tagUseSkillAttack.HurtList[i];
+ BattleObject battleObject = caster.battleField.battleObjMgr.GetBattleObject((int)Hurt.ObjID);
- // // 鍋氫竴涓井寰殑鎻愬墠
- // MoveToTarget(mainTarget.Camp, mainTarget.teamHero.positionNum, entry.AnimationEnd - 0.05f, () => DoSkillLogic(_onComplete));
- // }
+ string targetName = battleObject != null ? battleObject.GetName() : "Unknown";
+ long hurtHp = GeneralDefine.GetFactValue(Hurt.HurtHP, Hurt.HurtHPEx);
+ long curHp = GeneralDefine.GetFactValue(Hurt.CurHP, Hurt.CurHPEx);
- // 杩欓噷鍏跺疄鏄妧鑳藉悗鎽囩粨鏉熺殑鍦版柟
- protected virtual void DoSkillLogic(Action _onComplete = null)
- {
-
- }
+ skillDetail += $" [{i}] Target: {targetName} (ObjID:{Hurt.ObjID})\n";
+ skillDetail += $" HurtHP: {hurtHp}\n";
+ skillDetail += $" CurHP: {curHp}\n";
+ skillDetail += $" SuckHP: {Hurt.SuckHP}\n";
+ skillDetail += $" BounceHP: {Hurt.BounceHP}\n";
+ skillDetail += $" AttackTypes: {Hurt.AttackTypes}\n";
- protected TrackEntry PlayCastAnimation(Action onComplete = null)
- {
- // 鎾斁鏂芥硶鍔ㄤ綔
- return caster.motionBase.PlaySkillAnimation(skillConfig, onComplete,
- OnStartSkillFrame,//鏀诲嚮鍓嶆憞缁撴潫
- OnActiveSkillFrame);//鏀诲嚮涓憞缁撴潫
- }
+ if (Hurt.HurtListEx != null && Hurt.HurtListEx.Length > 0)
+ {
+ skillDetail += $" HurtListEx ({Hurt.HurtListEx.Length}):\n";
+ for (int j = 0; j < Hurt.HurtListEx.Length; j++)
+ {
+ var hurtEx = Hurt.HurtListEx[j];
+ long hurtExHp = GeneralDefine.GetFactValue(hurtEx.HurtHP, hurtEx.HurtHPEx);
+ long curExHp = GeneralDefine.GetFactValue(hurtEx.CurHP, hurtEx.CurHPEx);
- public void MoveToTarget(BattleCamp camp, BattleObject target, float duration = 0.2f, Action _onComplete = null)
- {
- targetNode = battleField.GetTeamNode(camp, target);
+ skillDetail += $" [{j}] ObjID:{hurtEx.ObjID} HurtHP:{hurtExHp} CurHP:{curExHp} SuckHP:{hurtEx.SuckHP} AttackTypes:{hurtEx.AttackTypes}\n";
+ }
+ }
+ }
- Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
- RectTransform selfRect = caster.heroRectTrans;
- RectTransform targetRect = targetNode;
+ skillDetail += "------------------ HurtListEx ------------------\n";
+ if (tagUseSkillAttack.HurtListEx != null)
+ {
+ for (int i = 0; i < tagUseSkillAttack.HurtListEx.Length; i++)
+ {
+ var HurtEx = tagUseSkillAttack.HurtListEx[i];
+ BattleObject battleObject = caster.battleField.battleObjMgr.GetBattleObject((int)HurtEx.ObjID);
- var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
- battleField.battleTweenMgr.OnPlayTween(tweener);
- }
+ string targetName = battleObject != null ? battleObject.GetName() : "Unknown";
+ long hurtHp = GeneralDefine.GetFactValue(HurtEx.HurtHP, HurtEx.HurtHPEx);
+ long curHp = GeneralDefine.GetFactValue(HurtEx.CurHP, HurtEx.CurHPEx);
- public void MoveToTarget(BattleCamp camp, SkillConfig skillCfg, float duration = 0.2f, Action _onComplete = null)
- {
- targetNode = battleField.GetTeamNode(camp, skillCfg);
+ skillDetail += $" [{i}] Target: {targetName} (ObjID:{HurtEx.ObjID})\n";
+ skillDetail += $" HurtHP: {hurtHp}\n";
+ skillDetail += $" CurHP: {curHp}\n";
+ skillDetail += $" SuckHP: {HurtEx.SuckHP}\n";
+ skillDetail += $" AttackTypes: {HurtEx.AttackTypes}\n";
+ }
+ }
- Vector2 offset = new Vector2(skillConfig.CastDistance, 0);
- RectTransform selfRect = caster.heroRectTrans;
- RectTransform targetRect = targetNode;
+ skillDetail += "------------------ END ------------------\n";
- var tweener = BattleUtility.MoveToTarget(selfRect, targetRect, offset, duration, _onComplete);
- battleField.battleTweenMgr.OnPlayTween(tweener);
- }
+ if (changeListDict.ContainsKey(caster.battleField.guid))
+ {
+ string origin = changeListDict[caster.battleField.guid];
+ origin += skillDetail;
+ changeListDict[caster.battleField.guid] = origin;
- public void TurnBack(Action _onComplete)
- {
- if (skillConfig.CastDistance < 0)
- {
- // 杞韩
- caster.heroGo.transform.localScale = new Vector3(-1, 1, 1);
- }
- _onComplete?.Invoke();
- }
-
- 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();
- });
-
- battleField.battleTweenMgr.OnPlayTween(tween);
- }
-
- 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)
- {
- 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 = DivideDamageToList(damageDivide, totalDamage);
-
- OnHitEachTarget(target, totalDamage, damageList, ref hurt);
- }
- }
-
- /// <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;
- }
+ }
+ else
+ changeListDict.Add(caster.battleField.guid, skillDetail);
- protected virtual void OnHitEachTarget(BattleObject target, long totalDamage, List<long> damageList, ref HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
- {
- target.Hurt(damageList, totalDamage, hurt.AttackTypes);
+ Debug.LogError("skillDetail : " + skillDetail);
+#endif
+ }
- // 鍑讳腑鐩爣鐨勬椂鍊�,涓嶇杩戞垬杩滅▼ 閮界‘璁や竴涓嬫槸鍚︽湁鐖嗙偢鐗规晥 鐒跺悗鎾斁
- if (skillConfig.ExplosionEffectId > 0)
- {
- // 鎾斁鐖嗙偢鐗规晥
- target.battleField.battleEffectMgr.PlayEffect(
- target.ObjID,
- skillConfig.ExplosionEffectId,
- target.heroGo.transform
- );
- }
+ private void SafetyCheck()
+ {
+#if UNITY_EDITOR
+ if (Launch.Instance.isOpenSkillLogFile)
+ {
+ PinrtHB427Hp();
+ }
+#endif
- // 鍙椾激涔嬪悗杈ㄥ埆姝讳骸鐘舵�� 姝讳骸鍖呭叾瀹炲墠鍚庡抚浼氬娆¤Е鍙� 搴旇瑕佸嵆鏃秗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]);
- }
+ bool safety = caster != null
+ && skillConfig != null
+ && tagUseSkillAttack != null
+ && battleField != null;
- dropPackList.Clear();
- target.PushExpPackList(new List<HB405_tagMCAddExp>(expPackList));
+ if (!safety)
+ {
+ Debug.LogError("SkillBase SafetyCheck failed! Caster or SkillConfig or TagUseSkillAttack or BattleField is null, or Caster is dead.");
+ ForceFinished();
+ }
+ }
- expPackList.Clear();
+ // 鎶�鑳借繍琛屼富閫昏緫锛氫粎椹卞姩鎶�鑳芥晥鏋滐紙skillEffect锛夛紝瀛愭妧鑳藉拰姝讳骸鐢盜sFinished()鎺ㄨ繘
+ public virtual void Run()
+ {
+ if (skillEffect != null)
+ {
+ if (skillEffect.IsFinished())
+ {
+ skillEffect = null;
+ OnSkillFinished();
+ }
+ else
+ {
+ skillEffect.Run();
+ }
+ return;
+ }
+ }
- // 澶勭悊姝讳骸鍖�
- PackageRegedit.Distribute(deadPack);
- packList.Remove(deadPack);
- }
-
- // 澶嶆椿鍖呮殏鏃朵笉绠� 鍙兘鏄妧鑳界殑鍖�
- // HB423_tagMCTurnFightObjReborn rebornPack = FindRebornPack(target);
- // if (rebornPack != null)
- // {
- // // 澶勭悊澶嶆椿鍖�
- // PackageRegedit.Distribute(rebornPack);
- // packList.Remove(rebornPack);
- // }
- }
- }
+ // 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
+ public void OnSkillStart()
+ {
+ if (isPlay)
+ {
+ Debug.LogError(" play twice OnSkillStart skillId :" + skillConfig.SkillID);
+ return;
+ }
- 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;
- }
+ // 鍏堟妸姝讳骸鍖呮敹闆嗕簡
+ HandleDead();
- 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;
- }
+ // 鍐嶅鐞� 鍐呭祵鎶�鑳�
+ ProcessSubSkill();
- 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];
+ skillEffect = SkillEffectFactory.CreateSkillEffect(this, caster, skillConfig, skillSkinConfig, tagUseSkillAttack);
+ skillEffect.Play(OnHitTargets);
- // 澶嶆椿鍩烘湰閮介潬鎶�鑳藉寘
- 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;
- //B4 05 鑾峰緱缁忛獙 #tagMCAddExp 閫氱煡鑾峰緱鐨勭粡楠岋紝
- //鍙敤浜庡仛缁忛獙鑾峰緱琛ㄧ幇 Source = 2 鏃朵负涓荤嚎鍑绘潃鎬墿鑾峰緱缁忛獙
- if (h405Pack.Source == 2)
- {
- expPackList.Add(h405Pack);
- removeIndexList.Add(i);
- }
- }
+ isPlay = true;
+ }
- }
+ // ===== 鎶�鑳借妭鎷嶅洖璋� =====
- for (int i = removeIndexList.Count - 1; i >= 0; i--)
- {
- packList.RemoveAt(removeIndexList[i]);
- }
- }
- public virtual bool IsFinished()
- {
- return isFinished;
- }
+ // 鎶�鑳藉墠鎽囩粨鏉熷洖璋�
+ public virtual void OnStartSkillFrameEnd() { }
- public virtual void ForceFinished()
- {
- isFinished = true;
- }
+ // 鎶�鑳戒腑鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囧紑濮�
+ public virtual void OnMiddleFrameStart(int times)
+ {
+ skillEffect?.OnMiddleFrameStart(times); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- public void OnSkillFinished()
- {
- while (packList.Count > 0)
- {
- var pack = packList[0];
- packList.RemoveAt(0);
+ // 鎶�鑳戒腑鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗕腑鎽囩粨鏉�
+ public virtual void OnMiddleFrameEnd(int times, int hitIndex)
+ {
+ skillEffect?.OnMiddleFrameEnd(times, hitIndex); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- if (pack is CustomHB426CombinePack)
- {
- var combinePack = pack as CustomHB426CombinePack;
- if (combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- otherSkillAction = combinePack.CreateSkillAction();
- return;
- }
- }
+ // 鎶�鑳藉悗鎽囧紑濮嬪洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囧紑濮�
+ public virtual void OnFinalFrameStart()
+ {
+ skillEffect?.OnFinalFrameStart(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
- PackageRegedit.Distribute(pack);
- }
+ // 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
+ public virtual void OnFinalFrameEnd()
+ {
+ // 鏍囪鍔ㄧ敾鎾斁瀹屾垚
+ isMotionCompleted = true;
+ BattleDebug.LogError($"SkillBase.OnFinalFrameEnd: 鎶�鑳� {skillConfig?.SkillID} 鍔ㄧ敾鎾斁瀹屾垚");
- isFinished = true;
- }
-}
\ No newline at end of file
+ skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
+ }
+}
--
Gitblit v1.8.0