Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-01-10 b8bcfae71df34b7b422dd59741e1e9c0358e4142

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -328,6 +328,11 @@
                        var bosses = ModelCenter.Instance.GetModel<DogzDungeonModel>().GetBosses();

                        m_BossBriefInfos.Display(bosses);

                    }

                    else if (PlayerDatas.Instance.baseData.MapID == CrossServerBossModel.DATA_MAPID)

                    {

                        var bosses = ModelCenter.Instance.GetModel<CrossServerBossModel>().GetBosses();

                        m_BossBriefInfos.Display(bosses);

                    }

                    else

                    {

                        var bosses = ModelCenter.Instance.GetModel<WorldBossModel>().GetWorldBosses(PlayerDatas.Instance.baseData.MapID);

@@ -457,7 +462,7 @@
                m_RedpackGetSfx.StopImediatly();

            }

            var requireRedpack = (OSEnvelopeModel.CanGetEnvelope()

                || redPacket.IsRedBagGetBool) && PlayerDatas.Instance.baseData.ExAttr5 != 1;

                || redPacket.IsRedBagGetBool) && !CrossServerUtility.IsCrossServer();

            if (requireRedpack)

            {

                m_RedBag.gameObject.SetActive(true);

@@ -726,7 +731,7 @@


        private void UpdateDungeonAssistImag()

        {

            if (PlayerDatas.Instance.baseData.ExAttr5 == 1)

            if (CrossServerUtility.IsCrossServer())

            {

                DungeonAssistImg.gameObject.SetActive(false);

                return;

@@ -736,7 +741,7 @@


        private void UpdateMysticalPurchaseImag()

        {

            if (PlayerDatas.Instance.baseData.ExAttr5 == 1)

            if (CrossServerUtility.IsCrossServer())

            {

                MysticalPurchaseImg.gameObject.SetActive(false);

                return;

@@ -746,7 +751,7 @@


        private void UpdateWishAwardImag()

        {

            if(PlayerDatas.Instance.baseData.ExAttr5 == 1)

            if (CrossServerUtility.IsCrossServer())

            {

                WishingAwardImg.gameObject.SetActive(false);

                return;

@@ -1168,8 +1173,7 @@
        private void IsShowTaskPanel()//是否显示任务面板

        {

            var inDungeon = IsDungeon();

            var IsCrossServerOneVsOne = PlayerDatas.Instance.baseData.ExAttr5 == 1;

            if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne)

            if (inDungeon || fairyGrabBossModel.grabBossHintOpen || CrossServerUtility.IsCrossServer())

            {

                m_TaskAndTeamTip.SetActive(false);

                m_TaskSwithButton.gameObject.SetActive(false);

@@ -1296,7 +1300,7 @@


        private void IsCrossServerOneVsOne()

        {

            if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//是否再跨服副本中

            if (CrossServerUtility.IsCrossServerOneVsOne())//是否再跨服副本中

            {

                WindowCenter.Instance.Open<FightingPKWin>();

                m_HeadPortraitTip.gameObject.SetActive(false);