Merge remote-tracking branch 'origin/master' into Equip

client_Wu Xijin

2019-03-08 afb266da01d7fb99af1cee0dd4749ca3a56a3e2f

 System/MainInterfacePanel/HighSettingTip.cs

@@ -220,7 +220,7 @@
        void MarketButton()//市场按钮

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<MarketWin>();

            WindowCenter.Instance.Open<AuctionHouseWin>();

        }



        void OpenService()//开服活动