From 1d24fbd1655e724eebb2e717c9f0ed80e881b582 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 24 八月 2018 11:49:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OpenServerActivityWin.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index 96f062c..767fda8 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -121,13 +121,15 @@
OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
CloseOtherWin();
- WindowCenter.Instance.Open<MainInterfaceWin>();
impactRankModel.gotoImpactRankType = 0;
}
protected override void OnAfterClose()
{
-
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
int GetDefaultSelect()
--
Gitblit v1.8.0