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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/MainInterfacePanel/TipPanel.cs

@@ -63,7 +63,7 @@
        private bool IsDungeon()

        {

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            return mapConfig != null && mapConfig.MapFBType != 0;

        }

        public void IsOPenTip()