Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2025-12-09 8f9b0688987da60ac863fe043531831e238895ad

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

# Conflicts:
#	Main/System/Battle/BattleField/StoryBossBattleField.cs

 Main/System/Main/FightPowerFormula.cs

@@ -10,12 +10,14 @@
    private const string HJGVALUE_VALUE = "hjgValue";

    private const string HORSEVALUE_VALUE = "horseValue";

    private const string BEAUTYVALUE_VALUE = "beautyValue";

    private const string FATESVALUE_VALUE = "fatesValue";

    private const string LINEUPHALOPER_VALUE = "lineupHaloPer";

    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 FATESPER_VALUE = "fatesPer";

    private const string CARDPER_VALUE = "cardPer";

    private const string INHERITPER_VALUE = "inheritPer";

    private const string FETTERPER_VALUE = "fetterPer";

@@ -119,9 +121,9 @@
    private const string OFFICIALLV_VALUE = "OfficialLV";



    // 基础属性公式

    // (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue

    // (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue

    // 战斗属性公式

    // (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue

    // (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue)+(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,12 +138,14 @@
        double hjgValue = variables[HJGVALUE_VALUE];

        double horseValue = variables[HORSEVALUE_VALUE];

        double beautyValue = variables[BEAUTYVALUE_VALUE];

        double fatesValue = variables[FATESVALUE_VALUE];

        double lineupHaloPer = variables[LINEUPHALOPER_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 fatesPer = variables[FATESPER_VALUE];

        double cardPer = variables[CARDPER_VALUE];

        double inheritPer = variables[INHERITPER_VALUE];

        double fetterPer = variables[FETTERPER_VALUE];

@@ -151,7 +155,7 @@
        double heroSelfValue = variables[HEROSELFVALUE_VALUE];

        double heroLVValue = variables[HEROLVVALUE_VALUE];



        return (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue;

        return (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue;

    }



    public static double GetFightAttr(Dictionary<string, double> variables)

@@ -163,6 +167,7 @@
        double hjgValue = variables[HJGVALUE_VALUE];

        double horseValue = variables[HORSEVALUE_VALUE];

        double beautyValue = variables[BEAUTYVALUE_VALUE];

        double fatesValue = variables[FATESVALUE_VALUE];

        double heroSelfValue = variables[HEROSELFVALUE_VALUE];

        double lineupHaloValue = variables[LINEUPHALOVALUE_VALUE];

        double starTalentValue = variables[STARTALENTVALUE_VALUE];

@@ -170,7 +175,7 @@
        double awakeTalentValue = variables[AWAKETALENTVALUE_VALUE];

        double fetterValue = variables[FETTERVALUE_VALUE];



        return (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue;

        return (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue;

    }



    public static double GetFightPower(Dictionary<string, double> variables)


 Main/System/Main/FightPowerManager.cs

@@ -27,10 +27,8 @@
    private const string HORSE_PER = "horsePer";
    private const string BEAUTY_VALUE = "beautyValue";
    private const string BEAUTY_PER = "beautyPer";
    private const string LINEUP_INIT_ADD_PER = "lineupInitAddPer";
    private const string LINEUP_LV_ADD_PER = "lineupLVAddPer";
    private const string LINEUP_BREAK_LV_ADD_PER = "lineupBreakLVAddPer";
    private const string LINEUP_STAR_ADD_PER = "lineupStarAddPer";
    private const string FATES_VALUE = "fatesValue";
    private const string FATES_PER = "fatesPer";
    private const string LINEUP_HALO_VALUE = "lineupHaloValue";
    private const string LINEUP_HALO_PER = "lineupHaloPer";
    private const string INHERIT_PER = "inheritPer";
@@ -317,6 +315,8 @@
        propertyVariables[HORSE_PER] = HorseManager.Instance.GetAttrPer(attrType) / 10000.0f;
        propertyVariables[BEAUTY_VALUE] = 0;
        propertyVariables[BEAUTY_PER] = 0;
        propertyVariables[FATES_VALUE] = 0;
        propertyVariables[FATES_PER] = 0;

        //全体卡牌加成
        propertyVariables[HERO_CARDPER] = allHeroAddPer;