少年修仙传客户端代码仓库
client_linchunjie
2019-03-29 3b5e9773c20b37daa5151f10b3ef649886607b18
3335 修复拍卖行bug
4个文件已修改
102 ■■■■ 已修改文件
System/Auction/AuctionHouseWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/AuctionInquiry.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/AuctionInquiryModel.cs 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/FamilyAuctionWin.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Auction/AuctionHouseWin.cs
@@ -58,7 +58,7 @@
        }
        protected override void OnActived()
        {
            OnClickFullServiceAuction();
            //OnClickFullServiceAuction();
            m_FuncBtnGroup.TriggerByOrder(functionOrder);
        }
        protected override void OnAfterOpen()
System/Auction/AuctionInquiry.cs
@@ -26,6 +26,9 @@
    {
        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
        public string locationGuid = string.Empty;
        public int GetSendNumber()//获取当前拍卖列表的索引类型
        {
            var sendNumber = 0;
@@ -86,6 +89,7 @@
        {
            if (model.FamilyAuctionItemDic.ContainsKey(itemGUID))
            {
                locationGuid = itemGUID;
                WindowCenter.Instance.Open<AuctionHouseWin>(true, 1);
            }
            else
System/Auction/AuctionInquiryModel.cs
@@ -119,14 +119,14 @@
            }
        }
        public void AuctionItemInfo(HB501_tagGCAuctionItemInfo info)// 拍卖行拍卖中的物品信息
        public void ReceivePackage(HB501_tagGCAuctionItemInfo info)// 拍卖行拍卖中的物品信息
        {
            List<AuctionItemClass> fullServiceAuctionList = new List<AuctionItemClass>();
            for (int i = 0; i < info.AuctionItemCount; i++)
            {
                var PlayerAuctionItem = info.AuctionItemList[i];
                AuctionItemClass playerAuctionItemClass = new AuctionItemClass();
                playerAuctionItemClass.ItemGUID = PlayerAuctionItem.ItemGUID;
                playerAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(PlayerAuctionItem.ItemGUID);
                playerAuctionItemClass.FamilyID = (int)PlayerAuctionItem.FamilyID;
                playerAuctionItemClass.ItemID = (int)PlayerAuctionItem.ItemID;
                playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
@@ -139,7 +139,10 @@
                }
                playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;
                playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;
                var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == PlayerAuctionItem.ItemGUID; });
                var index = FullServiceAuctionList.FindIndex((x) =>
                {
                    return x.ItemGUID == playerAuctionItemClass.ItemGUID;
                });
                if (index == -1)
                {
                    fullServiceAuctionList.Add(playerAuctionItemClass);
@@ -149,15 +152,7 @@
            if (info.QueryDir == 1)//往后查询
            {
                QueryRemaining.DownBool = info.QueryRemainlCount != 0;
                if (FullServiceAuctionList.Count == 0)
                {
                    FullServiceAuctionList.InsertRange(0, fullServiceAuctionList);
                }
                else
                {
                    FullServiceAuctionList.InsertRange(FullServiceAuctionList.Count - 1, fullServiceAuctionList);
                }
                FullServiceAuctionList.AddRange(fullServiceAuctionList);
            }
            else if (info.QueryDir == 2)//往前查询
            {
@@ -166,14 +161,7 @@
            }
            else if (info.QueryDir == 3)//定位查询
            {
                if (FullServiceAuctionList.Count == 0)
                {
                    FullServiceAuctionList.InsertRange(0, fullServiceAuctionList);
                }
                else
                {
                    FullServiceAuctionList.InsertRange(FullServiceAuctionList.Count - 1, fullServiceAuctionList);
                }
                FullServiceAuctionList.AddRange(fullServiceAuctionList);
                LocationQuery = true;
                WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);//定位查询
            }
