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/Pet/PetWin.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/System/Pet/PetWin.cs b/System/Pet/PetWin.cs
index c9bc0e1..763791c 100644
--- a/System/Pet/PetWin.cs
+++ b/System/Pet/PetWin.cs
@@ -27,7 +27,6 @@
{
CloseChild();
WindowCenter.Instance.CloseImmediately<PetWin>();
- WindowCenter.Instance.Open<MainInterfaceWin>();
}
protected override void BindController()
@@ -52,6 +51,10 @@
protected override void OnAfterClose()
{
+ if (!WindowJumpMgr.Instance.IsJumpState)
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
}
protected override void OnActived()
--
Gitblit v1.8.0