From 17c684a98dd8811fd22ced8da1590e08d3bc4831 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 28 四月 2019 10:32:26 +0800
Subject: [PATCH] Merge branch 'master' into ViewOtherPlayer

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

diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 88c5af1..4f87e27 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -143,6 +143,7 @@
             case JumpUIType.SkillFunc2:
             case JumpUIType.SkillFunc3:
             case JumpUIType.SkillFunc2Type2:
+            case JumpUIType.TreasureSkill:
                 SetJumpLogic<SkillWin>(_tagWinSearchModel.TABID);
                 break;
             case JumpUIType.StrengthFunc1:
@@ -716,6 +717,16 @@
                 break;
             case JumpUIType.HazyRegion:
                 SetJumpLogic<CrossServerWin>(_tagWinSearchModel.TABID);
+                break;
+            case JumpUIType.Alchemy1:
+            case JumpUIType.Alchemy2:
+            case JumpUIType.Alchemy3:
+            case JumpUIType.Alchemy4:
+            case JumpUIType.Alchemy5:
+                var selectAlchemy = 0;
+                int.TryParse(_tagWinSearchModel.SelectActive, out selectAlchemy);
+                ModelCenter.Instance.GetModel<AlchemyModel>().jumpAlchemy = selectAlchemy;
+                SetJumpLogic<AlchemyBaseWin>(_tagWinSearchModel.TABID);
                 break;
             default:
                 DebugEx.Log("鏈坊鍔犳璺宠浆鐣岄潰锛�" + jumpType);
@@ -1651,6 +1662,12 @@
     AllianceBoss1 = 308,//浠欑洘Boss1
     AllianceBoss2 = 309,//浠欑洘Boss2
     FairyAuction = 310,//浠欑洘鎷嶅崠琛�
+    TreasureSkill = 311,//鎶�鑳藉崌绾�
+    Alchemy1 = 312,//鐐间腹
+    Alchemy2 = 313,
+    Alchemy3 = 314,
+    Alchemy4 = 315,
+    Alchemy5 = 316,
 
     DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
     HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�

--
Gitblit v1.8.0