From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 System/Chat/ChatTip.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/System/Chat/ChatTip.cs b/System/Chat/ChatTip.cs
index abe1422..bfb9a37 100644
--- a/System/Chat/ChatTip.cs
+++ b/System/Chat/ChatTip.cs
@@ -155,7 +155,7 @@
         {
             ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
             WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
-            WindowCenter.Instance.Open<SocialWin>(false, 2);
+            WindowCenter.Instance.Open<SocialWin>();
             return;
         }
         WindowCenter.Instance.Open<ChatWin>();
@@ -228,11 +228,11 @@
         {
             case ChatInfoType.Team:
                 WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
-                WindowCenter.Instance.Open<SocialWin>(false, 1);
+                WindowCenter.Instance.Open<SocialWin>(false, 2);
                 break;
             case ChatInfoType.Fairy:
                 WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
-                WindowCenter.Instance.Open<SocialWin>(false, 2);
+                WindowCenter.Instance.Open<SocialWin>();
                 break;
             default:
                 WindowCenter.Instance.Open<ChatWin>();

--
Gitblit v1.8.0