From d591b5c972cdd4f290e114bc08ef443a051aecad Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 14:14:27 +0800
Subject: [PATCH] 125 战斗 buff合并展示
---
Main/System/Battle/Skill/SkillBase.cs | 165 +++++++++++++++++----------
Main/System/Battle/Buff/BattleObjectBuffMgr.cs | 184 +++++++++++++++++++-----------
2 files changed, 220 insertions(+), 129 deletions(-)
diff --git a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
index 1aa679f..de47f8b 100644
--- a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
+++ b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
@@ -5,7 +5,6 @@
using Spine.Unity;
using UnityEngine;
-
public class BattleObjectBuffMgr
{
@@ -18,7 +17,6 @@
private Dictionary<uint, HB428_tagSCBuffRefresh> buffDataDict = new Dictionary<uint, HB428_tagSCBuffRefresh>();
private BattleObject battleObject;
-
public Dictionary<int, bool> isControled = new Dictionary<int, bool>()
{
@@ -156,6 +154,9 @@
// 鍒锋柊buff
public void RefreshBuff(HB428_tagSCBuffRefresh vNetData, bool insert = false)
{
+ if (vNetData == null)
+ return;
+
if (battleObject.IsDead())
{
Debug.LogError("缁欐浜″璞″埛鏂癰uff 妫�鏌ユ湇鍔″櫒浠ｇ爜");
@@ -163,87 +164,132 @@
return;
}
- SkillConfig skillConfig = SkillConfig.Get((int)vNetData.SkillID);
-
- if (null == skillConfig)
+ // IsAdd != 0 琛ㄧず鏄坊鍔�/瑕嗙洊锛岄渶瑕佹挱鏀惧姩鐢�
+ if (vNetData.IsAdd != 0)
{
- Debug.LogError("buff瀵瑰簲鐨勬妧鑳戒笉瀛樺湪锛宻killId : " + vNetData.SkillID);
- return;
- }
-
- var tempvNetData = vNetData;
-
- if (tempvNetData.IsAdd != 0)
- {
- BuffMountAction buffMountAction = new BuffMountAction(battleObject.battleField, new List<HB428_tagSCBuffRefresh>() { tempvNetData }, () =>
- {
- if (buffDataDict.ContainsKey(tempvNetData.BuffID))
+ var tempvNetData = vNetData;
+ BuffMountAction buffMountAction = new BuffMountAction(
+ battleObject.battleField,
+ new List<HB428_tagSCBuffRefresh> { vNetData },
+ () =>
{
- buffDataDict[tempvNetData.BuffID] = tempvNetData;
- }
- else
- {
- buffDataDict.Add(tempvNetData.BuffID, tempvNetData);
- }
+ ApplyBuffAddition(tempvNetData);
+ OnBuffChanged();
+ });
- if (battleObject.IsDead())
- {
- return;
- }
-
- if (null != skillConfig && skillConfig.BuffEffect > 0)
- {
- // 宸茬粡瀛樺湪鐩稿悓鐨刡uff鐗规晥
- if (buffEffectDict.TryGetValue(skillConfig.BuffEffect, out KeyValuePair<BattleEffectPlayer, HashSet<uint>> pair))
- {
- pair.Value.Add(tempvNetData.BuffID);
- }
- else
- {
- BattleEffectPlayer effect = battleObject.battleField.battleEffectMgr.PlayEffect(battleObject, skillConfig.BuffEffect, battleObject.heroRectTrans, battleObject.Camp);
-
- BoneFollower boneFollower = effect.AddMissingComponent<BoneFollower>();
-
- effect.BindBone(battleObject.motionBase.skeletonAnim, effect.effectConfig.nodeName);
-
- HashSet<uint> buffIdSet = new HashSet<uint>();
- buffIdSet.Add(tempvNetData.BuffID);
- buffEffectDict.Add(skillConfig.BuffEffect, new KeyValuePair<BattleEffectPlayer, HashSet<uint>>(effect, buffIdSet));
- }
-
- }
-
- if (skillConfig != null && FuncConfigConfig.buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
- {
- BattleDebug.LogError("[BattleObjectBuffMgr]娣诲姞瀵硅薄 " + battleObject.ObjID + " 鐨刡uff id " + tempvNetData.BuffID + " pack uid 鏄� " + tempvNetData.packUID + " BuffState is " + skillConfig.BuffState);
- }
-
- OnBuffChanged();
- });
if (insert)
- {
battleObject.battleField.recordPlayer.ImmediatelyPlay(buffMountAction);
- }
else
- {
battleObject.battleField.recordPlayer.PlayRecord(buffMountAction);
- }
}
else
{
- if (buffDataDict.ContainsKey(tempvNetData.BuffID))
+ // IsAdd == 0 鍙槸鏁版嵁鍒锋柊锛岀洿鎺ユ洿鏂版暟鎹笉鎾斁鍔ㄧ敾
+ if (buffDataDict.ContainsKey(vNetData.BuffID))
{
- buffDataDict[tempvNetData.BuffID] = tempvNetData;
+ buffDataDict[vNetData.BuffID] = vNetData;
+ OnBuffChanged();
}
- else
- {
- buffDataDict.Add(tempvNetData.BuffID, tempvNetData);
- }
- // 宸茬粡瀛樺湪鐨刡uff 鍒锋柊
- OnBuffChanged();
}
}
+ public void RefreshBuff(List<HB428_tagSCBuffRefresh> vNetDataList, bool insert = false)
+ {
+ if (vNetDataList == null || vNetDataList.Count == 0)
+ return;
+
+ if (battleObject.IsDead())
+ {
+ Debug.LogError("缁欐浜″璞″埛鏂癰uff(鎵归噺) 妫�鏌ユ湇鍔″櫒浠ｇ爜");
+ RemoveAllBuff();
+ return;
+ }
+
+ var buffList = vNetDataList.Where(buff => buff != null && buff.IsAdd != 0).ToList();
+ var refreshList = vNetDataList.Where(buff => buff != null && buff.IsAdd == 0).ToList();
+
+ // 澶勭悊闇�瑕佹挱鏀惧姩鐢荤殑buff (IsAdd != 0)
+ if (buffList.Count > 0)
+ {
+ BuffMountAction buffMountAction = new BuffMountAction(
+ battleObject.battleField,
+ buffList,
+ () =>
+ {
+ foreach (var temp in buffList)
+ ApplyBuffAddition(temp);
+ OnBuffChanged();
+ });
+
+ if (insert)
+ battleObject.battleField.recordPlayer.ImmediatelyPlay(buffMountAction);
+ else
+ battleObject.battleField.recordPlayer.PlayRecord(buffMountAction);
+ }
+
+ // 澶勭悊鍙埛鏂版暟鎹殑buff (IsAdd == 0)
+ if (refreshList.Count > 0)
+ {
+ bool hasChanged = false;
+ foreach (var buff in refreshList)
+ {
+ if (buffDataDict.ContainsKey(buff.BuffID))
+ {
+ buffDataDict[buff.BuffID] = buff;
+ hasChanged = true;
+ }
+ }
+ if (hasChanged)
+ {
+ OnBuffChanged();
+ }
+ }
+ }
+
+ private void ApplyBuffAddition(HB428_tagSCBuffRefresh buffRefresh)
+ {
+ SkillConfig skillConfig = SkillConfig.Get((int)buffRefresh.SkillID);
+ if (skillConfig == null)
+ {
+ Debug.LogError($"buff瀵瑰簲鐨勬妧鑳戒笉瀛樺湪,skillId : {buffRefresh.SkillID}");
+ return;
+ }
+
+ if (buffDataDict.ContainsKey(buffRefresh.BuffID))
+ buffDataDict[buffRefresh.BuffID] = buffRefresh;
+ else
+ buffDataDict.Add(buffRefresh.BuffID, buffRefresh);
+
+ if (battleObject.IsDead())
+ return;
+
+ if (skillConfig.BuffEffect > 0)
+ {
+ if (buffEffectDict.TryGetValue(skillConfig.BuffEffect, out var pair))
+ {
+ pair.Value.Add(buffRefresh.BuffID);
+ }
+ else
+ {
+ BattleEffectPlayer effect = battleObject.battleField.battleEffectMgr
+ .PlayEffect(battleObject, skillConfig.BuffEffect, battleObject.heroRectTrans, battleObject.Camp);
+
+ effect.BindBone(battleObject.motionBase.skeletonAnim, effect.effectConfig.nodeName);
+
+ var buffIdSet = new HashSet<uint> { buffRefresh.BuffID };
+ buffEffectDict.Add(
+ skillConfig.BuffEffect,
+ new KeyValuePair<BattleEffectPlayer, HashSet<uint>>(effect, buffIdSet));
+ }
+ }
+
+ if (FuncConfigConfig.buffGroupStateDict[BattleConst.HardControlGroup.ToString()]
+ .Contains(skillConfig.BuffState))
+ {
+ BattleDebug.LogError(
+ $"[BattleObjectBuffMgr]娣诲姞瀵硅薄 {battleObject.ObjID} 鐨刡uff id {buffRefresh.BuffID} pack uid 鏄� {buffRefresh.packUID} BuffState is {skillConfig.BuffState}");
+ }
+ }
private void OnBuffChanged()
{
@@ -307,7 +353,7 @@
{
// if (groupType == 1)
// {
- // // Debug.LogError("瀵硅薄 " + battleObject.ObjID + " 鍙楀埌浜� " + skillConfig.SkillID + " 鐨勬帶鍒舵晥鏋滐紝BuffState:" + buffState + " buffGroup :" + groupType + " buff id is " + hB428_TagSCBuffRefresh.BuffID + " ralate skill id is " + hB428_TagSCBuffRefresh.RelatedSkillID + " pack uid is " + hB428_TagSCBuffRefresh.packUID);
+ // // Debug.LogError("瀵硅薄 " + battleObject.ObjID + " 鍙楀埌浜� " + skillConfig.SkillID + " 鐨勬帶鍒舵晥鏋�,BuffState:" + buffState + " buffGroup :" + groupType + " buff id is " + hB428_TagSCBuffRefresh.BuffID + " ralate skill id is " + hB428_TagSCBuffRefresh.RelatedSkillID + " pack uid is " + hB428_TagSCBuffRefresh.packUID);
// }
return true;
}
diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index b8c46b5..0b9f285 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -36,6 +36,9 @@
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)
{
@@ -712,76 +715,118 @@
// 淇锛氫娇鐢ㄥ惊鐜唬鏇块�掑綊锛岄伩鍏嶆爤婧㈠嚭椋庨櫓
// 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--)
{
- skillEffect = null;
+ var action = otherSkillActionList[i];
+ if (action.IsFinished())
+ {
+ otherSkillActionList.RemoveAt(i);
+ hasFinishedAction = true;
+ }
+ }
+ if (hasFinishedAction)
+ {
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; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ return;
}
- // 澶勭悊鍓╀綑鍖�
- while (packList.Count > 0)
- {
- var pack = packList[0];
- packList.RemoveAt(0);
+ break; // 娌℃湁鏇村闇�瑕佸鐞嗙殑锛岄��鍑哄惊鐜�
+ }
- if (pack is CustomHB426CombinePack combinePack && combinePack.startTag.Tag.StartsWith("Skill_"))
- {
- BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
- var otherSkillAction = combinePack.CreateSkillAction();
- otherSkillAction.fromSkillId = skillConfig.SkillID;
- otherSkillActionList.Add(otherSkillAction);
- return;
- }
-
- 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; // 閲嶆柊鎶涘嚭寮傚父渚涗笂灞傚鐞�
- // }
+ // 澶勭悊鍓╀綑鍖�
+ 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.fromSkillId = skillConfig.SkillID;
+ 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;
+ }
+ }
+
+ // 鍚屾椂鍒锋柊鎵�鏈夊璞＄殑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);
+ }
+ }
+
+ return true;
+ }
// 娣诲姞娓呯悊鏂规硶锛氶槻姝㈠唴瀛樻硠婕�
public virtual void Cleanup()
--
Gitblit v1.8.0