From ff032a0d727eee13399e29391e1437bea912337c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 06 十二月 2025 16:42:46 +0800
Subject: [PATCH] 121 【武将】武将系统 - 生效武将版本,同步属性计算,更改新筛选模式

---
 Main/System/Main/FightPowerFormula.cs |   23 ++++++-----------------
 1 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Main/System/Main/FightPowerFormula.cs b/Main/System/Main/FightPowerFormula.cs
index 2bef83b..25d17af 100644
--- a/Main/System/Main/FightPowerFormula.cs
+++ b/Main/System/Main/FightPowerFormula.cs
@@ -5,23 +5,18 @@
     // 鍙橀噺鍚嶅父閲忓畾涔�
     private const string LVVALUE_VALUE = "lvValue";
     private const string EQUIPVALUE_VALUE = "equipValue";
-    private const string BOOKVALUE_VALUE = "bookValue";
     private const string REALMVALUE_VALUE = "realmValue";
     private const string GUBAOVALUE_VALUE = "gubaoValue";
     private const string HJGVALUE_VALUE = "hjgValue";
     private const string HORSEVALUE_VALUE = "horseValue";
     private const string BEAUTYVALUE_VALUE = "beautyValue";
     private const string LINEUPHALOPER_VALUE = "lineupHaloPer";
-    private const string BOOKPER_VALUE = "bookPer";
     private const string REALMPER_VALUE = "realmPer";
     private const string GUBAOPER_VALUE = "gubaoPer";
     private const string HJGPER_VALUE = "hjgPer";
     private const string HORSEPER_VALUE = "horsePer";
     private const string BEAUTYPER_VALUE = "beautyPer";
-    private const string LINEUPINITADDPER_VALUE = "lineupInitAddPer";
-    private const string LINEUPLVADDPER_VALUE = "lineupLVAddPer";
-    private const string LINEUPBREAKLVADDPER_VALUE = "lineupBreakLVAddPer";
-    private const string LINEUPSTARADDPER_VALUE = "lineupStarAddPer";
+    private const string CARDPER_VALUE = "cardPer";
     private const string INHERITPER_VALUE = "inheritPer";
     private const string FETTERPER_VALUE = "fetterPer";
     private const string STARTALENTPER_VALUE = "starTalentPer";
@@ -124,9 +119,9 @@
     private const string OFFICIALLV_VALUE = "OfficialLV";
 
     // 鍩虹灞炴�у叕寮�
-    // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue
+    // (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue
     // 鎴樻枟灞炴�у叕寮�
-    // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue
+    // (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue
     // 鎴樻枟鍔涘叕寮�
     // long(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+(StunRate*StunRateRatio+SuperHitRate*SuperHitRateRatio+ComboRate*ComboRateRatio+MissRate*MissRateRatio+ParryRate*ParryRateRatio+SuckHPPer*SuckHPPerRatio+StunRateDef*StunRateDefRatio+SuperHitRateDef*SuperHitRateDefRatio+ComboRateDef*ComboRateDefRatio+MissRateDef*MissRateDefRatio+ParryRateDef*ParryRateDefRatio+SuckHPPerDef*SuckHPPerDefRatio+FinalDamPer*FinalDamPerRatio+FinalDamPerDef*FinalDamPerDefRatio+PhyDamPer*PhyDamPerRatio+PhyDamPerDef*PhyDamPerDefRatio+MagDamPer*MagDamPerRatio+MagDamPerDef*MagDamPerDefRatio+NormalSkillPer*NormalSkillPerRatio+NormalSkillPerDef*NormalSkillPerDefRatio+AngerSkillPer*AngerSkillPerRatio+AngerSkillPerDef*AngerSkillPerDefRatio+SuperDamPer*SuperDamPerRatio+SuperDamPerDef*SuperDamPerDefRatio+CurePer*CurePerRatio+CurePerDef*CurePerDefRatio+ShieldPer*ShieldPerRatio+ShieldPerDef*ShieldPerDefRatio+DOTPer*DOTPerRatio+DOTPerDef*DOTPerDefRatio+WeiFinalDamPer*WeiFinalDamPerRatio+WeiFinalDamPerDef*WeiFinalDamPerDefRatio+ShuFinalDamPer*ShuFinalDamPerRatio+ShuFinalDamPerDef*ShuFinalDamPerDefRatio+WuFinalDamPer*WuFinalDamPerRatio+WuFinalDamPerDef*WuFinalDamPerDefRatio+QunFinalDamPer*QunFinalDamPerRatio+QunFinalDamPerDef*QunFinalDamPerDefRatio+PVPDamPer*PVPDamPerRatio+PVPDamPerDef*PVPDamPerDefRatio)/100.0-55000)
     // 鎶�鑳芥垬鏂楀姏鍏紡
@@ -136,23 +131,18 @@
     {
         double lvValue = variables[LVVALUE_VALUE];
         double equipValue = variables[EQUIPVALUE_VALUE];
-        double bookValue = variables[BOOKVALUE_VALUE];
         double realmValue = variables[REALMVALUE_VALUE];
         double gubaoValue = variables[GUBAOVALUE_VALUE];
         double hjgValue = variables[HJGVALUE_VALUE];
         double horseValue = variables[HORSEVALUE_VALUE];
         double beautyValue = variables[BEAUTYVALUE_VALUE];
         double lineupHaloPer = variables[LINEUPHALOPER_VALUE];
-        double bookPer = variables[BOOKPER_VALUE];
         double realmPer = variables[REALMPER_VALUE];
         double gubaoPer = variables[GUBAOPER_VALUE];
         double hjgPer = variables[HJGPER_VALUE];
         double horsePer = variables[HORSEPER_VALUE];
         double beautyPer = variables[BEAUTYPER_VALUE];
-        double lineupInitAddPer = variables[LINEUPINITADDPER_VALUE];
-        double lineupLVAddPer = variables[LINEUPLVADDPER_VALUE];
-        double lineupBreakLVAddPer = variables[LINEUPBREAKLVADDPER_VALUE];
-        double lineupStarAddPer = variables[LINEUPSTARADDPER_VALUE];
+        double cardPer = variables[CARDPER_VALUE];
         double inheritPer = variables[INHERITPER_VALUE];
         double fetterPer = variables[FETTERPER_VALUE];
         double starTalentPer = variables[STARTALENTPER_VALUE];
@@ -161,14 +151,13 @@
         double heroSelfValue = variables[HEROSELFVALUE_VALUE];
         double heroLVValue = variables[HEROLVVALUE_VALUE];
 
-        return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue;
+        return (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue;
     }
 
     public static double GetFightAttr(Dictionary<string, double> variables)
     {
         double lvValue = variables[LVVALUE_VALUE];
         double equipValue = variables[EQUIPVALUE_VALUE];
-        double bookValue = variables[BOOKVALUE_VALUE];
         double realmValue = variables[REALMVALUE_VALUE];
         double gubaoValue = variables[GUBAOVALUE_VALUE];
         double hjgValue = variables[HJGVALUE_VALUE];
@@ -181,7 +170,7 @@
         double awakeTalentValue = variables[AWAKETALENTVALUE_VALUE];
         double fetterValue = variables[FETTERVALUE_VALUE];
 
-        return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue;
+        return (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue;
     }
 
     public static double GetFightPower(Dictionary<string, double> variables)

--
Gitblit v1.8.0