Merge branch 'master' into MainWinAdjust

client_Wu Xijin

2019-03-27 3649e01bbb042e497cf6dd015b0e26cd9c775ad8

 System/Auction/AuctionInquiryModel.cs

@@ -429,6 +429,15 @@
                    PlayerAuctionItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID] = PlayerAuctionItemInfo;

                }

                if (BiddingItemInfoDic.ContainsKey(RefreshAuctionItem.ItemGUID))//玩家竞价中的物品

                {

                    var biddingItemInfo = BiddingItemInfoDic[RefreshAuctionItem.ItemGUID];

                    biddingItemInfo.TimeStr = RefreshAuctionItem.AddTime;

                    biddingItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                    biddingItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;

                    biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    BiddingItemInfoDic[RefreshAuctionItem.ItemGUID] = biddingItemInfo;

                }

                if (RefreshAuctionItemUpdate != null)

                {

                    RefreshAuctionItemUpdate();