From 4accfd79b9b44aa456f779abb76bfa808ef80899 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 28 三月 2019 17:46:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Auction/MyAuctionCell.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/System/Auction/MyAuctionCell.cs b/System/Auction/MyAuctionCell.cs
index efd8f09..c9770d4 100644
--- a/System/Auction/MyAuctionCell.cs
+++ b/System/Auction/MyAuctionCell.cs
@@ -96,18 +96,18 @@
m_BiddingText.text = Language.Get("PMH_06");
if (type == 0)
{
- int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.
+ int auctionTaxrate = Mathf.FloorToInt((float)(auctionHelpModel.
AuctionTaxrate1 * myAuction.BidderPrice) / 100);//涓汉绋庢敹
int incomeNumber = myAuction.BidderPrice - auctionTaxrate;
m_Income.text = incomeNumber.ToString();
}
else if (type == 1)
{
- int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.
+ int auctionTaxrate = Mathf.FloorToInt((float)(auctionHelpModel.
AuctionTaxrate2 * myAuction.BidderPrice) / 100);//浠欑洘绋庢敹
int number = myAuction.BidderPrice - auctionTaxrate;
int incomeMax = Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);
- int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count);
+ int incomeNumber = Mathf.CeilToInt((float)number / myAuction.FamilyPlayerIDList.Count);
if (incomeMax >= incomeNumber)
{
m_Income.text = incomeNumber.ToString();
@@ -145,7 +145,7 @@
}
else
{
- m_JadeNumber.text = auctionItem.BasePrice.ToString();
+ m_JadeNumber.text = 0.ToString();
}
}
@@ -158,6 +158,7 @@
TimeSpan timeSpan = timeNow - MyAuction.Time;
int minute = (int)timeSpan.TotalMinutes;
+ DateTime overTime = MyAuction.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);
DateTime extensionTime = MyAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);
if (minute < AuctionItem.NoticeSaleMinutes)//棰勭儹涓�
{
@@ -169,7 +170,7 @@
int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);
m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));
}
- else if (timeNow < extensionTime)//鍔犳椂涓�
+ if (overTime < extensionTime)//鍔犳椂涓�
{
if (!m_OverTime.gameObject.activeSelf)
{
--
Gitblit v1.8.0