From 47a7baf09dc230c19e9b3f01b449570b3ac11fbe Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 30 三月 2019 15:06:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Auction/AuctionInquiry.cs | 53 +++++++++++------------------------------------------
1 files changed, 11 insertions(+), 42 deletions(-)
diff --git a/System/Auction/AuctionInquiry.cs b/System/Auction/AuctionInquiry.cs
index 7d4b38f..8045e62 100644
--- a/System/Auction/AuctionInquiry.cs
+++ b/System/Auction/AuctionInquiry.cs
@@ -93,49 +93,16 @@
locationGuid = itemGUID;
WindowCenter.Instance.Open<AuctionHouseWin>(true, 1);
}
+ else if (model.BiddingItemInfoDic.ContainsKey(itemGUID))
+ {
+ locationGuid = itemGUID;
+ WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);
+ }
else
{
- SendLocationQuery(itemGUID);
+ SendQueryTagAuctionItem(itemGUID);
}
}
-
- private void SendLocationQuery(string itemGUID)//瀹氫綅鏌ヨ
- {
- if (auctionHelpModel.SelectedGenreNow != 0)
- {
- auctionHelpModel.SelectedGenreNow = 0;
- }
- int indexId = GetInquiryIndex();
- var auctionIndex = AuctionIndexConfig.Get(indexId);
- if (auctionIndex == null)
- {
- DebugEx.LogError("鎷嶅崠绱㈠紩琛ㄦ病鏈夋煡鍒板搴旂殑ID" + indexId);
- return;
- }
- QueryAuctionItem queryAuctionItem = new QueryAuctionItem();
- queryAuctionItem.FromItemGUID = itemGUID;
- queryAuctionItem.Job = auctionIndex.Job;
- queryAuctionItem.ItemTypeList = new List<uint>();
- if (auctionIndex.ItemType != null && auctionIndex.ItemType.Length > 0)
- {
- for (int i = 0; i < auctionIndex.ItemType.Length; i++)
- {
- queryAuctionItem.ItemTypeList.Add((uint)auctionIndex.ItemType[i]);
- }
- }
- queryAuctionItem.ClassLV = auctionIndex.Order;
- queryAuctionItem.SpecItemIDList = new List<uint>();
- if (auctionIndex.SpecItemID != null && auctionIndex.SpecItemID.Length > 0)
- {
- for (int i = 0; i < auctionIndex.SpecItemID.Length; i++)
- {
- queryAuctionItem.SpecItemIDList.Add((uint)auctionIndex.SpecItemID[i]);
- }
- }
- queryAuctionItem.QueryDir = 3;//瀹氫綅鏌ヨ
- queryAuctionItem.QueryCount = 10;
- SendQueryAuctionItem(queryAuctionItem);
- }
private void SendQueryAuctionItem(QueryAuctionItem queryAuctionItem)//鎷嶅崠琛屾煡璇㈡媿鍗栦腑鐨勭墿鍝�
{
@@ -176,10 +143,12 @@
CB516_tagCGQueryAttentionAuctionItem cb516 = new CB516_tagCGQueryAttentionAuctionItem();
GameNetSystem.Instance.SendInfo(cb516);
}
- public void SendQueryTagAuctionItem()//鎷嶅崠琛屾煡璇㈠畾浣嶇洰鏍囨媿鍝�
+
+ public void SendQueryTagAuctionItem(string guid)//鎷嶅崠琛屾煡璇㈠畾浣嶇洰鏍囨媿鍝�
{
- CB517_tagCGQueryTagAuctionItem cb517 = new CB517_tagCGQueryTagAuctionItem();
- GameNetSystem.Instance.SendInfo(cb517);
+ var pak = new CB517_tagCGQueryTagAuctionItem();
+ pak.ItemGUID = guid;
+ GameNetSystem.Instance.SendInfo(pak);
}
public void SendSellAuctionItem(int itemIndex)//鎷嶅崠琛屼笂鏋舵媿鍝�
--
Gitblit v1.8.0