3335 拍卖行修改

client_linchunjie

2019-04-01 3bc0b933b0bbcd7e8672ca6888ec1a090f52e277

 System/Auction/AuctionModel.cs

@@ -55,7 +55,6 @@
        public event Action myFocusAuctionRefresh;//拍卖行关注中的拍品信息变更（信息每次重置）

        public event Action auctionItemRefresh;//拍卖行数据刷新(仅用于数据刷新)

        public event Action onAuctionRemove;//拍卖行物品清除

        public event Action onFairyAuctionRemove;//清除仙盟物品

        public event Action AddAuctionItemInfoUpdate;



        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

@@ -114,9 +113,9 @@
            if (PlayerDatas.Instance.baseData.FamilyId == 0)

            {

                m_FairyAuctionItemGuids.Clear();

                if (onFairyAuctionRemove != null)

                if (fairyAuctionRefresh != null)

                {

                    onFairyAuctionRemove();

                    fairyAuctionRefresh();

                }

            }

        }

@@ -343,11 +342,8 @@
                item.itemId = (int)data.ItemID;

                item.itemCount = (int)data.ItemCount;

                item.putAwayTime = DateTime.Parse(data.AddTime);

                var str = UIHelper.ServerStringTrim(data.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    item.biddingTime = DateTime.Parse(str);

                }

                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);

                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);

                item.biddingPrice = data.BidderPrice;

                item.customData = data.UserData;



@@ -400,11 +396,8 @@
                item.itemId = (int)data.ItemID;

                item.itemCount = (int)data.ItemCount;

                item.putAwayTime = DateTime.Parse(data.AddTime);

                var str = UIHelper.ServerStringTrim(data.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    item.biddingTime = DateTime.Parse(str);

                }

                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);

                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);

                item.biddingPrice = data.BidderPrice;

                item.customData = data.UserData;



@@ -496,11 +489,8 @@
                item.itemId = (int)data.ItemID;

                item.itemCount = (int)data.ItemCount;

                item.putAwayTime = DateTime.Parse(data.AddTime);

                var str = UIHelper.ServerStringTrim(data.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    item.biddingTime = DateTime.Parse(str);

                }

                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);

                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);

                item.biddingPrice = data.BidderPrice;

                item.customData = data.UserData;

                item.familyPlayers = new List<int>();

@@ -538,11 +528,8 @@
                item.itemId = (int)data.ItemID;

                item.itemCount = (int)data.ItemCount;

                item.putAwayTime = DateTime.Parse(data.AddTime);

                var str = UIHelper.ServerStringTrim(data.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    item.biddingTime = DateTime.Parse(str);

                }

                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);

                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);

                item.biddingPrice = data.BidderPrice;

                item.customData = data.UserData;



@@ -577,6 +564,8 @@


        public void ReceivePackage(HB508_tagGCRefreshAuctionItemInfo package)//拍卖行刷新拍品(只进行刷新)

        {

            var refreshFairyAuction = false;



            for (int i = 0; i < package.RefreshCount; i++)

            {

                var data = package.RefreshAuctionItemList[i];

@@ -586,37 +575,43 @@
                AuctionItem item;

                if (!TryGetAuctionItem(guid, out item))

                {

                    continue;

                    item = new AuctionItem(guid);

                    PushAuctionItem(item);

                }



                var _autionType = item.auctionType;



                item.auctionType = data.AuctionType;

                item.putAwayTime = DateTime.Parse(data.AddTime);

                item.biddingTime = DateTime.Parse(data.BiddingTime);

                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);

                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);

                item.biddingPlayer = (int)data.BidderID;

                item.biddingPrice = (int)data.BidderPrice;

                var str = UIHelper.ServerStringTrim(data.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    item.biddingTime = DateTime.Parse(str);

                }



                if (m_FairyAuctionItemGuids.Contains(guid) && item.auctionType != 1)// 拍卖行仙盟拍卖中的物品信息

                if (_autionType == 1 && item.auctionType != 1)// 拍卖行仙盟拍卖中的物品信息

                {

                    m_FairyAuctionItemGuids.Remove(guid);

                    if (onFairyAuctionRemove != null)

                    {

                        onFairyAuctionRemove();

                    }

                    refreshFairyAuction = true;

                }

                if (auctionItemRefresh != null)

            }



            if (refreshFairyAuction)

            {

                if (fairyAuctionRefresh != null)

                {

                    auctionItemRefresh();

                    fairyAuctionRefresh();

                }

            }



            if (auctionItemRefresh != null)

            {

                auctionItemRefresh();

            }

        }



        public void ReceivePackage(HB509_tagGCClearAuctionItemInfo package)//拍卖行清除拍品 

        {

            var refreshFairyAuction = false;



            for (int i = 0; i < package.ClearCount; i++)

            {

                var ItemGUIDList = package.ClearAuctionItemList[i];

@@ -629,10 +624,7 @@
                if (m_FairyAuctionItemGuids.Contains(guid))// 清除拍卖行仙盟拍卖中的物品信息

                {

                    m_FairyAuctionItemGuids.Remove(guid);

                    if (onFairyAuctionRemove != null)

                    {

                        onFairyAuctionRemove();

                    }

                    refreshFairyAuction = true;

                }

                var index = m_ServerAuctionItemGuids.IndexOf(guid);

                if (index != -1)//清除全服拍品的某一件物品

@@ -649,6 +641,13 @@
                }



                RemoveAuctionItem(guid);

            }

            if (refreshFairyAuction)

            {

                if (fairyAuctionRefresh != null)

                {

                    fairyAuctionRefresh();

                }

            }

            if (onAuctionRemove != null)

            {

@@ -675,11 +674,8 @@
                item.itemCount = data.ItemCount;

                item.familyId = (int)data.FamilyID;

                item.putAwayTime = DateTime.Parse(data.AddTime);

                var str = UIHelper.ServerStringTrim(data.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    item.biddingTime = DateTime.Parse(str);

                }

                var biddingTimeLabel = UIHelper.ServerStringTrim(data.BiddingTime);

                item.biddingTime = string.IsNullOrEmpty(biddingTimeLabel) ? DateTime.MinValue : DateTime.Parse(biddingTimeLabel);

                item.biddingPrice = data.BidderPrice;//竞拍玩家出价

                item.biddingPlayer = (int)data.BidderID;//竞拍玩家ID，也就是当前最高竞价玩家ID

                item.customData = data.UserData;