Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-03-30 9cf3593afecb8f89da1afd97ada94e58ac011a2d

 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>();//关注的物品ID



        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);