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/Buff/BattleObjectBuffMgr.cs | 184 ++++++++++++++++++++++++++++-----------------
1 files changed, 115 insertions(+), 69 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;
}
--
Gitblit v1.8.0