From e20c125c6ac39deaa12a16c05a675d57b9348c3e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 19 十一月 2018 14:43:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityNotifyModel.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityNotifyModel.cs b/System/OpenServerActivity/OpenServerActivityNotifyModel.cs
index d2db4ba..c86c8b6 100644
--- a/System/OpenServerActivity/OpenServerActivityNotifyModel.cs
+++ b/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();
--
Gitblit v1.8.0