From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/WorldMap/MapFrameWin.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/System/WorldMap/MapFrameWin.cs b/System/WorldMap/MapFrameWin.cs
index e07e4f1..cea7eb3 100644
--- a/System/WorldMap/MapFrameWin.cs
+++ b/System/WorldMap/MapFrameWin.cs
@@ -58,7 +58,10 @@
protected override void OnAfterClose()
{
- WindowCenter.Instance.Open<MainInterfaceWin>();
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
--
Gitblit v1.8.0