From 42044e959bbd3f169519fce262bfeb2c84932cb8 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 19 九月 2018 14:21:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Chat/ChatCenter.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/System/Chat/ChatCenter.cs b/System/Chat/ChatCenter.cs
index 05adb6c..a6c8059 100644
--- a/System/Chat/ChatCenter.cs
+++ b/System/Chat/ChatCenter.cs
@@ -46,10 +46,12 @@
var _funcCfg = Config.Instance.Get<FuncConfigConfig>("BugleItem");
bugleItem = int.Parse(_funcCfg.Numerical1);
chatChannels = new List<ChatInfoType>();
- for (int i = (int)ChatInfoType.System; i <= (int)ChatInfoType.Friend; i++)
- {
- chatChannels.Add((ChatInfoType)i);
- }
+ chatChannels.Add(ChatInfoType.System);
+ chatChannels.Add(ChatInfoType.World);
+ chatChannels.Add(ChatInfoType.Area);
+ chatChannels.Add(ChatInfoType.Invite);
+ chatChannels.Add(ChatInfoType.Trumpet);
+ chatChannels.Add(ChatInfoType.Friend);
}
public event Action<string, bool, bool> UpdateChatValueEvent;
@@ -755,10 +757,11 @@
return;
}
openChatAfterCollect = false;
- if (!WindowCenter.Instance.CheckOpen<ChatWin>())
+ if (!WindowCenter.Instance.CheckOpen<SocialWin>())
{
ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
- WindowCenter.Instance.Open<ChatWin>();
+ WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
+ WindowCenter.Instance.Open<SocialWin>(false, 2);
}
}
#endregion
--
Gitblit v1.8.0