From 4debfee66e8d8aabd179e2f8a61c7ca5ce62af3d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 31 十二月 2025 15:28:37 +0800
Subject: [PATCH] 0312 修复觉醒后战力计算错误的问题
---
Main/System/Battle/Skill/SkillBase.cs | 319 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 258 insertions(+), 61 deletions(-)
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index b6ab66b..056b849 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -27,6 +27,9 @@
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 SkillBase fromSkill;
public bool isPlay = false;
@@ -34,23 +37,26 @@
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
@@ -311,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);
+ }
});
}
@@ -352,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);
+ }
});
}
@@ -516,7 +536,7 @@
// 楂樹寒鎵�鏈夌浉鍏崇洰鏍囷細璁剧疆鏂芥硶鑰呭拰鐩爣鐨勬樉绀哄眰绾�
protected void HighLightAllTargets()
{
- caster.layerMgr.SetSortingOrder(BattleConst.ActiveHeroActionSortingOrder);
+ caster.layerMgr.SetSortingOrder(BattleConst.SkillMaskOrder + BattleConst.BattleActiveHeroOffset);
if (skillConfig.FuncType != 2)
return;
@@ -589,21 +609,16 @@
battleField.battleRootNode.skillMaskNode.SetActive(true);
}
- protected long suckHp = 0;
// 鍛戒腑鐩爣鍥炶皟锛氬鐞嗘墍鏈夎鍛戒腑鐨勭洰鏍囷紙鍖呮嫭涓荤洰鏍囥�佸脊灏勭洰鏍囥�佹簠灏勭洰鏍囷級
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();
- suckHp = 0;
-
- // 缁熻鍚歌鎬婚噺锛堜富鐩爣锛�
- foreach (var hurt in hitList)
- {
- suckHp += hurt.SuckHP;
- }
+ bool suckHp = true;
// 澶勭悊涓荤洰鏍囧垪琛�
foreach (var hurt in hitList)
@@ -615,7 +630,9 @@
continue;
}
- OnHitEachTarget(_hitIndex, target, hurt);
+ OnHitEachTarget(_hitIndex, target, hurt, suckHp);
+
+ suckHp = false;
// 澶勭悊璇ョ洰鏍囩殑棰濆鐩爣鍒楄〃锛堝寮瑰皠浼ゅ鐨勫钩鎽婄洰鏍囷級
if (hurt.HurtListEx != null && hurt.HurtListEx.Length > 0)
@@ -691,16 +708,21 @@
}
// 澶勭悊鍗曚釜鐩爣琚懡涓�:搴旂敤浼ゅ鍜屾柦娉曡�呮晥鏋�
- 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)
{
// ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
int objID = (int)target.ObjID;
tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
- tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
+ tempDeadPackList.TryGetValue(objID, out BattleDeadPack deadPack);
+
+ // 濡傛灉鐩爣姝ｅ湪閲婃斁鎶�鑳斤紝璺宠繃姝讳骸澶勭悊锛堝欢杩熷埌鎶�鑳界粨鏉燂級
+ if (battleField != null && battleField.IsCastingSkill(target.ObjID))
+ {
+ deadPack = null;
+ }
// ============ 鍙傛暟鎵撳寘 ============
- BattleHurtParam hurtParam = BattleUtility.CalcBattleHurtParam(this, _hitIndex, target, hurt, battleDrops, deadPack);
-
+ BattleHurtParam hurtParam = BattleUtility.CalcBattleHurtParam(this, _hitIndex, target, hurt, battleDrops, deadPack, suckHp);
#if UNITY_EDITOR
PrintHurtParamDebugInfo(hurtParam);
#endif
@@ -718,8 +740,14 @@
// ============ 鑾峰彇涓存椂鏁版嵁(鎺夎惤銆佹浜＄瓑) ============
int objID = (int)target.ObjID;
tempDropList.TryGetValue(objID, out BattleDrops battleDrops);
- tempDeadPackList.TryGetValue(objID, out HB422_tagMCTurnFightObjDead deadPack);
+ 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
{
@@ -729,23 +757,13 @@
HurtHPEx = hurtEx.HurtHPEx,
CurHP = hurtEx.CurHP,
CurHPEx = hurtEx.CurHPEx,
- SuckHP = hurtEx.SuckHP,
+ SuckHP = 0,//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);
+ OnHitEachTarget(_hitIndex, target, hurt, false);//鑾峰彇鍏ㄩ儴鍚歌鏃跺凡缁忚绠楄繃 杩欓噷灏变笉鍐嶈绠�
}
#if UNITY_EDITOR
@@ -803,7 +821,7 @@
// 澶勭悊姝讳骸鐩稿叧閫昏緫锛氬垎閰嶆帀钀藉拰缁忛獙
protected void HandleDead()
{
- var deadPackList = BattleUtility.FindDeadPack(packList);
+ List<BattleDeadPack> deadPackList = BattleUtility.FindDeadPack(packList);
if (deadPackList.Count <= 0) return;
CheckAfterDeadhPack();
@@ -827,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);
// 淇锛氭坊鍔犵┖鍊兼鏌�
@@ -869,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);
@@ -963,6 +983,37 @@
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()
{
@@ -1011,6 +1062,14 @@
return false;
}
+ // 鎶�鑳藉畬鍏ㄧ粨鏉燂紝绉婚櫎鎶�鑳芥敞鍐屽苟瑙﹀彂寤惰繜鐨勬浜″垽瀹�
+ if (battleField != null && caster != null)
+ {
+ battleField.RemoveCastingSkill(caster.ObjID, this);
+
+ battleField.OnObjsDead(new List<BattleDeadPack>(tempDeadPackList.Values));
+ }
+
return true;
}
@@ -1021,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];
@@ -1124,16 +1273,16 @@
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
@@ -1142,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;
}
@@ -1178,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