From eb27e5fd31f73b998a4bbd85511a31e40b8c61b7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 十一月 2025 17:03:47 +0800
Subject: [PATCH] 0312 关闭游戏内日志
---
Main/System/Main/FightPowerManager.cs | 110 ++++++++++++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/Main/System/Main/FightPowerManager.cs b/Main/System/Main/FightPowerManager.cs
index 9af704d..20fc8eb 100644
--- a/Main/System/Main/FightPowerManager.cs
+++ b/Main/System/Main/FightPowerManager.cs
@@ -74,7 +74,7 @@
//绛夌骇灞炴��
void RefreshLVAttrs()
{
- // lvAttrs.Clear();
+ lvAttrs.Clear();
var playerLVConfig = PlayerLVConfig.Get(PlayerDatas.Instance.baseData.LV);
foreach (var attrType in PlayerPropertyConfig.baseAttrs)
{
@@ -107,7 +107,7 @@
//瀹樿亴灞炴��
void RefreshOfficialAttrs()
{
- // officialAttrs.Clear();
+ officialAttrs.Clear();
var config = RealmConfig.Get(PlayerDatas.Instance.baseData.realmLevel);
for (int i = 0; i < config.AddAttrType.Length; i++)
{
@@ -221,58 +221,58 @@
#region 灞炴�у叕寮�
// 鍗曞熀纭�灞炴�ц绠�
- public double GetPropertyVaule(int attrType, HeroInfo hero, string formula)
- {
- // propertyVariables.Clear();
- propertyVariables["lvValue"] = lvAttrs.ContainsKey(attrType) ? lvAttrs[attrType] : 0;
- propertyVariables["equipValue"] = equipAttrs.ContainsKey(attrType) ? equipAttrs[attrType] : 0;
- propertyVariables["bookValue"] = 0;
- propertyVariables["bookPer"] = GetBookPer(attrType) / 10000.0f;
- propertyVariables["realmValue"] = officialAttrs.ContainsKey(attrType) ? officialAttrs[attrType] : 0;
- propertyVariables["realmPer"] = GetOfficialPer(attrType) / 10000.0f;
- propertyVariables["gubaoValue"] = 0;
- propertyVariables["gubaoPer"] = 0;
- propertyVariables["hjgValue"] = 0;
- propertyVariables["hjgPer"] = 0;
- propertyVariables["horseValue"] = 0;
- propertyVariables["horsePer"] = 0;
+// public double GetPropertyVaule(int attrType, HeroInfo hero, string formula)
+// {
+// propertyVariables.Clear();
+// propertyVariables["lvValue"] = lvAttrs.ContainsKey(attrType) ? lvAttrs[attrType] : 0;
+// propertyVariables["equipValue"] = equipAttrs.ContainsKey(attrType) ? equipAttrs[attrType] : 0;
+// propertyVariables["bookValue"] = 0;
+// propertyVariables["bookPer"] = GetBookPer(attrType) / 10000.0f;
+// propertyVariables["realmValue"] = officialAttrs.ContainsKey(attrType) ? officialAttrs[attrType] : 0;
+// propertyVariables["realmPer"] = GetOfficialPer(attrType) / 10000.0f;
+// propertyVariables["gubaoValue"] = 0;
+// propertyVariables["gubaoPer"] = 0;
+// propertyVariables["hjgValue"] = 0;
+// propertyVariables["hjgPer"] = 0;
+// propertyVariables["horseValue"] = 0;
+// propertyVariables["horsePer"] = 0;
- //锛侊紒锛佸崟姝﹀皢鎴樺姏棰勮鐨勮瘽闇�瑕佹帓闄ら槦浼嶅奖鍝嶆垬鍔涳紝鍙畻姝﹀皢鑷韩鐨勪笂闃靛睘鎬�
- propertyVariables["lineupInitAddPer"] = GetLineUpPer(attrType, "lineupInitAddPer") / 10000.0f;
- propertyVariables["lineupLVAddPer"] = GetLineUpPer(attrType, "lineupLVAddPer") / 10000.0f;
- propertyVariables["lineupBreakLVAddPer"] = GetLineUpPer(attrType, "lineupBreakLVAddPer") / 10000.0f;
- propertyVariables["lineupStarAddPer"] = GetLineUpPer(attrType, "lineupStarAddPer") / 10000.0f;
+// //锛侊紒锛佸崟姝﹀皢鎴樺姏棰勮鐨勮瘽闇�瑕佹帓闄ら槦浼嶅奖鍝嶆垬鍔涳紝鍙畻姝﹀皢鑷韩鐨勪笂闃靛睘鎬�
+// propertyVariables["lineupInitAddPer"] = GetLineUpPer(attrType, "lineupInitAddPer") / 10000.0f;
+// propertyVariables["lineupLVAddPer"] = GetLineUpPer(attrType, "lineupLVAddPer") / 10000.0f;
+// propertyVariables["lineupBreakLVAddPer"] = GetLineUpPer(attrType, "lineupBreakLVAddPer") / 10000.0f;
+// propertyVariables["lineupStarAddPer"] = GetLineUpPer(attrType, "lineupStarAddPer") / 10000.0f;
- //闃靛鍏夌幆 涓夊洿鐧惧垎姣斿姞鎴�
- propertyVariables["lineupHaloValue"] = countryAttrs.ContainsKey(attrType) ? countryAttrs[attrType] : 0;
- propertyVariables["lineupHaloPer"] = GetCountryPer(attrType) / 10000.0f;
+// //闃靛鍏夌幆 涓夊洿鐧惧垎姣斿姞鎴�
+// propertyVariables["lineupHaloValue"] = countryAttrs.ContainsKey(attrType) ? countryAttrs[attrType] : 0;
+// propertyVariables["lineupHaloPer"] = GetCountryPer(attrType) / 10000.0f;
- //姝﹀皢灞炴��
- propertyVariables["inheritPer"] = hero.GetInheritAttrPer(attrType) / 10000.0f;
- propertyVariables["heroSelfValue"] = hero.GetSelfAddValue(attrType);
- propertyVariables["heroSelfPer"] = hero.GetSelfAddPer(attrType) / 10000.0f;
- propertyVariables["starTalentValue"] = hero.GetTalentAttrValue(attrType);
- propertyVariables["starTalentPer"] = hero.GetTalentAttrPer(attrType) / 10000.0f;
- propertyVariables["breakLVValue"] = hero.GetBreakAttrValue(attrType);
- propertyVariables["breakLVPer"] = hero.GetBreakAttrPer(attrType) / 10000.0f;
- propertyVariables["awakeTalentValue"] = hero.GetAwakeAttrValue(attrType);
- propertyVariables["awakeTalentPer"] = hero.GetAwakeAttrPer(attrType) / 10000.0f;
- propertyVariables["fetterValue"] = hero.GetFetterAttrValue(attrType);
- propertyVariables["fetterPer"] = hero.GetFetterAttrPer(attrType) / 10000.0f;
+// //姝﹀皢灞炴��
+// propertyVariables["inheritPer"] = hero.GetInheritAttrPer(attrType) / 10000.0f;
+// propertyVariables["heroSelfValue"] = hero.GetSelfAddValue(attrType);
+// propertyVariables["heroSelfPer"] = hero.GetSelfAddPer(attrType) / 10000.0f;
+// propertyVariables["starTalentValue"] = hero.GetTalentAttrValue(attrType);
+// propertyVariables["starTalentPer"] = hero.GetTalentAttrPer(attrType) / 10000.0f;
+// propertyVariables["breakLVValue"] = hero.GetBreakAttrValue(attrType);
+// propertyVariables["breakLVPer"] = hero.GetBreakAttrPer(attrType) / 10000.0f;
+// propertyVariables["awakeTalentValue"] = hero.GetAwakeAttrValue(attrType);
+// propertyVariables["awakeTalentPer"] = hero.GetAwakeAttrPer(attrType) / 10000.0f;
+// propertyVariables["fetterValue"] = hero.GetFetterAttrValue(attrType);
+// propertyVariables["fetterPer"] = hero.GetFetterAttrPer(attrType) / 10000.0f;
-#if UNITY_EDITOR
- //鎺掗櫎鍊间负0鐨勫睘鎬ц緭鍑�
- // var tmpPropertyVariables = propertyVariables.Where(x => x.Value > 0).ToDictionary(x => x.Key, x => x.Value);
- // if (!tmpPropertyVariables.IsNullOrEmpty())
- // propertyStrForDebug += $"灞炴�D {attrType} - {JsonMapper.ToJson(tmpPropertyVariables)}";
-#endif
- return JaceCalculator.Calculate(formula, propertyVariables);
- }
+// #if UNITY_EDITOR
+// //鎺掗櫎鍊间负0鐨勫睘鎬ц緭鍑�
+// // var tmpPropertyVariables = propertyVariables.Where(x => x.Value > 0).ToDictionary(x => x.Key, x => x.Value);
+// // if (!tmpPropertyVariables.IsNullOrEmpty())
+// // propertyStrForDebug += $"灞炴�D {attrType} - {JsonMapper.ToJson(tmpPropertyVariables)}";
+// #endif
+// return JaceCalculator.Calculate(formula, propertyVariables);
+// }
public double GetPropertyVaule(int attrType, HeroInfo hero, int type)
{
- // propertyVariables.Clear();
+ propertyVariables.Clear();
propertyVariables["lvValue"] = lvAttrs.ContainsKey(attrType) ? lvAttrs[attrType] : 0;
propertyVariables["equipValue"] = equipAttrs.ContainsKey(attrType) ? equipAttrs[attrType] : 0;
propertyVariables["bookValue"] = 0;
@@ -281,10 +281,10 @@
propertyVariables["realmPer"] = GetOfficialPer(attrType) / 10000.0f;
propertyVariables["gubaoValue"] = 0;
propertyVariables["gubaoPer"] = 0;
- propertyVariables["hjgValue"] = 0;
- propertyVariables["hjgPer"] = 0;
- propertyVariables["horseValue"] = 0;
- propertyVariables["horsePer"] = 0;
+ propertyVariables["hjgValue"] = PhantasmPavilionManager.Instance.GetAttrValue(attrType);
+ propertyVariables["hjgPer"] = PhantasmPavilionManager.Instance.GetAttrPer(attrType) / 10000.0f;
+ propertyVariables["horseValue"] = HorseManager.Instance.GetAttrValue(attrType);
+ propertyVariables["horsePer"] = HorseManager.Instance.GetAttrPer(attrType) / 10000.0f;
//锛侊紒锛佸崟姝﹀皢鎴樺姏棰勮鐨勮瘽闇�瑕佹帓闄ら槦浼嶅奖鍝嶆垬鍔涳紝鍙畻姝﹀皢鑷韩鐨勪笂闃靛睘鎬�
propertyVariables["lineupInitAddPer"] = GetLineUpPer(attrType, "lineupInitAddPer") / 10000.0f;
@@ -442,15 +442,15 @@
{
if (useFormulaType == 0)
fightPowerVariables[config.Parameter] = Math.Round(GetPropertyVaule(config.ID, hero, 0), 3);
- else
- fightPowerVariables[config.Parameter] = Math.Round(GetPropertyVaule(config.ID, hero, propertyFormula), 3);
+ // else
+ // fightPowerVariables[config.Parameter] = Math.Round(GetPropertyVaule(config.ID, hero, propertyFormula), 3);
}
else
{
if (useFormulaType == 0)
fightPowerVariables[config.Parameter] = Math.Round(GetPropertyVaule(config.ID, hero, 1), 3);
- else
- fightPowerVariables[config.Parameter] = Math.Round(GetPropertyVaule(config.ID, hero, fightPropertyFormula), 3);
+ // else
+ // fightPowerVariables[config.Parameter] = Math.Round(GetPropertyVaule(config.ID, hero, fightPropertyFormula), 3);
}
}
@@ -502,6 +502,8 @@
fightPowerVariables["MagDamPerDefRatio"] = fightPowerRatioConfig.MagDamPerDefRatio;
fightPowerVariables["CurePerRatio"] = fightPowerRatioConfig.CurePerRatio;
fightPowerVariables["CurePerDefRatio"] = fightPowerRatioConfig.CurePerDefRatio;
+ fightPowerVariables["PVPDamPerRatio"] = fightPowerRatioConfig.PVPDamPerRatio;
+ fightPowerVariables["PVPDamPerDefRatio"] = fightPowerRatioConfig.PVPDamPerDefRatio;
long fightPower;
if (useFormulaType == 0)
--
Gitblit v1.8.0