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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/PKModel.cs

@@ -44,7 +44,7 @@
        private void onStageLoadFinish()
        {
            int MapID = PlayerDatas.Instance.baseData.MapID;
            var config = ConfigManager.Instance.GetTemplate<MapConfig>(MapID);
            var config = Config.Instance.Get<MapConfig>(MapID);

            if (config!=null)
            {