From b72e2a5936d7103572f227a936add1149893e885 Mon Sep 17 00:00:00 2001 From: lkddi Date: Fri, 27 Feb 2026 01:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=80=81=E8=8A=B1?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=94=B9=E4=B8=BA=E6=99=AE=E9=80=9A=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=A0=B7=E5=BC=8F=20+=20=E5=9C=A8=E6=94=B6=E8=8A=B1?= =?UTF-8?q?=E4=BA=BA=E7=A7=81=E8=81=8A=E5=B1=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - from_user 从'系统传音'改为'送花播报',不再使用红色公告样式 - to_user 从'大家'改为收花人用户名,消息在收花人 say2 显示 - 礼物图片渲染逻辑移到普通系统用户分支 --- app/Http/Controllers/ChatController.php | 4 ++-- resources/views/chat/partials/scripts.blade.php | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/ChatController.php b/app/Http/Controllers/ChatController.php index 5fb16d4..33ff3f0 100644 --- a/app/Http/Controllers/ChatController.php +++ b/app/Http/Controllers/ChatController.php @@ -503,8 +503,8 @@ class ChatController extends Controller $sysMsg = [ 'id' => $this->chatState->nextMessageId($roomId), 'room_id' => $roomId, - 'from_user' => '系统传音', - 'to_user' => '大家', + 'from_user' => '送花播报', + 'to_user' => $toUsername, 'content' => "{$gift->emoji} {$user->username} 向 {$toUsername} 送出了{$countText}【{$gift->name}】!魅力 +{$totalCharm}!", 'is_secret' => false, 'font_color' => '#e91e8f', diff --git a/resources/views/chat/partials/scripts.blade.php b/resources/views/chat/partials/scripts.blade.php index 7460ac4..cb13932 100644 --- a/resources/views/chat/partials/scripts.blade.php +++ b/resources/views/chat/partials/scripts.blade.php @@ -217,7 +217,7 @@ const timeStr = msg.sent_at || ''; // 系统用户名列表(不可被选为聊天对象) - const systemUsers = ['钓鱼播报', '星海小博士', '系统传音', '系统公告', 'AI小助手']; + const systemUsers = ['钓鱼播报', '星海小博士', '系统传音', '系统公告', 'AI小助手', '送花播报']; // 用户名(单击切换发言对象,双击查看资料;系统用户仅显示文本) const clickableUser = (uName, color) => { if (systemUsers.includes(uName)) { @@ -240,18 +240,17 @@ // 管理员公告/系统传音:大字醒目样式 div.style.cssText = 'background: linear-gradient(135deg, #fef2f2, #fff1f2); border: 2px solid #ef4444; border-radius: 6px; padding: 8px 12px; margin: 4px 0; box-shadow: 0 2px 4px rgba(239,68,68,0.15);'; - // 如果是送花消息,显示礼物图片 + html = + `
${msg.content}
`; + } else { + // 其他系统用户(钓鱼播报、送花播报、AI小助手等):普通样式 let giftHtml = ''; if (msg.gift_image) { giftHtml = `${msg.gift_name || ''}`; } html = - `
${msg.content}${giftHtml}
`; - } else { - // 其他系统用户(钓鱼播报、AI小助手等):普通样式 - html = - `${headImg}${msg.from_user}:${msg.content}`; + `${headImg}${msg.from_user}:${msg.content}${giftHtml}`; } } else if (msg.is_secret) { // 悄悄话样式(原版:紫色斜体)