From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Chat/ChatWin.cs | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/Main/System/Chat/ChatWin.cs b/Main/System/Chat/ChatWin.cs
index 6b58dbc..9dc9d02 100644
--- a/Main/System/Chat/ChatWin.cs
+++ b/Main/System/Chat/ChatWin.cs
@@ -43,6 +43,9 @@
btnClose.SetListener(CloseWindow);
btnSendChat.SetListener(() =>
{
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Chat, true))
+ return;
+
// 濡傛灉鍦ㄨ亰澶╄緭鍏ョ晫闈㈡棤杈撳叆鏂囧瓧鐐瑰嚮鍙戦�侊紝鍒欏叧闂亰澶╄緭鍏ョ晫闈�
if (string.IsNullOrEmpty(inputChat.text))
{
@@ -312,7 +315,7 @@
}
}
- private void OnChatTabChange(ChatTab entrance)
+ private void OnChatTabChange(ChatChannel entrance)
{
CreaterAll(entrance);
}
@@ -327,13 +330,13 @@
RefreshAll(manager.nowChatChannel);
}
- private void CreaterAll(ChatTab chatTab)
+ private void CreaterAll(ChatChannel chatTab)
{
- if (chatTab == ChatTab.World)
+ if (chatTab == ChatChannel.World)
{
manager.nowChatChannel = ChatChannel.World;
}
- else if (chatTab == ChatTab.Guild)
+ else if (chatTab == ChatChannel.Guild)
{
manager.nowChatChannel = ChatChannel.Guild;
}
@@ -342,34 +345,34 @@
// 鎵撳紑鐣岄潰鏃堕粯璁ゅ埌搴曢儴锛屾棤鏈
isJumpArea = true;
scrWorld.lockType = EnhanceLockType.LockVerticalBottom; // 鍒濆閿佸畾搴曢儴
- scrWorld.SetActive(chatTab == ChatTab.World);
+ scrWorld.SetActive(chatTab == ChatChannel.World);
scrGuild.lockType = EnhanceLockType.LockVerticalBottom; // 鍒濆閿佸畾搴曢儴
- scrGuild.SetActive(chatTab == ChatTab.Guild);
+ scrGuild.SetActive(chatTab == ChatChannel.Guild);
scrCrossServer.lockType = EnhanceLockType.LockVerticalBottom; // 鍒濆閿佸畾搴曢儴
- scrCrossServer.SetActive(chatTab == ChatTab.CrossServer);
+ scrCrossServer.SetActive(chatTab == ChatChannel.CrossServer);
transInput.SetActive(true);
- serversBtn.SetActive(chatTab == ChatTab.CrossServer);
+ serversBtn.SetActive(chatTab == ChatChannel.CrossServer);
CreateChatTabScroller();
switch (chatTab)
{
- case ChatTab.World:
+ case ChatChannel.World:
manager.nowChatChannel = ChatChannel.World;
CreateScroller(scrWorld, ChatChannel.World);
ScrollerJump(scrWorld, ChatChannel.World);
ClearUnreadMsg();
break;
- case ChatTab.Guild:
+ case ChatChannel.Guild:
manager.nowChatChannel = ChatChannel.Guild;
CreateScroller(scrGuild, ChatChannel.Guild);
ScrollerJump(scrGuild, ChatChannel.Guild);
ClearUnreadMsg();
break;
- case ChatTab.CrossServer:
+ case ChatChannel.CrossServer:
manager.nowChatChannel = ChatChannel.CrossServer;
CreateScroller(scrCrossServer, ChatChannel.CrossServer);
ScrollerJump(scrCrossServer, ChatChannel.CrossServer);
@@ -440,11 +443,11 @@
scroller.m_Scorller.RefreshActiveCellViews();
}
- if (type == ChatChannel.World && manager.nowChatTab != ChatTab.World)
+ if (type == ChatChannel.World && manager.nowChatTab != ChatChannel.World)
return;
- if (type == ChatChannel.Guild && manager.nowChatTab != ChatTab.Guild)
+ if (type == ChatChannel.Guild && manager.nowChatTab != ChatChannel.Guild)
return;
- if (type == ChatChannel.CrossServer && manager.nowChatTab != ChatTab.CrossServer)
+ if (type == ChatChannel.CrossServer && manager.nowChatTab != ChatChannel.CrossServer)
return;
// 1. 鑷繁鍙戦�佺殑娑堟伅 -> 寮哄埗璺宠浆鍒板簳閮� + 娓呴浂
if (playerId == PlayerDatas.Instance.PlayerId)
--
Gitblit v1.8.0