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/AuctionInquiryModel.cs | 263 +++++++++++++++++++++++++---------------------------
1 files changed, 126 insertions(+), 137 deletions(-)
diff --git a/System/Auction/AuctionInquiryModel.cs b/System/Auction/AuctionInquiryModel.cs
index 1885916..69df6ea 100644
--- a/System/Auction/AuctionInquiryModel.cs
+++ b/System/Auction/AuctionInquiryModel.cs
@@ -10,27 +10,28 @@
namespace Snxxz.UI
{
- [XLua.LuaCallCSharp]
- public class AuctionItemClass
+ public class AuctionItem
{
- public string ItemGUID;//鐗╁搧GUID
- public int FamilyID; //鏈夊�兼椂涓轰粰鐩熸媿鍝�
- public int ItemID;//鐗╁搧ID
- public int ItemCount;
- public string TimeStr;//涓婃灦鏃堕棿 yyyy-MM-dd hh:mm:ss
- public DateTime Time;//涓婃灦鏃堕棿
- public DateTime TimeEnd;//鏈�鍚庝笂鏋舵椂闂�
- public int BidderPrice;//绔炴媿鐜╁鍑轰环
- public string UserData;//鑷畾涔夋暟鎹�
- public string FamilyPlayerIDInfo;//鍙幏寰楁敹鐩婄殑浠欑洘鐜╁ID淇℃伅
- public List<int> FamilyPlayerIDList;//鍙幏寰楁敹鐩婄殑浠欑洘鐜╁ID淇℃伅瀛樺偍
- public int AuctionType;//鎷嶅搧绫诲瀷锛�0-鍏ㄦ湇鎷嶅搧锛�1-浠欑洘鎷嶅搧
+ public string itemGuid;
+ public int itemId; //鐗╁搧ID
+ public int itemCount;
- public int RecordType;//璁板綍绫诲瀷 0-鎴戠殑鎷嶅搧璁板綍 1-浠欑洘鎷嶅搧璁板綍 2-鎴戠殑绔炴媿璁板綍
- public int RecordResult;//璁板綍缁撴灉 0-娴佹媿 1-鎷嶅崠鎴愪氦 2-鍥炴敹 3-绔炰环鎴愬姛 4-绔炰环澶辫触
- public string BidderName;//鎴愪氦鐜╁鍚�
+ public int auctionType; //鎷嶅搧绫诲瀷锛�0-鍏ㄦ湇鎷嶅搧锛�1-浠欑洘鎷嶅搧
- public int BidderID;//绔炴媿鐜╁ID锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
+ public DateTime putAwayTime; //涓婃灦鏃堕棿
+ public DateTime latestBiddingTime; //鏈�鏂扮珵浠锋椂闂�
+
+ public string customData; //鑷畾涔夋暟鎹�
+
+ public int familyId; //鏈夊�兼椂涓轰粰鐩熸媿鍝�
+ public List<int> familyPlayers; //鍙幏寰楁敹鐩婄殑浠欑洘鐜╁ID淇℃伅瀛樺偍
+
+ public int recordType; //璁板綍绫诲瀷 0-鎴戠殑鎷嶅搧璁板綍 1-浠欑洘鎷嶅搧璁板綍 2-鎴戠殑绔炴媿璁板綍
+ public int recordResult; //璁板綍缁撴灉 0-娴佹媿 1-鎷嶅崠鎴愪氦 2-鍥炴敹 3-绔炰环鎴愬姛 4-绔炰环澶辫触
+
+ public int biddingPrice; //绔炴媿鐜╁鍑轰环
+ public int biddingPlayer; //绔炴媿鐜╁ID锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
+ public string biddingPlayerName; //鎴愪氦鐜╁鍚�
}
public class AddAuctionItemInfoClass
@@ -46,22 +47,22 @@
}
public class AuctionInquiryModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
- public Dictionary<string, AuctionItemClass> PlayerAuctionItemInfoDic = new Dictionary<string, AuctionItemClass>();//鑷韩鐜╁涓婃灦鐨勬媿鍝�
+ public Dictionary<string, AuctionItem> PlayerAuctionItemInfoDic = new Dictionary<string, AuctionItem>();//鑷韩鐜╁涓婃灦鐨勬媿鍝�
public event Action PlayerAuctionItem;
- public List<AuctionItemClass> FullServiceAuctionList = new List<AuctionItemClass>();//鍏ㄦ湇鎷嶅搧鍒楄〃
+ public List<AuctionItem> FullServiceAuctionList = new List<AuctionItem>();//鍏ㄦ湇鎷嶅搧鍒楄〃
public event Action FullServiceAuctionUpdate;//鍏ㄦ湇鎷嶅搧鏁版嵁璇锋眰
- public Dictionary<string, AuctionItemClass> FamilyAuctionItemDic = new Dictionary<string, AuctionItemClass>();// 鎷嶅崠琛屼粰鐩熸媿鍗栦腑鐨勭墿鍝佷俊鎭�
+ public Dictionary<string, AuctionItem> FamilyAuctionItemDic = new Dictionary<string, AuctionItem>();// 鎷嶅崠琛屼粰鐩熸媿鍗栦腑鐨勭墿鍝佷俊鎭�
- public Dictionary<string, AuctionItemClass> PlayerAuctionRecordDic = new Dictionary<string, AuctionItemClass>();//鎷嶅崠琛岀帺瀹舵媿鍗栬褰�
+ public Dictionary<string, AuctionItem> PlayerAuctionRecordDic = new Dictionary<string, AuctionItem>();//鎷嶅崠琛岀帺瀹舵媿鍗栬褰�
public Dictionary<int, AddAuctionItemInfoClass> AddAuctionItemInfoDic = new Dictionary<int, AddAuctionItemInfoClass>();//鍏虫敞鐨勬媿鍝佺殑涓婃灦鎻愰啋锛堝脊妗嗘樉绀猴級
public event Action AddAuctionItemInfoUpdate;
- public Dictionary<string, AuctionItemClass> BiddingItemInfoDic = new Dictionary<string, AuctionItemClass>();//鎷嶅崠琛岀帺瀹剁珵浠蜂腑鐨勭墿鍝佷俊鎭�
+ public Dictionary<string, AuctionItem> BiddingItemInfoDic = new Dictionary<string, AuctionItem>();//鎷嶅崠琛岀帺瀹剁珵浠蜂腑鐨勭墿鍝佷俊鎭�
- public Dictionary<string, AuctionItemClass> AttentionAuctionItemDic = new Dictionary<string, AuctionItemClass>();//鎷嶅崠琛屽叧娉ㄤ腑鐨勬媿鍝佽鎯�
+ public Dictionary<string, AuctionItem> AttentionAuctionItemDic = new Dictionary<string, AuctionItem>();//鎷嶅崠琛屽叧娉ㄤ腑鐨勬媿鍝佽鎯�
public Dictionary<int, int> AttentionAuctionItemIDdic = new Dictionary<int, int>();//鍏虫敞鐨勭墿鍝両D
@@ -121,27 +122,26 @@
public void ReceivePackage(HB501_tagGCAuctionItemInfo info)// 鎷嶅崠琛屾媿鍗栦腑鐨勭墿鍝佷俊鎭�
{
- List<AuctionItemClass> fullServiceAuctionList = new List<AuctionItemClass>();
+ List<AuctionItem> fullServiceAuctionList = new List<AuctionItem>();
for (int i = 0; i < info.AuctionItemCount; i++)
{
var PlayerAuctionItem = info.AuctionItemList[i];
- AuctionItemClass playerAuctionItemClass = new AuctionItemClass();
- playerAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(PlayerAuctionItem.ItemGUID);
- playerAuctionItemClass.FamilyID = (int)PlayerAuctionItem.FamilyID;
- playerAuctionItemClass.ItemID = (int)PlayerAuctionItem.ItemID;
- playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
- playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;
- playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);
+ AuctionItem playerAuctionItemClass = new AuctionItem();
+ playerAuctionItemClass.itemGuid = UIHelper.ServerStringTrim(PlayerAuctionItem.ItemGUID);
+ playerAuctionItemClass.familyId = (int)PlayerAuctionItem.FamilyID;
+ playerAuctionItemClass.itemId = (int)PlayerAuctionItem.ItemID;
+ playerAuctionItemClass.itemCount = (int)PlayerAuctionItem.ItemCount;
+ playerAuctionItemClass.putAwayTime = DateTime.Parse(PlayerAuctionItem.AddTime);
var str = UIHelper.ServerStringTrim(PlayerAuctionItem.BiddingTime);
if (!str.Equals(string.Empty))
{
- playerAuctionItemClass.TimeEnd = DateTime.Parse(str);
+ playerAuctionItemClass.latestBiddingTime = DateTime.Parse(str);
}
- playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
- playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
+ playerAuctionItemClass.biddingPrice = PlayerAuctionItem.BidderPrice;
+ playerAuctionItemClass.customData = PlayerAuctionItem.UserData;
var index = FullServiceAuctionList.FindIndex((x) =>
{
- return x.ItemGUID == playerAuctionItemClass.ItemGUID;
+ return x.itemGuid == playerAuctionItemClass.itemGuid;
});
if (index == -1)
{
@@ -177,27 +177,26 @@
for (int i = 0; i < info.AuctionItemCount; i++)
{
var PlayerAuctionItem = info.AuctionItemList[i];
- AuctionItemClass playerAuctionItemClass = new AuctionItemClass();
- playerAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(PlayerAuctionItem.ItemGUID);
- playerAuctionItemClass.FamilyID = (int)PlayerAuctionItem.FamilyID;
- playerAuctionItemClass.ItemID = (int)PlayerAuctionItem.ItemID;
- playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
- playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;
- playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);
+ AuctionItem playerAuctionItemClass = new AuctionItem();
+ playerAuctionItemClass.itemGuid = UIHelper.ServerStringTrim(PlayerAuctionItem.ItemGUID);
+ playerAuctionItemClass.familyId = (int)PlayerAuctionItem.FamilyID;
+ playerAuctionItemClass.itemId = (int)PlayerAuctionItem.ItemID;
+ playerAuctionItemClass.itemCount = (int)PlayerAuctionItem.ItemCount;
+ playerAuctionItemClass.putAwayTime = DateTime.Parse(PlayerAuctionItem.AddTime);
var str = UIHelper.ServerStringTrim(PlayerAuctionItem.BiddingTime);
if (!str.Equals(string.Empty))
{
- playerAuctionItemClass.TimeEnd = DateTime.Parse(str);
+ playerAuctionItemClass.latestBiddingTime = DateTime.Parse(str);
}
- playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
- playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
- if (PlayerAuctionItemInfoDic.ContainsKey(playerAuctionItemClass.ItemGUID))
+ playerAuctionItemClass.biddingPrice = PlayerAuctionItem.BidderPrice;
+ playerAuctionItemClass.customData = PlayerAuctionItem.UserData;
+ if (PlayerAuctionItemInfoDic.ContainsKey(playerAuctionItemClass.itemGuid))
{
- PlayerAuctionItemInfoDic[playerAuctionItemClass.ItemGUID] = playerAuctionItemClass;
+ PlayerAuctionItemInfoDic[playerAuctionItemClass.itemGuid] = playerAuctionItemClass;
}
else
{
- PlayerAuctionItemInfoDic.Add(playerAuctionItemClass.ItemGUID, playerAuctionItemClass);
+ PlayerAuctionItemInfoDic.Add(playerAuctionItemClass.itemGuid, playerAuctionItemClass);
}
}
if (PlayerAuctionItem != null)
@@ -212,25 +211,24 @@
for (int i = 0; i < info.Count; i++)
{
var PlayerAuctionRecord = info.AuctionRecordList[i];
- AuctionItemClass playerAuctionRecordClass = new AuctionItemClass();
- playerAuctionRecordClass.ItemGUID = UIHelper.ServerStringTrim(PlayerAuctionRecord.ItemGUID);
- playerAuctionRecordClass.FamilyID = (int)PlayerAuctionRecord.FamilyID;
- playerAuctionRecordClass.TimeStr = PlayerAuctionRecord.RecordTime;//璁板綍鏃堕棿
- playerAuctionRecordClass.Time = DateTime.Parse(PlayerAuctionRecord.RecordTime);
- playerAuctionRecordClass.RecordType = PlayerAuctionRecord.RecordType;//璁板綍绫诲瀷 0-鎴戠殑鎷嶅搧璁板綍 1-浠欑洘鎷嶅搧璁板綍 2-鎴戠殑绔炴媿璁板綍
- playerAuctionRecordClass.RecordResult = PlayerAuctionRecord.RecordResult;//璁板綍缁撴灉 0-娴佹媿 1-鎷嶅崠鎴愪氦 2-鍥炴敹 3-绔炰环鎴愬姛 4-绔炰环澶辫触
- playerAuctionRecordClass.BidderPrice = (int)PlayerAuctionRecord.BidderPrice;//鎴愪氦浠锋牸
- playerAuctionRecordClass.BidderName = PlayerAuctionRecord.BidderName;//鐜╁鍚�
- playerAuctionRecordClass.ItemID = (int)PlayerAuctionRecord.ItemID;
- playerAuctionRecordClass.ItemCount = (int)PlayerAuctionRecord.ItemCount;
- playerAuctionRecordClass.UserData = PlayerAuctionRecord.UserData;
- if (PlayerAuctionRecordDic.ContainsKey(playerAuctionRecordClass.ItemGUID))
+ AuctionItem playerAuctionRecordClass = new AuctionItem();
+ playerAuctionRecordClass.itemGuid = UIHelper.ServerStringTrim(PlayerAuctionRecord.ItemGUID);
+ playerAuctionRecordClass.familyId = (int)PlayerAuctionRecord.FamilyID;
+ playerAuctionRecordClass.putAwayTime = DateTime.Parse(PlayerAuctionRecord.RecordTime);
+ playerAuctionRecordClass.recordType = PlayerAuctionRecord.RecordType;//璁板綍绫诲瀷 0-鎴戠殑鎷嶅搧璁板綍 1-浠欑洘鎷嶅搧璁板綍 2-鎴戠殑绔炴媿璁板綍
+ playerAuctionRecordClass.recordResult = PlayerAuctionRecord.RecordResult;//璁板綍缁撴灉 0-娴佹媿 1-鎷嶅崠鎴愪氦 2-鍥炴敹 3-绔炰环鎴愬姛 4-绔炰环澶辫触
+ playerAuctionRecordClass.biddingPrice = (int)PlayerAuctionRecord.BidderPrice;//鎴愪氦浠锋牸
+ playerAuctionRecordClass.biddingPlayerName = PlayerAuctionRecord.BidderName;//鐜╁鍚�
+ playerAuctionRecordClass.itemId = (int)PlayerAuctionRecord.ItemID;
+ playerAuctionRecordClass.itemCount = (int)PlayerAuctionRecord.ItemCount;
+ playerAuctionRecordClass.customData = PlayerAuctionRecord.UserData;
+ if (PlayerAuctionRecordDic.ContainsKey(playerAuctionRecordClass.itemGuid))
{
- PlayerAuctionRecordDic[playerAuctionRecordClass.ItemGUID] = playerAuctionRecordClass;
+ PlayerAuctionRecordDic[playerAuctionRecordClass.itemGuid] = playerAuctionRecordClass;
}
else
{
- PlayerAuctionRecordDic.Add(playerAuctionRecordClass.ItemGUID, playerAuctionRecordClass);
+ PlayerAuctionRecordDic.Add(playerAuctionRecordClass.itemGuid, playerAuctionRecordClass);
}
}
if (PlayerAuctionRecordUpdate != null)
@@ -269,31 +267,29 @@
for (int i = 0; i < info.AuctionItemCount; i++)
{
var FamilyAuctionItem = info.AuctionItemList[i];
- AuctionItemClass familyAuctionItemClass = new AuctionItemClass();
- familyAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(FamilyAuctionItem.ItemGUID);
- familyAuctionItemClass.FamilyID = (int)FamilyAuctionItem.FamilyID;
- familyAuctionItemClass.ItemID = (int)FamilyAuctionItem.ItemID;
- familyAuctionItemClass.ItemCount = (int)FamilyAuctionItem.ItemCount;
- familyAuctionItemClass.TimeStr = FamilyAuctionItem.AddTime;
- familyAuctionItemClass.Time = DateTime.Parse(FamilyAuctionItem.AddTime);
+ AuctionItem familyAuctionItemClass = new AuctionItem();
+ familyAuctionItemClass.itemGuid = UIHelper.ServerStringTrim(FamilyAuctionItem.ItemGUID);
+ familyAuctionItemClass.familyId = (int)FamilyAuctionItem.FamilyID;
+ familyAuctionItemClass.itemId = (int)FamilyAuctionItem.ItemID;
+ familyAuctionItemClass.itemCount = (int)FamilyAuctionItem.ItemCount;
+ familyAuctionItemClass.putAwayTime = DateTime.Parse(FamilyAuctionItem.AddTime);
var str = UIHelper.ServerStringTrim(FamilyAuctionItem.BiddingTime);
if (!str.Equals(string.Empty))
{
- familyAuctionItemClass.TimeEnd = DateTime.Parse(str);
+ familyAuctionItemClass.latestBiddingTime = DateTime.Parse(str);
}
- familyAuctionItemClass.BidderPrice = FamilyAuctionItem.BidderPrice;
- familyAuctionItemClass.UserData = FamilyAuctionItem.UserData;
- familyAuctionItemClass.FamilyPlayerIDInfo = FamilyAuctionItem.FamilyPlayerIDInfo;
- familyAuctionItemClass.FamilyPlayerIDList = new List<int>();
- familyAuctionItemClass.FamilyPlayerIDList = GetFamilyPlayerIDList(FamilyAuctionItem.FamilyPlayerIDInfo);
- familyAuctionItemClass.AuctionType = FamilyAuctionItem.AuctionType;
- if (FamilyAuctionItemDic.ContainsKey(familyAuctionItemClass.ItemGUID))
+ familyAuctionItemClass.biddingPrice = FamilyAuctionItem.BidderPrice;
+ familyAuctionItemClass.customData = FamilyAuctionItem.UserData;
+ familyAuctionItemClass.familyPlayers = new List<int>();
+ familyAuctionItemClass.familyPlayers = GetFamilyPlayerIDList(FamilyAuctionItem.FamilyPlayerIDInfo);
+ familyAuctionItemClass.auctionType = FamilyAuctionItem.AuctionType;
+ if (FamilyAuctionItemDic.ContainsKey(familyAuctionItemClass.itemGuid))
{
- FamilyAuctionItemDic[familyAuctionItemClass.ItemGUID] = familyAuctionItemClass;
+ FamilyAuctionItemDic[familyAuctionItemClass.itemGuid] = familyAuctionItemClass;
}
else
{
- FamilyAuctionItemDic.Add(familyAuctionItemClass.ItemGUID, familyAuctionItemClass);
+ FamilyAuctionItemDic.Add(familyAuctionItemClass.itemGuid, familyAuctionItemClass);
}
}
if (FamilyAuctionItemUpdate != null)
@@ -320,27 +316,26 @@
for (int i = 0; i < info.AuctionItemCount; i++)
{
var AttentionAuctionItem = info.AuctionItemList[i];
- AuctionItemClass playerAuctionItemClass = new AuctionItemClass();
- playerAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(AttentionAuctionItem.ItemGUID);
- playerAuctionItemClass.FamilyID = (int)AttentionAuctionItem.FamilyID;
- playerAuctionItemClass.ItemID = (int)AttentionAuctionItem.ItemID;
- playerAuctionItemClass.ItemCount = (int)AttentionAuctionItem.ItemCount;
- playerAuctionItemClass.TimeStr = AttentionAuctionItem.AddTime;
- playerAuctionItemClass.Time = DateTime.Parse(AttentionAuctionItem.AddTime);
+ AuctionItem playerAuctionItemClass = new AuctionItem();
+ playerAuctionItemClass.itemGuid = UIHelper.ServerStringTrim(AttentionAuctionItem.ItemGUID);
+ playerAuctionItemClass.familyId = (int)AttentionAuctionItem.FamilyID;
+ playerAuctionItemClass.itemId = (int)AttentionAuctionItem.ItemID;
+ playerAuctionItemClass.itemCount = (int)AttentionAuctionItem.ItemCount;
+ playerAuctionItemClass.putAwayTime = DateTime.Parse(AttentionAuctionItem.AddTime);
var str = UIHelper.ServerStringTrim(AttentionAuctionItem.BiddingTime);
if (!str.Equals(string.Empty))
{
- playerAuctionItemClass.TimeEnd = DateTime.Parse(str);
+ playerAuctionItemClass.latestBiddingTime = DateTime.Parse(str);
}
- playerAuctionItemClass.BidderPrice = AttentionAuctionItem.BidderPrice;
- playerAuctionItemClass.UserData = AttentionAuctionItem.UserData;
- if (AttentionAuctionItemDic.ContainsKey(playerAuctionItemClass.ItemGUID))
+ playerAuctionItemClass.biddingPrice = AttentionAuctionItem.BidderPrice;
+ playerAuctionItemClass.customData = AttentionAuctionItem.UserData;
+ if (AttentionAuctionItemDic.ContainsKey(playerAuctionItemClass.itemGuid))
{
- AttentionAuctionItemDic[playerAuctionItemClass.ItemGUID] = playerAuctionItemClass;
+ AttentionAuctionItemDic[playerAuctionItemClass.itemGuid] = playerAuctionItemClass;
}
else
{
- AttentionAuctionItemDic.Add(playerAuctionItemClass.ItemGUID, playerAuctionItemClass);
+ AttentionAuctionItemDic.Add(playerAuctionItemClass.itemGuid, playerAuctionItemClass);
}
}
if (AttentionAuctionItemUdate != null)
@@ -380,18 +375,17 @@
if (FamilyAuctionItemDic.ContainsKey(guid))// 鎷嶅崠琛屼粰鐩熸媿鍗栦腑鐨勭墿鍝佷俊鎭�
{
var FamilyAuctionItem = FamilyAuctionItemDic[guid];
- if (FamilyAuctionItem.AuctionType == RefreshAuctionItem.AuctionType)
+ if (FamilyAuctionItem.auctionType == RefreshAuctionItem.AuctionType)
{
- FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime;
- FamilyAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
- FamilyAuctionItem.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
+ FamilyAuctionItem.putAwayTime = DateTime.Parse(RefreshAuctionItem.AddTime);
+ FamilyAuctionItem.latestBiddingTime= DateTime.Parse(RefreshAuctionItem.BiddingTime);
var str = UIHelper.ServerStringTrim(RefreshAuctionItem.BiddingTime);
if (!str.Equals(string.Empty))
{
- FamilyAuctionItem.TimeEnd = DateTime.Parse(str);
+ FamilyAuctionItem.latestBiddingTime = DateTime.Parse(str);
}
- FamilyAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;
- FamilyAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
+ FamilyAuctionItem.biddingPlayer = (int)RefreshAuctionItem.BidderID;
+ FamilyAuctionItem.biddingPrice = (int)RefreshAuctionItem.BidderPrice;
FamilyAuctionItemDic[guid] = FamilyAuctionItem;
}
else
@@ -403,42 +397,38 @@
}
}
}
- var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == guid; });
+ var index = FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == guid; });
if (index != -1)//鍏ㄦ湇鎷嶅搧
{
- FullServiceAuctionList[index].TimeStr = RefreshAuctionItem.AddTime;
- FullServiceAuctionList[index].Time = DateTime.Parse(RefreshAuctionItem.AddTime);
- FullServiceAuctionList[index].BidderID = (int)RefreshAuctionItem.BidderID;
- FullServiceAuctionList[index].BidderPrice = (int)RefreshAuctionItem.BidderPrice;
+ FullServiceAuctionList[index].putAwayTime = DateTime.Parse(RefreshAuctionItem.AddTime);
+ FullServiceAuctionList[index].biddingPlayer = (int)RefreshAuctionItem.BidderID;
+ FullServiceAuctionList[index].biddingPrice = (int)RefreshAuctionItem.BidderPrice;
}
if (PlayerAuctionItemInfoDic.ContainsKey(guid))//鎴戠殑鎷嶅搧鍒锋柊
{
var PlayerAuctionItemInfo = PlayerAuctionItemInfoDic[guid];
- PlayerAuctionItemInfo.TimeStr = RefreshAuctionItem.AddTime;
- PlayerAuctionItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
- PlayerAuctionItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
- PlayerAuctionItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;
- PlayerAuctionItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
+ PlayerAuctionItemInfo.putAwayTime = DateTime.Parse(RefreshAuctionItem.AddTime);
+ PlayerAuctionItemInfo.latestBiddingTime= DateTime.Parse(RefreshAuctionItem.BiddingTime);
+ PlayerAuctionItemInfo.biddingPlayer = (int)RefreshAuctionItem.BidderID;
+ PlayerAuctionItemInfo.biddingPrice = (int)RefreshAuctionItem.BidderPrice;
PlayerAuctionItemInfoDic[guid] = PlayerAuctionItemInfo;
}
if (BiddingItemInfoDic.ContainsKey(guid))//鐜╁绔炰环涓殑鐗╁搧
{
var biddingItemInfo = BiddingItemInfoDic[guid];
- biddingItemInfo.TimeStr = RefreshAuctionItem.AddTime;
- biddingItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
- biddingItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
- biddingItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;
- biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
+ biddingItemInfo.putAwayTime = DateTime.Parse(RefreshAuctionItem.AddTime);
+ biddingItemInfo.latestBiddingTime= DateTime.Parse(RefreshAuctionItem.BiddingTime);
+ biddingItemInfo.biddingPlayer = (int)RefreshAuctionItem.BidderID;
+ biddingItemInfo.biddingPrice = (int)RefreshAuctionItem.BidderPrice;
BiddingItemInfoDic[guid] = biddingItemInfo;
}
if (AttentionAuctionItemDic.ContainsKey(guid))//鎴戝叧娉ㄤ腑鐨勬媿鍝�
{
var attentionAuctionItem = AttentionAuctionItemDic[guid];
- attentionAuctionItem.TimeStr = RefreshAuctionItem.AddTime;
- attentionAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
- attentionAuctionItem.TimeEnd = DateTime.Parse(RefreshAuctionItem.BiddingTime);
- attentionAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;
- attentionAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
+ attentionAuctionItem.putAwayTime = DateTime.Parse(RefreshAuctionItem.AddTime);
+ attentionAuctionItem.latestBiddingTime = DateTime.Parse(RefreshAuctionItem.BiddingTime);
+ attentionAuctionItem.biddingPlayer = (int)RefreshAuctionItem.BidderID;
+ attentionAuctionItem.biddingPrice = (int)RefreshAuctionItem.BidderPrice;
AttentionAuctionItemDic[guid] = attentionAuctionItem;
}
if (RefreshAuctionItemUpdate != null)
@@ -469,7 +459,7 @@
ClearFamilyAuctionUpdate();
}
}
- var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == guid; });
+ var index = FullServiceAuctionList.FindIndex((x) => { return x.itemGuid == guid; });
if (index != -1)//娓呴櫎鍏ㄦ湇鎷嶅搧鐨勬煇涓�浠剁墿鍝�
{
FullServiceAuctionList.RemoveAt(index);
@@ -491,28 +481,27 @@
for (int i = 0; i < info.AuctionItemCount; i++)
{
var BiddingItem = info.AuctionItemList[i];
- AuctionItemClass BiddingItemClass = new AuctionItemClass();
- BiddingItemClass.ItemGUID = UIHelper.ServerStringTrim(BiddingItem.ItemGUID);
- BiddingItemClass.ItemID = (int)BiddingItem.ItemID;
- BiddingItemClass.ItemCount = BiddingItem.ItemCount;
- BiddingItemClass.FamilyID = (int)BiddingItem.FamilyID;
- BiddingItemClass.TimeStr = BiddingItem.AddTime;
- BiddingItemClass.Time = DateTime.Parse(BiddingItem.AddTime);
+ AuctionItem BiddingItemClass = new AuctionItem();
+ BiddingItemClass.itemGuid = UIHelper.ServerStringTrim(BiddingItem.ItemGUID);
+ BiddingItemClass.itemId = (int)BiddingItem.ItemID;
+ BiddingItemClass.itemCount = BiddingItem.ItemCount;
+ BiddingItemClass.familyId = (int)BiddingItem.FamilyID;
+ BiddingItemClass.putAwayTime = DateTime.Parse(BiddingItem.AddTime);
var str = UIHelper.ServerStringTrim(BiddingItem.BiddingTime);
if (!str.Equals(string.Empty))
{
- BiddingItemClass.TimeEnd = DateTime.Parse(str);
+ BiddingItemClass.latestBiddingTime = DateTime.Parse(str);
}
- BiddingItemClass.BidderPrice = BiddingItem.BidderPrice;//绔炴媿鐜╁鍑轰环
- BiddingItemClass.BidderID = (int)BiddingItem.BidderID;//绔炴媿鐜╁ID锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
- BiddingItemClass.UserData = BiddingItem.UserData;
- if (BiddingItemInfoDic.ContainsKey(BiddingItemClass.ItemGUID))
+ BiddingItemClass.biddingPrice = BiddingItem.BidderPrice;//绔炴媿鐜╁鍑轰环
+ BiddingItemClass.biddingPlayer = (int)BiddingItem.BidderID;//绔炴媿鐜╁ID锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
+ BiddingItemClass.customData = BiddingItem.UserData;
+ if (BiddingItemInfoDic.ContainsKey(BiddingItemClass.itemGuid))
{
- BiddingItemInfoDic[BiddingItemClass.ItemGUID] = BiddingItemClass;
+ BiddingItemInfoDic[BiddingItemClass.itemGuid] = BiddingItemClass;
}
else
{
- BiddingItemInfoDic.Add(BiddingItemClass.ItemGUID, BiddingItemClass);
+ BiddingItemInfoDic.Add(BiddingItemClass.itemGuid, BiddingItemClass);
}
}
if (BiddingItemInfoUpdate != null)
@@ -545,7 +534,7 @@
}
foreach (var key in FamilyAuctionItemDic.Keys)//鍒ゆ柇鐜╁鏄惁鏈夊湪绔炰环浠欑洘鎷嶅搧(涓旀槸鏈�楂樹环)
{
- if (BiddingItemInfoDic.ContainsKey(key) && BiddingItemInfoDic[key].BidderID == playerID)
+ if (BiddingItemInfoDic.ContainsKey(key) && BiddingItemInfoDic[key].biddingPlayer == playerID)
{
isbool = false;
}
--
Gitblit v1.8.0