Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/GeneralConfig/GeneralConfig.cs

@@ -160,15 +160,15 @@
            EarlierGetTreasure = new List<int>(GetIntArray("EarlierGetTreasure"));

            BossSound = GetInt("BossSound");

            PlayBossHurtInterval = GetFloat("BossSound", 2);

            var jobHeadPortraitConfig1 = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("Job1Head");

            var jobHeadPortraitConfig1 = Config.Instance.Get<FuncConfigConfig>("Job1Head");

            jobHeadPortrait[1] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig1.Numerical1);

            otherjobHeadPortrait[1] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig1.Numerical2);



            var jobHeadPortraitConfig2 = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("Job2Head");

            var jobHeadPortraitConfig2 = Config.Instance.Get<FuncConfigConfig>("Job2Head");

            jobHeadPortrait[2] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig2.Numerical1);

            otherjobHeadPortrait[2] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig2.Numerical2);



            var jobHeadPortraitConfig3 = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("Job3Head");

            var jobHeadPortraitConfig3 = Config.Instance.Get<FuncConfigConfig>("Job3Head");

            jobHeadPortrait[3] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig3.Numerical1);

            otherjobHeadPortrait[3] = ConfigParse.GetDic<int, string>(jobHeadPortraitConfig3.Numerical2);



@@ -220,7 +220,7 @@
            elderGodBigBoss = GetInt("ElderGodBigBoss");

            PassiveSkillShow = new List<int>(GetIntArray("PassiveSkillShow"));



            FuncConfigConfig func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("NpcPosOffset");

            FuncConfigConfig func = Config.Instance.Get<FuncConfigConfig>("NpcPosOffset");

            LitJson.JsonData _data = LitJson.JsonMapper.ToObject(func.Numerical1);

            foreach (var _key in _data.Keys)

            {

@@ -231,7 +231,7 @@
                NpcPosOffset.Add(_npcID, new Vector3((float)_pos[0], 0, (float)_pos[1]));

            }



            FuncConfigConfig nxxdImg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("NXXDPicture");

            FuncConfigConfig nxxdImg = Config.Instance.Get<FuncConfigConfig>("NXXDPicture");

            LitJson.JsonData nxxdData = LitJson.JsonMapper.ToObject(nxxdImg.Numerical1);

            multipleRealmImgDict = new Dictionary<int, string>();

            if (nxxdData.IsArray)

@@ -249,7 +249,7 @@
            bossShuntDays = GetInt("BossShunt", 3);



            itemDropEffect.Clear();

            func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ItemEquipmentEffect");

            func = Config.Instance.Get<FuncConfigConfig>("ItemEquipmentEffect");

            _data = LitJson.JsonMapper.ToObject(func.Numerical1);

            List<string> _keys = new List<string>(_data.Keys);

            for (i = 0; i < _keys.Count; ++i)

@@ -291,7 +291,7 @@
            }



            dropEffectQuality.Clear();

            func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("IeemEquipmentEffectQuality");

            func = Config.Instance.Get<FuncConfigConfig>("IeemEquipmentEffectQuality");

            _data = LitJson.JsonMapper.ToObject(func.Numerical1);

            _keys.Clear();

            _keys.AddRange(_data.Keys);

@@ -301,7 +301,7 @@
            }



            customDropEffect.Clear();

            func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ItemEquipmentEffectItem");

            func = Config.Instance.Get<FuncConfigConfig>("ItemEquipmentEffectItem");

            _data = LitJson.JsonMapper.ToObject(func.Numerical1);

            _keys.Clear();

            _keys.AddRange(_data.Keys);

@@ -329,7 +329,7 @@
            }



            BuffToHitEffect.Clear();

            func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BuffToHitEffect");

            func = Config.Instance.Get<FuncConfigConfig>("BuffToHitEffect");

            if (!string.IsNullOrEmpty(func.Numerical1) && !string.IsNullOrEmpty(func.Numerical2))

            {

                string[] _buffs = func.Numerical1.Split('|');

@@ -349,7 +349,7 @@
            autoBuyItemPrices = GetIntArray("BuyItemPrice", 2);

            neutralMaps.AddRange(GetIntArray("BossListMapID"));



            var _propertyIconCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("PropertyIcon");

            var _propertyIconCfg = Config.Instance.Get<FuncConfigConfig>("PropertyIcon");

            var _propertyIconJson = LitJson.JsonMapper.ToObject(_propertyIconCfg.Numerical1);

            foreach (var _key in _propertyIconJson.Keys)

            {

@@ -367,7 +367,7 @@
            heroDialogueRotation = GetInputString("NpcHalfLength", 2).Vector3Parse();

            heroDialogueScale = GetFloat("NpcHalfLength", 3);



            var ancientConfig = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ElderBattleTarget");

            var ancientConfig = Config.Instance.Get<FuncConfigConfig>("ElderBattleTarget");

            ancientGrandTotalAchievements = new List<int>();

            ancientGrandTotalAchievements.AddRange(ConfigParse.GetMultipleStr<int>(ancientConfig.Numerical1));

            ancientContinueKillAchievements = new List<int>();

@@ -399,7 +399,7 @@


            if (ModeDefaultConfig == null)

            {

                func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ModeDefault");

                func = Config.Instance.Get<FuncConfigConfig>("ModeDefault");



                string[] _funcNpc = func.Numerical1.Split('|');

                string[] _fightNpc = func.Numerical2.Split('|');

@@ -415,7 +415,7 @@


            if (RealmGroup == null)

            {

                func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RealmGroup");

                func = Config.Instance.Get<FuncConfigConfig>("RealmGroup");

                string[] _group = func.Numerical1.Split('|');

                RealmGroup = new int[_group.Length];

                for (int j = 0; j < _group.Length; ++j)

@@ -424,7 +424,7 @@
                }

            }



            func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("PrefightAtkRange");

            func = Config.Instance.Get<FuncConfigConfig>("PrefightAtkRange");

            PrefightAtkRange = float.Parse(func.Numerical1);

            inGameDownLoadHighestLevelPoint = GetInt("DownReward", 2);



@@ -578,7 +578,7 @@


    private string GetInputString(string _key, int _index = 1)

    {

        var config = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(_key);

        var config = Config.Instance.Get<FuncConfigConfig>(_key);

        var inputString = string.Empty;



        switch (_index)