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

client_Zxw

2018-11-26 97b0f2ade9f284760492e52d5b2bd3417a2e09df

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -85,6 +85,7 @@
        [SerializeField] Button m_SendRedbagBtn;

        [SerializeField] Button WishingAwardImg;

        [SerializeField] Button MysticalPurchaseImg;

        [SerializeField] Button DungeonAssistImg;

        [SerializeField] Button m_GotoFairyGrabBoss;

        [SerializeField] Button m_FlyToFairyGrabBoss;



@@ -144,6 +145,7 @@
        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }

        WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } }

        MysticalPurchaseModel purchaseModel { get { return ModelCenter.Instance.GetModel<MysticalPurchaseModel>(); } }

        DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }

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

        #region Built-in

@@ -183,6 +185,7 @@
            m_SendRedbagBtn.AddListener(SendRedpacketBtn);

            WishingAwardImg.AddListener(ClickWishAward);

            MysticalPurchaseImg.AddListener(ClickMysticalPurchase);

            DungeonAssistImg.AddListener(ClickDungeonAssist);

            m_GotoFairyGrabBoss.AddListener(GotoFairyGrabBoss);

            m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);

        }

@@ -214,6 +217,7 @@
            m_BossBriefInfos.gameObject.SetActive(false);

            UpdateWishAwardImag();

            UpdateMysticalPurchaseImag();

            UpdateDungeonAssistImag();

            ArticleExperience();//关于经验条

            FriendQuestBtn();

            UpdateFairyRequest();

@@ -240,6 +244,7 @@
            NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;

            fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;

            wishModel.UpdateWishAwardEvent += UpdateWishAwardImag;

            assistModel.UpdateRedpointEvent += UpdateDungeonAssistImag;

            purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;

            fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;

        }

@@ -395,6 +400,7 @@
            m_FairyCallBehaviour.UnInit();

            horseRidBool = false;

            purchaseModel.UpdateNewMysticalEvent -= UpdateMysticalPurchaseImag;

            assistModel.UpdateRedpointEvent -= UpdateDungeonAssistImag;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;

            FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;

            fairyModel.UpdateFairyRequestEvent -= UpdateFairyRequest;

@@ -694,6 +700,16 @@
            WindowCenter.Instance.Open<OpenServerActivityWin>(false, (int)OpenServerActivityCenter.OSActivityType.MysticalPurchase);

        }



        private void ClickDungeonAssist()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DungeonAssitCheckIn);

        }



        private void UpdateDungeonAssistImag()

        {

            DungeonAssistImg.gameObject.SetActive(assistModel.IsNewAssistInfo);

        }



        private void UpdateMysticalPurchaseImag()

        {

            MysticalPurchaseImg.gameObject.SetActive(purchaseModel.priorityOpen);