From 538463c764f8ef1466f2c543c73c7d4848aeca5d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 25 一月 2019 11:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 747593e..0c9a746 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -193,10 +193,22 @@
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
case JumpUIType.EquipCompose291:
- int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
- if(types.Length > 0)
+ 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;
@@ -382,7 +394,7 @@
case JumpUIType.JadeDynastyBoss290:
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
- case JumpUIType.JadeDynastyEquip:
+ case JumpUIType.JadeDynastyEquip292:
SetJumpLogic<JadeDynastyKnapSackWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.LootPreciousFrameSpec:
@@ -1611,7 +1623,14 @@
JadeDynastyTowerRank289 = 289,//鎺掕姒�-璇涗粰濉�
JadeDynastyBoss290 = 290,//璇涗粰Boss
EquipCompose291 = 291,//瑁呭鍚堟垚-璇涗粰瑁呭
- JadeDynastyEquip=292,//璇涗粰瑁呭
+ JadeDynastyEquip292=292,//璇涗粰瑁呭
+ EquipCompose293 = 293,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚鎶
+ EquipCompose294 = 294,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚濡傛剰
+ EquipCompose295 = 295,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚璇涗粰鍓�
+ EquipCompose296 = 296,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚鎴粰鍓�
+ EquipCompose297 = 297,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚闄蜂粰鍓�
+ EquipCompose298 = 298,//瑁呭鍚堟垚-璇涗粰瑁呭-鍚堟垚缁濅粰鍓�
+
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0