From 5f728e2633e8e20ebafc4e534fe7e7362362c839 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 04 十二月 2025 11:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/Skill/SkillBase.cs | 697 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 590 insertions(+), 107 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 639bde7..46d265e 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -9,23 +9,35 @@
{
const float moveTime = 0.5f;
+ 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 SkillEffect skillEffect;
- protected HB427_tagSCUseSkill tagUseSkillAttack;
+ public HB427_tagSCUseSkill tagUseSkillAttack;
public SkillConfig skillConfig;
protected bool isFinished = false;
protected BattleField battleField = null; // 鎴樺満
protected RectTransform targetNode = null; // 鐩爣鑺傜偣
- protected BattleObject caster = null; // 鏂芥硶鑰�
+ public 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 SkillBase fromSkill;
public bool isPlay = false;
+
+ private float MoveSpeed = 750f;
private Dictionary<int, BattleDrops> tempDropList = new Dictionary<int, BattleDrops>();
private Dictionary<int, HB422_tagMCTurnFightObjDead> tempDeadPackList = new Dictionary<int, HB422_tagMCTurnFightObjDead>();
+
+ protected List<HB428_tagSCBuffRefresh> buffCollections = new List<HB428_tagSCBuffRefresh>();
+
// 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
public SkillBase(BattleObject _caster, SkillConfig _skillCfg, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> _packList, BattleField _battleField = null)
@@ -39,6 +51,107 @@
tagUseSkillAttack = vNetData;
battleField = _battleField;
packList = _packList;
+
+ SafetyCheck();
+#if UNITY_EDITOR
+ if (Launch.Instance.isOpenSkillLogFile)
+ {
+ PinrtHB427Hp();
+ }
+#endif
+ }
+
+#if UNITY_EDITOR
+ public static Dictionary<string, string> changeListDict = new Dictionary<string, string>();
+#endif
+ private void PinrtHB427Hp()
+ {
+#if UNITY_EDITOR
+ string skillDetail = "SkillCaster : " + tagUseSkillAttack.ObjID + " -> cast SkillID: " + skillConfig.SkillID + "\n";
+
+ 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);
+
+ string targetName = battleObject != null ? battleObject.teamHero.name : "Unknown";
+ long hurtHp = GeneralDefine.GetFactValue(Hurt.HurtHP, Hurt.HurtHPEx);
+ long curHp = GeneralDefine.GetFactValue(Hurt.CurHP, Hurt.CurHPEx);
+
+ 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";
+
+ 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);
+
+ skillDetail += $" [{j}] ObjID:{hurtEx.ObjID} HurtHP:{hurtExHp} CurHP:{curExHp} SuckHP:{hurtEx.SuckHP} AttackTypes:{hurtEx.AttackTypes}\n";
+ }
+ }
+ }
+
+ 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);
+
+ string targetName = battleObject != null ? battleObject.teamHero.name : "Unknown";
+ long hurtHp = GeneralDefine.GetFactValue(HurtEx.HurtHP, HurtEx.HurtHPEx);
+ long curHp = GeneralDefine.GetFactValue(HurtEx.CurHP, HurtEx.CurHPEx);
+
+ 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";
+ }
+ }
+
+ skillDetail += "------------------ END ------------------\n";
+
+ if (changeListDict.ContainsKey(caster.battleField.guid))
+ {
+ string origin = changeListDict[caster.battleField.guid];
+ origin += skillDetail;
+ changeListDict[caster.battleField.guid] = origin;
+
+ }
+ else
+ changeListDict.Add(caster.battleField.guid, skillDetail);
+
+ Debug.LogError("skillDetail : " + skillDetail);
+#endif
+ }
+
+ private void SafetyCheck()
+ {
+ bool safety = caster != null
+ && skillConfig != null
+ && tagUseSkillAttack != null
+ && battleField != null
+ && caster.IsDead() == false;
+
+
+ if (!safety)
+ {
+ Debug.LogError("SkillBase SafetyCheck failed! Caster or SkillConfig or TagUseSkillAttack or BattleField is null, or Caster is dead.");
+ ForceFinished();
+ }
+
+
}
// 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
@@ -76,6 +189,44 @@
}
}
+ 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);
+ }
+ }
+
// 鎶�鑳介噴鏀句富閫昏緫锛氬箍鎾簨浠躲�侀珮浜洰鏍囥�佹墽琛岄噴鏀�
public virtual void Cast()
{
@@ -84,12 +235,40 @@
TeamHero teamHero = caster.teamHero;
EventBroadcast.Instance.Broadcast<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, guid, skillConfig, teamHero);
+ if (skillConfig.SkinllSFX1 != 0)
+ {
+ battleField.soundManager.PlayEffectSound(skillConfig.SkinllSFX1, false);
+ }
+
+ 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);
+ }
+
+ Hint(caster, hintConfig);
+
+
+ }
+
// 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
HighLightAllTargets();
// 鏍规嵁閲婃斁妯″紡鎵ц鐩稿簲閫昏緫
switch (skillConfig.castMode)
{
+ case SkillCastMode.None:
case SkillCastMode.Self:
CastImpl(OnAttackFinish);
break;
@@ -112,6 +291,14 @@
}
}
+ protected void Hint(BattleObject battleObject, DamageNumConfig hintConfig)
+ {
+ if (hintConfig != null)
+ {
+ battleObject.heroInfoBar.ShowTips(((char)hintConfig.prefix).ToString(), true, false, 1.25f);
+ }
+ }
+
// 鍐叉挒鏀诲嚮妯″紡锛堝緟瀹炵幇锛�
protected void DashCast(Action _onComplete)
{
@@ -125,7 +312,12 @@
RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
ExecuteMoveAndCastSequence(target, () =>
{
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, OnAttackFinish, 750F);
+ // ShadowIllutionCreate(true);
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
});
}
@@ -139,14 +331,19 @@
return;
}
- int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(caster, tagUseSkillAttack.HurtList.ToList(), skillConfig);
+ int mainTargetPosNum = BattleUtility.GetMainTargetPositionNum(this, 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);
- MoveToTarget(rectTransform, Vector2.zero, OnAttackFinish, 750F);
+ // ShadowIllutionCreate(true);
+ MoveToTarget(rectTransform, Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
});
}
@@ -156,17 +353,30 @@
RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
ExecuteMoveAndCastSequence(target, () =>
{
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, OnAttackFinish, 750F);
+ // 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), () =>
{
+ if (skillConfig.CastDistance < 9999 && skillConfig.SkinllSFX2 != 0)
+ {
+ battleField.soundManager.PlayEffectSound(skillConfig.SkinllSFX2, false);
+ }
+
TurnBack(() =>
{
+ ShadowIllutionCreate(false);
+
CastImpl(() =>
{
TurnBack(() =>
@@ -187,7 +397,7 @@
}
// 绉诲姩鍒扮洰鏍囦綅缃細澶勭悊瑙掕壊鐨勭Щ鍔ㄥ姩鐢诲拰閫昏緫
- protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 500f)
+ protected void MoveToTarget(RectTransform target, Vector2 offset, Action _onComplete = null, float speed = 750f)
{
if (skillConfig.CastDistance >= 9999)
{
@@ -246,14 +456,33 @@
// 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
public void OnSkillStart()
{
+ if (isPlay)
+ {
+ Debug.LogError(" play twice OnSkillStart skillId :" + skillConfig.SkillID);
+ return;
+ }
+
HandleDead();
- skillEffect = SkillEffectFactory.CreateSkillEffect(caster, skillConfig, tagUseSkillAttack);
+
+ skillEffect = SkillEffectFactory.CreateSkillEffect(this, caster, skillConfig, tagUseSkillAttack);
skillEffect.Play(OnHitTargets);
foreach (var subSkillPack in tagUseSkillAttack.subSkillList)
{
- RecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, new List<GameNetPackBasic>() { subSkillPack });
+ SkillRecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, new List<GameNetPackBasic>() { subSkillPack });
+ recordAction.fromSkill = this;
+ otherSkillActionList.Add(recordAction);
battleField.recordPlayer.ImmediatelyPlay(recordAction);
}
+ tagUseSkillAttack.subSkillList.Clear();
+ foreach (var subCombinePack in tagUseSkillAttack.subSkillCombinePackList)
+ {
+ SkillRecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, subCombinePack.packList);
+ recordAction.fromSkill = this;
+ otherSkillActionList.Add(recordAction);
+ battleField.recordPlayer.ImmediatelyPlay(recordAction);
+ }
+ tagUseSkillAttack.subSkillCombinePackList.Clear();
+
isPlay = true;
}
@@ -281,6 +510,7 @@
// 鎶�鑳藉悗鎽囩粨鏉熷洖璋冿細閫氱煡鎶�鑳芥晥鏋滃鐞嗗悗鎽囩粨鏉�
public virtual void OnFinalFrameEnd()
{
+
skillEffect?.OnFinalFrameEnd(); // 淇锛氭坊鍔犵┖鍊兼鏌�
}
@@ -292,21 +522,58 @@
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);
+ // 鏀堕泦鎵�鏈夌洰鏍囷紙鍖呭惈 HurtList銆佹瘡涓� Hurt 鐨� HurtListEx銆佷互鍙婇《灞� HurtListEx锛�
+ var targetSet = new HashSet<BattleObject>();
+ if (tagUseSkillAttack != null)
+ {
+ // 涓荤洰鏍囧垪琛�
+ if (tagUseSkillAttack.HurtList != null)
+ {
+ foreach (var hurt in tagUseSkillAttack.HurtList)
+ {
+ var bo = battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
+ if (bo != null) targetSet.Add(bo);
+
+ // 涓荤洰鏍囩殑棰濆鐩爣锛堝脊灏�/骞虫憡锛�
+ if (hurt.HurtListEx != null)
+ {
+ foreach (var hurtEx in hurt.HurtListEx)
+ {
+ var exBo = battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+ if (exBo != null) targetSet.Add(exBo);
+ }
+ }
+ }
+ }
+
+ // 鎶�鑳藉寘椤跺眰鐨� HurtListEx锛堝婧呭皠銆侀《灞傚钩鎽婏級
+ if (tagUseSkillAttack.HurtListEx != null)
+ {
+ foreach (var hurtEx in tagUseSkillAttack.HurtListEx)
+ {
+ var exBo = battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+ if (exBo != null) targetSet.Add(exBo);
+ }
+ }
+ }
+
+ // 纭繚鏂芥硶鑰呬篃琚珮浜紙鍘熼�昏緫锛�
+ var highlightList = new List<BattleObject>(targetSet) { caster };
+
+ var allList = battleField.battleObjMgr.allBattleObjDict.Values.ToList();
+
+ // 鏋勯�犻泦鍚堜究浜庡垽鏂�
+ var targetSetLookup = new HashSet<BattleObject>(targetSet);
var highlightSet = new HashSet<BattleObject>(highlightList);
-
+
+ // 鍏堟妸鏂芥硶鑰呯殑 InfoBar 闅愯棌锛堝師閫昏緫淇濈暀锛�
caster.heroInfoBar.SetActive(false);
foreach (BattleObject bo in allList)
{
bool isHighlight = highlightSet.Contains(bo);
- bool isTarget = targetSet.Contains(bo);
-
+ bool isTarget = targetSetLookup.Contains(bo);
+
if (isHighlight)
{
bo.layerMgr.SetFront();
@@ -316,18 +583,32 @@
bo.layerMgr.SetBack();
}
+ // 鐩爣锛堝惈 HurtListEx锛夐兘搴旀樉绀� InfoBar
bo.heroInfoBar.SetActive(isTarget);
}
battleField.battleRootNode.skillMaskNode.SetActive(true);
- battleField.battleRootNode.SetSortingOrder();
}
- // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍�
+ protected long suckHp = 0;
+
+ // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍囷紙鍖呮嫭涓荤洰鏍囥�佸脊灏勭洰鏍囥�佹簠灏勭洰鏍囷級
protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
{
+ // 閫犳垚浼ゅ鍓嶅厛澶勭悊琛�閲忓埛鏂板寘
+ HandleRefreshHP();
+
+ suckHp = 0;
+
+ // 缁熻鍚歌鎬婚噺锛堜富鐩爣锛�
foreach (var hurt in hitList)
{
+ suckHp += hurt.SuckHP;
+ }
+
+ // 澶勭悊涓荤洰鏍囧垪琛�
+ foreach (var hurt in hitList)
+ {
BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
if (target == null)
{
@@ -336,43 +617,188 @@
}
OnHitEachTarget(_hitIndex, target, hurt);
+
+ // 澶勭悊璇ョ洰鏍囩殑棰濆鐩爣鍒楄〃锛堝寮瑰皠浼ゅ鐨勫钩鎽婄洰鏍囷級
+ if (hurt.HurtListEx != null && hurt.HurtListEx.Length > 0)
+ {
+ foreach (var hurtEx in hurt.HurtListEx)
+ {
+ BattleObject exTarget = caster.battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+ if (exTarget == null)
+ {
+ Debug.LogError($"棰濆鐩爣涓虹┖ HurtListEx target == null ObjId : {hurtEx.ObjID}");
+ continue;
+ }
+
+ OnHitEachTargetEx(_hitIndex, exTarget, hurtEx);
+ }
+ }
}
+
+ // 澶勭悊鎶�鑳藉寘椤跺眰鐨勯澶栫洰鏍囧垪琛紙濡傛簠灏勪激瀹炽�佸钩鎽婁激瀹筹級
+ if (tagUseSkillAttack.HurtListEx != null && tagUseSkillAttack.HurtListEx.Length > 0)
+ {
+ foreach (var hurtEx in tagUseSkillAttack.HurtListEx)
+ {
+ BattleObject exTarget = caster.battleField.battleObjMgr.GetBattleObject((int)hurtEx.ObjID);
+ if (exTarget == null)
+ {
+ Debug.LogError($"椤跺眰棰濆鐩爣涓虹┖ tagUseSkillAttack.HurtListEx target == null ObjId : {hurtEx.ObjID}");
+ continue;
+ }
+
+ OnHitEachTargetEx(_hitIndex, exTarget, hurtEx);
+ }
+ }
+
+ if (0 == _hitIndex)
+ {
+ bool needhint = false;
+
+ for (int i = 0; i < hitList.Count; i++)
+ {
+ var hurt = hitList[i];
+
+ //8-鍑绘檿
+ if ((hurt.AttackTypes & (int)DamageType.Stunned) == (int)DamageType.Stunned)
+ {
+ needhint = true;
+ break;
+ }
+
+ for (int j = 0; j < hurt.HurtListEx?.Length; j++)
+ {
+ var hurtex = hurt.HurtListEx[j];
+ //8-鍑绘檿
+ if ((hurtex.AttackTypes & (int)ServerDamageType.Stunned) == (int)ServerDamageType.Stunned)
+ {
+ needhint = true;
+ break;
+ }
+ }
+
+ if (needhint)
+ break;
+ }
+
+ if (needhint)
+ {
+ DamageNumConfig hintConfig = DamageNumConfig.Get(BattleConst.BattleStun);
+ Hint(caster, hintConfig);
+ }
+ }
+
+
}
- // 澶勭悊鍗曚釜鐩爣琚懡涓細搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
+ // 澶勭悊鍗曚釜鐩爣琚懡涓�:搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
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(damageDivide.ToArray(), totalDamage);
-
- // 鑾峰彇涓存椂鏁版嵁骞跺簲鐢ㄤ激瀹�
+ // ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
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);
- // 澶勭悊鏂芥硶鑰呯浉鍏虫晥鏋�
- caster.SuckHp(hurt.SuckHP, skillConfig);
- caster.HurtByReflect(hurt.BounceHP, skillConfig);
+ // ============ 鍙傛暟鎵撳寘 ============
+ BattleHurtParam hurtParam = BattleUtility.CalcBattleHurtParam(this, _hitIndex, target, hurt, battleDrops, deadPack);
+
+#if UNITY_EDITOR
+ PrintHurtParamDebugInfo(hurtParam);
+#endif
+
+ // 鍏堣皟鐢ㄧ洰鏍囧彈浼�
+ target.Hurt(hurtParam);
+
+ // 鍐嶈皟鐢ㄦ柦娉曡�呭惛琛�/鍙嶄激
+ caster.OnHurtTarget(hurtParam);
+ }
+
+ // 澶勭悊棰濆鐩爣琚懡涓紙HurtListEx锛夛細婧呭皠銆佸脊灏勩�佸钩鎽婁激瀹崇瓑
+ protected virtual void OnHitEachTargetEx(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurtEx hurtEx)
+ {
+ // ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
+ int objID = (int)target.ObjID;
+ tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
+ tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
+
+ // ============ 鍙傛暟鎵撳寘锛堝皢 tagSCUseSkillHurtEx 杞崲涓� tagSCUseSkillHurt锛�============
+ HB427_tagSCUseSkill.tagSCUseSkillHurt hurt = new HB427_tagSCUseSkill.tagSCUseSkillHurt
+ {
+ ObjID = hurtEx.ObjID,
+ AttackTypes = hurtEx.AttackTypes,
+ HurtHP = hurtEx.HurtHP,
+ HurtHPEx = hurtEx.HurtHPEx,
+ CurHP = hurtEx.CurHP,
+ CurHPEx = hurtEx.CurHPEx,
+ SuckHP = hurtEx.SuckHP,
+ BounceHP = 0, // HurtEx 娌℃湁鍙嶄激瀛楁
+ HurtCountEx = 0,
+ HurtListEx = null
+ };
+
+ BattleHurtParam hurtParam = BattleUtility.CalcBattleHurtParam(this, _hitIndex, target, hurt, battleDrops, deadPack);
+
+#if UNITY_EDITOR
+ PrintHurtParamDebugInfo(hurtParam);
+#endif
+
+ // 鍏堣皟鐢ㄧ洰鏍囧彈浼�
+ target.Hurt(hurtParam);
+
+ // 鍐嶈皟鐢ㄦ柦娉曡�呭惛琛�/鍙嶄激
+ caster.OnHurtTarget(hurtParam);
+ }
+
+#if UNITY_EDITOR
+ private void PrintHurtParamDebugInfo(BattleHurtParam hurtParam)
+ {
+ bool isLastHit = hurtParam.hitIndex >= hurtParam.skillConfig.DamageDivide.Length - 1;
+
+ long currentHitDamage = hurtParam.hurter.damageList != null ? hurtParam.hurter.damageList.Sum() : 0;
+ long currentHitSuckHp = hurtParam.caster.suckHpList != null ? hurtParam.caster.suckHpList.Sum() : 0;
+ long currentHitReflectHp = hurtParam.caster.reflectHpList != null ? hurtParam.caster.reflectHpList.Sum() : 0;
+
+ long totalDamage = GeneralDefine.GetFactValue(hurtParam.hurt.HurtHP, hurtParam.hurt.HurtHPEx);
+ long totalSuckHp = BattleUtility.GetSuckHp(tagUseSkillAttack);
+ long totalReflectHp = hurtParam.hurt.BounceHP;
+
+ BattleDebug.LogError(
+ (hurtParam.caster.casterObj.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ�� ") +
+ $"鏀诲嚮鑰�: {hurtParam.caster.casterObj.teamHero.name} (ObjID:{hurtParam.caster.casterObj.ObjID})\n" +
+ $"鐩爣: {hurtParam.hurter.hurtObj.teamHero.name} (ObjID:{hurtParam.hurter.hurtObj.ObjID})\n" +
+ $"鎶�鑳�: {hurtParam.skillConfig.SkillName} (ID:{hurtParam.skillConfig.SkillID})\n" +
+ $"鍑绘暟: 绗瑊hurtParam.hitIndex + 1}鍑� / 鍏眥hurtParam.skillConfig.DamageDivide.Length}鍑�" + (isLastHit ? " [鏈�鍚庝竴鍑籡" : " [涓棿鍑籡") + "\n" +
+ $"\n" +
+ $"========== 鐩爣鍙椾激鏁版嵁 ==========\n" +
+ $"浼ゅ: {currentHitDamage} / 鎬讳激瀹�: {totalDamage}\n" +
+ $"浼ゅ鍒嗘: [{string.Join(", ", hurtParam.hurter.damageList ?? new List<long>())}]\n" +
+ $"鐩爣琛�閲�: {hurtParam.hurter.fromHp} -> {hurtParam.hurter.toHp} (鏈�澶�:{hurtParam.hurter.maxHp})\n" +
+ $"鐩爣鎶ょ浘: {hurtParam.hurter.fromShieldValue} -> {hurtParam.hurter.toShieldValue}\n" +
+ $"鏀诲嚮绫诲瀷: {hurtParam.hurt.AttackTypes}\n" +
+ $"\n" +
+ $"========== 鏂芥硶鑰呮暟鎹� ==========\n" +
+ $"鍚歌: {currentHitSuckHp} / 鎬诲惛琛�: {totalSuckHp}\n" +
+ $"鍚歌鍒嗘: [{string.Join(", ", hurtParam.caster.suckHpList ?? new List<long>())}]\n" +
+ $"鍙嶄激: {currentHitReflectHp} / 鎬诲弽浼�: {totalReflectHp}\n" +
+ $"鍙嶄激鍒嗘: [{string.Join(", ", hurtParam.caster.reflectHpList ?? new List<long>())}]\n" +
+ $"鏂芥硶鑰呰閲�: {hurtParam.caster.fromHp} -> {hurtParam.caster.toHp} (鏈�澶�:{hurtParam.caster.maxHp})\n" +
+ $"鏂芥硶鑰呮姢鐩�: {hurtParam.caster.fromShieldValue} -> {hurtParam.caster.toShieldValue}\n"
+ );
+ }
+#endif
+
+ // 澶勭悊HP鍒锋柊鍖咃紙绠�鍖栭�昏緫锛�
+ private void HandleRefreshHP()
+ {
+ // 鏌ユ壘HP鍒锋柊鍖�
+ HB419_tagSCObjHPRefresh refreshPack = BattleUtility.FindObjHPRefreshPack(packList);
+
+ if (refreshPack != null)
+ {
+ // 鍒嗗彂HP鍒锋柊鍖�
+ PackageRegedit.Distribute(refreshPack);
+ packList.Remove(refreshPack);
+ }
}
// 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
@@ -490,8 +916,8 @@
long assignExp = avgExp + (i < remain ? 1 : 0);
var newPack = new HB405_tagMCAddExp
{
- Exp = (uint)(assignExp % 100000000),
- ExpPoint = (uint)(assignExp / 100000000),
+ Exp = (uint)(assignExp % Constants.ExpPointValue),
+ ExpPoint = (uint)(assignExp / Constants.ExpPointValue),
Source = expPack.Source
};
expAssign[i].Add(newPack);
@@ -543,6 +969,7 @@
{
if (!isPlay) return false;
+ bool tempRetValue = true;
// 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
if (skillEffect != null)
@@ -550,7 +977,7 @@
if (!skillEffect.IsFinished()) return false;
skillEffect = null;
OnSkillFinished();
- return false;
+ tempRetValue = false;
}
// 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
@@ -565,7 +992,15 @@
OnSkillFinished();
}
}
- if (otherSkillActionList.Count > 0) return false;
+ if (otherSkillActionList.Count > 0)
+ {
+ tempRetValue = false;
+ }
+ }
+
+ if (!tempRetValue)
+ {
+ return false;
}
// 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
@@ -605,7 +1040,7 @@
if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
{
var otherSkillAction = combinePack.CreateSkillAction();
- otherSkillAction.fromSkillId = skillConfig.SkillID;
+ otherSkillAction.fromSkill = this;
otherSkillAction.ForceFinish();
}
else
@@ -621,71 +1056,119 @@
public void OnSkillFinished()
{
// 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
- try
+ // try
+ // {
+ while (true)
{
- while (true)
+ // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
+ if (skillEffect != null && !skillEffect.IsFinished())
+ return;
+
+ if (skillEffect != null)
{
- // 楠岃瘉鎶�鑳芥晥鏋滄槸鍚﹀畬鎴�
- if (skillEffect != null && !skillEffect.IsFinished())
- return;
-
- if (skillEffect != null)
- {
- skillEffect = null;
- continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
- }
-
- // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
- if (otherSkillActionList.Count > 0)
- {
- bool hasFinishedAction = false;
- for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
- {
- var action = otherSkillActionList[i];
- if (action.IsFinished())
- {
- otherSkillActionList.RemoveAt(i);
- hasFinishedAction = true;
- }
- }
- if (hasFinishedAction)
- {
- continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
- }
- return;
- }
-
- break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ skillEffect = null;
+ continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
}
- // 澶勭悊鍓╀綑鍖�
- while (packList.Count > 0)
+ // 楠岃瘉鍏朵粬鎶�鑳藉姩浣滄槸鍚﹀畬鎴�
+ if (otherSkillActionList.Count > 0)
{
- var pack = packList[0];
- packList.RemoveAt(0);
-
- if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+ bool hasFinishedAction = false;
+ for (int i = otherSkillActionList.Count - 1; i >= 0; i--)
{
- BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
- var otherSkillAction = combinePack.CreateSkillAction();
- otherSkillAction.fromSkillId = skillConfig.SkillID;
- return;
+ var action = otherSkillActionList[i];
+ if (action.IsFinished())
+ {
+ otherSkillActionList.RemoveAt(i);
+ hasFinishedAction = true;
+ }
+ }
+ if (hasFinishedAction)
+ {
+ continue; // 浣跨敤continue浠ｆ浛閫掑綊璋冪敤
+ }
+ return;
+ }
+
+ break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ }
+
+ // 澶勭悊鍓╀綑鍖�
+ 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);
+
+ if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
+ {
+ BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
+ var otherSkillAction = combinePack.CreateSkillAction();
+ otherSkillAction.fromSkill = this;
+ 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;
+ }
}
- if (pack is CustomB421ActionPack actionPack)
- actionPack.Distribute();
+ // 鍚屾椂鍒锋柊鎵�鏈夊璞＄殑buff锛屼笉鍒嗙粍
+ foreach (var buff in buffCollections)
+ {
+ BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buff.ObjID);
+ if (battleObj != null)
+ {
+ battleObj.buffMgr.RefreshBuff(buff, true);
+ }
+ }
+
+ // 娓呯┖宸插鐞嗙殑buff闆嗗悎
+ buffCollections.Clear();
+ continue;
+ }
+
+ if (pack is CustomB421ActionPack actionPack)
+ {
+ actionPack.Distribute();
+ }
+ else
+ {
PackageRegedit.Distribute(pack);
}
}
- catch (Exception ex)
- {
- Debug.LogError($"OnSkillFinished寮傚父: {ex.Message}锛屾妧鑳絀D={skillConfig.SkillID}");
- // 纭繚鐘舵�佷竴鑷存�э紝鍗充娇鍑虹幇寮傚父涔熻鏍囪瀹屾垚
- isFinished = true;
- throw; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
- }
- isFinished = true;
+ return true;
}
// 娣诲姞娓呯悊鏂规硶锛氶槻姝㈠唴瀛樻硠婕�
--
Gitblit v1.8.0