@@ -190,7 +178,7 @@
            {
                var PlayerAuctionItem = info.AuctionItemList[i];
                AuctionItemClass playerAuctionItemClass = new AuctionItemClass();
                playerAuctionItemClass.ItemGUID = PlayerAuctionItem.ItemGUID;
                playerAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(PlayerAuctionItem.ItemGUID);
                playerAuctionItemClass.FamilyID = (int)PlayerAuctionItem.FamilyID;
                playerAuctionItemClass.ItemID = (int)PlayerAuctionItem.ItemID;
                playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;
@@ -225,7 +213,7 @@
            {
                var PlayerAuctionRecord = info.AuctionRecordList[i];
                AuctionItemClass playerAuctionRecordClass = new AuctionItemClass();
                playerAuctionRecordClass.ItemGUID = PlayerAuctionRecord.ItemGUID;
                playerAuctionRecordClass.ItemGUID = UIHelper.ServerStringTrim(PlayerAuctionRecord.ItemGUID);
                playerAuctionRecordClass.FamilyID = (int)PlayerAuctionRecord.FamilyID;
                playerAuctionRecordClass.TimeStr = PlayerAuctionRecord.RecordTime;//记录时间
                playerAuctionRecordClass.Time = DateTime.Parse(PlayerAuctionRecord.RecordTime);
@@ -257,7 +245,7 @@
            {
                var AddAuctionItem = info.AddAuctionItemList[i];
                AddAuctionItemInfoClass addAuctionItemInfo = new AddAuctionItemInfoClass();
                addAuctionItemInfo.ItemGUID = AddAuctionItem.ItemGUID;
                addAuctionItemInfo.ItemGUID = UIHelper.ServerStringTrim(AddAuctionItem.ItemGUID);
                addAuctionItemInfo.ItemID = (int)AddAuctionItem.ItemID;
                addAuctionItemInfo.Bool = true;
                if (AddAuctionItemInfoDic.ContainsKey(addAuctionItemInfo.ItemID))
@@ -282,7 +270,7 @@
            {
                var FamilyAuctionItem = info.AuctionItemList[i];
                AuctionItemClass familyAuctionItemClass = new AuctionItemClass();
                familyAuctionItemClass.ItemGUID = FamilyAuctionItem.ItemGUID;
                familyAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(FamilyAuctionItem.ItemGUID);
                familyAuctionItemClass.FamilyID = (int)FamilyAuctionItem.FamilyID;
                familyAuctionItemClass.ItemID = (int)FamilyAuctionItem.ItemID;
                familyAuctionItemClass.ItemCount = (int)FamilyAuctionItem.ItemCount;
@@ -333,7 +321,7 @@
            {
                var AttentionAuctionItem = info.AuctionItemList[i];
                AuctionItemClass playerAuctionItemClass = new AuctionItemClass();
                playerAuctionItemClass.ItemGUID = AttentionAuctionItem.ItemGUID;
                playerAuctionItemClass.ItemGUID = UIHelper.ServerStringTrim(AttentionAuctionItem.ItemGUID);
                playerAuctionItemClass.FamilyID = (int)AttentionAuctionItem.FamilyID;
                playerAuctionItemClass.ItemID = (int)AttentionAuctionItem.ItemID;
                playerAuctionItemClass.ItemCount = (int)AttentionAuctionItem.ItemCount;
@@ -387,9 +375,11 @@
            {
                var RefreshAuctionItem = info.RefreshAuctionItemList[i];
                if (FamilyAuctionItemDic.ContainsKey(RefreshAuctionItem.ItemGUID))// 拍卖行仙盟拍卖中的物品信息
                var guid = UIHelper.ServerStringTrim(RefreshAuctionItem.ItemGUID);
                if (FamilyAuctionItemDic.ContainsKey(guid))// 拍卖行仙盟拍卖中的物品信息
                {
                    var FamilyAuctionItem = FamilyAuctionItemDic[RefreshAuctionItem.ItemGUID];
                    var FamilyAuctionItem = FamilyAuctionItemDic[guid];
                    if (FamilyAuctionItem.AuctionType == RefreshAuctionItem.AuctionType)
                    {
                        FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime;
@@ -402,18 +392,18 @@
                        }
                        FamilyAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;
                        FamilyAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
                        FamilyAuctionItemDic[RefreshAuctionItem.ItemGUID] = FamilyAuctionItem;
                        FamilyAuctionItemDic[guid] = FamilyAuctionItem;
                    }
                    else
                    {
                        FamilyAuctionItemDic.Remove(RefreshAuctionItem.ItemGUID);
                        FamilyAuctionItemDic.Remove(guid);
                        if (ClearFamilyAuctionUpdate != null)
                        {
                            ClearFamilyAuctionUpdate();
                        }
                    }
                }
                var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == RefreshAuctionItem.ItemGUID; });
                var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == guid; });
                if (index != -1)//全服拍品
                {
                    FullServiceAuctionList[index].TimeStr = RefreshAuctionItem.AddTime;
@@ -421,35 +411,35 @@
                    FullServiceAuctionList[index].BidderID = (int)RefreshAuctionItem.BidderID;
                    FullServiceAuctionList[index].BidderPrice = (int)RefreshAuctionItem.BidderPrice;
                }
                if (PlayerAuctionItemInfoDic.ContainsKey(RefreshAuctionItem.ItemGUID))//我的拍品刷新
                if (PlayerAuctionItemInfoDic.ContainsKey(guid))//我的拍品刷新
                {
                    var PlayerAuctionItemInfo = PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID];
                    var PlayerAuctionItemInfo = PlayerAuctionItemInfoDic[guid];
                    PlayerAuctionItemInfo.TimeStr = RefreshAuctionItem.AddTime;
                    PlayerAuctionItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
                    PlayerAuctionItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
                    PlayerAuctionItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;
                    PlayerAuctionItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
                    PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID] = PlayerAuctionItemInfo;
                    PlayerAuctionItemInfoDic[guid] = PlayerAuctionItemInfo;
                }
                if (BiddingItemInfoDic.ContainsKey(RefreshAuctionItem.ItemGUID))//玩家竞价中的物品
                if (BiddingItemInfoDic.ContainsKey(guid))//玩家竞价中的物品
                {
                    var biddingItemInfo = BiddingItemInfoDic[RefreshAuctionItem.ItemGUID];
                    var biddingItemInfo = BiddingItemInfoDic[guid];
                    biddingItemInfo.TimeStr = RefreshAuctionItem.AddTime;
                    biddingItemInfo.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
                    biddingItemInfo.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);
                    biddingItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;
                    biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
                    BiddingItemInfoDic[RefreshAuctionItem.ItemGUID] = biddingItemInfo;
                    BiddingItemInfoDic[guid] = biddingItemInfo;
                }
                if (AttentionAuctionItemDic.ContainsKey(RefreshAuctionItem.ItemGUID))//我关注中的拍品
                if (AttentionAuctionItemDic.ContainsKey(guid))//我关注中的拍品
                {
                    var attentionAuctionItem = AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID];
                    var attentionAuctionItem = AttentionAuctionItemDic[guid];
                    attentionAuctionItem.TimeStr = RefreshAuctionItem.AddTime;
                    attentionAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);
                    attentionAuctionItem.TimeEnd = DateTime.Parse(RefreshAuctionItem.BiddingTime);
                    attentionAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;
                    attentionAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;
                    AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID] = attentionAuctionItem;
                    AttentionAuctionItemDic[guid] = attentionAuctionItem;
                }
                if (RefreshAuctionItemUpdate != null)
                {
@@ -465,26 +455,28 @@
            for (int i = 0; i < info.ClearCount; i++)
            {
                var ItemGUIDList = info.ClearAuctionItemList[i];
                if (BiddingItemInfoDic.ContainsKey(ItemGUIDList.ItemGUID))//清除拍卖行玩家参与竞价中的物品信息
                var guid = UIHelper.ServerStringTrim(ItemGUIDList.ItemGUID);
                if (BiddingItemInfoDic.ContainsKey(guid))//清除拍卖行玩家参与竞价中的物品信息
                {
                    BiddingItemInfoDic.Remove(ItemGUIDList.ItemGUID);
                    BiddingItemInfoDic.Remove(guid);
                }
                if (FamilyAuctionItemDic.ContainsKey(ItemGUIDList.ItemGUID))// 清除拍卖行仙盟拍卖中的物品信息
                if (FamilyAuctionItemDic.ContainsKey(guid))// 清除拍卖行仙盟拍卖中的物品信息
                {
                    FamilyAuctionItemDic.Remove(ItemGUIDList.ItemGUID);
                    FamilyAuctionItemDic.Remove(guid);
                    if (ClearFamilyAuctionUpdate != null)
                    {
                        ClearFamilyAuctionUpdate();
                    }
                }
                var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == ItemGUIDList.ItemGUID; });
                var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == guid; });
                if (index != -1)//清除全服拍品的某一件物品
                {
                    FullServiceAuctionList.RemoveAt(index);
                }
                if (PlayerAuctionItemInfoDic.ContainsKey(ItemGUIDList.ItemGUID))//我的拍品清除
                if (PlayerAuctionItemInfoDic.ContainsKey(guid))//我的拍品清除
                {
                    PlayerAuctionItemInfoDic.Remove(ItemGUIDList.ItemGUID);
                    PlayerAuctionItemInfoDic.Remove(guid);
                }
            }
            if (ClearAuctionUpdate != null)
@@ -500,7 +492,7 @@
            {
                var BiddingItem = info.AuctionItemList[i];
                AuctionItemClass BiddingItemClass = new AuctionItemClass();
                BiddingItemClass.ItemGUID = BiddingItem.ItemGUID;
                BiddingItemClass.ItemGUID = UIHelper.ServerStringTrim(BiddingItem.ItemGUID);
                BiddingItemClass.ItemID = (int)BiddingItem.ItemID;
                BiddingItemClass.ItemCount = BiddingItem.ItemCount;
                BiddingItemClass.FamilyID = (int)BiddingItem.FamilyID;
System/Auction/FamilyAuctionWin.cs
@@ -33,6 +33,16 @@
            GetFamilyAuctionItemList();
            ListSotr();
            OnCreateGridCellItem(m_ScrollerControllerItem);
            var index = FamilyAuctionList.FindIndex((x) =>
             {
                 return x.ItemGUID.Equals(AuctionInquiry.Instance.locationGuid);
             });
            if (index != -1)
            {
                m_ScrollerControllerItem.JumpIndex(index);
            }
            AuctionInquiry.Instance.locationGuid = string.Empty;
        }
        protected override void OnAfterOpen()