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

client_linchunjie

2018-11-19 e20c125c6ac39deaa12a16c05a675d57b9348c3e

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

 System/OpenServerActivity/OpenServerActivityNotifyModel.cs

@@ -8,7 +8,6 @@
    [XLua.LuaCallCSharp]

    public class OpenServerActivityNotifyModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk

    {

      
        public override void Init()

        {

          

@@ -17,27 +16,29 @@
        public void OnBeforePlayerDataInitialize()

        {

            FlashRushToBuyActivityClose();

            GlobalTimeEvent.Instance.minuteEvent -= UpdateMinute;

            TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;

            OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;

            OperationTimeHepler.Instance.operationEndEvent -= OperationEndEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeEvent;

            OperationTimeHepler.Instance.operationServerCloseEvent -= OperationServerCloseEvent;

            NewBieCenter.Instance.guideCompletedEvent -= GuideCompletedEvent;

            WindowCenter.Instance.windowBeforeOpenEvent -= UpdateWindowOpen;

        }



        public void OnPlayerLoginOk()

        {

            if (!WindowCenter.Instance.IsOpen<OpenServerActivityNotifyWin>())

            {

                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();

            }

            OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;

            OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;

            OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeEvent;

            OperationTimeHepler.Instance.operationServerCloseEvent += OperationServerCloseEvent;

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            GlobalTimeEvent.Instance.minuteEvent += UpdateMinute;

            TimeMgr.Instance.OnMinuteEvent += UpdateMinute;

            WindowCenter.Instance.windowBeforeOpenEvent += UpdateWindowOpen;

            SetFlashRushToBuyNotify();

            if(!WindowCenter.Instance.IsOpen<OpenServerActivityNotifyWin>())

            {

                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();

            }

        }



        public override void UnInit()

@@ -45,6 +46,16 @@
          

        }



        private void UpdateWindowOpen(Window win)

        {

            if (win.name != "MainInterfaceWin") return;



            if (!WindowCenter.Instance.IsOpen<OpenServerActivityNotifyWin>())

            {

                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();

            }

        }



        private void UpdateMinute()

        {

            SetFlashRushToBuyNotify();


 System/OpenServerActivity/WishingPoolModel.cs

@@ -394,7 +394,6 @@
            {

                freeWishRedpoint.state = RedPointState.Simple;

            }

            UpdateRedpoint();

        }



        private void UpdateRedpoint()