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

client_linchunjie

2019-04-28 befbbfa399d03b62bc10959597c42fe9f1c52edb

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -145,7 +145,7 @@
            }



            var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);

            if (isNeutralMap)

            if (isNeutralMap && !AdventureStage.Instance.IsInAdventureStage)

            {

                m_BossBriefInfos.gameObject.SetActive(true);

                if (PlayerDatas.Instance.baseData.MapID == DogzDungeonModel.DATA_MAPID)