From 3c38893503de952157eac2bc1134e3f30b292537 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 14 九月 2018 11:21:31 +0800
Subject: [PATCH] 3442运营活动修改
---
System/OpenServerActivity/FlashSaleCoolDown.cs | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/System/OpenServerActivity/FlashSaleCoolDown.cs b/System/OpenServerActivity/FlashSaleCoolDown.cs
index 5304715..56de4e9 100644
--- a/System/OpenServerActivity/FlashSaleCoolDown.cs
+++ b/System/OpenServerActivity/FlashSaleCoolDown.cs
@@ -12,7 +12,7 @@
private void OnEnable()
{
- DisplayTime();
+ SecondEvent();
GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
GlobalTimeEvent.Instance.secondEvent += SecondEvent;
OperationTimeHepler.Instance.dayResetEvent -= DayResetEvent;
@@ -21,7 +21,7 @@
private void DayResetEvent(int resetType)
{
- DisplayTime();
+ SecondEvent();
}
private void SecondEvent()
@@ -30,8 +30,22 @@
if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase))
{
var operation = (operationBase as OperationFlashSale);
- var seconds = operation.GetSurplusTime();
- m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);
+ var seconds = operation.GetResetSurplusTime();
+ if (seconds * TimeSpan.TicksPerSecond >= TimeSpan.TicksPerDay || seconds <= 0)
+ {
+ if (m_Time.gameObject.activeSelf)
+ {
+ DisplayTime(0);
+ }
+ }
+ else
+ {
+ m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);
+ if (!m_Time.gameObject.activeSelf)
+ {
+ DisplayTime(seconds);
+ }
+ }
}
}
@@ -41,15 +55,10 @@
OperationTimeHepler.Instance.dayResetEvent -= DayResetEvent;
}
- void DisplayTime()
+ void DisplayTime(int seconds)
{
- OperationBase operationBase;
- if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBase))
- {
- var seconds = (operationBase as OperationFlashSale).GetSurplusTime();
- m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);
- m_Time.Begin(DateTime.Now.AddTicks(seconds * TimeSpan.TicksPerSecond));
- }
+ m_Time.timeShow.color = seconds > 3600 ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);
+ m_Time.Begin(DateTime.Now.AddTicks(seconds * TimeSpan.TicksPerSecond));
}
}
}
--
Gitblit v1.8.0