From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/OpenServerActivity/OpenServerGiftWin.cs | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerGiftWin.cs b/System/OpenServerActivity/OpenServerGiftWin.cs
index 274d5e4..1e140b2 100644
--- a/System/OpenServerActivity/OpenServerGiftWin.cs
+++ b/System/OpenServerActivity/OpenServerGiftWin.cs
@@ -26,6 +26,8 @@
return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<StoreModel>());
}
}
+
+ OSGiftModel giftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
#region Built-in
protected override void BindController()
{
@@ -43,9 +45,8 @@
{
WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;
WindowCenter.Instance.windowAfterCloseEvent += windowAfterCloseEvent;
- ModelCenter.Instance.GetModel<OSGiftModel>().giftGetNotify = false;
model.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent;
-
+ giftModel.SetDayRemind();
Display();
m_ContainerDisplay.gameObject.SetActive(!WindowCenter.Instance.CheckOpen<OffLineOnHookWin>());
@@ -114,10 +115,6 @@
private void OnCloseClick()
{
CloseImmediately();
- if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())
- {
- WindowCenter.Instance.Open<MainInterfaceWin>();
- }
}
}
--
Gitblit v1.8.0