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

client_linchunjie

2019-06-11 29ed6eeb05ad3bc5bec4792fdb03bc0c1143ed39

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

 System/FairyAu/ExchangeActiveTokenWin.cs

@@ -55,7 +55,7 @@


    private void ExchangeSuccess()

    {

        Close();

        RefreshEquipsScroll();

    }



    private void RefreshActiveCanGet()


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -96,6 +96,7 @@
            m_ChatTip.Init();

            m_HighSettingTip.Init();

            m_HighSettingFadeInFadeOut.Init();

            m_MainPositionTween.Init();

            m_TaskListTip.Init();

            m_IsShowXp.Init();

            m_TopRightTip.Init();

@@ -188,6 +189,7 @@
            m_ChatTip.UnInit();

            m_HighSettingTip.UnInit();

            m_HighSettingFadeInFadeOut.UnInit();

            m_MainPositionTween.UnInit();

            m_TaskListTip.UnInit();

            m_TopRightTip.UnInit();

            m_FunctionForecastTip.Unit();


 System/MainInterfacePanel/MainPositionTween.cs

@@ -43,6 +43,16 @@


        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }



        public void Init()

        {

            this.enabled = true;

        }



        public void UnInit()

        {

            this.enabled = false;

        }



        void Start()

        {

            m_RayMask.AddListener(MarkRayButton);


 System/MainWin/HighSettingFadeInFadeOut.cs

@@ -52,6 +52,7 @@

        public void Init()
        {
            this.enabled = true;
            RefreshGridsActiveState();

            TimeUtility.OnServerOpenDayRefresh += OnStepServerDay;
@@ -82,6 +83,8 @@
            OpenServerModel.IsOpenEvent -= IsOpenEvent;
            OpenServerModel.IsPreviewTimeUpdate -= IsOpenEvent;
            OperationTimeHepler.Instance.operationAdvanceEvent -= OperationAdvanceEvent;

            this.enabled = false;
        }

        void Switch(bool active)