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/AuctionInquiryModel.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
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);//瀹氫綅鏌ヨ
}
--
Gitblit v1.8.0