From 6fdd4b40277b3aab892a8a0cadc310a492f20d2b Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期三, 24 二月 2021 16:34:59 +0800
Subject: [PATCH] Merge branch 'master' into ILRuntime
---
System/WindowJump/WindowJumpMgr.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index ff202c3..811b301 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -685,6 +685,9 @@
ModelCenter.Instance.GetModel<ImpactRankModel>().gotoImpactRankType = type;
SetJumpLogic<OpenServerActivityRankWin>(_tagWinSearchModel.TABID);
break;
+ case JumpUIType.HolidayWishBottle:
+ SetJumpLogic<HolidayWishesWin>(_tagWinSearchModel.TABID);
+ break;
case JumpUIType.OpenServerActivityFunc2_1:
case JumpUIType.OpenServerActivityFunc2_2:
ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = int.Parse(_tagWinSearchModel.SelectActive) + 1;
@@ -1127,6 +1130,15 @@
if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
{
OperationTimeHepler.Instance.ProcessConditionError(Operation.DaysAccumulateRecharge);
+ return false;
+ }
+ }
+ break;
+ case JumpUIType.HolidayWishBottle:
+ {
+ if (!OpenServerActivityCenter.Instance.IsActivityOpen(int.Parse(_tagWinSearchModel.SelectActive), (int)OpenServerActivityCenter.ActivityType.AT_JRZF))
+ {
+ OperationTimeHepler.Instance.ProcessConditionError(Operation.HolidayWish);
return false;
}
}
@@ -1963,6 +1975,7 @@
OpenServer_JZYY = 400, //闆嗗瓧 娲诲姩鐣岄潰
OpenServer_JZHF = 401, //闆嗗瓧 鍚堟湇鐣岄潰
+ HolidayWishBottle = 402, //鑺傛棩绁濈-鐏
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0