From 4b916dd4e22f726973af3defb4281f45bdf214e2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 26 三月 2019 16:39:48 +0800
Subject: [PATCH] 3088 【BUG】【2.0】拍卖，没有加时
---
Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB508_tagGCRefreshAuctionItemInfo.cs | 6 ++++--
Core/NetworkPackage/ServerPack/HB5_Bourse/HB508_tagGCRefreshAuctionItemInfo.cs | 2 ++
Core/NetworkPackage/ServerPack/HB5_Bourse/HB510_tagGCBiddingItemInfo.cs | 2 ++
Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB501_tagGCAuctionItemInfo.cs | 6 ++++--
Core/NetworkPackage/ServerPack/HB5_Bourse/HB506_tagGCAttentionAuctionItemInfo.cs | 2 ++
Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB502_tagGCPlayerAuctionItemInfo.cs | 6 ++++--
Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB505_tagGCFamilyAuctionItemInfo.cs | 6 ++++--
Core/NetworkPackage/ServerPack/HB5_Bourse/HB505_tagGCFamilyAuctionItemInfo.cs | 2 ++
Core/NetworkPackage/ServerPack/HB5_Bourse/HB501_tagGCAuctionItemInfo.cs | 2 ++
Core/NetworkPackage/ServerPack/HB5_Bourse/HB502_tagGCPlayerAuctionItemInfo.cs | 2 ++
System/Auction/AuctionInquiryModel.cs | 9 ++++++++-
11 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB501_tagGCAuctionItemInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB501_tagGCAuctionItemInfo.cs
index b320325..270e6fd 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB501_tagGCAuctionItemInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB501_tagGCAuctionItemInfo.cs
@@ -6,9 +6,11 @@
-public class DTCB501_tagGCAuctionItemInfo : DtcBasic {
+public class DTCB501_tagGCAuctionItemInfo : DtcBasic
+{
AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
- public override void Done(GameNetPackBasic vNetPack) {
+ public override void Done(GameNetPackBasic vNetPack)
+ {
base.Done(vNetPack);
HB501_tagGCAuctionItemInfo vNetData = vNetPack as HB501_tagGCAuctionItemInfo;
model.AuctionItemInfo(vNetData);
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB502_tagGCPlayerAuctionItemInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB502_tagGCPlayerAuctionItemInfo.cs
index bc70949..e36aced 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB502_tagGCPlayerAuctionItemInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB502_tagGCPlayerAuctionItemInfo.cs
@@ -6,9 +6,11 @@
-public class DTCB502_tagGCPlayerAuctionItemInfo : DtcBasic {
+public class DTCB502_tagGCPlayerAuctionItemInfo : DtcBasic
+{
AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
- public override void Done(GameNetPackBasic vNetPack) {
+ public override void Done(GameNetPackBasic vNetPack)
+ {
base.Done(vNetPack);
HB502_tagGCPlayerAuctionItemInfo vNetData = vNetPack as HB502_tagGCPlayerAuctionItemInfo;
model.PlayerAuctionItemInfo(vNetData);
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB505_tagGCFamilyAuctionItemInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB505_tagGCFamilyAuctionItemInfo.cs
index 224c4bf..3909f67 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB505_tagGCFamilyAuctionItemInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB505_tagGCFamilyAuctionItemInfo.cs
@@ -6,9 +6,11 @@
-public class DTCB505_tagGCFamilyAuctionItemInfo : DtcBasic {
+public class DTCB505_tagGCFamilyAuctionItemInfo : DtcBasic
+{
AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
- public override void Done(GameNetPackBasic vNetPack) {
+ public override void Done(GameNetPackBasic vNetPack)
+ {
base.Done(vNetPack);
HB505_tagGCFamilyAuctionItemInfo vNetData = vNetPack as HB505_tagGCFamilyAuctionItemInfo;
model.FamilyAuctionItemInfo(vNetData);
}
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB508_tagGCRefreshAuctionItemInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB508_tagGCRefreshAuctionItemInfo.cs
index 6e1ff77..54cbc1e 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB508_tagGCRefreshAuctionItemInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HB5_Bourse/DTCB508_tagGCRefreshAuctionItemInfo.cs
@@ -6,9 +6,11 @@
-public class DTCB508_tagGCRefreshAuctionItemInfo : DtcBasic {
+public class DTCB508_tagGCRefreshAuctionItemInfo : DtcBasic
+{
AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
- public override void Done(GameNetPackBasic vNetPack) {
+ public override void Done(GameNetPackBasic vNetPack)
+ {
base.Done(vNetPack);
HB508_tagGCRefreshAuctionItemInfo vNetData = vNetPack as HB508_tagGCRefreshAuctionItemInfo;
model.RefreshAuctionItem(vNetData);
}
diff --git a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB501_tagGCAuctionItemInfo.cs b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB501_tagGCAuctionItemInfo.cs
index 79da81b..3b0db8b 100644
--- a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB501_tagGCAuctionItemInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB501_tagGCAuctionItemInfo.cs
@@ -42,6 +42,7 @@
TransBytes (out AuctionItemList[i].ItemCount, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].AddTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].BidderPrice, vBytes, NetDataType.WORD);
+ TransBytes (out AuctionItemList[i].BiddingTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].UserDataLen, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].UserData, vBytes, NetDataType.Chars, AuctionItemList[i].UserDataLen);
}
@@ -54,6 +55,7 @@
public ushort ItemCount;
public string AddTime; //上架时间 yyyy-MM-dd hh:mm:ss
public ushort BidderPrice; //竞拍玩家出价
+ public string BiddingTime; //竞价时间 yyyy-MM-dd hh:mm:ss
public ushort UserDataLen;
public string UserData; //自定义数据
}
diff --git a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB502_tagGCPlayerAuctionItemInfo.cs b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB502_tagGCPlayerAuctionItemInfo.cs
index 868c43b..e29490d 100644
--- a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB502_tagGCPlayerAuctionItemInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB502_tagGCPlayerAuctionItemInfo.cs
@@ -22,6 +22,7 @@
TransBytes (out AuctionItemList[i].ItemCount, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].AddTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].BidderPrice, vBytes, NetDataType.WORD);
+ TransBytes (out AuctionItemList[i].BiddingTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].UserDataLen, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].UserData, vBytes, NetDataType.Chars, AuctionItemList[i].UserDataLen);
}
@@ -34,6 +35,7 @@
public ushort ItemCount;
public string AddTime; //上架时间 yyyy-MM-dd hh:mm:ss
public ushort BidderPrice; //竞拍玩家出价
+ public string BiddingTime; //竞价时间 yyyy-MM-dd hh:mm:ss
public ushort UserDataLen;
public string UserData; //自定义数据
}
diff --git a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB505_tagGCFamilyAuctionItemInfo.cs b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB505_tagGCFamilyAuctionItemInfo.cs
index d93c191..100c067 100644
--- a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB505_tagGCFamilyAuctionItemInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB505_tagGCFamilyAuctionItemInfo.cs
@@ -22,6 +22,7 @@
TransBytes (out AuctionItemList[i].ItemCount, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].AddTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].BidderPrice, vBytes, NetDataType.WORD);
+ TransBytes (out AuctionItemList[i].BiddingTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].UserDataLen, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].UserData, vBytes, NetDataType.Chars, AuctionItemList[i].UserDataLen);
TransBytes (out AuctionItemList[i].FamilyPlayerIDLen, vBytes, NetDataType.WORD);
@@ -37,6 +38,7 @@
public ushort ItemCount;
public string AddTime; //上架时间 yyyy-MM-dd hh:mm:ss
public ushort BidderPrice; //竞拍玩家出价
+ public string BiddingTime; //竞价时间 yyyy-MM-dd hh:mm:ss
public ushort UserDataLen;
public string UserData; //自定义数据
public ushort FamilyPlayerIDLen;
diff --git a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB506_tagGCAttentionAuctionItemInfo.cs b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB506_tagGCAttentionAuctionItemInfo.cs
index 8bd1b61..419e92b 100644
--- a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB506_tagGCAttentionAuctionItemInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB506_tagGCAttentionAuctionItemInfo.cs
@@ -22,6 +22,7 @@
TransBytes (out AuctionItemList[i].ItemCount, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].AddTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].BidderPrice, vBytes, NetDataType.WORD);
+ TransBytes (out AuctionItemList[i].BiddingTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].UserDataLen, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].UserData, vBytes, NetDataType.Chars, AuctionItemList[i].UserDataLen);
}
@@ -34,6 +35,7 @@
public ushort ItemCount;
public string AddTime; //上架时间 yyyy-MM-dd hh:mm:ss
public ushort BidderPrice; //竞拍玩家出价
+ public string BiddingTime; //竞价时间 yyyy-MM-dd hh:mm:ss
public ushort UserDataLen;
public string UserData; //自定义数据
}
diff --git a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB508_tagGCRefreshAuctionItemInfo.cs b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB508_tagGCRefreshAuctionItemInfo.cs
index 9fcc5a7..ebc9824 100644
--- a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB508_tagGCRefreshAuctionItemInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB508_tagGCRefreshAuctionItemInfo.cs
@@ -21,6 +21,7 @@
TransBytes (out RefreshAuctionItemList[i].AddTime, vBytes, NetDataType.Chars, 19);
TransBytes (out RefreshAuctionItemList[i].BidderID, vBytes, NetDataType.DWORD);
TransBytes (out RefreshAuctionItemList[i].BidderPrice, vBytes, NetDataType.DWORD);
+ TransBytes (out RefreshAuctionItemList[i].BiddingTime, vBytes, NetDataType.Chars, 19);
}
}
@@ -30,6 +31,7 @@
public string AddTime; //上架时间
public uint BidderID; //最高竞拍玩家ID，也就是当前最高竞价玩家ID
public uint BidderPrice; //最高竞拍价格
+ public string BiddingTime; //竞价时间 yyyy-MM-dd hh:mm:ss
}
}
diff --git a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB510_tagGCBiddingItemInfo.cs b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB510_tagGCBiddingItemInfo.cs
index 8c3bfc7..12be3d0 100644
--- a/Core/NetworkPackage/ServerPack/HB5_Bourse/HB510_tagGCBiddingItemInfo.cs
+++ b/Core/NetworkPackage/ServerPack/HB5_Bourse/HB510_tagGCBiddingItemInfo.cs
@@ -23,6 +23,7 @@
TransBytes (out AuctionItemList[i].AddTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].BidderID, vBytes, NetDataType.DWORD);
TransBytes (out AuctionItemList[i].BidderPrice, vBytes, NetDataType.WORD);
+ TransBytes (out AuctionItemList[i].BiddingTime, vBytes, NetDataType.Chars, 19);
TransBytes (out AuctionItemList[i].UserDataLen, vBytes, NetDataType.WORD);
TransBytes (out AuctionItemList[i].UserData, vBytes, NetDataType.Chars, AuctionItemList[i].UserDataLen);
}
@@ -36,6 +37,7 @@
public string AddTime; //上架时间 yyyy-MM-dd hh:mm:ss
public uint BidderID; //竞拍玩家ID，也就是当前最高竞价玩家ID
public ushort BidderPrice; //竞拍玩家出价
+ public string BiddingTime; //竞价时间 yyyy-MM-dd hh:mm:ss
public ushort UserDataLen;
public string UserData; //自定义数据
}
diff --git a/System/Auction/AuctionInquiryModel.cs b/System/Auction/AuctionInquiryModel.cs
index ed6813d..0efbd4e 100644
--- a/System/Auction/AuctionInquiryModel.cs
+++ b/System/Auction/AuctionInquiryModel.cs
@@ -18,7 +18,8 @@
public int ItemID;//鐗╁搧ID
public int ItemCount;
public string TimeStr;//涓婃灦鏃堕棿 yyyy-MM-dd hh:mm:ss
- public DateTime Time;
+ public DateTime Time;//涓婃灦鏃堕棿
+ public DateTime TimeEnd;//鏈�鍚庝笂鏋舵椂闂�
public int BidderPrice;//绔炴媿鐜╁鍑轰环
public string UserData;//鑷畾涔夋暟鎹�
public string FamilyPlayerIDInfo;//鍙幏寰楁敹鐩婄殑浠欑洘鐜╁ID淇℃伅
@@ -131,6 +132,7 @@
playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;
playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);
+ playerAuctionItemClass.TimeEnd= DateTime.Parse(PlayerAuctionItem.BiddingTime);
playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == PlayerAuctionItem.ItemGUID; });
@@ -190,6 +192,7 @@
playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;
playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);
+ playerAuctionItemClass.TimeEnd= DateTime.Parse(PlayerAuctionItem.BiddingTime);
playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
if (PlayerAuctionItemInfoDic.ContainsKey(playerAuctionItemClass.ItemGUID))
@@ -277,6 +280,7 @@
familyAuctionItemClass.ItemCount = (int)FamilyAuctionItem.ItemCount;
familyAuctionItemClass.TimeStr = FamilyAuctionItem.AddTime;
familyAuctionItemClass.Time = DateTime.Parse(FamilyAuctionItem.AddTime);
+ familyAuctionItemClass.TimeEnd= DateTime.Parse(FamilyAuctionItem.BiddingTime);
familyAuctionItemClass.BidderPrice = FamilyAuctionItem.BidderPrice;
familyAuctionItemClass.UserData = FamilyAuctionItem.UserData;
familyAuctionItemClass.FamilyPlayerIDInfo = FamilyAuctionItem.FamilyPlayerIDInfo;
@@ -323,6 +327,7 @@
playerAuctionItemClass.ItemCount = (int)AttentionAuctionItem.ItemCount;
playerAuctionItemClass.TimeStr = AttentionAuctionItem.AddTime;
playerAuctionItemClass.Time = DateTime.Parse(AttentionAuctionItem.AddTime);
+ playerAuctionItemClass.TimeEnd= DateTime.Parse(AttentionAuctionItem.BiddingTime);
playerAuctionItemClass.BidderPrice = AttentionAuctionItem.BidderPrice;
playerAuctionItemClass.UserData = AttentionAuctionItem.UserData;
if (AttentionAuctionItemDic.ContainsKey(playerAuctionItemClass.ItemGUID))
@@ -373,6 +378,7 @@
{
FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime;
FamilyAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
+ FamilyAuctionItem.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
FamilyAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;
FamilyAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
FamilyAuctionItemDic[RefreshAuctionItem.ItemGUID] = FamilyAuctionItem;
@@ -458,6 +464,7 @@
BiddingItemClass.FamilyID = (int)BiddingItem.FamilyID;
BiddingItemClass.TimeStr = BiddingItem.AddTime;
BiddingItemClass.Time = DateTime.Parse(BiddingItem.AddTime);
+ BiddingItemClass.TimeEnd= DateTime.Parse(BiddingItem.BiddingTime);
BiddingItemClass.BidderPrice = BiddingItem.BidderPrice;//绔炴媿鐜╁鍑轰环
BiddingItemClass.BidderID = (int)BiddingItem.BidderID;//绔炴媿鐜╁ID锛屼篃灏辨槸褰撳墠鏈�楂樼珵浠风帺瀹禝D
BiddingItemClass.UserData = BiddingItem.UserData;
--
Gitblit v1.8.0