From 3cc2e2b2673ae00b90b2a3a269667744ca3bf49f Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 30 八月 2018 10:23:47 +0800
Subject: [PATCH] 3001 修改精彩活动跳转
---
System/WindowJump/WindowJumpMgr.cs | 196 ++++++++++++++++---------------------------------
1 files changed, 64 insertions(+), 132 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index ebaf2c7..bc30533 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -120,14 +120,6 @@
return;
}
break;
- case JumpUIType.OpenServerActivityFunc2_1:
- case JumpUIType.OpenServerActivityFunc2_2:
- if(TimeUtility.OpenDay >= ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().openDays)
- {
- SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
- return;
- }
- break;
case JumpUIType.TreasureFindHostFunc1:
case JumpUIType.TreasureFindHostFunc2:
case JumpUIType.TreasureFindHostFunc3:
@@ -141,46 +133,11 @@
return;
}
break;
- case JumpUIType.OpenServerGift:
- if(!ModelCenter.Instance.GetModel<OSGiftModel>().activate)
- {
- if (PlayerDatas.Instance.baseData.coinPointTotal <= 0
- || !ModelCenter.Instance.GetModel<VipModel>().firstChargeRewardGet)
- {
- SysNotifyMgr.Instance.ShowTip("GiftNoOpen");
- }
- else
- {
- SysNotifyMgr.Instance.ShowTip("GiftAlreadyBuy");
- }
- return;
- }
- break;
case JumpUIType.FirstRecharge:
var model = ModelCenter.Instance.GetModel<VipModel>();
if (model.firstChargeRewardGet)
{
model.AreadyGetFirstRecharge();
- return;
- }
- break;
- case JumpUIType.OpenServerMountRank:
- var type = int.Parse(_tagWinSearchModel.SelectActive);
- if (rankModel.IsLock(type))
- {
- SysNotifyMgr.Instance.ShowTip("InOperationTimeError");
- return;
- }
- if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)
- {
- SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
- return;
- }
- break;
- case JumpUIType.OpenServerRank:
- if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)
- {
- SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
return;
}
break;
@@ -227,76 +184,53 @@
return;
}
break;
- case JumpUIType.ConsumreRebate:
- OperationBase operationBaseConsumre;
- if (!OperationTimeHepler.Instance.TryGetOperationTime(Operation.ConsumeRebate, out operationBaseConsumre))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.ConsumeRebate);
- return;
- }
- if (!operationBaseConsumre.SatisfyOpenCondition() || !operationBaseConsumre.InTime(TimeUtility.ServerNow))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.ConsumeRebate);
- return;
- }
- break;
- case JumpUIType.BossReborn:
- OperationBase operationBaseBoss;
- if (!OperationTimeHepler.Instance.TryGetOperationTime(Operation.BossReborn, out operationBaseBoss))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.BossReborn);
- return;
- }
- if (!operationBaseBoss.SatisfyOpenCondition() || !operationBaseBoss.InTime(TimeUtility.ServerNow))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.BossReborn);
- return;
- }
- break;
- case JumpUIType.LimitedTimePackage:
- OperationBase operationBaseLimitTime;
- if (!OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBaseLimitTime))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.GiftPackage);
- return;
- }
- if (!operationBaseLimitTime.SatisfyOpenCondition() || !operationBaseLimitTime.InTime(TimeUtility.ServerNow))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.GiftPackage);
- return;
- }
- break;
- case JumpUIType.VipRechargeFunc3:
- if (!OpenServerActivityCenter.Instance.IsActivityOpen(10))
- {
- SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
- return;
- }
- break;
- case JumpUIType.OSTimeLimitGift:
- if (!OpenServerActivityCenter.Instance.IsActivityOpen(3))
- {
- SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
- return;
- }
- break;
- case JumpUIType.FlashSale:
- OperationBase operationBaseFlash;
- if (!OperationTimeHepler.Instance.TryGetOperationTime(Operation.FlashSale, out operationBaseFlash))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.FlashSale);
- return;
- }
- if (!operationBaseFlash.SatisfyOpenCondition() || !operationBaseFlash.InTime(TimeUtility.ServerNow))
- {
- OperationTimeHepler.Instance.ProcessConditionError(Operation.FlashSale);
- return;
- }
- break;
case JumpUIType.TrialExchange:
if (!trialDungeonModel.CompleteTrialFloor(0))
{
trialDungeonModel.ProcessOpenTrialExchangeError();
+ return;
+ }
+ break;
+ case JumpUIType.OpenServerMountRank:
+ var type = int.Parse(_tagWinSearchModel.SelectActive);
+ if (rankModel.IsLock(type))
+ {
+ SysNotifyMgr.Instance.ShowTip("InOperationTimeError");
+ return;
+ }
+ if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)
+ {
+ SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
+ return;
+ }
+ break;
+ case JumpUIType.OpenServerRank:
+ case JumpUIType.OSTimeLimitGift:
+ case JumpUIType.VipRechargeFunc3:
+ case JumpUIType.FlashSale:
+ case JumpUIType.ConsumreRebate:
+ case JumpUIType.LimitedTimePackage:
+ case JumpUIType.BossReborn:
+ case JumpUIType.OpenServerActivityFunc2_1:
+ case JumpUIType.OpenServerActivityFunc2_2:
+ if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))
+ {
+ SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
+ return;
+ }
+ break;
+ case JumpUIType.OpenServerGift:
+ if (!ModelCenter.Instance.GetModel<OSGiftModel>().activate)
+ {
+ if (PlayerDatas.Instance.baseData.coinPointTotal <= 0
+ || !ModelCenter.Instance.GetModel<VipModel>().firstChargeRewardGet)
+ {
+ SysNotifyMgr.Instance.ShowTip("GiftNoOpen");
+ }
+ else
+ {
+ SysNotifyMgr.Instance.ShowTip("GiftAlreadyBuy");
+ }
return;
}
break;
@@ -589,11 +523,6 @@
case JumpUIType.UnionTask2:
SetJumpLogic<FairyAuTaskWin>(_tagWinSearchModel.TABID);
break;
- case JumpUIType.OpenServerActivityFunc2_1:
- case JumpUIType.OpenServerActivityFunc2_2:
- ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = int.Parse(_tagWinSearchModel.SelectActive) + 1;
- SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
- break;
case JumpUIType.UnionActive1:
case JumpUIType.UnionActive2:
SetJumpLogic<UnionTaskWin>(_tagWinSearchModel.TABID);
@@ -632,14 +561,6 @@
ModelCenter.Instance.GetModel<BlastFurnaceModel>().jumpToPrescripe =int.Parse(_tagWinSearchModel.SelectActive);
SetJumpLogic<BlastFurnaceWin>(_tagWinSearchModel.TABID);
break;
- case JumpUIType.OpenServerMountRank:
- var type = int.Parse(_tagWinSearchModel.SelectActive);
- ModelCenter.Instance.GetModel<ImpactRankModel>().gotoImpactRankType = type;
- SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
- break;
- case JumpUIType.OpenServerRank:
- SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
- break;
case JumpUIType.AttackMagicianType1:
case JumpUIType.AttackMagicianType2:
ModelCenter.Instance.GetModel<MagicianModel>().gotoType = int.Parse(_tagWinSearchModel.SelectActive);
@@ -655,6 +576,17 @@
case JumpUIType.BossReborn:
case JumpUIType.OpenServerGift:
case JumpUIType.LimitedTimePackage:
+ case JumpUIType.OpenServerRank:
+ SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
+ break;
+ case JumpUIType.OpenServerMountRank:
+ var type = int.Parse(_tagWinSearchModel.SelectActive);
+ ModelCenter.Instance.GetModel<ImpactRankModel>().gotoImpactRankType = type;
+ SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
+ break;
+ case JumpUIType.OpenServerActivityFunc2_1:
+ case JumpUIType.OpenServerActivityFunc2_2:
+ ModelCenter.Instance.GetModel<OSRedEnvelopeModel>().JumpType = int.Parse(_tagWinSearchModel.SelectActive) + 1;
SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.BestXB:
@@ -1065,7 +997,7 @@
StoreFunc5 = 76,
VipRechargeFunc1 = 77,
VipRechargeFunc2 = 78,
- VipRechargeFunc3 = 79,//浠欑帀鎶曡祫
+ VipRechargeFunc3 = 79,//鎴愰暱鍩洪噾(绮惧僵娲诲姩)
VipRechargeFunc4 = 80,
VipRechargeFunc5 = 81,
FindPreciousFrameFunc1 = 82,
@@ -1113,8 +1045,8 @@
MakeDrug = 138, //涓硅嵂浣跨敤
XianBaguaIntr = 139, //浠欐棌娉曞疂鍏崷鐐変粙缁嶇晫闈�
UnionTask2 = 140, //浠欑洘浠诲姟鐣岄潰鍥炲埌涓荤晫闈�
- OpenServerActivityFunc2_1 =141, //娲诲姩鍙戠孩鍖�
- OpenServerActivityFunc2_2 = 142, //娲诲姩鎶㈢孩鍖�
+ OpenServerActivityFunc2_1 =141, //娲诲姩鍙戠孩鍖咃紙绮惧僵娲诲姩锛�
+ OpenServerActivityFunc2_2 = 142, //娲诲姩鎶㈢孩鍖咃紙绮惧僵娲诲姩锛�
FirstRecharge = 143, // 棣栧厖鐣岄潰
KnapSackFunc1Type2 = 144, // 鑳屽寘鐣岄潰锛堣繑鍥烇級
StrengthFunc1Type2 = 145, // 寮哄寲鐣岄潰锛堣繑鍥烇級
@@ -1139,14 +1071,14 @@
VipRechargeVip9 = 164, // vip9
VipRechargeVip10 = 165, // vip10
PlotTaskFunc3 = 166, //鏀嚎浠诲姟
- OpenServerMountRank = 167,//寮�鏈嶆椿鍔ㄥ潗楠戞帓琛屾
+ OpenServerMountRank = 167,//寮�鏈嶆椿鍔ㄥ潗楠戞帓琛屾锛堢簿褰╂椿鍔級
AncientBattle = 168,//涓婂彜鎴樺満
XMZZBattle = 169, //浠欓瓟涔嬩簤
VipRechargeVip1 = 170, // vip1
Daily_Kirin = 171, //鏃ュ父浠诲姟-楹掗簾涔嬪簻
AttackMagicianType1 = 172, //鏀诲嚮绁炲叺
AttackMagicianType2 = 173, //鏀诲嚮绁炲叺
- OpenServerRank = 174, //鍏ㄥ悕鍐叉
+ OpenServerRank = 174, //鍏ㄥ悕鍐叉锛堢簿褰╂椿鍔級
Daily_BountyMission = 175, //鏃ュ父浠诲姟-甯堥棬鎮祻
Daily_IceCrystal = 176, //鏃ュ父浠诲姟-鍐版櫠鐭胯剦
Daily_Trial = 177, //鏃ュ父浠诲姟-瀹楅棬璇曠偧
@@ -1170,12 +1102,12 @@
FaBaoSoul_Wings = 195, //娉曞疂榄�-缈呰唨涔嬮瓊
FaBaoSoul_Suit = 196, //娉曞疂榄�-濂楄涔嬮瓊
FaBaoSoul_Wash = 197, //娉曞疂榄�-娲楃偧涔嬮瓊
- ConsumreRebate = 198, //绂忓埄鈥旀秷璐硅繑鍒╃晫闈�
- OSTimeLimitGift=199, //寮�鏈嶆椿鍔ㄥ紑鏈嶇壒鎯�
+ ConsumreRebate = 198, //绂忓埄鈥旀秷璐硅繑鍒╃晫闈紙绮惧僵娲诲姩锛�
+ OSTimeLimitGift=199, //寮�鏈嶆椿鍔ㄥ紑鏈嶇壒鎯狅紙绮惧僵娲诲姩锛�
WelfareFunc2Type2 = 200, //绁堟効杩斿洖涓荤晫闈�
- LimitedTimePackage = 201, //闄愭椂绀煎寘
- BossReborn = 202, //Boss澶嶆椿
- FlashSale = 203, //寮�鏈嶆椿鍔�-闄愭椂鐗规儬
+ LimitedTimePackage = 201, //闄愭椂绀煎寘锛堢簿褰╂椿鍔級
+ BossReborn = 202, //Boss澶嶆椿锛堢簿褰╂椿鍔級
+ FlashSale = 203, //寮�鏈嶆椿鍔�-闄愭椂鐗规儬锛堢簿褰╂椿鍔級
BestXB = 204, //鏋佸搧瀵诲疂
RuneXB = 205, //绗﹀嵃瀵诲疂
XBStore = 206, //瀵诲疂鍟嗗簵
--
Gitblit v1.8.0