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

client_Wu Xijin

2018-12-04 31efa47c430874f95f4ff5503372f0cf6ecb53ae

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -90,6 +90,7 @@
        [SerializeField] RectTransform m_ContainerAdaptiveChat;

        [SerializeField] Button m_GotoFairyGrabBoss;

        [SerializeField] Button m_FlyToFairyGrabBoss;

        [SerializeField] FairyLeagueRemindBehaviour m_FairyLeagueRemind;



        [SerializeField] Transform m_EffectTask;//任务完成特效播放位置

        private int m_CollectNPCID;

@@ -216,6 +217,7 @@
            m_TeamInvitationEntrance.Init();

            m_FairyCallBehaviour.Init();

            m_MapSwitchingBehaviour.Init();

            m_FairyLeagueRemind.Init();

            m_BossBriefInfos.gameObject.SetActive(false);

            UpdateWishAwardImag();

            UpdateMysticalPurchaseImag();

@@ -402,6 +404,7 @@
            m_AnimationFadeOut.Unit();

            m_TeamInvitationEntrance.UnInit();

            m_FairyCallBehaviour.UnInit();

            m_FairyLeagueRemind.UnInit();

            horseRidBool = false;

            purchaseModel.UpdateNewMysticalEvent -= UpdateMysticalPurchaseImag;

            assistModel.UpdateRedpointEvent -= UpdateDungeonAssistImag;