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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainWin/SkillTurnplate.cs

@@ -77,7 +77,7 @@
                }

                else

                {

                    var config = ConfigManager.Instance.GetTemplate<TreasureConfig>(GeneralConfig.Instance.skillPanelUnLock);

                    var config = Config.Instance.Get<TreasureConfig>(GeneralConfig.Instance.skillPanelUnLock);

                    SysNotifyMgr.Instance.ShowTip("SkillPanel_Unlock", config.Name);

                }

            }