From cbc27f8ffdf143a5610dcd3fd391ec8c0ee8661a Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 31 一月 2019 16:49:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/WindowJump/WindowJumpMgr.cs |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index e46e46f..28c70b0 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -200,6 +200,7 @@
             case JumpUIType.EquipCompose296:
             case JumpUIType.EquipCompose297:
             case JumpUIType.EquipCompose298:
+            case JumpUIType.ToolCompose305:
                 int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;     
                 if(types.Length > 2)
                 {
@@ -396,6 +397,7 @@
                 SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
                 break;
             case JumpUIType.JadeDynastyEquip292:
+            case JumpUIType.JadeDynastyGem304:
                 SetJumpLogic<JadeDynastyKnapSackWin>(_tagWinSearchModel.TABID);
                 break;
             case JumpUIType.LootPreciousFrameSpec:
@@ -1051,6 +1053,7 @@
             case JumpUIType.EquipCompose269:
             case JumpUIType.EquipCompose270:
             case JumpUIType.EquipCompose291:
+            case JumpUIType.ToolCompose305:
                 int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
                 if (types.Length > 0)
                 {
@@ -1664,7 +1667,10 @@
     NewYearTour300 = 300, //2019鏄ヨ妭宸$ぜ
     NewYearTour301 = 301, //2019鏄ヨ妭宸$ぜ
     NewYearTour302 = 302, //2019鏄ヨ妭宸$ぜ
-    FestivalRedBag303 = 303, //鑺傛棩绾㈠寘鐣岄潰

+    FestivalRedBag303 = 303, //鑺傛棩绾㈠寘鐣岄潰
+    JadeDynastyGem304 = 304, //璇涗粰瀹濈煶
+    ToolCompose305 = 305, //璇涗粰闄勪激瀹濈煶鍚堟垚
+
     DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
     HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
     GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�

--
Gitblit v1.8.0