From ffd736fac6f2880561165dcc758e058a5a860c53 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期二, 30 十二月 2025 22:27:28 +0800
Subject: [PATCH] 76 聊天系统-客户端 没有聊天记录时隐藏首页的最后一条消息展示
---
Main/System/Battle/Buff/BattleObjectBuffMgr.cs | 257 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 169 insertions(+), 88 deletions(-)
diff --git a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
index a6339e4..4fb482a 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
{
@@ -19,8 +18,6 @@
private BattleObject battleObject;
- private static Dictionary<string, List<int>> buffGroupStateDict = null;
-
public Dictionary<int, bool> isControled = new Dictionary<int, bool>()
{
{ BattleConst.HardControlGroup, false },
@@ -33,13 +30,18 @@
public void Init(BattleObject _battleObject)
{
battleObject = _battleObject;
- InitBuffGroupStateDict();
}
+
+#if UNITY_EDITOR
+ public List<HB428_tagSCBuffRefresh> GetBuffDataList()
+ {
+ return buffDataDict.Values.ToList();
+ }
+#endif
public void Release()
{
onBuffChanged = null;
- buffGroupStateDict = null;
RemoveAllBuff();
}
@@ -92,25 +94,26 @@
}
// 鍒犻櫎buff
- public void RemoveBuff(HB429_tagSCBuffDel vNetData)
+ public void RemoveBuff(HB429_tagSCBuffDel vNetData, bool insert = false)
{
- HB428_tagSCBuffRefresh buffData = null;
-
- bool isRemove = false;
-
- if (buffDataDict.TryGetValue(vNetData.BuffID, out buffData))
- {
- isRemove = true;
- buffDataDict.Remove(vNetData.BuffID);
- }
-
- if (!isRemove)
- {
- return;
- }
-
+ var tempvNetData = vNetData;
BuffUnmountAction buffRemoveAction = new BuffUnmountAction(battleObject.battleField, new List<HB429_tagSCBuffDel>() { vNetData }, () =>
{
+ HB428_tagSCBuffRefresh buffData = null;
+
+ bool isRemove = false;
+
+ if (buffDataDict.TryGetValue(tempvNetData.BuffID, out buffData))
+ {
+ isRemove = true;
+ buffDataDict.Remove(tempvNetData.BuffID);
+ }
+
+ if (!isRemove)
+ {
+ return;
+ }
+
bool isRemoveEffect = false;
int remainCnt = -1;
@@ -141,9 +144,9 @@
}
}
- if (buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
+ if (FuncConfigConfig.buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
{
- BattleDebug.LogError("[BattleObjectBuffMgr]绉婚櫎瀵硅薄 " + battleObject.ObjID + " 鐨刡uff id " + vNetData.BuffID + " BuffState is " + skillConfig.BuffState + " 鏄惁鍒犻櫎浜嗗瓧鍏稿唴鐨勫唴瀹� " + isRemove.ToString() + " 鏄惁鍒犻櫎浜嗙壒鏁� " + isRemoveEffect.ToString() + " pack uid 鏄� " + vNetData.packUID);
+ BattleDebug.LogError("[BattleObjectBuffMgr]绉婚櫎瀵硅薄 " + battleObject.ObjID + " 鐨刡uff id " + tempvNetData.BuffID + " BuffState is " + skillConfig.BuffState + " 鏄惁鍒犻櫎浜嗗瓧鍏稿唴鐨勫唴瀹� " + isRemove.ToString() + " 鏄惁鍒犻櫎浜嗙壒鏁� " + isRemoveEffect.ToString() + " pack uid 鏄� " + vNetData.packUID);
}
}
@@ -151,13 +154,19 @@
OnBuffChanged();
});
- battleObject.battleField.recordPlayer.PlayRecord(buffRemoveAction);
+ if (insert)
+ battleObject.battleField.recordPlayer.ImmediatelyPlay(buffRemoveAction);
+ else
+ battleObject.battleField.recordPlayer.PlayRecord(buffRemoveAction);
}
// 鍒锋柊buff
public void RefreshBuff(HB428_tagSCBuffRefresh vNetData, bool insert = false)
{
+ if (vNetData == null)
+ return;
+
if (battleObject.IsDead())
{
Debug.LogError("缁欐浜″璞″埛鏂癰uff 妫�鏌ユ湇鍔″櫒浠ｇ爜");
@@ -165,83 +174,130 @@
return;
}
- SkillConfig skillConfig = SkillConfig.Get((int)vNetData.SkillID);
-
- if (null == skillConfig)
- {
- Debug.LogError("buff瀵瑰簲鐨勬妧鑳戒笉瀛樺湪锛宻killId : " + vNetData.SkillID);
- return;
- }
-
- // bool isNew = false;
- if (buffDataDict.ContainsKey(vNetData.BuffID))
- {
- buffDataDict[vNetData.BuffID] = vNetData;
- }
- else
- {
- // isNew = true;
- buffDataDict.Add(vNetData.BuffID, vNetData);
- }
-
+ // IsAdd != 0 琛ㄧず鏄坊鍔�/瑕嗙洊锛岄渶瑕佹挱鏀惧姩鐢�
if (vNetData.IsAdd != 0)
{
- BuffMountAction buffMountAction = new BuffMountAction(battleObject.battleField, new List<HB428_tagSCBuffRefresh>() { vNetData }, () =>
- {
- if (battleObject.IsDead())
+ var tempvNetData = vNetData;
+ BuffMountAction buffMountAction = new BuffMountAction(
+ battleObject.battleField,
+ new List<HB428_tagSCBuffRefresh> { vNetData },
+ () =>
{
- return;
- }
- if (null != skillConfig && skillConfig.BuffEffect > 0)
- {
- // 宸茬粡瀛樺湪鐩稿悓鐨刡uff鐗规晥
- if (buffEffectDict.TryGetValue(skillConfig.BuffEffect, out KeyValuePair<BattleEffectPlayer, HashSet<uint>> pair))
- {
- pair.Value.Add(vNetData.BuffID);
- }
- else
- {
- BattleEffectPlayer effect = battleObject.battleField.battleEffectMgr.PlayEffect(battleObject, skillConfig.BuffEffect, battleObject.heroRectTrans, battleObject.Camp);
+ ApplyBuffAddition(tempvNetData);
+ OnBuffChanged();
+ });
- BoneFollower boneFollower = effect.AddMissingComponent<BoneFollower>();
-
- effect.BindBone(battleObject.motionBase.skeletonAnim, effect.effectConfig.nodeName);
-
- HashSet<uint> buffIdSet = new HashSet<uint>();
- buffIdSet.Add(vNetData.BuffID);
- buffEffectDict.Add(skillConfig.BuffEffect, new KeyValuePair<BattleEffectPlayer, HashSet<uint>>(effect, buffIdSet));
- }
- }
-
- if (buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
- {
- BattleDebug.LogError("[BattleObjectBuffMgr]娣诲姞瀵硅薄 " + battleObject.ObjID + " 鐨刡uff id " + vNetData.BuffID + " pack uid 鏄� " + vNetData.packUID + " BuffState is " + skillConfig.BuffState);
- }
-
- OnBuffChanged();
- });
if (insert)
- {
battleObject.battleField.recordPlayer.ImmediatelyPlay(buffMountAction);
- }
else
- {
battleObject.battleField.recordPlayer.PlayRecord(buffMountAction);
- }
}
else
{
- // 宸茬粡瀛樺湪鐨刡uff 鍒锋柊
- OnBuffChanged();
+ // IsAdd == 0 鍙槸鏁版嵁鍒锋柊锛岀洿鎺ユ洿鏂版暟鎹笉鎾斁鍔ㄧ敾
+ if (buffDataDict.ContainsKey(vNetData.BuffID))
+ {
+ buffDataDict[vNetData.BuffID] = vNetData;
+ OnBuffChanged();
+ }
}
}
- private void InitBuffGroupStateDict()
+ public void RefreshBuff(List<HB428_tagSCBuffRefresh> vNetDataList, bool insert = false)
{
- if (null == buffGroupStateDict)
+ if (vNetDataList == null || vNetDataList.Count == 0)
+ return;
+
+ if (battleObject.IsDead())
{
- FuncConfigConfig buffGroupStateConfig = FuncConfigConfig.Get("BuffStateGroup");
- buffGroupStateDict = JsonMapper.ToObject<Dictionary<string, List<int>>>(buffGroupStateConfig.Numerical1);
+ 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, battleObject.teamHero.modelScale);
+
+ 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}");
}
}
@@ -301,13 +357,13 @@
{
int buffState = skillConfig.BuffState;
- if (buffGroupStateDict != null && buffGroupStateDict.TryGetValue(groupType.ToString(), out List<int> buffGroupState))
+ if (FuncConfigConfig.buffGroupStateDict.TryGetValue(groupType.ToString(), out List<int> buffGroupState))
{
if (buffGroupState.Contains(buffState))
{
// 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;
}
@@ -317,12 +373,37 @@
return false;
}
-
+
public List<HB428_tagSCBuffRefresh> GetBuffList()
{
return buffDataDict.Values.ToList();
}
+ public long GetShieldValue()
+ {
+ // 鎵夸激鐩惧垽鏂紝褰撻噴鏀炬柟寮忎负1003鏃跺彲浠ヨ涓烘壙浼ょ浘
+ // 鍓嶇鐩墠搴旇鏄壙浼ょ浘浼氱敤鍒�
+ // Value1 褰撳墠鍓╀綑鐩惧�兼眰浣欎嚎閮ㄥ垎
+ // Value2 褰撳墠鍓╀綑鐩惧�兼暣闄や嚎閮ㄥ垎
+ return GetBuffValue(BattleConst.ShieldBuffAttackType);
+ }
+
+ public long GetBuffValue(int buffAtkType)
+ {
+
+ long values = 0;
+ foreach (var kv in buffDataDict)
+ {
+ HB428_tagSCBuffRefresh hB428_TagSCBuffRefresh = kv.Value;
+ SkillConfig skillConfig = SkillConfig.Get((int)hB428_TagSCBuffRefresh.SkillID);
+ if (null != skillConfig && skillConfig.AtkType == buffAtkType)
+ {
+ values += GeneralDefine.GetFactValue(hB428_TagSCBuffRefresh.Value1, hB428_TagSCBuffRefresh.Value2);
+ }
+ }
+ return values;
+ }
+
public void InsertBuff(HB428_tagSCBuffRefresh vNetData)
{
RefreshBuff(vNetData, true);
--
Gitblit v1.8.0