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/FullServiceAuctionWin.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/System/Auction/FullServiceAuctionWin.cs b/System/Auction/FullServiceAuctionWin.cs
index ed3e2a0..a05eae9 100644
--- a/System/Auction/FullServiceAuctionWin.cs
+++ b/System/Auction/FullServiceAuctionWin.cs
@@ -26,7 +26,7 @@
[SerializeField] Button m_TypeTipBtn;
[SerializeField] Text m_JobTipText;
[SerializeField] Text m_TypeTipText;
- List<AuctionItemClass> FullServiceAuctionListSort = new List<AuctionItemClass>();//鍏ㄦ湇鎷嶅搧鍒楄〃
+ List<AuctionItem> FullServiceAuctionListSort = new List<AuctionItem>();//鍏ㄦ湇鎷嶅搧鍒楄〃
AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
@@ -270,7 +270,7 @@
for (int i = 0; i < model.FullServiceAuctionList.Count; i++)
{
var FullServiceAuction = model.FullServiceAuctionList[i];
- var index = FullServiceAuctionListSort.FindIndex((x) => { return x.ItemGUID == FullServiceAuction.ItemGUID; });
+ var index = FullServiceAuctionListSort.FindIndex((x) => { return x.itemGuid == FullServiceAuction.itemGuid; });
if (index == -1)
{
FullServiceAuctionListSort.Add(FullServiceAuction);
@@ -284,8 +284,8 @@
gridCtrl.Refresh();
for (int i = 0; i < FullServiceAuctionListSort.Count; i++)
{
- var GUID = FullServiceAuctionListSort[i].ItemGUID;
- var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == GUID; });
+ var GUID = FullServiceAuctionListSort[i].itemGuid;
+ var indexList = model.FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == GUID; });
if (indexList == -1 && !model.BiddingItemInfoDic.ContainsKey(GUID))//鏈煡鎵惧埌鐩稿簲鐨勫垪琛ㄦ暟鎹�(闃茶寖)
{
continue;
@@ -298,8 +298,8 @@
{
int index = cell.index;
FullServiceAuctioncell fullServiceAuctioncell = cell.GetComponent<FullServiceAuctioncell>();
- AuctionItemClass auctionItemClass = FullServiceAuctionListSort[index];
- fullServiceAuctioncell.GetFullServiceAuctionGUID(auctionItemClass.ItemGUID, index);
+ AuctionItem auctionItemClass = FullServiceAuctionListSort[index];
+ fullServiceAuctioncell.GetFullServiceAuctionGUID(auctionItemClass.itemGuid, index);
}
private void Reset()//閲嶇疆鏌ヨ
@@ -347,11 +347,11 @@
int num = 0;
if (sendNumber != 0)
{
- var auctionItem = AuctionItemConfig.Get(vlaue.ItemID);
+ var auctionItem = AuctionItemConfig.Get(vlaue.itemId);
num = sendNumber / 1000;
num -= 1;
- if (model.FamilyAuctionItemDic.ContainsKey(vlaue.ItemGUID)
- && model.FamilyAuctionItemDic[vlaue.ItemGUID].AuctionType != 0)//濡傛灉瀛樺湪浠欑洘鎷嶅搧涓斾笉鏄叏鏈嶆媿鍝佽繃婊ゆ帀
+ if (model.FamilyAuctionItemDic.ContainsKey(vlaue.itemGuid)
+ && model.FamilyAuctionItemDic[vlaue.itemGuid].auctionType != 0)//濡傛灉瀛樺湪浠欑洘鎷嶅搧涓斾笉鏄叏鏈嶆媿鍝佽繃婊ゆ帀
{
continue;
}
@@ -365,16 +365,16 @@
}
FullServiceAuctionListSort.Sort(Compare);
}
- int Compare(AuctionItemClass x, AuctionItemClass y)//鏁扮粍鎺掑垪
+ int Compare(AuctionItem x, AuctionItem y)//鏁扮粍鎺掑垪
{
- bool havex = IsHighestPrice(x.ItemGUID);
- bool havey = IsHighestPrice(y.ItemGUID);
+ bool havex = IsHighestPrice(x.itemGuid);
+ bool havey = IsHighestPrice(y.itemGuid);
if (havex.CompareTo(havey) != 0)//鏄惁鏈�楂樹环
{
return -havex.CompareTo(havey);
}
- bool havex1 = IsParticipate(x.ItemGUID);
- bool havey1 = IsParticipate(y.ItemGUID);
+ bool havex1 = IsParticipate(x.itemGuid);
+ bool havey1 = IsParticipate(y.itemGuid);
if (havex1.CompareTo(havey1) != 0)//鏄惁鍙備笌
{
return -havex1.CompareTo(havey1);
@@ -388,7 +388,7 @@
if (model.BiddingItemInfoDic.ContainsKey(GUID))
{
var biddingItemInfo = model.BiddingItemInfoDic[GUID];
- isBool = biddingItemInfo.BidderID == playerId;
+ isBool = biddingItemInfo.biddingPlayer == playerId;
}
return isBool;
}
--
Gitblit v1.8.0