From f90bcf177217ad0e104bc811d576c1517b79758e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 09 一月 2026 11:04:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Main/FightPowerManager.cs |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/Main/System/Main/FightPowerManager.cs b/Main/System/Main/FightPowerManager.cs
index 81c154d..76ba0c0 100644
--- a/Main/System/Main/FightPowerManager.cs
+++ b/Main/System/Main/FightPowerManager.cs
@@ -45,6 +45,8 @@
     private const string HERO_LV_VALUE = "heroLVValue";
     private const string HERO_LV_PER = "heroLVPer";
     private const string HERO_CARDPER = "cardPer";
+    private const string DINGJUNGE_VALUE = "dingjungeValue";
+    private const string DINGJUNGE_PER = "dingjungePer";
 
     // 鎴樺姏鍙橀噺甯搁噺
     private const string ATK_RATIO = "AtkRatio";
@@ -90,6 +92,12 @@
     private const string CURE_PER_DEF_RATIO = "CurePerDefRatio";
     private const string PVP_DAM_PER_RATIO = "PVPDamPerRatio";
     private const string PVP_DAM_PER_DEF_RATIO = "PVPDamPerDefRatio";
+    private const string GUANCHUAN_RATIO = "GuanchuanRatio";
+    private const string GUANCHUAN_DEF_RATIO = "GuanchuanDefRatio";
+    private const string ZHAOJIA_RATIO = "ZhaojiaRatio";
+    private const string ZHAOJIA_DEF_RATIO = "ZhaojiaDefRatio";
+
+
     private const string PLAYER_LV = "PlayerLV";
     private const string OFFICIAL_LV = "OfficialLV";
     private const string SKILL_POWER = "SkillPower";
@@ -321,6 +329,9 @@
         propertyVariables[BEAUTY_PER] = BeautyMMManager.Instance.GetAttrPer(attrType) / 10000.0f;
         propertyVariables[FATES_VALUE] = HeroFatesManager.Instance.GetAttrValue(attrType);
         propertyVariables[FATES_PER] = HeroFatesManager.Instance.GetAttrPer(attrType) / 10000.0f;
+        propertyVariables[DINGJUNGE_VALUE] = 0; //榛樿涓嶉渶瑕佸姞锛岀埇濉旂壒娈婄敤锛岄厤鍚堝叕寮�
+        propertyVariables[DINGJUNGE_PER] = 0;   //榛樿涓嶉渶瑕佸姞锛岀埇濉旂壒娈婄敤锛岄厤鍚堝叕寮�
+
 
         //鍏ㄤ綋鍗$墝鍔犳垚
         propertyVariables[HERO_CARDPER] = allHeroAddPer;
@@ -535,6 +546,11 @@
         fightPowerVariables[CURE_PER_DEF_RATIO] = fightPowerRatioConfig.CurePerDefRatio;
         fightPowerVariables[PVP_DAM_PER_RATIO] = fightPowerRatioConfig.PVPDamPerRatio;
         fightPowerVariables[PVP_DAM_PER_DEF_RATIO] = fightPowerRatioConfig.PVPDamPerDefRatio;
+        fightPowerVariables[GUANCHUAN_RATIO] = fightPowerRatioConfig.GuanchuanRatio;
+        fightPowerVariables[GUANCHUAN_DEF_RATIO] = fightPowerRatioConfig.GuanchuanDefRatio;
+        fightPowerVariables[ZHAOJIA_RATIO] = fightPowerRatioConfig.ZhaojiaRatio;
+        fightPowerVariables[ZHAOJIA_DEF_RATIO] = fightPowerRatioConfig.ZhaojiaDefRatio;
+
 
         long fightPower = (long)FightPowerFormula.GetFightPower(fightPowerVariables);
 #if UNITY_EDITOR

--
Gitblit v1.8.0