From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/WindowJump/WindowJumpMgr.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index d9a766d..04b197a 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -48,6 +48,8 @@
ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } }
ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }
MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
+ PlayerSuitModel suitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } }
+
public bool IsJumpState { get; private set; }
public int jumpPhase { get; private set;}
public int jumpType { get; private set; }
@@ -119,8 +121,14 @@
case JumpUIType.StrengthFunc4:
case JumpUIType.StrengthFunc5:
case JumpUIType.EquipWashType2:
- case JumpUIType.StrengthFunc1Type2:
- case JumpUIType.EquipSuitType2:
+ case JumpUIType.StrengthFunc1Type2:
+ SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);
+ break;
+ case JumpUIType.EquipHighSuit:
+ case JumpUIType.EquipLowSuit:
+ int suitType = 0;
+ int.TryParse(_tagWinSearchModel.SelectActive,out suitType);
+ suitModel.SetJumpModel(suitType);
SetJumpLogic<EquipReinforceWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.ComposeFunc1:
@@ -838,7 +846,7 @@
var giftModel = ModelCenter.Instance.GetModel<OSGiftModel>();
int giftId = 0;
int.TryParse(_tagWinSearchModel.SelectActive, out giftId);
- if (!giftModel.CheckActivate())
+ if (!giftModel.IsGiftExist(giftId))
{
if (PlayerDatas.Instance.baseData.coinPointTotal <= 0
|| !ModelCenter.Instance.GetModel<VipModel>().firstChargeRewardGet)
@@ -849,11 +857,15 @@
{
SysNotifyMgr.Instance.ShowTip("GiftAlreadyBuy");
}
- else if (giftModel.IsGiftOverdue(giftId))
+ else if (!giftModel.IsGiftExist(giftId))
{
SysNotifyMgr.Instance.ShowTip("MissSell");
}
return false;
+ }
+ else
+ {
+ giftModel.jumpGiftId = giftId;
}
break;
case JumpUIType.OpenServerGift:
@@ -1185,7 +1197,7 @@
StrengthFunc2 = 13,
StrengthFunc3 = 14,
StrengthFunc4 = 15,
- EquipSuitType2 = 241, //濂楄鐣岄潰
+ EquipLowSuit = 241, //鏅�氬瑁呯晫闈�
StrengthFunc5 = 16,
EquipWashType2 = 239, //瑁呭娲楃粌鐣岄潰
ComposeFunc1 = 17,
@@ -1392,6 +1404,7 @@
DogzFunc2Type2 = 251, //绁炲吔寮哄寲鐣岄潰
BindGoldWheel = 252, //缁戠帀杞洏鐣岄潰
FlashRushToBuy = 253, //绮惧僵娲诲姩鈥旈檺鏃舵姠璐晫闈�
+ EquipHighSuit = 254, //寮哄寲濂楄鐣岄潰
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0