From f9c36d64475eee0eeffbde866c9096fefdbf7763 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 29 三月 2019 16:00:14 +0800
Subject: [PATCH] 3335 修复拍卖行bug
---
System/Auction/FullServiceAuctioncell.cs | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/System/Auction/FullServiceAuctioncell.cs b/System/Auction/FullServiceAuctioncell.cs
index 3c80a42..baef987 100644
--- a/System/Auction/FullServiceAuctioncell.cs
+++ b/System/Auction/FullServiceAuctioncell.cs
@@ -39,7 +39,7 @@
AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
private AuctionItemConfig AuctionItem;
- private AuctionItemClass FullServiceAuction;
+ private AuctionItem FullServiceAuction;
public void GetFullServiceAuctionGUID(string GUID, int index)
{
@@ -48,13 +48,13 @@
m_HighestPriceImage.SetActive(false);
m_EquipmentScoreObj.SetActive(false);
m_OverTime.gameObject.SetActive(false);
- var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == GUID; });
+ var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == GUID; });
if (indexList == -1 && !model.BiddingItemInfoDic.ContainsKey(GUID))
{
DebugEx.Log("鏈煡鎵惧埌鐩稿簲鐨勫垪琛ㄦ暟鎹�");
return;
}
- AuctionItemClass fullServiceAuction = new AuctionItemClass();
+ AuctionItem fullServiceAuction = new AuctionItem();
if (indexList != -1)
{
fullServiceAuction = model.FullServiceAuctionList[indexList];
@@ -68,7 +68,7 @@
var sendNumber = AuctionInquiry.Instance.GetSendNumber();
if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool && !auctionHelpModel.isOpenPanel)
{
- AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 2);
+ AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.itemGuid, sendNumber, 2);
auctionHelpModel.Wait = false;
}
}
@@ -77,22 +77,22 @@
var sendNumber = AuctionInquiry.Instance.GetSendNumber();
if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool && !auctionHelpModel.isOpenPanel)
{
- AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 1);
+ AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.itemGuid, sendNumber, 1);
auctionHelpModel.Wait = false;
}
}
FullServiceAuction = fullServiceAuction;
var playerId = PlayerDatas.Instance.baseData.PlayerID;
- var auctionItem = AuctionItemConfig.Get(fullServiceAuction.ItemID);
- var itemConfig = ItemConfig.Get(fullServiceAuction.ItemID);
+ var auctionItem = AuctionItemConfig.Get(fullServiceAuction.itemId);
+ var itemConfig = ItemConfig.Get(fullServiceAuction.itemId);
if (itemConfig == null)
{
- DebugEx.LogError("鐗╁搧琛ㄦ病鏈夋壘鍒拌鐗╁搧锛岀墿鍝両D涓�" + fullServiceAuction.ItemID);
+ DebugEx.LogError("鐗╁搧琛ㄦ病鏈夋壘鍒拌鐗╁搧锛岀墿鍝両D涓�" + fullServiceAuction.itemId);
return;
}
if (auctionItem == null)
{
- DebugEx.LogError("鎷嶅崠鐗╁搧琛ㄦ病鏈夋壘鍒拌鐗╁搧锛岀墿鍝両D涓�" + fullServiceAuction.ItemID);
+ DebugEx.LogError("鎷嶅崠鐗╁搧琛ㄦ病鏈夋壘鍒拌鐗╁搧锛岀墿鍝両D涓�" + fullServiceAuction.itemId);
return;
}
AuctionItem = auctionItem;
@@ -102,17 +102,22 @@
{
m_NeedImage.SetActive(true);
}
- if (model.BiddingItemInfoDic.ContainsKey(fullServiceAuction.ItemGUID))//鍙備笌浜嗙珵浠风殑鐗╁搧
+ if (model.BiddingItemInfoDic.ContainsKey(fullServiceAuction.itemGuid))//鍙備笌浜嗙珵浠风殑鐗╁搧
{
- var biddingItemInfo = model.BiddingItemInfoDic[fullServiceAuction.ItemGUID];
+ var biddingItemInfo = model.BiddingItemInfoDic[fullServiceAuction.itemGuid];
m_ParticipateImage.SetActive(true);
- if (biddingItemInfo.BidderID == playerId)//鍒ゆ柇鏄惁鏈�楂樼珵浠�
+ if (biddingItemInfo.biddingPlayer == playerId)//鍒ゆ柇鏄惁鏈�楂樼珵浠�
{
m_HighestPriceImage.SetActive(true);
}
}
- if (fullServiceAuction.BidderPrice != 0)
+
+ if (auctionHelpModel.IsItemWarmUp(fullServiceAuction))
+ {
+ m_BiddingText.text = Language.Get("PMH_07");
+ }
+ else if (fullServiceAuction.biddingPrice != 0)
{
m_BiddingText.text = Language.Get("PMH_06");
}
@@ -121,11 +126,11 @@
m_BiddingText.text = Language.Get("PMH_05");
}
- ItemCellModel cellModel = new ItemCellModel(fullServiceAuction.ItemID, true, (ulong)fullServiceAuction.ItemCount);
+ ItemCellModel cellModel = new ItemCellModel(fullServiceAuction.itemId, true, (ulong)fullServiceAuction.itemCount);
m_ItemCell.Init(cellModel);
m_ItemCell.button.SetListener(() =>
{
- ItemAttrData attrData = new ItemAttrData(fullServiceAuction.ItemID, true, (ulong)1);
+ ItemAttrData attrData = new ItemAttrData(fullServiceAuction.itemId, true, (ulong)1);
itemTipsModel.SetItemTipsModel(attrData);
});
m_ItemName.text = itemConfig.ItemName;
@@ -143,20 +148,20 @@
}
int needJade = 0;
int priceMax = 0;
- priceMax = auctionItem.BuyoutPrice * fullServiceAuction.ItemCount;
- if (fullServiceAuction.BidderPrice == 0)
+ priceMax = auctionItem.BuyoutPrice * fullServiceAuction.itemCount;
+ if (fullServiceAuction.biddingPrice == 0)
{
- needJade = auctionItem.BasePrice * fullServiceAuction.ItemCount;
+ needJade = auctionItem.BasePrice * fullServiceAuction.itemCount;
}
else
{
- needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd * fullServiceAuction.ItemCount;
+ needJade = fullServiceAuction.biddingPrice + auctionItem.BiddingAdd * fullServiceAuction.itemCount;
}
if (auctionItem.BuyoutPrice != 0 && needJade > priceMax)//绔炰环浠锋牸姘歌繙涓嶈兘澶т簬鏈�楂樹环
{
needJade = priceMax;
}
- m_JadeNumber.text = fullServiceAuction.BidderPrice.ToString();
+ m_JadeNumber.text = fullServiceAuction.biddingPrice.ToString();
m_JadeNumber1.text = priceMax.ToString();
if (auctionItem.BuyoutPrice == 0)
{
@@ -176,7 +181,7 @@
{
if (jade >= priceMax)
{
- AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, priceMax);
+ AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.itemGuid, priceMax);
}
else
{
@@ -196,7 +201,7 @@
{
if (jade >= needJade)
{
- AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.ItemGUID, needJade);
+ AuctionInquiry.Instance.SendSellAuctionItem(fullServiceAuction.itemGuid, needJade);
}
else
{
@@ -212,11 +217,11 @@
if (AuctionItem != null && FullServiceAuction != null)
{
var timeNow = TimeUtility.ServerNow;
- TimeSpan timeSpan = timeNow - FullServiceAuction.Time;
+ TimeSpan timeSpan = timeNow - FullServiceAuction.putAwayTime;
int minute = (int)timeSpan.TotalMinutes;
- DateTime overTime = FullServiceAuction.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);
- DateTime extensionTime = FullServiceAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);
+ DateTime overTime = FullServiceAuction.putAwayTime.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);
+ DateTime extensionTime = FullServiceAuction.latestBiddingTime.AddSeconds(auctionHelpModel.ExtensionTime);
if (minute < AuctionItem.NoticeSaleMinutes)//棰勭儹涓�
{
if (m_PriceButton.interactable)
@@ -256,15 +261,15 @@
private void SetButtonStatus()
{
- var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;
+ var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.itemCount;
var needMoney = 0;
- if (FullServiceAuction.BidderPrice == 0)
+ if (FullServiceAuction.biddingPrice == 0)
{
- needMoney = AuctionItem.BasePrice * FullServiceAuction.ItemCount;
+ needMoney = AuctionItem.BasePrice * FullServiceAuction.itemCount;
}
else
{
- needMoney = FullServiceAuction.BidderPrice + AuctionItem.BiddingAdd * FullServiceAuction.ItemCount;
+ needMoney = FullServiceAuction.biddingPrice + AuctionItem.BiddingAdd * FullServiceAuction.itemCount;
}
if (!m_PriceButton.interactable || m_PriceImage.gray)
{
--
Gitblit v1.8.0