lkddi/chatroom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

修复钓鱼通知与游戏配置保存问题

Browse Source
This commit is contained in:
pllx
2026-04-29 15:23:32 +08:00
parent c640a31302
commit 4fe4155ec0
5 changed files with 275 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/FishingService.php
+23 -20
View File
@@ -11,6 +11,7 @@
* （会员加成：+经验X，+金币Y）
*
* @author ChatRoom Laravel
*
* @version 1.2.0
*/
@@ -24,20 +25,19 @@ use App\Models\User;
class FishingService
{
public function __construct(
private readonly ChatStateService $chatState,
private readonly VipService $vipService,
private readonly ChatStateService $chatState,
private readonly VipService $vipService,
private readonly UserCurrencyService $currencyService,
private readonly ShopService $shopService,
)
{
}
private readonly ShopService $shopService,
) {}
/**
* 处理收竿逻辑：计算结果、发放积分并全服广播。
*
* @param User $user 收竿的用户实体
* @param int $roomId 所在房间 ID
* @param bool $isAi 是否为 AI 调用（用于影响文案或标签）
* @param User $user 收竿的用户实体
* @param int $roomId 所在房间 ID
* @param bool $isAi 是否为 AI 调用（用于影响文案或标签）
* @return array{emoji:string,message:string,exp:int,jjb:int,base_exp:int,base_jjb:int,bonus_exp:int,bonus_jjb:int}
*/
public function processCatch(User $user, int $roomId, bool $isAi = false): array
{
@@ -54,11 +54,11 @@ class FishingService
if ($result['exp'] !== 0) {
// 当经验为 正数 则可使用会员翻倍，负数则不
$finalExp = $result['exp'] > 0 ? (int)round($result['exp'] * $expMul) : $result['exp'];
$finalExp = $result['exp'] > 0 ? (int) round($result['exp'] * $expMul) : $result['exp'];
}
if ($result['jjb'] !== 0) {
$finalJjb = $result['jjb'] > 0 ? (int)round($result['jjb'] * $jjbMul) : $result['jjb'];
$finalJjb = $result['jjb'] > 0 ? (int) round($result['jjb'] * $jjbMul) : $result['jjb'];
}
// 4. 计算会员额外加成部分
@@ -92,16 +92,18 @@ class FishingService
// 8. 广播钓鱼结果到聊天室
$promoTag = '';
if (!$isAi) {
if (! $isAi) {
$autoFishingMinutesLeft = $this->shopService->getActiveAutoFishingMinutesLeft($user);
$promoTag = $autoFishingMinutesLeft > 0
? ' <span onclick="window.openShopModal&&window.openShopModal()" '
. 'style="display:inline-block;margin-left:6px;padding:1px 7px;background:#e9e4f5;'
. 'color:#6d4fa8;border-radius:10px;font-size:10px;cursor:pointer;font-weight:bold;vertical-align:middle;'
. 'border:1px solid #d0c4ec;" title="点击购买自动钓鱼卡">🎣 自动钓鱼卡</span>'
.'style="display:inline-block;margin-left:6px;padding:1px 7px;background:#e9e4f5;'
.'color:#6d4fa8;border-radius:10px;font-size:10px;cursor:pointer;font-weight:bold;vertical-align:middle;'
.'border:1px solid #d0c4ec;" title="点击购买自动钓鱼卡">🎣 自动钓鱼卡</span>'
: '';
}
// 广播结果时额外带上统一动作标记和钓鱼者用户名，
// 方便前端把“钓鱼者本人”的公屏结果折叠到包厢窗口，避免重复显示。
$sysMsg = [
'id' => $this->chatState->nextMessageId($roomId),
'room_id' => $roomId,
@@ -110,7 +112,8 @@ class FishingService
'content' => "{$result['emoji']} 【{$user->username}】{$finalMessage}{$promoTag}",
'is_secret' => false,
'font_color' => ($result['exp'] < 0 || $result['jjb'] < 0) ? '#dc2626' : '#16a34a',
'action' => '',
'action' => 'fishing_result',
'fishing_username' => $user->username,
'sent_at' => now()->toDateTimeString(),
];
@@ -154,7 +157,7 @@ class FishingService
return $baseMessage;
}
return $baseMessage . '（' . $user->vipName() . '追加：' . implode('，', $bonusParts) . '）';
return $baseMessage.'（'.$user->vipName().'追加：'.implode('，', $bonusParts).'）';
}
/**
@@ -168,7 +171,7 @@ class FishingService
{
$event = FishingEvent::rollOne();
if (!$event) {
if (! $event) {
return [
'emoji' => '🐟',
'message' => '钓到一条小鱼，获得金币10',
@@ -180,8 +183,8 @@ class FishingService
return [
'emoji' => $event->emoji,
'message' => $event->message,
'exp' => (int)$event->exp,
'jjb' => (int)$event->jjb,
'exp' => (int) $event->exp,
'jjb' => (int) $event->jjb,
];
}
}