From 291ccee6cdf1812f8b3b1f7b0e52c1ebd70cfe4c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 26 三月 2019 20:03:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Auction/FullServiceAuctioncell.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/System/Auction/FullServiceAuctioncell.cs b/System/Auction/FullServiceAuctioncell.cs
index 6b2d9c6..d046d0f 100644
--- a/System/Auction/FullServiceAuctioncell.cs
+++ b/System/Auction/FullServiceAuctioncell.cs
@@ -201,8 +201,10 @@
if (AuctionItem != null && FullServiceAuction != null)
{
var timeNow = TimeUtility.ServerNow;
- TimeSpan timeSpan = timeNow - FullServiceAuction.Time;
+ TimeSpan timeSpan = timeNow - FullServiceAuction.Time;
int minute = (int)timeSpan.TotalMinutes;
+
+ DateTime extensionTime = FullServiceAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);
if (minute < AuctionItem.NoticeSaleMinutes)//棰勭儹涓�
{
if (m_PriceButton.interactable)
@@ -218,7 +220,7 @@
int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;
m_TimeText.text = Language.Get("PMH_03", TimeUtility.SecondsToHMS(seconds));
}
- else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.WorldSaleMinutes)//鎷嶅崠涓�
+ else if (minute <= AuctionItem.WorldSaleMinutes)//鎷嶅崠涓�
{
var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;
var needMoney = 0;
@@ -248,6 +250,13 @@
int seconds = AuctionItem.WorldSaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);
m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));
}
+ else if(timeNow< extensionTime)
+ {
+ m_TimeText.text = Language.Get("PMH_04",0);
+ TimeSpan timeSpan2 = extensionTime - timeNow;
+ int timeSeconds = (int)timeSpan2.TotalSeconds;
+ DebugEx.LogError(Language.Get("PMH_04", TimeUtility.SecondsToHMS(timeSeconds)));
+ }
}
}
}
--
Gitblit v1.8.0