From 9cf3593afecb8f89da1afd97ada94e58ac011a2d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 30 三月 2019 16:05:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Auction/AuctionInquiryModel.cs | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/System/Auction/AuctionInquiryModel.cs b/System/Auction/AuctionInquiryModel.cs
index 514a0f5..9681b2b 100644
--- a/System/Auction/AuctionInquiryModel.cs
+++ b/System/Auction/AuctionInquiryModel.cs
@@ -47,23 +47,13 @@
}
public class AuctionInquiryModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{
- public Dictionary<string, AuctionItem> PlayerAuctionItemInfoDic = new Dictionary<string, AuctionItem>();//鑷韩鐜╁涓婃灦鐨勬媿鍝�
- public event Action PlayerAuctionItem;
-
public List<AuctionItem> FullServiceAuctionList = new List<AuctionItem>();//鍏ㄦ湇鎷嶅搧鍒楄〃
- public event Action FullServiceAuctionUpdate;//鍏ㄦ湇鎷嶅搧鏁版嵁璇锋眰
-
+ public Dictionary<string, AuctionItem> PlayerAuctionItemInfoDic = new Dictionary<string, AuctionItem>();//鑷韩鐜╁涓婃灦鐨勬媿鍝�
public Dictionary<string, AuctionItem> FamilyAuctionItemDic = new Dictionary<string, AuctionItem>();// 鎷嶅崠琛屼粰鐩熸媿鍗栦腑鐨勭墿鍝佷俊鎭�
-
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, AuctionItem> BiddingItemInfoDic = new Dictionary<string, AuctionItem>();//鎷嶅崠琛岀帺瀹剁珵浠蜂腑鐨勭墿鍝佷俊鎭�
-
public Dictionary<string, AuctionItem> AttentionAuctionItemDic = new Dictionary<string, AuctionItem>();//鎷嶅崠琛屽叧娉ㄤ腑鐨勬媿鍝佽鎯�
-
public Dictionary<int, int> AttentionAuctionItemIDdic = new Dictionary<int, int>();//鍏虫敞鐨勭墿鍝両D
AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
@@ -78,6 +68,10 @@
get { return locationQuery; }
set { locationQuery = value; }
}
+
+ public event Action PlayerAuctionItem;
+ public event Action FullServiceAuctionUpdate;//鍏ㄦ湇鎷嶅搧鏁版嵁璇锋眰
+ public event Action AddAuctionItemInfoUpdate;
public override void Init()
{
@@ -157,6 +151,11 @@
return BiddingItemInfoDic.TryGetValue(guid, out item);
}
+ public bool TryGetFairyAuctionItem(string guid, out AuctionItem item)
+ {
+ return FamilyAuctionItemDic.TryGetValue(guid, out item);
+ }
+
public List<string> GetServerAuctionItems()
{
List<string> guids = new List<string>();
@@ -172,6 +171,11 @@
return BiddingItemInfoDic.Keys;
}
+ public ICollection<string> GetFairyAuctionItems()
+ {
+ return FamilyAuctionItemDic.Keys;
+ }
+
public bool IsParticipateInBidding(string guid)
{
return BiddingItemInfoDic.ContainsKey(guid);
--
Gitblit v1.8.0