From afb266da01d7fb99af1cee0dd4749ca3a56a3e2f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 08 三月 2019 17:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Equip

---
 System/MainInterfacePanel/HighSettingTip.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 4f53f99..9e27839 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -220,7 +220,7 @@
         void MarketButton()//甯傚満鎸夐挳
         {
             WindowCenter.Instance.Close<MainInterfaceWin>();
-            WindowCenter.Instance.Open<MarketWin>();
+            WindowCenter.Instance.Open<AuctionHouseWin>();
         }
 
         void OpenService()//寮�鏈嶆椿鍔�

--
Gitblit v1.8.0