From e53d449edd692b467c6d90cfcf804e781765cc9f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 24 一月 2019 15:19:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/WindowJump/WindowJumpMgr.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index cd33759..1d6a793 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -192,6 +192,7 @@
case JumpUIType.EquipCompose268:
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
+ case JumpUIType.EquipCompose291:
int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
if(types.Length > 0)
{
@@ -378,6 +379,7 @@
case JumpUIType.LootPreciousFrameFunc1:
case JumpUIType.DogzDungeon:
case JumpUIType.FairyGrabBoss:
+ case JumpUIType.JadeDynastyBoss290:
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.LootPreciousFrameSpec:
@@ -706,7 +708,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 +1015,7 @@
case JumpUIType.EquipCompose268:
case JumpUIType.EquipCompose269:
case JumpUIType.EquipCompose270:
+ case JumpUIType.EquipCompose291:
int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
if (types.Length > 0)
{
@@ -1602,8 +1605,9 @@
SevenDaysTour286 = 286, //涓冩棩宸＄ぜ
SevenDaysTour287 = 287, //涓冩棩宸＄ぜ
JadeDynastyTower288 = 288,//璇涗粰濉�
- JadeDynastyTowerRank = 289,//鎺掕姒�-璇涗粰濉�
-
+ JadeDynastyTowerRank289 = 289,//鎺掕姒�-璇涗粰濉�
+ JadeDynastyBoss290 = 290,//璇涗粰Boss
+ EquipCompose291 = 291,//瑁呭鍚堟垚-璇涗粰瑁呭
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0