From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/OpenServerActivity/FlashSaleWin.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/System/OpenServerActivity/FlashSaleWin.cs b/System/OpenServerActivity/FlashSaleWin.cs
index f865e03..4d209de 100644
--- a/System/OpenServerActivity/FlashSaleWin.cs
+++ b/System/OpenServerActivity/FlashSaleWin.cs
@@ -79,7 +79,7 @@
{
OperationFlashSale operation = operationBase as OperationFlashSale;
m_OpreationTime.text = StringUtility.Contact(Language.Get("ExpActivity_Text1"), operation.ToDisplayTime());
- m_RefreshGiftTime.gameObject.SetActive(operation.allDay);
+ m_RefreshGiftTime.gameObject.SetActive(operation.allDay && operation.dayReset);
OperationFlashSale.FlashSale flashSale;
if (operation.TryGetFlashSale(TimeUtility.ServerNow, out flashSale))
{
--
Gitblit v1.8.0