From dc1fa88455f8f67efc4ae6e20bfefc3a7a297366 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 30 八月 2018 15:56:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index abc4ddf..3b79e7d 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -219,8 +219,12 @@
return;
}
break;
- case JumpUIType.OpenServerGift:
+ case JumpUIType.OpenServerGift1:
+ case JumpUIType.OpenServerGift2:
+ case JumpUIType.OpenServerGift3:
var giftModel = ModelCenter.Instance.GetModel<OSGiftModel>();
+ int giftId = 0;
+ int.TryParse(_tagWinSearchModel.SelectActive, out giftId);
if (!giftModel.CheckActivate())
{
if (PlayerDatas.Instance.baseData.coinPointTotal <= 0
@@ -228,13 +232,19 @@
{
SysNotifyMgr.Instance.ShowTip("GiftNoOpen");
}
- else
+ else if (giftModel.IsGiftBuy(giftId))
{
SysNotifyMgr.Instance.ShowTip("GiftAlreadyBuy");
+ }
+ else if (giftModel.IsGiftOverdue(giftId))
+ {
+ SysNotifyMgr.Instance.ShowTip("MissSell");
}
return;
}
break;
+ case JumpUIType.OpenServerGift:
+ return;
}
DebugEx.Log("WindowJumpTo" + jumpType);
@@ -576,6 +586,9 @@
case JumpUIType.ConsumreRebate:
case JumpUIType.BossReborn:
case JumpUIType.OpenServerGift:
+ case JumpUIType.OpenServerGift1:
+ case JumpUIType.OpenServerGift2:
+ case JumpUIType.OpenServerGift3:
case JumpUIType.LimitedTimePackage:
case JumpUIType.OpenServerRank:
SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);
@@ -1127,7 +1140,9 @@
TrialDungeonSelect3 = 219, //瀹楅棬璇曠粌涓夊眰
FindPreciousFrameFunc4Type2 = 220, //鍙ょ绂佸湴鐣岄潰 杩斿洖涓荤晫闈�
FindPreciousFrameFunc2Type2 = 221, //BOSS涔嬪 杩斿洖涓荤晫闈�
-
+ OpenServerGift1 = 223, //瓒呭�肩ぜ鍖�1
+ OpenServerGift2 = 224, //瓒呭�肩ぜ鍖�2
+ OpenServerGift3 = 225, //瓒呭�肩ぜ鍖�3
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0