Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/SystemSetting/SystemSetWin.cs

@@ -253,7 +253,7 @@
        {

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

                if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

                {

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                }

@@ -261,7 +261,7 @@


            WindowCenter.Instance.CloseImmediately<SettingUpWin>();



            if (!WindowCenter.Instance.CheckOpen<LockedScreenWin>())

            if (!WindowCenter.Instance.IsOpen<LockedScreenWin>())

            {

                WindowCenter.Instance.Open<LockedScreenWin>();

            }