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 +++--------------
System/Auction/AuctionLogicUtil.cs | 7 -
System/Auction/AuctionInquiryModel.cs | 23 ++++++-
System/Auction/FullServiceAuctionWin.cs | 45 ++++++++++-----
System/Auction/FullServiceAuctioncell.cs | 6 +
5 files changed, 65 insertions(+), 69 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)//鎷嶅崠琛屼笂鏋舵媿鍝�
diff --git a/System/Auction/AuctionInquiryModel.cs b/System/Auction/AuctionInquiryModel.cs
index 3707b74..514a0f5 100644
--- a/System/Auction/AuctionInquiryModel.cs
+++ b/System/Auction/AuctionInquiryModel.cs
@@ -71,22 +71,23 @@
private const int Redpointkey1 = 217;
public Redpoint redPointStre1 = new Redpoint(2, Redpointkey1);//鎷嶅崠琛岀孩鐐�
- private bool locationQuery = false;//鏄惁瀹氫綅鏌ヨ
+
+ bool locationQuery = false;//鏄惁瀹氫綅鏌ヨ
public bool LocationQuery
{
get { return locationQuery; }
set { locationQuery = value; }
}
+
public override void Init()
{
-
+ StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
}
public void OnBeforePlayerDataInitialize()
{
LocationQuery = false;
PlayerAuctionItemInfoDic.Clear();
- FullServiceAuctionList.Clear();
FamilyAuctionItemDic.Clear();
PlayerAuctionRecordDic.Clear();
AddAuctionItemInfoDic.Clear();
@@ -105,7 +106,15 @@
public override void UnInit()
{
+ StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish;
+ }
+ private void OnStageLoadFinish()
+ {
+ if (!(StageLoad.Instance.currentStage is DungeonStage))
+ {
+ FullServiceAuctionList.Clear();
+ }
}
private void OnRefreshFairyMine()//鐢ㄤ簬琚彁鍑轰粰鐩熸竻闄や粰鐩熸媿鍝�
@@ -122,8 +131,11 @@
public void ResetServerAuctionInquiry()
{
- FullServiceAuctionList.Clear();
- QueryRemaining.UpBool = true;
+ if (!LocationQuery)
+ {
+ FullServiceAuctionList.Clear();
+ }
+ QueryRemaining.UpBool = LocationQuery;
QueryRemaining.DownBool = true;
}
@@ -207,6 +219,7 @@
else if (info.QueryDir == 3)//瀹氫綅鏌ヨ
{
FullServiceAuctionList.AddRange(fullServiceAuctionList);
+ auctionHelpModel.SelectedGenreNow = 0;
LocationQuery = true;
WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);//瀹氫綅鏌ヨ
}
diff --git a/System/Auction/AuctionLogicUtil.cs b/System/Auction/AuctionLogicUtil.cs
index 5a2a8c9..3bae026 100644
--- a/System/Auction/AuctionLogicUtil.cs
+++ b/System/Auction/AuctionLogicUtil.cs
@@ -57,16 +57,13 @@
}
var extraEndTime = item.biddingTime.AddTicks(extraAuctionSecond * TimeSpan.TicksPerSecond);
- var normalTotalMinutes = config.NoticeSaleMinutes +
- item.auctionType == 0 ? config.WorldSaleMinutes : config.FamilySaleMinutes;
+ var normalTotalMinutes = config.NoticeSaleMinutes + (item.auctionType == 0 ? config.WorldSaleMinutes : config.FamilySaleMinutes);
var normalEndTime = item.putAwayTime.AddTicks(normalTotalMinutes * TimeSpan.TicksPerMinute);
var isExtraTime = extraEndTime > normalEndTime;
if (isExtraTime)
{
- var endTime = item.biddingTime >= normalEndTime ?
- extraEndTime : normalEndTime.AddTicks(extraAuctionSecond * TimeSpan.TicksPerSecond);
- var seconds = Mathf.CeilToInt((float)(endTime - TimeUtility.ServerNow).TotalSeconds);
+ var seconds = Mathf.CeilToInt((float)(extraEndTime - TimeUtility.ServerNow).TotalSeconds);
return Language.Get("PMH_18", TimeUtility.SecondsToHMS(seconds));
}
else
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);
+ }
}
}
diff --git a/System/Auction/FullServiceAuctioncell.cs b/System/Auction/FullServiceAuctioncell.cs
index 5ee96de..9a48067 100644
--- a/System/Auction/FullServiceAuctioncell.cs
+++ b/System/Auction/FullServiceAuctioncell.cs
@@ -75,9 +75,9 @@
#region 婊氬姩鏌ヨ
var inquiryIndex = AuctionInquiry.Instance.GetInquiryIndex();
- if (index < 5)
+ if (index < 2)
{
- if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool && !auctionHelpModel.isOpenPanel)
+ if (inquiryIndex != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool)
{
AuctionInquiry.Instance.SendQueryAuction(auctionItem.itemGuid, inquiryIndex, 2);
auctionHelpModel.Wait = false;
@@ -187,6 +187,8 @@
void DisplayTime(AuctionItem auctionItem)
{
m_TimeText.text = AuctionLogicUtil.GetBiddingTimeLabel(auctionItem);
+ var colortype = AuctionLogicUtil.IsAuctionItemExtraTime(auctionItem) ? TextColType.Red : TextColType.Green;
+ m_TimeText.color = UIHelper.GetUIColor(colortype, true);
}
}
--
Gitblit v1.8.0