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

client_linchunjie

2019-04-28 befbbfa399d03b62bc10959597c42fe9f1c52edb

 System/MainInterfacePanel/MainPositionTween.cs

@@ -109,7 +109,8 @@
            m_ContainerBossList.gameObject.SetActive(isNeutralMap);



            rightTopState = RightTopState.Function;

            if ((isDungeon || isNeutralMap || isBossArea) && !isGuiding && switchParams.showDefault)

            if ((isDungeon || isNeutralMap || isBossArea || AdventureStage.Instance.IsInAdventureStage)

                && !isGuiding && switchParams.showDefault)

            {

                rightTopState = RightTopState.Boss;

            }