From 42044e959bbd3f169519fce262bfeb2c84932cb8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 19 九月 2018 14:21:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index a523ce4..3a683f6 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -278,6 +278,12 @@
}
}
break;
+ case JumpUIType.VipRechargeFunc5:
+ if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
+ {
+ return;
+ }
+ break;
case JumpUIType.OpenServerRank:
case JumpUIType.OSTimeLimitGift:
case JumpUIType.OpenServerActivityFunc2_1:
@@ -478,7 +484,6 @@
case JumpUIType.VipRechargeFunc1:
case JumpUIType.VipRechargeFunc2:
case JumpUIType.VipRechargeFunc4:
- case JumpUIType.VipRechargeFunc5:
if (VersionConfig.Get().isBanShu)
{
SysNotifyMgr.Instance.ShowTip("FuncNoOpen_VIP");
@@ -623,7 +628,16 @@
case JumpUIType.UnionChat1:
case JumpUIType.UnionChat2:
ChatCtrl.Inst.presentChatType = (ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);
- SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);
+ switch (ChatCtrl.Inst.presentChatType)
+ {
+ case ChatInfoType.Team:
+ case ChatInfoType.Fairy:
+ SetJumpLogic<SocialWin>(_tagWinSearchModel.TABID);
+ break;
+ default:
+ SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);
+ break;
+ }
break;
case JumpUIType.MakeDrug:
if (PackSendQuestMgr.Instance.useItemModel != null)
@@ -680,6 +694,7 @@
case JumpUIType.OpenServerGift3:
case JumpUIType.LimitedTimePackage:
case JumpUIType.OpenServerRank:
+ case JumpUIType.VipRechargeFunc5:
SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.OpenServerMountRank:
--
Gitblit v1.8.0