Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

 System/MainInterfacePanel/MainButtonMisc.cs

@@ -19,7 +19,6 @@
        [SerializeField] Button m_MysticalPurchaseImg;

        [SerializeField] Button m_DungeonAssistImg;

        [SerializeField] RectTransform m_ContainerGotoGrabBoss;

        [SerializeField] RectTransform m_ContainerAdaptiveChat;

        [SerializeField] Button m_GotoFairyGrabBoss;

        [SerializeField] Button m_FlyToFairyGrabBoss;

        [SerializeField] Button m_FriendQuestBtn;

@@ -34,6 +33,7 @@
        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }

        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }



        private void Start()

        {

            m_RedBag.SetListener(RedPacketButton);

@@ -45,6 +45,7 @@
            m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss);

            m_FairyRequestBtn.SetListener(OnFairyRequestClick);

        }



        public void Init()

        {

            friendsModel.askAddFriendEvent = FriendQuestBtn;

@@ -70,12 +71,13 @@
            ChatTip.OnChatUpEvent += RefreshAdaptiveChat;

            fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest;

        }



        public void OnActived()

        {

            RefreshAdaptiveChat();



        }

        public void Unit()



        public void UnInit()

        {

            m_CollectBehaviour.Dispose();

            RedPacketModel.OnRedBagGetEvent -= OnRedBagGet;

@@ -207,6 +209,7 @@
                WindowCenter.Instance.Open<OpenServerActivityWin>(false, 2);

            }

        }



        void OnArriveCollectNPC(uint sid, int npcID)

        {

            m_CollectBehaviour.gameObject.SetActive(true);

@@ -218,48 +221,56 @@
            m_CollectBehaviour.Dispose();

            m_CollectBehaviour.gameObject.SetActive(false);

        }



        private void ClickWishAward()

        {

            WindowCenter.Instance.Open<WishingGetItemWin>();

        }



        private void UpdateWishAwardImag()

        {

            m_WishingAwardImg.gameObject.SetActive(wishModel.wishingAwardDict.Count > 0 ? true : false);

        }



        private void ClickMysticalPurchase()

        {

            WindowCenter.Instance.Open<OpenServerActivityWin>(false, (int)OpenServerActivityCenter.OSActivityType.MysticalPurchase);

        }



        private void UpdateMysticalPurchaseImag()

        {

            m_MysticalPurchaseImg.gameObject.SetActive(purchaseModel.priorityOpen);

        }



        private void ClickDungeonAssist()

        {

            WindowCenter.Instance.Open<DungeonAssistWin>();

        }



        private void UpdateDungeonAssistImag()

        {

            m_DungeonAssistImg.gameObject.SetActive(assistModel.IsNewAssistInfo);

        }



        private void ShowFairyGrabBoss()

        {

            m_ContainerGotoGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&

                !fairyGrabBossModel.grabBossHintOpen);

        }



        private void bossGrabHintEvent()

        {

            ShowFairyGrabBoss();

        }



        private void RefreshAdaptiveChat()

        {

            if (ChatTip.Inst == null)

            {

                return;

            }

            m_ContainerAdaptiveChat.sizeDelta = m_ContainerAdaptiveChat.sizeDelta.SetY(

                ChatTip.Inst.IsChatUp ? ChatTip.Inst.chatHighSize.y : ChatTip.Inst.chatLowSize.y);

        }



        private void GotoFairyGrabBoss()

        {

            if (fairyGrabBossModel.cacheGotoBossId != 0)