From 4a4e4a2100c9f42f648e2dffb19255f93936ca5d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 17 九月 2018 15:07:51 +0800
Subject: [PATCH] 3442运营活动修改
---
System/OpenServerActivity/FlashSaleModel.cs | 1 +
System/OpenServerActivity/FlashSaleWin.cs | 22 +++++++++++++++++++---
System/Welfare/OperationBase.cs | 3 ++-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/System/OpenServerActivity/FlashSaleModel.cs b/System/OpenServerActivity/FlashSaleModel.cs
index 207475f..d0cb78e 100644
--- a/System/OpenServerActivity/FlashSaleModel.cs
+++ b/System/OpenServerActivity/FlashSaleModel.cs
@@ -114,6 +114,7 @@
OperationFlashSale operation = operationBase as OperationFlashSale;
if (operation.InAdvanceTime(TimeUtility.ServerNow))
{
+ SysNotifyMgr.Instance.ShowTip("InOperationTimeError");
return;
}
if (!operation.InTime(TimeUtility.ServerNow))
diff --git a/System/OpenServerActivity/FlashSaleWin.cs b/System/OpenServerActivity/FlashSaleWin.cs
index 6918e87..251179d 100644
--- a/System/OpenServerActivity/FlashSaleWin.cs
+++ b/System/OpenServerActivity/FlashSaleWin.cs
@@ -129,14 +129,30 @@
OperationBase operationBase;
OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase);
var seconds = 0;
+ var inAdvance = false;
if (operationBase != null)
{
- OperationFlashSale operation = operationBase as OperationFlashSale;
- seconds = operation.GetResetSurplusTime();
+ if (operationBase.InAdvanceTime(TimeUtility.ServerNow))
+ {
+ inAdvance = true;
+ seconds = operationBase.GetSecondsBeforeStart(TimeUtility.ServerNow);
+ }
+ else
+ {
+ OperationFlashSale operation = operationBase as OperationFlashSale;
+ seconds = operation.GetResetSurplusTime();
+ }
}
if (seconds > 0)
{
- m_SurplusTime.text = Language.Get("LimitGift1", TimeUtility.SecondsToDHMSCHS(seconds));
+ if (inAdvance)
+ {
+ m_SurplusTime.text = string.Format("{0}涔嬪悗寮�鍚�", TimeUtility.SecondsToDHMSCHS(seconds));
+ }
+ else
+ {
+ m_SurplusTime.text = Language.Get("LimitGift1", TimeUtility.SecondsToDHMSCHS(seconds));
+ }
}
else
{
diff --git a/System/Welfare/OperationBase.cs b/System/Welfare/OperationBase.cs
index f20a330..090da1d 100644
--- a/System/Welfare/OperationBase.cs
+++ b/System/Welfare/OperationBase.cs
@@ -190,7 +190,8 @@
return false;
}
var advanceSeconds = inAdvanceMinute * 60;
- return GetSecondsBeforeStart(time) <= advanceSeconds;
+ var beforeStartSeconds = GetSecondsBeforeStart(time);
+ return beforeStartSeconds > 0 && beforeStartSeconds <= advanceSeconds;
}
public int GetSecondsBeforeStart(DateTime time)
--
Gitblit v1.8.0