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

yyl

3 小时以前 b3b82915705dfee86db127d45eea6dd2442d6d92

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

 Main/Config/Configs/DienstgradConfig.cs

File was deleted

 Main/Config/Configs/DienstgradConfig.cs.meta

File was deleted

 Main/Core/GameEngine/Launch/LaunchInHot.cs

@@ -22,20 +22,6 @@

    void Start()
    {

#if !UNITY_EDITOR
        if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
        LocalSave.GetString("#@#BrancH") != string.Empty)
        {
            Debug.unityLogger.logEnabled = true;
        }
        else
        { 
            Debug.unityLogger.logEnabled = false;
        }

#endif

        System.Net.ServicePointManager.DefaultConnectionLimit = 100;//设置http最大连接数
        Application.backgroundLoadingPriority = ThreadPriority.High;
        Screen.sleepTimeout = SleepTimeout.NeverSleep;

 Main/Main.cs

@@ -120,6 +120,21 @@
        ClearGameData();

        //销毁所有战场

        BattleManager.Instance.DestroyAllBattleField();



        //游戏内日志关闭

#if !UNITY_EDITOR

        if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||

        LocalSave.GetString("#@#BrancH") != string.Empty)

        {

            Debug.unityLogger.logEnabled = true;

        }

        else

        { 
            Debug.unityLogger.logEnabled = false;

        }



#endif



    }



    private static void ReleaseMgrs()


 Main/System/Main/FightPowerFormula.cs

@@ -3,9 +3,9 @@
public class FightPowerFormula

{

    // 基础属性公式

    // (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue

    // (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

    // 战斗属性公式

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

    // (lvValue+equipValue+bookValue+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)

    // 技能战斗力公式

@@ -20,12 +20,14 @@
        double gubaoValue = variables["gubaoValue"];

        double hjgValue = variables["hjgValue"];

        double horseValue = variables["horseValue"];

        double beautyValue = variables["beautyValue"];

        double lineupHaloPer = variables["lineupHaloPer"];

        double bookPer = variables["bookPer"];

        double realmPer = variables["realmPer"];

        double gubaoPer = variables["gubaoPer"];

        double hjgPer = variables["hjgPer"];

        double horsePer = variables["horsePer"];

        double beautyPer = variables["beautyPer"];

        double lineupInitAddPer = variables["lineupInitAddPer"];

        double lineupLVAddPer = variables["lineupLVAddPer"];

        double lineupBreakLVAddPer = variables["lineupBreakLVAddPer"];

@@ -37,7 +39,7 @@
        double awakeTalentPer = variables["awakeTalentPer"];

        double heroSelfValue = variables["heroSelfValue"];



        return (lvValue+equipValue+bookValue+realmValue+gubaoValue+hjgValue+horseValue)*(1+lineupHaloPer+bookPer+realmPer+gubaoPer+hjgPer+horsePer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue;

        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;

    }



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

@@ -49,6 +51,7 @@
        double gubaoValue = variables["gubaoValue"];

        double hjgValue = variables["hjgValue"];

        double horseValue = variables["horseValue"];

        double beautyValue = variables["beautyValue"];

        double heroSelfValue = variables["heroSelfValue"];

        double lineupHaloValue = variables["lineupHaloValue"];

        double starTalentValue = variables["starTalentValue"];

@@ -56,7 +59,7 @@
        double awakeTalentValue = variables["awakeTalentValue"];

        double fetterValue = variables["fetterValue"];



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

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

    }



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


 Main/System/Main/FightPowerManager.cs

@@ -285,6 +285,8 @@
        propertyVariables["hjgPer"] = PhantasmPavilionManager.Instance.GetAttrPer(attrType) / 10000.0f;
        propertyVariables["horseValue"] = HorseManager.Instance.GetAttrValue(attrType);
        propertyVariables["horsePer"] = HorseManager.Instance.GetAttrPer(attrType) / 10000.0f;
        propertyVariables["beautyValue"] = 0;
        propertyVariables["beautyPer"] = 0;

        //！！！单武将战力预览的话需要排除队伍影响战力，只算武将自身的上阵属性
        propertyVariables["lineupInitAddPer"] = GetLineUpPer(attrType, "lineupInitAddPer") / 10000.0f;

 Main/System/Message/RichTableEvent.cs

@@ -28,7 +28,7 @@
        return false;
    }

    

    public override string GetDisplay(RichTextEventEnum type, Dictionary<string, string> _dict)
    {
        switch (type)
@@ -137,7 +137,7 @@
                                    //         }
                                    //     }
                                    return "map";
                                 }
                                }
                                break;
                            case "skill":
                                {
@@ -252,7 +252,7 @@
                                    return "treasureprivilege";
                                }
                                break;
                            

                            // case "skytowerfloor":
                            //     {
                            //         var _id = 0;
@@ -300,7 +300,43 @@
                                    var _id = 0;
                                    if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
                                    {
                                        return UIHelper.AppendColor(TextColType.Green, DienstgradConfig.Get(_id).Name, true);
                                        return UIHelper.AppendColor(TextColType.Green, TitleConfig.Get(_id).Name, true);
                                    }
                                }
                                break;
                            case "face":
                                {
                                    var _id = 0;
                                    if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
                                    {
                                        return UIHelper.AppendColor(TextColType.Green, PlayerFaceConfig.Get(_id).Name, true);
                                    }
                                }
                                break;
                            case "facepic":
                                {
                                    var _id = 0;
                                    if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
                                    {
                                        return UIHelper.AppendColor(TextColType.Green, PlayerFacePicConfig.Get(_id).Name, true);
                                    }
                                }
                                break;
                            case "chatbox":
                                {
                                    var _id = 0;
                                    if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
                                    {
                                        return UIHelper.AppendColor(TextColType.Green, ChatBubbleBoxConfig.Get(_id).Name, true);
                                    }
                                }
                                break;
                            case "model":
                                {
                                    var _id = 0;
                                    if (_dict.ContainsKey("id") && int.TryParse(_dict["id"], out _id))
                                    {
                                        return UIHelper.AppendColor(TextColType.Green, ModelConfig.Get(_id).Name, true);
                                    }
                                }
                                break;