Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831

 System/MainInterfacePanel/TopRightTip.cs

@@ -27,10 +27,8 @@


        private void OpenMapWin()

        {

            var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig();

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

            if (string.IsNullOrEmpty(mapResConfig.BigMap)

                || PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON)

            var canOpen = ModelCenter.Instance.GetModel<MapModel>().CanOpenLocalMapWin(PlayerDatas.Instance.baseData.MapID);

            if (!canOpen)

            {

                SysNotifyMgr.Instance.ShowTip("MapInfo1");

            }