From d6bbb010e7d314c20d39de24fbbd7fe49b79bc67 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 22 四月 2026 10:06:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/FightPowerManager.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Main/System/Main/FightPowerManager.cs b/Main/System/Main/FightPowerManager.cs
index 477321a..9454ffc 100644
--- a/Main/System/Main/FightPowerManager.cs
+++ b/Main/System/Main/FightPowerManager.cs
@@ -82,7 +82,7 @@
// public Dictionary<string, int> lineUpPerDict = new Dictionary<string, int>(); //闃靛灞炴�у姞鎴�
public Dictionary<int, int> countryAttrs = new Dictionary<int, int>(); //闃靛鍥藉锛堝厜鐜級灞炴��
public Dictionary<int, long> minggeAttrs = new Dictionary<int, long>(); //鍛芥牸灞炴��
-
+ public Dictionary<int, long> djgAttrs = new Dictionary<int, long>(); //瀹氬啗闃佸睘鎬�
double allHeroAddPer = 0; //鎵�鏈夋灏嗗姞鎴�
//绛夌骇灞炴��
@@ -340,8 +340,10 @@
var beautyPer = BeautyMMManager.Instance.GetAttrPer(attrType) / 10000.0;
var fatesValue = HeroFatesManager.Instance.GetAttrValue(attrType);
var fatesPer = HeroFatesManager.Instance.GetAttrPer(attrType) / 10000.0;
- var dingjungeValue = 0; //榛樿涓嶉渶瑕佸姞锛岀埇濉旂壒娈婄敤锛岄厤鍚堝叕寮�
- var dingjungePer = 0; //榛樿涓嶉渶瑕佸姞锛岀埇濉旂壒娈婄敤锛岄厤鍚堝叕寮�
+
+ djgAttrs.TryGetValue(attrType, out var dingjungeValue);
+ var dingjungePer = GetAttrPer(attrType, djgAttrs) / 10000.0; //榛樿涓嶉渶瑕佸姞锛岀埇濉旂壒娈婄敤锛岄厤鍚堝叕寮�
+
minggeAttrs.TryGetValue(attrType, out var minggeValue);
var minggePer = GetAttrPer(attrType, minggeAttrs) / 10000.0;
@@ -397,7 +399,7 @@
var horseValue = HorseManager.Instance.GetAttrValue(attrType);
var beautyValue = BeautyMMManager.Instance.GetAttrValue(attrType);
var fatesValue = HeroFatesManager.Instance.GetAttrValue(attrType);
- var dingjungeValue = 0; //榛樿涓嶉渶瑕佸姞锛岀埇濉旂壒娈婄敤锛岄厤鍚堝叕寮�
+ djgAttrs.TryGetValue(attrType, out var dingjungeValue);
minggeAttrs.TryGetValue(attrType, out var minggeValue);
//闃靛鍏夌幆 涓夊洿鐧惧垎姣斿姞鎴�
@@ -487,7 +489,8 @@
RefreshOfficialAttrs();
RefrehEquipAttrs();
RefrehMinggeAttrs();
-
+ djgAttrs.Clear();
+
bool diffFP = lastFightPower != PlayerDatas.Instance.baseData.FightPower; //鎴樺姏鏄惁鏈夊彉鍖�
if (diffFP || calcType == 0)
{
@@ -812,6 +815,7 @@
RefrehMinggeAttrs();
RefrehEquipAttrs();
RefreshTeamAttrs();
+ djgAttrs.Clear();
var fightPower = CalculateTeamHeroPower(heroInfo);
fightPower += GetMinggeSkillPower();
--
Gitblit v1.8.0