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

client_Hale

2019-01-16 76eb108c295da185486d01fb523be3c7e43d6eb2

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -148,6 +148,7 @@
        IceCrystalVeinModel m_IceCrystalVeinModel;

        IceCrystalVeinModel iceCrystalVeinModel { get { return m_IceCrystalVeinModel ?? (m_IceCrystalVeinModel = ModelCenter.Instance.GetModel<IceCrystalVeinModel>()); } }

        #region Built-in

        private bool IsUpdateBool=true;

        protected override void BindController()

        {

            m_MapSwitchingBehaviour.InitAwake();

@@ -195,6 +196,7 @@
            {

                IsOpenMaininterface();

            }

            IsUpdateBool = true;

            SliderOpen = true;

            horseRidBool = false;

            friendsModel.askAddFriendEvent = FriendQuestBtn;

@@ -247,6 +249,7 @@
            purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;

            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;

            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;

            GlobalTimeEvent.Instance.secondEvent += secondEvent;

            IsCrossServerOneVsOne();

            SetAtkType();

        }

@@ -426,6 +429,7 @@
            NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;

            fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss;

            ChatTip.OnChatUpEvent -= RefreshAdaptiveChat;

            GlobalTimeEvent.Instance.secondEvent -= secondEvent;

            if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

            {

                WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();

@@ -435,6 +439,15 @@
            fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;

            wishModel.UpdateWishAwardEvent -= UpdateWishAwardImag;

            m_CollectBehaviour.gameObject.SetActive(false);

        }



        private void secondEvent()

        {

            if (IsUpdateBool)

            {

                StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告

                IsUpdateBool = false;

            }

        }



        private void GuideBeginEvent()

@@ -1034,7 +1047,7 @@
            ArticleExperience();//关于经验条

            if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)

            {

                StartCoroutine(featureNoticeModel.WhetherToPlayTheBox());//功能预告

                IsUpdateBool = true;          
            }

            if (_tCDBPlayerRefresh == PlayerDataRefresh.ExAttr5)//判断是否再跨服

            {