Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-08-24 1d24fbd1655e724eebb2e717c9f0ed80e881b582

 System/SystemSetting/SettingUpWin.cs

@@ -79,7 +79,10 @@


        protected override void OnAfterClose()

        {



            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }

        #endregion



@@ -182,11 +185,6 @@
        private void CloseWin()

        {

            CloseImmediately();



            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }