From 0012445c0109fa67987800a1bac8f32e989b2d19 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 15 八月 2018 15:16:01 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/OpenServerActivity/FlashSaleModel.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/System/OpenServerActivity/FlashSaleModel.cs b/System/OpenServerActivity/FlashSaleModel.cs
index 5814bbc..bd66fac 100644
--- a/System/OpenServerActivity/FlashSaleModel.cs
+++ b/System/OpenServerActivity/FlashSaleModel.cs
@@ -4,7 +4,7 @@
using UnityEngine;
namespace Snxxz.UI
{
- public class FlashSaleModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
+ public class FlashSaleModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
{
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
public override void Init()
@@ -12,6 +12,7 @@
OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
TimeMgr.Instance.OnDayEvent += OnDayEvent;
+ OpenServerActivityCenter.Instance.Register(4, this);
}
public void OnBeforePlayerDataInitialize()
@@ -35,6 +36,10 @@
if (type == Operation.FlashSale && state == 0)
{
UpdateRedpoint();
+ if (onStateUpate != null)
+ {
+ onStateUpate(4);
+ }
}
}
@@ -43,6 +48,10 @@
if (type == Operation.FlashSale && state == 0)
{
UpdateRedpoint();
+ if (onStateUpate != null)
+ {
+ onStateUpate(4);
+ }
}
}
@@ -77,6 +86,14 @@
OperationBase operationBase;
OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase);
return operationBase != null && operationBase.SatisfyOpenCondition() && operationBase.InAdvanceTime(TimeUtility.ServerNow);
+ }
+ }
+
+ public bool priorityOpen
+ {
+ get
+ {
+ return flashSaleRedpoint.state == RedPointState.Simple;
}
}
@@ -185,6 +202,9 @@
}
public Redpoint flashSaleRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20904);
+
+ public event Action<int> onStateUpate;
+
private void UpdateRedpoint()
{
flashSaleRedpoint.state = RedPointState.None;
--
Gitblit v1.8.0