From bc871b112bf04df5b5dcc3fadb77ac0f276749c8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 17 十一月 2025 02:01:58 +0800
Subject: [PATCH] 328 【主界面】坐骑系统 竞技场布阵的显隐 引导点战锤的时候不暂停游戏；引导的时候如果是功能开启，不显示战力变化避免遮挡
---
Main/System/Battle/Buff/BattleObjectBuffMgr.cs | 341 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 276 insertions(+), 65 deletions(-)
diff --git a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
index a3225a6..4e34649 100644
--- a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
+++ b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
@@ -1,17 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using LitJson;
using Spine.Unity;
using UnityEngine;
-
public class BattleObjectBuffMgr
{
+
+ public Action onBuffChanged;
+
+ public Action<int, bool> onIsControlChanged;
+
private Dictionary<int/*EffectId*/, KeyValuePair<BattleEffectPlayer, HashSet<uint/*BuffID*/>>> buffEffectDict = new Dictionary<int, KeyValuePair<BattleEffectPlayer, HashSet<uint>>>();
private Dictionary<uint, HB428_tagSCBuffRefresh> buffDataDict = new Dictionary<uint, HB428_tagSCBuffRefresh>();
private BattleObject battleObject;
+
+ public Dictionary<int, bool> isControled = new Dictionary<int, bool>()
+ {
+ { BattleConst.HardControlGroup, false },
+ { BattleConst.SoftControlGroup, false },
+ { BattleConst.NormalAttackLimitGroup, false },
+ { BattleConst.RageAttackLimitGroup, false },
+ { BattleConst.PassiveSkillLimitGroup, false },
+ };
public void Init(BattleObject _battleObject)
{
@@ -20,6 +34,8 @@
public void Release()
{
+ onBuffChanged = null;
+ RemoveAllBuff();
}
@@ -34,10 +50,11 @@
{
if (effectPlayer.isBindBone)
{
- continue;
+ effectPlayer.FollowBoneXY();
+ return;
}
+ int[] effectPos = effectPlayer.effectConfig.effectPos;
effectPlayer.transform.position = battleObject.heroRectTrans.position;
- var effectPos = effectPlayer.effectConfig.effectPos;
if (null != effectPos && effectPos.Length >= 2)
{
effectPlayer.rectTrans.anchoredPosition += new Vector2(effectPos[0], effectPos[1]);
@@ -66,50 +83,80 @@
buffEffectDict.Clear();
buffDataDict.Clear();
- battleObject.heroInfoBar.RefreshBuff(buffDataDict.Values.ToList());
+ OnBuffChanged();
}
// 鍒犻櫎buff
public void RemoveBuff(HB429_tagSCBuffDel vNetData)
{
- HB428_tagSCBuffRefresh buffData = null;
-
- if (buffDataDict.TryGetValue(vNetData.BuffID, out buffData))
+ var tempvNetData = vNetData;
+ BuffUnmountAction buffRemoveAction = new BuffUnmountAction(battleObject.battleField, new List<HB429_tagSCBuffDel>() { vNetData }, () =>
{
- buffDataDict.Remove(vNetData.BuffID);
- }
+ HB428_tagSCBuffRefresh buffData = null;
- if (buffData != null)
- {
- SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
+ bool isRemove = false;
- if (null == skillConfig || skillConfig.BuffEffect <= 0)
+ if (buffDataDict.TryGetValue(tempvNetData.BuffID, out buffData))
+ {
+ isRemove = true;
+ buffDataDict.Remove(tempvNetData.BuffID);
+ }
+
+ if (!isRemove)
{
return;
}
- KeyValuePair<BattleEffectPlayer, HashSet<uint>> effectPair;
+ bool isRemoveEffect = false;
- if (buffEffectDict.TryGetValue(skillConfig.BuffEffect, out effectPair))
+ int remainCnt = -1;
+
+ if (buffData != null)
{
- effectPair.Value.Remove(vNetData.BuffID);
+ SkillConfig skillConfig = SkillConfig.Get((int)buffData.SkillID);
- if (effectPair.Value.Count == 0)
+ if (null == skillConfig || skillConfig.BuffEffect <= 0)
{
- // 娌℃湁杩欎釜buff浜�
- battleObject.battleField.battleEffectMgr.RemoveEffect(skillConfig.BuffEffect, effectPair.Key);
- buffEffectDict.Remove(skillConfig.BuffEffect);
+ return;
+ }
+
+ KeyValuePair<BattleEffectPlayer, HashSet<uint>> effectPair;
+
+ if (buffEffectDict.TryGetValue(skillConfig.BuffEffect, out effectPair))
+ {
+ effectPair.Value.Remove(buffData.BuffID);
+
+ remainCnt = effectPair.Value.Count;
+
+ if (effectPair.Value.Count == 0)
+ {
+ // 娌℃湁杩欎釜buff浜�
+ isRemoveEffect = true;
+ battleObject.battleField.battleEffectMgr.RemoveEffect(skillConfig.BuffEffect, effectPair.Key);
+ buffEffectDict.Remove(skillConfig.BuffEffect);
+ }
+ }
+
+ if (FuncConfigConfig.buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
+ {
+ BattleDebug.LogError("[BattleObjectBuffMgr]绉婚櫎瀵硅薄 " + battleObject.ObjID + " 鐨刡uff id " + tempvNetData.BuffID + " BuffState is " + skillConfig.BuffState + " 鏄惁鍒犻櫎浜嗗瓧鍏稿唴鐨勫唴瀹� " + isRemove.ToString() + " 鏄惁鍒犻櫎浜嗙壒鏁� " + isRemoveEffect.ToString() + " pack uid 鏄� " + vNetData.packUID);
}
}
- }
- // 涓嶅仛琛ㄧ幇
- battleObject.heroInfoBar.RefreshBuff(buffDataDict.Values.ToList());
+ // 涓嶅仛琛ㄧ幇
+ OnBuffChanged();
+ });
+
+ 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 妫�鏌ユ湇鍔″櫒浠ｇ爜");
@@ -117,72 +164,236 @@
return;
}
- SkillConfig skillConfig = SkillConfig.Get((int)vNetData.SkillID);
-
- if (null == skillConfig)
+ // IsAdd != 0 琛ㄧず鏄坊鍔�/瑕嗙洊锛岄渶瑕佹挱鏀惧姩鐢�
+ if (vNetData.IsAdd != 0)
{
- Debug.LogError("buff瀵瑰簲鐨勬妧鑳戒笉瀛樺湪锛宻killId : " + vNetData.SkillID);
+ var tempvNetData = vNetData;
+ BuffMountAction buffMountAction = new BuffMountAction(
+ battleObject.battleField,
+ new List<HB428_tagSCBuffRefresh> { vNetData },
+ () =>
+ {
+ ApplyBuffAddition(tempvNetData);
+ OnBuffChanged();
+ });
+
+ if (insert)
+ battleObject.battleField.recordPlayer.ImmediatelyPlay(buffMountAction);
+ else
+ battleObject.battleField.recordPlayer.PlayRecord(buffMountAction);
+ }
+ else
+ {
+ // IsAdd == 0 鍙槸鏁版嵁鍒锋柊锛岀洿鎺ユ洿鏂版暟鎹笉鎾斁鍔ㄧ敾
+ if (buffDataDict.ContainsKey(vNetData.BuffID))
+ {
+ buffDataDict[vNetData.BuffID] = vNetData;
+ 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;
}
- // bool isNew = false;
- if (buffDataDict.ContainsKey(vNetData.BuffID))
- {
- buffDataDict[vNetData.BuffID] = vNetData;
- }
- else
- {
- // isNew = true;
- buffDataDict.Add(vNetData.BuffID, vNetData);
- }
+ var buffList = vNetDataList.Where(buff => buff != null && buff.IsAdd != 0).ToList();
+ var refreshList = vNetDataList.Where(buff => buff != null && buff.IsAdd == 0).ToList();
- if (vNetData.IsAdd != 0)
+ // 澶勭悊闇�瑕佹挱鏀惧姩鐢荤殑buff (IsAdd != 0)
+ if (buffList.Count > 0)
{
- BuffMountAction buffMountAction = new BuffMountAction(battleObject.battleField, new List<HB428_tagSCBuffRefresh>() { vNetData }, () =>
- {
- if (null != skillConfig && skillConfig.BuffEffect > 0)
+ BuffMountAction buffMountAction = new BuffMountAction(
+ battleObject.battleField,
+ buffList,
+ () =>
{
- // 宸茬粡瀛樺湪鐩稿悓鐨刡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);
+ foreach (var temp in buffList)
+ ApplyBuffAddition(temp);
+ OnBuffChanged();
+ });
- BoneFollower boneFollower = effect.AddMissingComponent<BoneFollower>();
-
- effect.BindBone(battleObject.motionBase.skeletonAnim, "hit");
-
- HashSet<uint> buffIdSet = new HashSet<uint>();
- buffIdSet.Add(vNetData.BuffID);
- buffEffectDict.Add(skillConfig.BuffEffect, new KeyValuePair<BattleEffectPlayer, HashSet<uint>>(effect, buffIdSet));
- }
- }
- battleObject.heroInfoBar.RefreshBuff(buffDataDict.Values.ToList());
- });
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
{
- battleObject.battleField.recordPlayer.PlayRecord(buffMountAction);
+ 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));
}
}
- else
+
+ if (FuncConfigConfig.buffGroupStateDict[BattleConst.HardControlGroup.ToString()]
+ .Contains(skillConfig.BuffState))
{
- // 宸茬粡瀛樺湪鐨刡uff 鍒锋柊
- battleObject.heroInfoBar.RefreshBuff(buffDataDict.Values.ToList());
+ BattleDebug.LogError(
+ $"[BattleObjectBuffMgr]娣诲姞瀵硅薄 {battleObject.ObjID} 鐨刡uff id {buffRefresh.BuffID} pack uid 鏄� {buffRefresh.packUID} BuffState is {skillConfig.BuffState}");
}
}
+
+ private void OnBuffChanged()
+ {
+
+ UpdateControlState();
+
+ battleObject.heroInfoBar.RefreshBuff(buffDataDict.Values.ToList());
+ onBuffChanged?.Invoke();
+
+ // bool isUnderControl = false;
+
+ // foreach (var kv in buffDataDict)
+ // {
+ // HB428_tagSCBuffRefresh hB428_TagSCBuffRefresh = kv.Value;
+ // SkillConfig skillConfig = SkillConfig.Get((int)hB428_TagSCBuffRefresh.SkillID);
+ // if (null != skillConfig && skillConfig.IsControlBuff())
+ // {
+ // isUnderControl = true;
+ // break;
+ // }
+ // }
+ }
+
+ private void UpdateControlState()
+ {
+ UpdateControlState(BattleConst.HardControlGroup);
+ UpdateControlState(BattleConst.SoftControlGroup);
+ UpdateControlState(BattleConst.NormalAttackLimitGroup);
+ UpdateControlState(BattleConst.RageAttackLimitGroup);
+ UpdateControlState(BattleConst.PassiveSkillLimitGroup);
+ }
+ private void UpdateControlState(int groupType)
+ {
+ bool isChange = false;
+ bool curState = isControled[groupType];
+ bool newState = IsUnderControl(groupType);
+ isControled[groupType] = newState;
+ isChange = curState != newState;
+ if (isChange)
+ {
+ onIsControlChanged?.Invoke(groupType, newState);
+ }
+ }
+
+ private bool IsUnderControl(int groupType)
+ {
+
+ foreach (var kv in buffDataDict)
+ {
+ HB428_tagSCBuffRefresh hB428_TagSCBuffRefresh = kv.Value;
+ SkillConfig skillConfig = SkillConfig.Get((int)hB428_TagSCBuffRefresh.SkillID);
+
+ if (null != skillConfig)
+ {
+ int buffState = skillConfig.BuffState;
+
+ 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);
+ // }
+ return true;
+ }
+ }
+ }
+ }
+
+ 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