From d52a5b74331e653b223775f49a1d9072852d18c1 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 30 十月 2025 17:42:07 +0800
Subject: [PATCH] 125 战斗 飘字时间调整 控制状态的配置不再每次都取(改静态)
---
Main/Config/PartialConfigs/FuncConfigConfig.cs.meta | 11 +++++
Main/System/Battle/UIComp/BattleFloatingUIController.cs | 4 +-
Main/System/Battle/Buff/BattleObjectBuffMgr.cs | 17 +-------
Main/Config/PartialConfigs/FuncConfigConfig.cs | 37 ++++++++++++++++++
4 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/Main/Config/PartialConfigs/FuncConfigConfig.cs b/Main/Config/PartialConfigs/FuncConfigConfig.cs
new file mode 100644
index 0000000..c1ac3aa
--- /dev/null
+++ b/Main/Config/PartialConfigs/FuncConfigConfig.cs
@@ -0,0 +1,37 @@
+锘�//--------------------------------------------------------
+// [Author]: YYL
+// [ Date ]: 2025骞�8鏈�5鏃�
+//--------------------------------------------------------
+
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+using LitJson;
+
+public partial class FuncConfigConfig : ConfigBase<string, FuncConfigConfig>
+{
+ private static Dictionary<string, List<int>> m_buffGroupStateDict = null;
+
+ public static Dictionary<string, List<int>> buffGroupStateDict
+ {
+ get
+ {
+ if (m_buffGroupStateDict == null)
+ {
+ FuncConfigConfig config = Get("BuffStateGroup");
+ if (config != null)
+ {
+ m_buffGroupStateDict = JsonMapper.ToObject<Dictionary<string, List<int>>>(config.Numerical1);
+ }
+ else
+ {
+ Debug.LogError("娌℃湁鎵惧埌FuncConfig琛ㄤ腑Key涓築uffStateGroup鐨勯厤缃�");
+ m_buffGroupStateDict = new Dictionary<string, List<int>>();
+ }
+ }
+ return m_buffGroupStateDict;
+ }
+ }
+
+
+}
diff --git a/Main/Config/PartialConfigs/FuncConfigConfig.cs.meta b/Main/Config/PartialConfigs/FuncConfigConfig.cs.meta
new file mode 100644
index 0000000..5a79567
--- /dev/null
+++ b/Main/Config/PartialConfigs/FuncConfigConfig.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1e18fbd8e3c8209479b2b8aa8a92b750
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
index 9e4f183..1aa679f 100644
--- a/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
+++ b/Main/System/Battle/Buff/BattleObjectBuffMgr.cs
@@ -19,7 +19,6 @@
private BattleObject battleObject;
- private static Dictionary<string, List<int>> buffGroupStateDict = null;
public Dictionary<int, bool> isControled = new Dictionary<int, bool>()
{
@@ -33,13 +32,11 @@
public void Init(BattleObject _battleObject)
{
battleObject = _battleObject;
- InitBuffGroupStateDict();
}
public void Release()
{
onBuffChanged = null;
- buffGroupStateDict = null;
RemoveAllBuff();
}
@@ -142,7 +139,7 @@
}
}
- if (buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
+ 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);
}
@@ -216,7 +213,7 @@
}
- if (skillConfig != null && buffGroupStateDict[BattleConst.HardControlGroup.ToString()].Contains(skillConfig.BuffState))
+ 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);
}
@@ -247,14 +244,6 @@
}
}
- private void InitBuffGroupStateDict()
- {
- if (null == buffGroupStateDict)
- {
- FuncConfigConfig buffGroupStateConfig = FuncConfigConfig.Get("BuffStateGroup");
- buffGroupStateDict = JsonMapper.ToObject<Dictionary<string, List<int>>>(buffGroupStateConfig.Numerical1);
- }
- }
private void OnBuffChanged()
{
@@ -312,7 +301,7 @@
{
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))
{
diff --git a/Main/System/Battle/UIComp/BattleFloatingUIController.cs b/Main/System/Battle/UIComp/BattleFloatingUIController.cs
index 2b6b342..fb14224 100644
--- a/Main/System/Battle/UIComp/BattleFloatingUIController.cs
+++ b/Main/System/Battle/UIComp/BattleFloatingUIController.cs
@@ -12,8 +12,8 @@
public Vector2 endPos = new Vector2(0, 150);
// Time Settings
- public float scaleChangeTime = 1f / BattleConst.skillMotionFps * 8f + 0.1f; // 7~8甯� (8/30=0.2667绉�)
- public float totalShowTime = 1f / BattleConst.skillMotionFps * 24f + 0.1f; // 鎬绘椂闂寸害24甯� (8+16=24甯�)
+ public float scaleChangeTime = 1f / BattleConst.skillMotionFps * 16f + 0.1f; // 7~8甯� (8/30=0.2667绉�)
+ public float totalShowTime = 1f / BattleConst.skillMotionFps * 48f + 0.1f; // 鎬绘椂闂寸害24甯� (8+16=24甯�)
// Normal Settings
public Vector3 normalBeginScale = new Vector3(2f, 2f, 2f);
--
Gitblit v1.8.0