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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Skill/SkillBehaviour.cs

@@ -24,7 +24,7 @@


        public void Display(int _skillId)

        {

            var config = ConfigManager.Instance.GetTemplate<SkillConfig>(_skillId);

            var config = Config.Instance.Get<SkillConfig>(_skillId);

            skillId = 0;

            if (config != null)

            {

@@ -35,7 +35,7 @@


        public void DisplayNewGot(int _skillId)

        {

            var config = ConfigManager.Instance.GetTemplate<SkillConfig>(_skillId);

            var config = Config.Instance.Get<SkillConfig>(_skillId);

            skillId = 0;

            if (config != null)

            {