From d82561629d51d3863002a3f1bbb32ef6b1b429bb Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 29 十月 2018 17:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into leonard
---
System/WindowJump/WindowJumpMgr.cs | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 04b197a..7568043 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -342,7 +342,6 @@
case JumpUIType.WelfareFunc2:
case JumpUIType.WelfareFunc3:
case JumpUIType.WelfareFunc2Type2:
- case JumpUIType.BindGoldWheel:
SetJumpLogic<WelfareWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.SystemSettingFunc1:
@@ -486,6 +485,7 @@
case JumpUIType.OpenServerRank:
case JumpUIType.VipRechargeFunc5:
case JumpUIType.FlashRushToBuy:
+ case JumpUIType.BindGoldWheel:
SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.OpenServerMountRank:
@@ -788,6 +788,14 @@
}
}
break;
+ case JumpUIType.BindGoldWheel:
+ {
+ if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
+ {
+ return false;
+ }
+ }
+ break;
case JumpUIType.ConsumreRebate:
{
if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
--
Gitblit v1.8.0