Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 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>();

            }

        }