Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-01-24 0762eb17cb1fefd1313e475d06b710d1bc966c5f

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 22, 2019
//    [  Date ]:           Thursday, January 24, 2019
//--------------------------------------------------------

using UnityEngine;
@@ -40,20 +40,20 @@
        public int SkillAtkRateReduceC { get ; private set ; }

        public int HitC { get ; private set ; }

        public int MissC { get ; private set ; }

        public int SkillAddPer1C { get ; private set ; }

        public int SkillAddPer2C { get ; private set ; }

        public int SkillAddPer3C { get ; private set ; }

        public int SkillAddPer4C { get ; private set ; }

        public int SkillAddPer5C { get ; private set ; }

        public int SkillAddPer6C { get ; private set ; }

        public int SkillAddPer7C { get ; private set ; }

        public int SkillReducePer1C { get ; private set ; }

        public int SkillReducePer2C { get ; private set ; }

        public int SkillReducePer3C { get ; private set ; }

        public int SkillReducePer4C { get ; private set ; }

        public int SkillReducePer5C { get ; private set ; }

        public int SkillReducePer6C { get ; private set ; }

        public int SkillReducePer7C { get ; private set ; }
        public int SkillAddPerAC { get ; private set ; }

        public int SkillAddPerBC { get ; private set ; }

        public int SkillAddPerCC { get ; private set ; }

        public int SkillAddPerDC { get ; private set ; }

        public int SkillAddPerEC { get ; private set ; }

        public int SkillAddPerFC { get ; private set ; }

        public int SkillAddPerGC { get ; private set ; }

        public int SkillReducePerAC { get ; private set ; }

        public int SkillReducePerBC { get ; private set ; }

        public int SkillReducePerCC { get ; private set ; }

        public int SkillReducePerDC { get ; private set ; }

        public int SkillReducePerEC { get ; private set ; }

        public int SkillReducePerFC { get ; private set ; }

        public int SkillReducePerGC { get ; private set ; }

        public override string getKey()
        {
@@ -121,33 +121,33 @@
            

                MissC=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0; 

            

                SkillAddPer1C=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0; 
                SkillAddPerAC=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0; 
            

                SkillAddPer2C=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0; 
                SkillAddPerBC=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0; 
            

                SkillAddPer3C=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0; 
                SkillAddPerCC=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0; 
            

                SkillAddPer4C=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0; 
                SkillAddPerDC=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0; 
            

                SkillAddPer5C=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0; 
                SkillAddPerEC=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0; 
            

                SkillAddPer6C=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0; 
                SkillAddPerFC=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0; 
            

                SkillAddPer7C=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0; 
                SkillAddPerGC=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0; 
            

                SkillReducePer1C=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0; 
                SkillReducePerAC=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0; 
            

                SkillReducePer2C=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0; 
                SkillReducePerBC=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0; 
            

                SkillReducePer3C=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0; 
                SkillReducePerCC=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0; 
            

                SkillReducePer4C=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0; 
                SkillReducePerDC=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0; 
            

                SkillReducePer5C=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0; 
                SkillReducePerEC=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0; 
            

                SkillReducePer6C=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0; 
                SkillReducePerFC=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0; 
            

                SkillReducePer7C=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0; 
                SkillReducePerGC=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0; 
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e238f9455d4062c4c867b41cfea2f046
timeCreated: 1548160973
timeCreated: 1548314012
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs

@@ -54,19 +54,19 @@
            _tagGsProValueDict.Add(AttrEnum.SkillHurtPrecent, gsModel.SkillAtkRateReduceC);

            _tagGsProValueDict.Add(AttrEnum.HIT, gsModel.HitC);

            _tagGsProValueDict.Add(AttrEnum.MISS, gsModel.MissC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer1, gsModel.SkillAddPer1C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer2, gsModel.SkillAddPer2C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer3, gsModel.SkillAddPer3C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer4, gsModel.SkillAddPer4C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer5, gsModel.SkillAddPer5C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer6, gsModel.SkillAddPer6C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer1, gsModel.SkillReducePer1C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer2, gsModel.SkillReducePer2C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer3, gsModel.SkillReducePer3C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer4, gsModel.SkillReducePer4C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer5, gsModel.SkillReducePer5C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer6, gsModel.SkillReducePer6C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer7, gsModel.SkillReducePer7C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPerA, gsModel.SkillAddPerAC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPerB, gsModel.SkillAddPerBC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPerC, gsModel.SkillAddPerCC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPerD, gsModel.SkillAddPerDC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPerE, gsModel.SkillAddPerEC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPerF, gsModel.SkillAddPerFC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerA, gsModel.SkillReducePerAC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerB, gsModel.SkillReducePerBC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerC, gsModel.SkillReducePerCC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerD, gsModel.SkillReducePerDC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerE, gsModel.SkillReducePerEC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerF, gsModel.SkillReducePerFC);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePerG, gsModel.SkillReducePerGC);

            return _tagGsProValueDict;

        }

    }


 Utility/EnumHelper.cs

@@ -1027,20 +1027,20 @@
    ZXRuyiAttrPer = 99,//诛仙·如意属性百分比

    ZXPendantAttrPer = 100, //诛仙·吊坠属性百分比

    ZXRingAttrPer = 101, //诛仙·戒指属性百分比

    SkillAddPer1 = 102,//定海神针技能伤害百分比

    SkillAddPer2 = 103, //皓月枪技能伤害百分比

    SkillAddPer3 = 104, //鬼牙刃技能伤害百分比

    SkillAddPer4 = 105, //磐龙印技能伤害百分比

    SkillAddPer5 = 106, //杏黄旗技能伤害百分比

    SkillAddPer6 = 107,//嗜天斧技能伤害百分比

    SkillAddPer7 = 108, //射日神弓技能伤害百分比

    SkillReducePer1 = 109, //定海神针技能减伤百分比

    SkillReducePer2 = 110, //皓月枪技能减伤百分比

    SkillReducePer3 = 111, //鬼牙刃技能减伤百分比

    SkillReducePer4 = 112, //磐龙印技能减伤百分比

    SkillReducePer5 = 113, //杏黄旗技能减伤百分比

    SkillReducePer6 = 114, //嗜天斧技能减伤百分比

    SkillReducePer7 = 115, //射日神弓技能减伤百分比

    SkillAddPerA = 102,//定海神针技能伤害百分比

    SkillAddPerB = 103, //皓月枪技能伤害百分比

    SkillAddPerC = 104, //鬼牙刃技能伤害百分比

    SkillAddPerD = 105, //磐龙印技能伤害百分比

    SkillAddPerE = 106, //杏黄旗技能伤害百分比

    SkillAddPerF = 107,//嗜天斧技能伤害百分比

    SkillAddPerG = 108, //射日神弓技能伤害百分比

    SkillReducePerA = 109, //定海神针技能减伤百分比

    SkillReducePerB = 110, //皓月枪技能减伤百分比

    SkillReducePerC = 111, //鬼牙刃技能减伤百分比

    SkillReducePerD = 112, //磐龙印技能减伤百分比

    SkillReducePerE = 113, //杏黄旗技能减伤百分比

    SkillReducePerF = 114, //嗜天斧技能减伤百分比

    SkillReducePerG = 115, //射日神弓技能减伤百分比

}

//UI图标类型

public enum SpriteFileType