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 | 518 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 324 insertions(+), 194 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index e0b8c61..46d265e 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -53,6 +53,87 @@
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()
@@ -76,13 +157,6 @@
// 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
public virtual void Run()
{
- // 鏂芥硶鑰呭湪鏀炬妧鑳界殑鏃跺�欐浜＄殑瀹归敊
- if (caster != null && caster.IsDead())
- {
- ForceFinished();
- return;
- }
-
if (skillEffect != null)
{
if (skillEffect.IsFinished())
@@ -161,6 +235,11 @@
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-琚姩瑙﹀彂鐨�
@@ -178,11 +257,9 @@
hintConfig = DamageNumConfig.Get(BattleConst.BattleChaseAttack);
}
- if (hintConfig != null)
- {
- caster.heroInfoBar.ShowTips(((char)hintConfig.prefix).ToString(), true, false, 1.25f);
- // Debug.Break();
- }
+ Hint(caster, hintConfig);
+
+
}
// 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
@@ -211,6 +288,14 @@
Debug.LogError("寮哄埗缁撴潫鎶�鑳� 鏆傛椂涓嶆敮鎸佸叾浠栫殑鏂瑰紡閲婃斁 鏈夐渶姹俻lease鑱旂郴绛栧垝 鎶�鑳絠d:" + skillConfig.SkillID + " cast position " + skillConfig.CastPosition);
ForceFinished();
break;
+ }
+ }
+
+ protected void Hint(BattleObject battleObject, DamageNumConfig hintConfig)
+ {
+ if (hintConfig != null)
+ {
+ battleObject.heroInfoBar.ShowTips(((char)hintConfig.prefix).ToString(), true, false, 1.25f);
}
}
@@ -283,9 +368,15 @@
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(() =>
@@ -365,8 +456,14 @@
// 鎶�鑳藉紑濮嬪洖璋冿細澶勭悊姝讳骸銆佸瓙鎶�鑳姐�佹妧鑳芥晥鏋滃垵濮嬪寲
public void OnSkillStart()
{
+ if (isPlay)
+ {
+ Debug.LogError(" play twice OnSkillStart skillId :" + skillConfig.SkillID);
+ return;
+ }
+
HandleDead();
-
+
skillEffect = SkillEffectFactory.CreateSkillEffect(this, caster, skillConfig, tagUseSkillAttack);
skillEffect.Play(OnHitTargets);
foreach (var subSkillPack in tagUseSkillAttack.subSkillList)
@@ -376,6 +473,7 @@
otherSkillActionList.Add(recordAction);
battleField.recordPlayer.ImmediatelyPlay(recordAction);
}
+ tagUseSkillAttack.subSkillList.Clear();
foreach (var subCombinePack in tagUseSkillAttack.subSkillCombinePackList)
{
SkillRecordAction recordAction = CustomHB426CombinePack.CreateSkillAction(battleField.guid, subCombinePack.packList);
@@ -383,6 +481,7 @@
otherSkillActionList.Add(recordAction);
battleField.recordPlayer.ImmediatelyPlay(recordAction);
}
+ tagUseSkillAttack.subSkillCombinePackList.Clear();
isPlay = true;
}
@@ -423,20 +522,57 @@
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>();
+ // 鏀堕泦鎵�鏈夌洰鏍囷紙鍖呭惈 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);
- // 淇锛氫娇鐢℉ashSet浼樺寲鎬ц兘锛岄伩鍏嶉噸澶嶈缃�
- var targetSet = new HashSet<BattleObject>(targetList);
+ // 涓荤洰鏍囩殑棰濆鐩爣锛堝脊灏�/骞虫憡锛�
+ 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)
{
@@ -447,16 +583,16 @@
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)
{
// 閫犳垚浼ゅ鍓嶅厛澶勭悊琛�閲忓埛鏂板寘
@@ -464,11 +600,13 @@
suckHp = 0;
+ // 缁熻鍚歌鎬婚噺锛堜富鐩爣锛�
foreach (var hurt in hitList)
{
suckHp += hurt.SuckHP;
}
+ // 澶勭悊涓荤洰鏍囧垪琛�
foreach (var hurt in hitList)
{
BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
@@ -479,192 +617,175 @@
}
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 void RecoveryHp(long suckHp, int _hitIndex)
- // {
- // // long suckHp = hurt.SuckHP;
-
- // if (suckHp <= 0)
- // {
- // return;
- // }
-
- // List<long> suckHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, suckHp);
-
- // long currentHitSuckHp = 0;
- // foreach (long suck in suckHpList)
- // {
- // currentHitSuckHp += suck;
- // }
-
- // long fromHp = caster.teamHero.curHp;
- // long toHp = caster.teamHero.curHp + currentHitSuckHp;
-
- // // 鍙傛暟鎵撳寘
- // BattleHurtParam hurtParam = new BattleHurtParam()
- // {
- // casterObj = caster,
- // hurtObj = null,
- // damageList = new List<long>(),
- // suckHpList = suckHpList,
- // reflectHpList = new List<long>(),
- // fromHp = fromHp,
- // toHp = toHp,
- // battleDrops = null,
- // hurt = null,
- // hitIndex = _hitIndex,
- // deadPack = null,
- // skillConfig = skillConfig
- // };
-
- // caster.Hurt(hurtParam);
- // }
// 澶勭悊鍗曚釜鐩爣琚懡涓�:搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt)
{
- // 璁＄畻鎬讳激瀹冲拰鍒嗘浼ゅ鍒楄〃
- long totalDamage = GeneralDefine.GetFactValue(hurt.HurtHP, hurt.HurtHPEx);
- List<long> damageList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalDamage);
-
- long totalSuckHp = suckHp;
- List<long> suckHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalSuckHp);
-
- long totalReflectHp = hurt.BounceHP;
- List<long> reflectHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, totalReflectHp);
-
- // 璁＄畻褰撳墠杩欎竴鍑荤殑鍚勯」鏁板��
- long currentHitDamage = 0;
- foreach (long dmg in damageList)
- {
- currentHitDamage += dmg;
- }
-
- long currentHitSuckHp = 0;
- foreach (long suck in suckHpList)
- {
- currentHitSuckHp += suck;
- }
-
- long currentHitReflectHp = 0;
- foreach (long reflect in reflectHpList)
- {
- currentHitReflectHp += reflect;
- }
-
- // ============ 绗簩姝�:鑾峰彇鐩爣褰撳墠鐘舵�� ============
- long fromHp = target.teamHero.curHp;
- long maxHp = target.teamHero.maxHp;
- long fromShieldValue = target.buffMgr.GetShieldValue();
-
- // 鍒ゆ柇鏄不鐤楄繕鏄激瀹�
- bool isHealing = BattleUtility.IsHealing(hurt);
-
- // ============ 绗笁姝�:璁＄畻鐩爣琛�閲忓拰鎶ょ浘鍙樺寲 ============
- long toHp;
- long toShieldValue;
-
- if (isHealing)
- {
- // 娌荤枟閫昏緫锛氱洿鎺ュ姞琛�锛屾姢鐩句笉鍙�
- toHp = Math.Min(maxHp, fromHp + currentHitDamage);
- toShieldValue = fromShieldValue;
- }
- else
- {
- // 浼ゅ閫昏緫锛氬厛鎵ｆ姢鐩撅紝鎶ょ浘涓嶈冻鍐嶆墸琛�
- if (fromShieldValue >= currentHitDamage)
- {
- // 鎶ょ浘瓒冲鎵垮彈鎵�鏈変激瀹�
- toShieldValue = fromShieldValue - currentHitDamage;
- toHp = fromHp;
- }
- else
- {
- // 鎶ょ浘涓嶈冻锛屽厛鎵ｅ畬鎶ょ浘锛屽墿浣欎激瀹虫墸琛�
- long remainingDamage = currentHitDamage - fromShieldValue;
- toShieldValue = 0;
- toHp = Math.Max(0, fromHp - remainingDamage);
- }
- }
-
- // ============ 绗洓姝�:鏇存柊鐩爣瀹為檯琛�閲� ============
- target.teamHero.curHp = toHp;
-
- // ============ 绗簲姝�:璁＄畻骞舵洿鏂版柦娉曡�呰閲忓彉鍖� ============
- long casterFromHp = caster.teamHero.curHp;
- long casterMaxHp = caster.teamHero.maxHp;
- long casterToHp = casterFromHp;
-
- // 澶勭悊鍚歌
- if (currentHitSuckHp > 0)
- {
- casterToHp = Math.Min(casterMaxHp, casterToHp + currentHitSuckHp);
- }
-
- // 澶勭悊鍙嶄激(鏂芥硶鑰呭彈鍒颁激瀹�)
- if (currentHitReflectHp > 0)
- {
- long casterShieldValue = caster.buffMgr.GetShieldValue();
- if (casterShieldValue >= currentHitReflectHp)
- {
- // 鏂芥硶鑰呮姢鐩捐冻澶�,琛�閲忎笉鍙�
- }
- else
- {
- // 鏂芥硶鑰呮姢鐩句笉瓒�,鎵ｈ
- long remainingReflect = currentHitReflectHp - casterShieldValue;
- casterToHp = Math.Max(0, casterToHp - remainingReflect);
- }
- }
-
- // 鏇存柊鏂芥硶鑰呰閲�
- caster.teamHero.curHp = casterToHp;
-
-#if UNITY_EDITOR
- BattleDebug.LogError(
- (caster.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ�� ") +
- $"鏀诲嚮鑰�: {caster.teamHero.name}\n" +
- $"鐩爣: {target.teamHero.name}\n" +
- $"鎶�鑳�: {skillConfig.SkillName} (绗瑊_hitIndex}鍑�)\n" +
- $"浼ゅ: {currentHitDamage} (鎬讳激瀹�: {totalDamage})\n" +
- $"鍚歌: {currentHitSuckHp}\n" +
- $"鍙嶄激: {currentHitReflectHp}\n" +
- $"鐩爣鎶ょ浘鍙樺寲: {fromShieldValue} -> {toShieldValue}\n" +
- $"鐩爣琛�閲忓彉鍖�: {fromHp} -> {toHp}\n" +
- $"鏂芥硶鑰呰閲忓彉鍖�: {casterFromHp} -> {casterToHp}\n"
- );
-#endif
-
- // ============ 绗叚姝�:鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
+ // ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
int objID = (int)target.ObjID;
tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
- // ============ 绗竷姝�:鍙傛暟鎵撳寘骞惰皟鐢ㄧ洰鏍嘓urt ============
- BattleHurtParam hurtParam = new BattleHurtParam()
+ // ============ 鍙傛暟鎵撳寘 ============
+ 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
{
- casterObj = caster,
- hurtObj = target,
- damageList = damageList,
- suckHpList = suckHpList, // 鐢ㄤ簬casterDamageList椋樺瓧
- reflectHpList = reflectHpList, // 鐢ㄤ簬casterDamageList椋樺瓧
- fromHp = fromHp,
- toHp = toHp,
- maxHp = maxHp,
- fromShieldValue = fromShieldValue,
- toShieldValue = toShieldValue,
- battleDrops = battleDrops,
- hurt = hurt,
- hitIndex = _hitIndex,
- deadPack = deadPack,
- skillConfig = skillConfig
+ 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()
@@ -848,6 +969,7 @@
{
if (!isPlay) return false;
+ bool tempRetValue = true;
// 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
if (skillEffect != null)
@@ -855,7 +977,7 @@
if (!skillEffect.IsFinished()) return false;
skillEffect = null;
OnSkillFinished();
- return false;
+ tempRetValue = false;
}
// 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
@@ -870,7 +992,15 @@
OnSkillFinished();
}
}
- if (otherSkillActionList.Count > 0) return false;
+ if (otherSkillActionList.Count > 0)
+ {
+ tempRetValue = false;
+ }
+ }
+
+ if (!tempRetValue)
+ {
+ return false;
}
// 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
--
Gitblit v1.8.0