From e5530e1ca1f28ab70c783d2b3ec685bb6569504b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 十二月 2018 14:44:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Cross_Server
---
System/WindowJump/WindowJumpMgr.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 4768834..e0f5660 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -173,6 +173,7 @@
case JumpUIType.ComposeFunc5:
case JumpUIType.TicketCompose1:
case JumpUIType.TicketCompose2:
+ case JumpUIType.GatherSoul271:
SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.EquipCompose1:
@@ -1522,7 +1523,7 @@
EquipCompose268 = 268, //瑁呭鍚堟垚-8闃舵鑹�2鏄熺帀浣�
EquipCompose269 = 269, //瑁呭鍚堟垚-9闃剁孩鑹�2鏄熺帀浣�
EquipCompose270 = 270, //瑁呭鍚堟垚-10闃剁孩鑹�3鏄熺帀浣�
-
+ GatherSoul271 = 271, //鑱氶瓊鍚堟垚
DhszTs = 1001,//瀹氭捣绁為拡鍔熸硶鎻愬崌鐣岄潰
HyqTs = 1002,//鐨撴湀鏋姛娉曟彁鍗囩晫闈�
GyzTs = 1003,//楝肩墮鍒冨姛娉曟彁鍗囩晫闈�
--
Gitblit v1.8.0