From 6cc9f56e28978bede19629ce50947b9609080da5 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 19 九月 2018 15:06:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

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

diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index b9728a4..3a683f6 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -628,7 +628,16 @@
             case JumpUIType.UnionChat1:
             case JumpUIType.UnionChat2:
                 ChatCtrl.Inst.presentChatType = (ChatInfoType)(int.Parse(_tagWinSearchModel.SelectActive) - 1);
-                SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);
+                switch (ChatCtrl.Inst.presentChatType)
+                {
+                    case ChatInfoType.Team:
+                    case ChatInfoType.Fairy:
+                        SetJumpLogic<SocialWin>(_tagWinSearchModel.TABID);
+                        break;
+                    default:
+                        SetJumpLogic<ChatWin>(_tagWinSearchModel.TABID);
+                        break;
+                }
                 break;
             case JumpUIType.MakeDrug:
                 if (PackSendQuestMgr.Instance.useItemModel != null)

--
Gitblit v1.8.0