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/FullServiceAuctionWin.cs | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/System/Auction/FullServiceAuctionWin.cs b/System/Auction/FullServiceAuctionWin.cs
index 4399fd8..37782aa 100644
--- a/System/Auction/FullServiceAuctionWin.cs
+++ b/System/Auction/FullServiceAuctionWin.cs
@@ -64,7 +64,16 @@
OnCreateGridLineCell(m_ScrollerController);
OnCreateGridLineCellJob(m_ScrollerControllerJob);
OnCreateGridLineCellType(m_ScrollerControllerType);
- OnCreateGridLineCellItem(m_ScrollerControllerItem);
+ OnCreateGridLineCellItem(m_ScrollerControllerItem);
+
+ var index = m_ServerAuctionItems.IndexOf(AuctionInquiry.Instance.locationGuid);
+ if (index != -1)
+ {
+ m_ScrollerControllerItem.JumpIndex(index);
+ }
+
+ model.LocationQuery = false;
+ AuctionInquiry.Instance.locationGuid = string.Empty;
SetTipText();
}
@@ -102,22 +111,27 @@
ResetServerAuctionInquiry();
}
}
+
private void FullServiceAuctionUpdate()
{
OnCreateGridLineCellItem(m_ScrollerControllerItem);
}
+
private void RefreshAuctionItemUpdate()
{
m_ScrollerControllerItem.m_Scorller.RefreshActiveCellViews();//鍒锋柊鍙
}
+
private void ClearAuctionUpdate()
{
OnCreateGridLineCellItem(m_ScrollerControllerItem);
}
+
private void BiddingItemInfoUpdate()
{
OnCreateGridLineCellItem(m_ScrollerControllerItem);
}
+
private void OnClickJobTipBtn()
{
m_JobTip.SetActive(true);
@@ -266,23 +280,20 @@
private void OnCreateGridLineCellItem(ScrollerController gridCtrl)
{
- PushMyBiddingItems();
-
- if (!model.LocationQuery)
+ if (!model.LocationQuery && !model.QueryRemaining.UpBool)
{
- List<string> guids = model.GetServerAuctionItems();
- foreach (var guid in guids)
+ PushMyBiddingItems();
+ }
+
+ List<string> guids = model.GetServerAuctionItems();
+ foreach (var guid in guids)
+ {
+ if (!m_ServerAuctionItems.Contains(guid))
{
- if (!m_ServerAuctionItems.Contains(guid))
- {
- m_ServerAuctionItems.Add(guid);
- }
+ m_ServerAuctionItems.Add(guid);
}
}
- else
- {
- model.LocationQuery = false;
- }
+
gridCtrl.Refresh();
for (int i = 0; i < m_ServerAuctionItems.Count; i++)
{
@@ -290,6 +301,7 @@
}
gridCtrl.Restart();
}
+
private void OnRefreshGridCellItem(ScrollerDataType type, CellView cell)
{
int index = cell.index;
@@ -303,7 +315,10 @@
var sendNumber = AuctionInquiry.Instance.GetInquiryIndex();
if (sendNumber != 0)
{
- AuctionInquiry.Instance.SendQueryAuction(string.Empty, sendNumber, 1);
+ if (!model.LocationQuery)
+ {
+ AuctionInquiry.Instance.SendQueryAuction(string.Empty, sendNumber, 1);
+ }
}
}
--
Gitblit v1.8.0