From d2280b3df8fddfad5b8a0ee04df7d4f2fd92f79b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 07 一月 2026 18:27:40 +0800
Subject: [PATCH] 0312 去掉纠正战报中的新旧封包数据
---
Main/System/Battle/Skill/SkillBase.cs | 772 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 608 insertions(+), 164 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index 22c3082..056b849 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -17,40 +17,146 @@
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 List<BattleDeadPack> endDeadPackList = new List<BattleDeadPack>();
+
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>();
+ private Dictionary<int, BattleDeadPack> tempDeadPackList = new Dictionary<int, BattleDeadPack>();
- protected List<HB428_tagSCBuffRefresh> buffCollections = new List<HB428_tagSCBuffRefresh>();
+ // Buff鐩稿叧鍖呴泦鍚堬紝鏀寔 HB428(鍒锋柊) 鍜� HB429(鍒犻櫎)
+ protected List<GameNetPackBasic> buffPackCollections = new List<GameNetPackBasic>();
// 鏋勯�犲嚱鏁帮細鍒濆鍖栨妧鑳藉熀纭�鏁版嵁
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;
+
+ // 娉ㄥ唽姝ｅ湪閲婃斁鐨勬妧鑳�
+ if (battleField != null && caster != null)
+ {
+ battleField.AddCastingSkill(caster.ObjID, this);
+ }
+
+ 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;
+
+
+ if (!safety)
+ {
+ Debug.LogError("SkillBase SafetyCheck failed! Caster or SkillConfig or TagUseSkillAttack or BattleField is null, or Caster is dead.");
+ ForceFinished();
+ }
+
+
}
// 鎶�鑳借繍琛屼富閫昏緫锛氬鐞嗘妧鑳芥晥鏋滃拰鍏朵粬鎶�鑳藉姩浣�
@@ -134,6 +240,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-琚姩瑙﹀彂鐨�
@@ -151,11 +262,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);
+
+
}
// 楂樹寒鎵�鏈夋湰娆℃妧鑳界浉鍏崇殑鐩爣
@@ -187,6 +296,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)
{
@@ -200,12 +317,19 @@
RectTransform target = battleField.GetTeamNode(caster.GetEnemyCamp(), skillConfig);
ExecuteMoveAndCastSequence(target, () =>
{
- // ShadowIllutionCreate(true);
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ if (skillConfig.ClientTriggerTiming == 1)
{
- // ShadowIllutionCreate(false);
OnAttackFinish();
- }, MoveSpeed);
+ }
+ else
+ {
+ // ShadowIllutionCreate(true);
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
+ }
});
}
@@ -219,7 +343,7 @@
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);
@@ -241,12 +365,19 @@
RectTransform target = battleField.GetTeamNode(caster.Camp, skillConfig);
ExecuteMoveAndCastSequence(target, () =>
{
- // ShadowIllutionCreate(true);
- MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ if (skillConfig.ClientTriggerTiming == 1)
{
- // ShadowIllutionCreate(false);
OnAttackFinish();
- }, MoveSpeed);
+ }
+ else
+ {
+ // ShadowIllutionCreate(true);
+ MoveToTarget(battleField.GetTeamNode(caster.Camp, caster.teamHero.positionNum), Vector2.zero, () =>
+ {
+ // ShadowIllutionCreate(false);
+ OnAttackFinish();
+ }, MoveSpeed);
+ }
});
}
@@ -256,9 +387,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(() =>
@@ -338,16 +475,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)
{
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;
}
@@ -382,26 +536,63 @@
// 楂樹寒鎵�鏈夌浉鍏崇洰鏍囷細璁剧疆鏂芥硶鑰呭拰鐩爣鐨勬樉绀哄眰绾�
protected void HighLightAllTargets()
{
- caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
+ caster.layerMgr.SetSortingOrder(BattleConst.SkillMaskOrder + BattleConst.BattleActiveHeroOffset);
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();
@@ -411,21 +602,27 @@
bo.layerMgr.SetBack();
}
+ // 鐩爣锛堝惈 HurtListEx锛夐兘搴旀樉绀� InfoBar
bo.heroInfoBar.SetActive(isTarget);
}
battleField.battleRootNode.skillMaskNode.SetActive(true);
- // battleField.battleRootNode.SetSortingOrder();
}
- // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍�
+
+ // 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍囷紙鍖呮嫭涓荤洰鏍囥�佸脊灏勭洰鏍囥�佹簠灏勭洰鏍囷級
protected virtual void OnHitTargets(int _hitIndex, List<HB427_tagSCUseSkill.tagSCUseSkillHurt> hitList)
{
+ // Debug.LogError($"Skill {skillConfig.SkillID} hit targets _hitIndex: {_hitIndex} hit {string.Join(", ", hitList.Select(h => h.ObjID + ":" + battleField.battleObjMgr.GetBattleObject((int)h.ObjID)?.teamHero.name))}");
+
// 閫犳垚浼ゅ鍓嶅厛澶勭悊琛�閲忓埛鏂板寘
HandleRefreshHP();
+ bool suckHp = true;
+
+ // 澶勭悊涓荤洰鏍囧垪琛�
foreach (var hurt in hitList)
- {
+ {
BattleObject target = caster.battleField.battleObjMgr.GetBattleObject((int)hurt.ObjID);
if (target == null)
{
@@ -433,120 +630,179 @@
continue;
}
- OnHitEachTarget(_hitIndex, target, hurt);
+ OnHitEachTarget(_hitIndex, target, hurt, suckHp);
+
+ suckHp = false;
+
+ // 澶勭悊璇ョ洰鏍囩殑棰濆鐩爣鍒楄〃锛堝寮瑰皠浼ゅ鐨勫钩鎽婄洰鏍囷級
+ 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)
+ protected virtual void OnHitEachTarget(int _hitIndex, BattleObject target, HB427_tagSCUseSkill.tagSCUseSkillHurt hurt, bool suckHp)
{
- // ============ 绗竴姝�:璁＄畻浼ゅ鍒嗗竷 ============
- 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(skillConfig.DamageDivide, _hitIndex, totalDamage);
-
- // ============ 绗簩姝�:鍒锋柊瀹為檯琛�閲� ============
- long fromHp = target.teamHero.curHp;
-
-
-
- // ============澶勭悊鍚歌璺熷弽浼� ===============
- // 涔熻鎸夋瘡涓�鍑诲钩鍧囩畻 鏈�鍚庤琛ラ綈浼ゅ
- long suckHp = hurt.SuckHP;
- long reflectHp = hurt.BounceHP;
-
- List<long> suckHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, suckHp);
-
- List<long> reflectHpList = BattleUtility.DivideDamageToList(skillConfig.DamageDivide, _hitIndex, hurt.BounceHP);
- // long currentSuckHp = suckHp / tagUseSkillAttack.HurtCount;
-
- // 璁＄畻褰撳墠杩欎竴鍑荤殑瀹為檯浼ゅ(鎵�鏈夊垎娈典激瀹充箣鍜�)
- 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 toHp = Math.Max(0, fromHp - currentHitDamage + currentHitSuckHp - currentHitReflectHp);
-
-
- // 鏇存柊鐩爣琛�閲�
- target.teamHero.curHp = toHp;
-
-#if UNITY_EDITOR
- BattleDebug.LogError(
- (caster.Camp == BattleCamp.Red ? "銆愮孩鏂硅鍔ㄣ��" : "銆愯摑鏂硅鍔ㄣ��") + "\n" +
- $"鏀诲嚮鑰�: {caster.teamHero.name}\n" +
- $"鐩爣: {target.teamHero.name}\n" +
- $"鎶�鑳�: {skillConfig.SkillName} (绗瑊_hitIndex}鍑�)\n" +
- $"浼ゅ: {currentHitDamage} (鎬讳激瀹�: {totalDamage})\n" +
- $"鍚歌: {currentHitSuckHp}\n" +
- $"鍙嶄激: {currentHitReflectHp}\n" +
- $"琛�閲忓彉鍖�: {fromHp} -> {toHp}"
- );
-#endif
-
-
- bool isLastHit = _hitIndex >= skillConfig.DamageDivide.Length - 1;
-
- // ============ 绗笁姝�:鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
+ // ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
int objID = (int)target.ObjID;
tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
- tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
+ tempDeadPackList.TryGetValue(objID, out BattleDeadPack deadPack);
-
- // 鍙傛暟鎵撳寘
- BattleHurtParam hurtParam = new BattleHurtParam()
+ // 濡傛灉鐩爣姝ｅ湪閲婃斁鎶�鑳斤紝璺宠繃姝讳骸澶勭悊锛堝欢杩熷埌鎶�鑳界粨鏉燂級
+ if (battleField != null && battleField.IsCastingSkill(target.ObjID))
{
- casterObj = caster,
- hurtObj = target,
- damageList = damageList,
- suckHpList = suckHpList,
- reflectHpList = reflectHpList,
- fromHp = fromHp,
- toHp = toHp,
- battleDrops = battleDrops,
- hurt = hurt,
- hitIndex = _hitIndex,
- deadPack = deadPack,
- skillConfig = skillConfig
+ deadPack = null;
+ }
+
+ // ============ 鍙傛暟鎵撳寘 ============
+ BattleHurtParam hurtParam = BattleUtility.CalcBattleHurtParam(this, _hitIndex, target, hurt, battleDrops, deadPack, suckHp);
+#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 BattleDeadPack deadPack);
+
+ // 濡傛灉鐩爣姝ｅ湪閲婃斁鎶�鑳斤紝璺宠繃姝讳骸澶勭悊锛堝欢杩熷埌鎶�鑳界粨鏉燂級
+ if (battleField != null && battleField.IsCastingSkill(target.ObjID))
+ {
+ deadPack = null;
+ }
+ // ============ 鍙傛暟鎵撳寘锛堝皢 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 = 0,//hurtEx.SuckHP, 鑾峰彇鍏ㄩ儴鍚歌鏃跺凡缁忚绠楄繃 杩欓噷灏变笉鍐嶈绠�
+ BounceHP = 0, // HurtEx 娌℃湁鍙嶄激瀛楁
+ HurtCountEx = 0,
+ HurtListEx = null
};
- // ============ 绗洓姝�:鎵ц琛ㄧ幇(椋樺瓧銆佸姩鐢荤瓑) ============
- target.Hurt(hurtParam);
-
-
+ OnHitEachTarget(_hitIndex, target, hurt, false);//鑾峰彇鍏ㄩ儴鍚歌鏃跺凡缁忚绠楄繃 杩欓噷灏变笉鍐嶈绠�
}
+
+#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()
@@ -565,7 +821,7 @@
// 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
protected void HandleDead()
{
- var deadPackList = BattleUtility.FindDeadPack(packList);
+ List<BattleDeadPack> deadPackList = BattleUtility.FindDeadPack(packList);
if (deadPackList.Count <= 0) return;
CheckAfterDeadhPack();
@@ -589,7 +845,8 @@
// 鏋勯�燘attleDrops骞剁紦瀛�
for (int i = 0; i < deadPackList.Count; i++)
{
- int objID = (int)deadPackList[i].ObjID;
+ BattleDeadPack battleDeadPack = deadPackList[i];
+ int objID = (int)battleDeadPack.deadPack.ObjID;
BattleObject deadTarget = battleField.battleObjMgr.GetBattleObject(objID);
// 淇锛氭坊鍔犵┖鍊兼鏌�
@@ -631,7 +888,8 @@
}
// 淇锛氶伩鍏嶅湪閬嶅巻鏃朵慨鏀归泦鍚堬紝鍏堟敹闆嗗悗鍒犻櫎
- var deadPacksToRemove = new List<GameNetPackBasic>(deadPackList.Cast<GameNetPackBasic>());
+ var deadPacksToRemove = new List<GameNetPackBasic>(deadPackList.Select(d => d.deadPack));
+ deadPacksToRemove.AddRange(deadPackList.Where(d => d.deadTriggerSkill != null).Select(d => d.deadTriggerSkill));
foreach (var deadPack in deadPacksToRemove)
{
packList.Remove(deadPack);
@@ -725,11 +983,43 @@
packList.RemoveAt(removeIndexList[i]);
}
+
+ public virtual bool IsFinishedForJudge()
+ {
+ if (!isPlay) return false;
+
+ if (skillEffect != null)
+ {
+ if (!skillEffect.IsFinished()) return false;
+ }
+
+ if (otherSkillActionList.Count > 0)
+ {
+ foreach (var action in otherSkillActionList)
+ {
+ if (!action.IsFinishedForJudge()) return false;
+ }
+ }
+
+ if (isFinished && moveFinished)
+ {
+ if (packList.Count > 0)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ return false;
+ }
+
// 妫�鏌ユ妧鑳芥槸鍚﹀畬鎴愶細缁煎悎妫�鏌ユ墍鏈夊畬鎴愭潯浠�
public virtual bool IsFinished()
{
if (!isPlay) return false;
+ bool tempRetValue = true;
// 妫�鏌ユ妧鑳芥晥鏋滄槸鍚﹀畬鎴�
if (skillEffect != null)
@@ -737,7 +1027,7 @@
if (!skillEffect.IsFinished()) return false;
skillEffect = null;
OnSkillFinished();
- return false;
+ tempRetValue = false;
}
// 妫�鏌ュ叾浠栨妧鑳藉姩浣滄槸鍚﹀畬鎴�
@@ -752,7 +1042,15 @@
OnSkillFinished();
}
}
- if (otherSkillActionList.Count > 0) return false;
+ if (otherSkillActionList.Count > 0)
+ {
+ tempRetValue = false;
+ }
+ }
+
+ if (!tempRetValue)
+ {
+ return false;
}
// 妫�鏌ユ渶缁堝畬鎴愮姸鎬�
@@ -762,6 +1060,14 @@
{
OnSkillFinished();
return false;
+ }
+
+ // 鎶�鑳藉畬鍏ㄧ粨鏉燂紝绉婚櫎鎶�鑳芥敞鍐屽苟瑙﹀彂寤惰繜鐨勬浜″垽瀹�
+ if (battleField != null && caster != null)
+ {
+ battleField.RemoveCastingSkill(caster.ObjID, this);
+
+ battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values));
}
return true;
@@ -774,16 +1080,106 @@
// 寮哄埗缁撴潫鎶�鑳斤細绔嬪嵆缁撴潫鎵�鏈夋妧鑳界浉鍏崇殑澶勭悊
public virtual void ForceFinished()
{
+ if (isFinished)
+ return;
+
+ // 绉婚櫎鎶�鑳芥敞鍐�
+ if (battleField != null && caster != null)
+ {
+ battleField.RemoveCastingSkill(caster.ObjID, this);
+ }
+
+ battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values));
+
+ // 1. 寮哄埗缁撴潫鎶�鑳芥晥鏋�
skillEffect?.ForceFinished();
+ skillEffect = null;
+
+ foreach (var subSkillPack in tagUseSkillAttack.subSkillList)
+ {
+ 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();
+ // 2. 寮哄埗缁撴潫鎵�鏈夊瓙鎶�鑳藉姩浣�
otherSkillActionList.ForEach(action => action.ForceFinish());
otherSkillActionList.Clear();
+
+ // 3. 娓呯悊 DOTween 鍔ㄧ敾锛堥槻姝㈢Щ鍔ㄥ洖璋冨湪鎴樻枟缁撴潫鍚庢墽琛岋級
+ if (caster != null && caster.heroRectTrans != null)
+ {
+ DG.Tweening.DOTween.Kill(caster.heroRectTrans);
+ }
+
+ // 4. 閲嶇疆鏂芥硶鑰呯姸鎬�
+ if (caster != null)
+ {
+ // 閲嶇疆浣嶇疆鍒板師鐐�
+ if (caster.heroRectTrans != null)
+ {
+ caster.heroRectTrans.anchoredPosition = Vector2.zero;
+ }
+
+ // 閲嶇疆鏈濆悜
+ if (caster.heroGo != null)
+ {
+ Vector3 scale = caster.heroGo.transform.localScale;
+ scale.x = Mathf.Abs(scale.x);
+ caster.heroGo.transform.localScale = scale;
+ }
+
+ // 鍙栨秷骞诲奖鏁堟灉
+ caster.motionBase?.ShowIllusionShadow(false);
+
+ // 鎾斁寰呮満鍔ㄧ敾锛堝鏋滆繕娲荤潃锛�
+ if (!caster.teamHero.isDead)
+ {
+ caster.motionBase?.ResetForReborn(false);
+ }
+ }
+
+ // 5. 鎭㈠ UI 鐘舵��
+ if (battleField != null)
+ {
+ // 鎭㈠鎵�鏈夎鑹茬殑鏄剧ず灞傜骇鍜岃鏉�
+ var allList = battleField.battleObjMgr?.allBattleObjDict?.Values;
+ if (allList != null)
+ {
+ foreach (BattleObject bo in allList)
+ {
+ bo.layerMgr?.SetFront();
+ bo.heroInfoBar?.SetActive(true);
+ }
+ }
+
+ // 鍏抽棴鎶�鑳介伄缃�
+ if (battleField.battleRootNode != null && battleField.battleRootNode.skillMaskNode != null)
+ {
+ battleField.battleRootNode.skillMaskNode.SetActive(false);
+ }
+ }
isFinished = true;
moveFinished = true;
isPlay = true;
- // 澶勭悊鎵�鏈夊墿浣欏寘
+ // 6. 澶勭悊鎵�鏈夊墿浣欏寘锛堝寘鎷� buff 鍖咃級
+ // 鍏堝鐞� buffPackCollections
+ DistributeBuffPacks(buffPackCollections);
+ buffPackCollections.Clear();
+
+ // 澶勭悊鍓╀綑鐨� packList
while (packList.Count > 0)
{
var pack = packList[0];
@@ -792,7 +1188,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
@@ -873,20 +1269,20 @@
{
BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
var otherSkillAction = combinePack.CreateSkillAction();
- otherSkillAction.fromSkillId = skillConfig.SkillID;
+ otherSkillAction.fromSkill = this;
otherSkillActionList.Add(otherSkillAction);
return false;
}
- else if (pack is HB428_tagSCBuffRefresh buffRefresh)
+ else if (IsBuffPack(pack))
{
- // 浠庢壘鍒扮涓�涓狧B428寮�濮� 鎵惧嚭杩炵画鐨凥B428_tagSCBuffRefresh鍖� 濡傛灉鎵惧埌涓�涓狟428鍚� 涔嬪悗纰板埌闈濰B428鍖呭氨鍋滄
- buffCollections.Add(buffRefresh);
+ // 浠庢壘鍒扮涓�涓� Buff 鍖呭紑濮嬶紝鏀堕泦杩炵画鐨� HB428/HB429 鍖�
+ buffPackCollections.Add(pack);
while (packList.Count > 0)
{
var nextPack = packList[0];
- if (nextPack is HB428_tagSCBuffRefresh nextBuffRefresh)
+ if (IsBuffPack(nextPack))
{
- buffCollections.Add(nextBuffRefresh);
+ buffPackCollections.Add(nextPack);
packList.RemoveAt(0);
}
else
@@ -895,18 +1291,11 @@
}
}
- // 鍚屾椂鍒锋柊鎵�鏈夊璞＄殑buff锛屼笉鍒嗙粍
- foreach (var buff in buffCollections)
- {
- BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buff.ObjID);
- if (battleObj != null)
- {
- battleObj.buffMgr.RefreshBuff(buff, true);
- }
- }
+ // 澶勭悊鎵�鏈夋敹闆嗗埌鐨� buff 鍖�
+ ProcessBuffPacks(buffPackCollections);
- // 娓呯┖宸插鐞嗙殑buff闆嗗悎
- buffCollections.Clear();
+ // 娓呯┖宸插鐞嗙殑 buff 闆嗗悎
+ buffPackCollections.Clear();
continue;
}
@@ -931,8 +1320,63 @@
otherSkillActionList?.Clear();
dropPackList?.Clear();
expPackList?.Clear();
+ buffPackCollections?.Clear();
skillEffect = null;
packList = null;
}
+
+ #region Buff鍖呭鐞�
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁涓� Buff 鐩稿叧鐨勫寘锛圚B428 鎴� HB429锛�
+ /// </summary>
+ protected bool IsBuffPack(GameNetPackBasic pack)
+ {
+ return pack is HB428_tagSCBuffRefresh || pack is HB429_tagSCBuffDel;
+ }
+
+ /// <summary>
+ /// 澶勭悊鏀堕泦鍒扮殑 Buff 鍖呭垪琛紙HB428 鍒锋柊 鍜� HB429 鍒犻櫎锛�
+ /// </summary>
+ protected void ProcessBuffPacks(List<GameNetPackBasic> buffPacks)
+ {
+ if (buffPacks == null || buffPacks.Count == 0) return;
+
+ foreach (var pack in buffPacks)
+ {
+ if (pack is HB428_tagSCBuffRefresh buffRefresh)
+ {
+ BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buffRefresh.ObjID);
+ if (battleObj != null)
+ {
+ battleObj.buffMgr.RefreshBuff(buffRefresh, true);
+ }
+ }
+ else if (pack is HB429_tagSCBuffDel buffDel)
+ {
+ BattleObject battleObj = battleField.battleObjMgr.GetBattleObject((int)buffDel.ObjID);
+ if (battleObj != null)
+ {
+ battleObj.buffMgr.RemoveBuff(buffDel, false);
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 寮哄埗鍒嗗彂 Buff 鍖咃紙鐢ㄤ簬 ForceFinished 鍦烘櫙锛�
+ /// </summary>
+ protected void DistributeBuffPacks(List<GameNetPackBasic> buffPacks)
+ {
+ if (buffPacks == null || buffPacks.Count == 0) return;
+
+ foreach (var pack in buffPacks)
+ {
+ PackageRegedit.Distribute(pack);
+ }
+ }
+
+ #endregion
+
}
\ No newline at end of file
--
Gitblit v1.8.0