From 47a7baf09dc230c19e9b3f01b449570b3ac11fbe Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 30 三月 2019 15:06:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Auction/AuctionLogicUtil.cs | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/System/Auction/AuctionLogicUtil.cs b/System/Auction/AuctionLogicUtil.cs
index 5a2a8c9..3bae026 100644
--- a/System/Auction/AuctionLogicUtil.cs
+++ b/System/Auction/AuctionLogicUtil.cs
@@ -57,16 +57,13 @@
}
var extraEndTime = item.biddingTime.AddTicks(extraAuctionSecond * TimeSpan.TicksPerSecond);
- var normalTotalMinutes = config.NoticeSaleMinutes +
- item.auctionType == 0 ? config.WorldSaleMinutes : config.FamilySaleMinutes;
+ var normalTotalMinutes = config.NoticeSaleMinutes + (item.auctionType == 0 ? config.WorldSaleMinutes : config.FamilySaleMinutes);
var normalEndTime = item.putAwayTime.AddTicks(normalTotalMinutes * TimeSpan.TicksPerMinute);
var isExtraTime = extraEndTime > normalEndTime;
if (isExtraTime)
{
- var endTime = item.biddingTime >= normalEndTime ?
- extraEndTime : normalEndTime.AddTicks(extraAuctionSecond * TimeSpan.TicksPerSecond);
- var seconds = Mathf.CeilToInt((float)(endTime - TimeUtility.ServerNow).TotalSeconds);
+ var seconds = Mathf.CeilToInt((float)(extraEndTime - TimeUtility.ServerNow).TotalSeconds);
return Language.Get("PMH_18", TimeUtility.SecondsToHMS(seconds));
}
else
--
Gitblit v1.8.0