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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Loading/LoadingFunctionShow.cs

@@ -17,7 +17,7 @@


        public void Display(int _id)

        {

            var config = ConfigManager.Instance.GetTemplate<LoadingFunctionConfig>(_id);

            var config = Config.Instance.Get<LoadingFunctionConfig>(_id);

            m_FunctionImage.SetSprite(config.Icon);

            m_FunctionLevel.text = Language.Get("LoadIconLV", config.Level);

        }