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/TransactionRecordWin.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/System/Auction/TransactionRecordWin.cs b/System/Auction/TransactionRecordWin.cs
index 9090e35..ea3dd19 100644
--- a/System/Auction/TransactionRecordWin.cs
+++ b/System/Auction/TransactionRecordWin.cs
@@ -24,7 +24,7 @@
[SerializeField] GameObject m_TextObj;
AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
- private List<AuctionItemClass> AuctionRecordList = new List<AuctionItemClass>();
+ private List<AuctionItem> AuctionRecordList = new List<AuctionItem>();
ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
int AuctionType = 0;
int MaxCount = 0;
@@ -111,17 +111,17 @@
{
int index = cell.index;
var auctionRecord = AuctionRecordList[index];
- var itemConfig = ItemConfig.Get(auctionRecord.ItemID);
+ var itemConfig = ItemConfig.Get(auctionRecord.itemId);
if (itemConfig == null)
{
- DebugEx.LogError("鐗╁搧琛ㄦ病鏈夋壘鍒拌鐗╁搧锛岀墿鍝両D涓�" + auctionRecord.ItemID);
+ DebugEx.LogError("鐗╁搧琛ㄦ病鏈夋壘鍒拌鐗╁搧锛岀墿鍝両D涓�" + auctionRecord.itemId);
return;
}
ItemCell itemCell = cell.transform.Find("ItemCell1").GetComponent<ItemCell>();
Text textName = cell.transform.Find("ItemName").GetComponent<Text>();
RichText transactionStatusText = cell.transform.Find("TransactionStatusText").GetComponent<RichText>();
Text timeText = cell.transform.Find("TimeText").GetComponent<Text>();
- ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)auctionRecord.ItemCount);
+ ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)auctionRecord.itemCount);
GameObject SuccessfulBiddingObj = cell.transform.Find("SuccessfulBiddingObj").gameObject;//绔炴媿鎴愬姛(绔炴媿鎴愬姛)
TextEx SuccessfulBiddingText = cell.transform.Find("SuccessfulBiddingObj/SuccessfulBiddingText").GetComponent<TextEx>();
@@ -129,7 +129,7 @@
GameObject AuctionFailedObj = cell.transform.Find("AuctionFailedObj").gameObject;//绔炴媿澶辫触
Text JadeMoney_1 = cell.transform.Find("AuctionFailedObj/JadeMoney").GetComponent<Text>();
- switch (auctionRecord.RecordResult)
+ switch (auctionRecord.recordResult)
{
case 0://娴佹媿
transactionStatusText.gameObject.SetActive(true);
@@ -141,9 +141,9 @@
SuccessfulBiddingObj.SetActive(true);
transactionStatusText.gameObject.SetActive(false);
AuctionFailedObj.SetActive(false);
- var name = UIHelper.ServerStringTrim(auctionRecord.BidderName);
+ var name = UIHelper.ServerStringTrim(auctionRecord.biddingPlayerName);
SuccessfulBiddingText.text = Language.Get("PMH_15", name);
- JadeMoney.text = auctionRecord.BidderPrice.ToString();
+ JadeMoney.text = auctionRecord.biddingPrice.ToString();
break;
case 2://鍥炴敹
transactionStatusText.gameObject.SetActive(true);
@@ -157,13 +157,13 @@
AuctionFailedObj.SetActive(false);
string strName = string.Empty;
SuccessfulBiddingText.text = Language.Get("PMH_13");
- JadeMoney.text = auctionRecord.BidderPrice.ToString();
+ JadeMoney.text = auctionRecord.biddingPrice.ToString();
break;
case 4://绔炰环澶辫触
AuctionFailedObj.SetActive(true);
SuccessfulBiddingObj.SetActive(false);
transactionStatusText.gameObject.SetActive(false);
- JadeMoney_1.text = auctionRecord.BidderPrice.ToString();
+ JadeMoney_1.text = auctionRecord.biddingPrice.ToString();
break;
case 5://浠欑洘娴佹媿鍒板叏鏈�
transactionStatusText.gameObject.SetActive(true);
@@ -176,11 +176,11 @@
itemCell.Init(cellModel);
itemCell.button.SetListener(() =>
{
- ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)auctionRecord.ItemCount);
+ ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)auctionRecord.itemCount);
itemTipsModel.SetItemTipsModel(attrData);
});
textName.text = itemConfig.ItemName;
- timeText.text = auctionRecord.TimeStr;
+ timeText.text = auctionRecord.putAwayTime.ToString("yyyy-MM-dd HH:mm:ss");
}
private void OnCreateGridTypeCell(ScrollerController gridCtrl)
@@ -234,18 +234,18 @@
AuctionRecordList.Clear();
foreach (var value in model.PlayerAuctionRecordDic.Values)
{
- if (value.RecordType == AuctionType)
+ if (value.recordType == AuctionType)
{
AuctionRecordList.Add(value);
}
}
AuctionRecordList.Sort(Compare);
}
- int Compare(AuctionItemClass x, AuctionItemClass y)
+ int Compare(AuctionItem x, AuctionItem y)
{
- if (x.Time.CompareTo(y.Time) != 0)//鏍规嵁鏃堕棿鎺掑簭
+ if (x.putAwayTime.CompareTo(y.putAwayTime) != 0)//鏍规嵁鏃堕棿鎺掑簭
{
- return -x.Time.CompareTo(y.Time);
+ return -x.putAwayTime.CompareTo(y.putAwayTime);
}
return 1;
}
--
Gitblit v1.8.0