From 8cf67fe69bb5fca89ced59210011d73313c3c938 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 20 九月 2018 20:59:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/TipPanel.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/System/MainInterfacePanel/TipPanel.cs b/System/MainInterfacePanel/TipPanel.cs
index 9684d0c..c50def1 100644
--- a/System/MainInterfacePanel/TipPanel.cs
+++ b/System/MainInterfacePanel/TipPanel.cs
@@ -91,7 +91,8 @@
             {
                 firstTimeRechargeModel.OpenFirstChargeTrialWin();
             }
-            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()) //鐏靛疇鍧愰獞鎺ㄩ��
+            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()
+                && !WindowCenter.Instance.CheckOpen<OffLineOnHookWin>()) //鐏靛疇鍧愰獞鎺ㄩ��
             {
                 storeModel.SetPushPetAndMountWinState();
             }

--
Gitblit v1.8.0