From 3a4eb38542bf8cc2cdf7f835a559ade8a8457ea3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 九月 2018 03:02:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Compose/New/ComposeWin.cs | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/System/Compose/New/ComposeWin.cs b/System/Compose/New/ComposeWin.cs
index 0246fbd..23acbad 100644
--- a/System/Compose/New/ComposeWin.cs
+++ b/System/Compose/New/ComposeWin.cs
@@ -48,7 +48,7 @@
#region Built-in
protected override void BindController()
{
- WindowCenter.Instance.jumpWindowCloseEvent += CloseJumpWindow;
+
}
protected override void AddListeners()
@@ -67,9 +67,10 @@
protected override void OnPreOpen()
{
ComposeModel.ResetModel();
- if(WindowJumpMgr.Instance.IsJumpState)
+
+ if (WindowJumpMgr.Instance.IsJumpState && ComposeModel.secondType == 0)
{
- if(ComposeModel.CurComposeModel != null)
+ if (ComposeModel.CurComposeModel != null)
{
ComposeModel.SetJumpToModel((ComposeFuncType)ComposeModel.CurComposeModel.firstType,
ComposeModel.CurComposeModel.secondType, ComposeModel.CurComposeModel.thirdType);
@@ -161,19 +162,8 @@
{
if (!WindowJumpMgr.Instance.IsJumpState)
{
+ ComposeModel.SetCurComposeModel(null);
WindowCenter.Instance.Open<MainInterfaceWin>();
-
- }
- }
-
- private void CloseJumpWindow(Window win)
- {
- if(win as ComposeWin)
- {
- if (WindowJumpMgr.Instance.jumpPhase <= 1)
- {
- ComposeModel.SetCurComposeModel(null);
- }
}
}
--
Gitblit v1.8.0