From 2bdca925498c2b06de803cd6ec1704faef8eec30 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 十月 2018 15:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/FlashSaleTimeCell.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/System/OpenServerActivity/FlashSaleTimeCell.cs b/System/OpenServerActivity/FlashSaleTimeCell.cs
index 145b996..0cd6253 100644
--- a/System/OpenServerActivity/FlashSaleTimeCell.cs
+++ b/System/OpenServerActivity/FlashSaleTimeCell.cs
@@ -65,12 +65,19 @@
switch (buyState)
{
case -1:
- this.gameObject.SetActive(true);
- string timeStr = operation.ToDisplayBuyTime(date.month, dayIndex + date.day, operationTime.startHour, operationTime.startMinute);
- remainText.text = Language.Get("FlashRushToBuy106", timeStr);
+ string timeStr = "";
+ if(seconds > 7200)
+ {
+ timeStr = operation.ToDisplayBuyTime(date.month, dayIndex + date.day, operationTime.startHour, operationTime.startMinute);
+ remainText.text = Language.Get("FlashRushToBuy106", timeStr);
+ }
+ else
+ {
+ timeStr = TimeUtility.SecondsToHMS(seconds);
+ remainText.text = Language.Get("FlashRushToBuy108", timeStr);
+ }
break;
case 0:
- this.gameObject.SetActive(true);
remainText.text = Language.Get("FlashRushToBuy105", TimeUtility.SecondsToHMS(seconds));
break;
case 1:
--
Gitblit v1.8.0