Merge branch 'master' into 技能升级修改

client_linchunjie

2019-04-28 befbbfa399d03b62bc10959597c42fe9f1c52edb

 System/MainInterfacePanel/MapSwitchingBehaviour.cs

@@ -29,7 +29,7 @@
        public void Init()

        {

            int MapID = PlayerDatas.Instance.baseData.MapID;

            if (MapIdList.Contains(MapID))

            if (MapIdList.Contains(MapID) && !AdventureStage.Instance.IsInAdventureStage)

            {

                m_Btn_MapSwitch.gameObject.SetActive(true);

            }