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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/WorldMap/MapFrameWin.cs

@@ -64,7 +64,7 @@
        protected override void OnActived()

        {

            base.OnActived();

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            var mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();

            if (string.IsNullOrEmpty(mapResConfig.BigMap))

            {