From f47ea60f59e0b2b8601583351e269151237c6708 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
System/WindowJump/WindowJumpMgr.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index cd33759..0c9a746 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -192,10 +192,23 @@
case JumpUIType.EquipCompose268:
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
- int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
- if(types.Length > 0)
+ case JumpUIType.EquipCompose291:
+ case JumpUIType.EquipCompose293:
+ case JumpUIType.EquipCompose294:
+ case JumpUIType.EquipCompose295:
+ case JumpUIType.EquipCompose296:
+ case JumpUIType.EquipCompose297:
+ case JumpUIType.EquipCompose298:
+ int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
+ if(types.Length > 2)
{
- composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1,types[0],types[1]);
+ ComposeEquipWin.selectEquipPlace = types[2];
+ composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, types[0], types[1]);
+ SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
+ }
+ else if (types.Length > 1)
+ {
+ composeModel.SetJumpToModel((ComposeFuncType)_tagWinSearchModel.TABID + 1, types[0], types[1]);
SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
}
break;
@@ -378,7 +391,11 @@
case JumpUIType.LootPreciousFrameFunc1:
case JumpUIType.DogzDungeon:
case JumpUIType.FairyGrabBoss:
+ case JumpUIType.JadeDynastyBoss290:
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
+ break;
+ case JumpUIType.JadeDynastyEquip292:
+ SetJumpLogic<JadeDynastyKnapSackWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.LootPreciousFrameSpec:
DemonJarWin.guideChallenge = true;
@@ -706,7 +723,7 @@
case JumpUIType.JadeDynastyTower288:
SetJumpLogic<TowerWin>(_tagWinSearchModel.TABID);
break;
- case JumpUIType.JadeDynastyTowerRank:
+ case JumpUIType.JadeDynastyTowerRank289:
var rankModel = ModelCenter.Instance.GetModel<RankModel>();
rankModel.jumpRankType = int.Parse(_tagWinSearchModel.SelectActive);
SetJumpLogic<RankPanel>(_tagWinSearchModel.TABID);
@@ -1013,6 +1030,7 @@
case JumpUIType.EquipCompose268:
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
+ case JumpUIType.EquipCompose291:
int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
if (types.Length > 0)
{
@@ -1602,7 +1620,16 @@
SevenDaysTour286 = 286, //涓冩棩宸＄ぜ
SevenDaysTour287 = 287, //涓冩棩宸＄ぜ
JadeDynastyTower288 = 288,//璇涗粰濉�
- JadeDynastyTowerRank = 289,//鎺掕姒�-璇涗粰濉�
+ JadeDynastyTowerRank289 = 289,//鎺掕姒�-璇涗粰濉�
+ JadeDynastyBoss290 = 290,//璇涗粰Boss
+ EquipCompose291 = 291,//瑁呭鍚堟垚-璇涗粰瑁呭
+ JadeDynastyEquip292=292,//璇涗粰瑁呭
+ EquipCompose293 = 293,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚鎶
+ EquipCompose294 = 294,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚濡傛剰
+ EquipCompose295 = 295,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚璇涗粰鍓�
+ EquipCompose296 = 296,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚鎴粰鍓�
+ EquipCompose297 = 297,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚闄蜂粰鍓�
+ EquipCompose298 = 298,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚缁濅粰鍓�
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0