From 5afed21972d27993fa39d92deb9cf63e1aa05ab9 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 25 十月 2018 17:58:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 7bd419b..963eeea 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -47,6 +47,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; }
@@ -118,8 +120,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:
@@ -1188,7 +1196,7 @@
StrengthFunc2 = 13,
StrengthFunc3 = 14,
StrengthFunc4 = 15,
- EquipSuitType2 = 241, //濂楄鐣岄潰
+ EquipLowSuit = 241, //鏅�氬瑁呯晫闈�
StrengthFunc5 = 16,
EquipWashType2 = 239, //瑁呭娲楃粌鐣岄潰
ComposeFunc1 = 17,
@@ -1395,6 +1403,7 @@
DogzFunc2Type2 = 251, //绁炲吔寮哄寲鐣岄潰
BindGoldWheel = 252, //缁戠帀杞洏鐣岄潰
FlashRushToBuy = 253, //绮惧僵娲诲姩鈥旈檺鏃舵姠璐晫闈�
+ EquipHighSuit = 254, //寮哄寲濂楄鐣岄潰
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0