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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Skill/SkillModel.cs

@@ -48,18 +48,18 @@
        {

            for (int i = 1; i <= 3; i++)

            {

                var cfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>(StringUtility.Contact("QuickJobSkill", i));

                var cfg = Config.Instance.Get<FuncConfigConfig>(StringUtility.Contact("QuickJobSkill", i));

                if (cfg != null)

                {

                    quickBaseSkillDic.Add(i, ConfigParse.GetMultipleStr<int>(cfg.Numerical1));

                }

            }

            FuncConfigConfig funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("XpSkillID");

            FuncConfigConfig funcCfg = Config.Instance.Get<FuncConfigConfig>("XpSkillID");

            if (funcCfg != null)

            {

                xpSkillsDic = ConfigParse.GetDic<int, int>(funcCfg.Numerical1);

            }

            funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("PassSkillEquipLimit");

            funcCfg = Config.Instance.Get<FuncConfigConfig>("PassSkillEquipLimit");

            if (funcCfg != null)

            {

                JsonData jsonData = JsonMapper.ToObject(funcCfg.Numerical1);

@@ -71,7 +71,7 @@
                }

                passEquipCnt = int.Parse(funcCfg.Numerical2);

            }

            funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("PassSkillEquipGetWay");

            funcCfg = Config.Instance.Get<FuncConfigConfig>("PassSkillEquipGetWay");

            if (funcCfg != null)

            {

                JsonData jsonData = JsonMapper.ToObject(funcCfg.Numerical1);

@@ -82,7 +82,7 @@
                }

                passEquipGetWayTxts = ConfigParse.GetDic<int, string>(funcCfg.Numerical2);

            }

            funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SkillActTypeIdSort");

            funcCfg = Config.Instance.Get<FuncConfigConfig>("SkillActTypeIdSort");

            skillActDict = new Dictionary<int, Dictionary<int, List<SkillConfig>>>();

            var _JobTypeIds = ConfigParse.GetMultipleStr<int>(funcCfg.Numerical1);

            var _dict = new Dictionary<int, List<SkillConfig>>();

@@ -117,7 +117,7 @@
                }

            }

            skillActDict.Add(8, _dict);

            funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SpecialPassSkills");

            funcCfg = Config.Instance.Get<FuncConfigConfig>("SpecialPassSkills");

            betterPassSkills = new List<int>();

            var _array = ConfigParse.GetMultipleStr<int>(funcCfg.Numerical1);

            if (_array != null)

@@ -610,7 +610,7 @@
                return;

            }

            m_SkillIcon.gameObject.SetActive(true);

            skillCfg = ConfigManager.Instance.GetTemplate<SkillConfig>(_id);

            skillCfg = Config.Instance.Get<SkillConfig>(_id);

            m_SkillIcon.SetSprite(skillCfg.IconName);



            if (m_SkillNameTxt != null)