From 5dee7cecd70159342e6cb13360a7ee7d9c22a8d7 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 15:59:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/ImpactRankModel.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/System/OpenServerActivity/ImpactRankModel.cs b/System/OpenServerActivity/ImpactRankModel.cs
index c840884..227c8ed 100644
--- a/System/OpenServerActivity/ImpactRankModel.cs
+++ b/System/OpenServerActivity/ImpactRankModel.cs
@@ -644,6 +644,18 @@
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
+ OperationTimeHepler.Instance.operationAdvanceEvent += OperationAdvanceEvent;
+ }
+
+ private void OperationAdvanceEvent(Operation type)
+ {
+ if (type == Operation.FlashSale)
+ {
+ if (openServerActivityStateChange != null)
+ {
+ openServerActivityStateChange();
+ }
+ }
}
private void OperationEndEvent(Operation type, int state)
@@ -774,7 +786,7 @@
public bool IsFlashSaleOpen()
{
- return flashSaleModel.IsOpen;
+ return flashSaleModel.IsOpen || flashSaleModel.InAdvanceOpen;
}
public bool IsConsumeRebateOpen()
--
Gitblit v1.8.0