功能更新与UI优化:游戏图标移除、用户名片修复、婚礼红包界面重设计
- 移除聊天室右下角浮动游戏图标(占卜、百家乐、赛马、老虎机) - 用户名片按钮区:修复已婚/已好友时按钮换行问题,统一单行显示 - 婚礼红包弹窗:重设计为喜庆鲜红背景,领取按钮改为圆形米黄样式 - 新增婚礼红包恢复接口(/wedding/pending-envelopes),刷新后自动恢复领取按钮 - 修复 Alpine :style 字符串覆盖静态 style 导致圆形按钮失效的问题 - 撤职后用户等级改为根据经验值重新计算,不再无条件重置为1 - 管理员修改用户经验值后自动重算等级,有职务用户等级锁定 - 娱乐大厅钓鱼游戏按钮直接调用 startFishing() 简化操作流程 - 新增赛马、占卜、百家乐游戏及相关后端逻辑
This commit is contained in:
@@ -88,7 +88,7 @@ class UserManagerController extends Controller
|
||||
*/
|
||||
public function update(Request $request, User $user): JsonResponse|RedirectResponse
|
||||
{
|
||||
$targetUser = $user;
|
||||
$targetUser = $user;
|
||||
$currentUser = Auth::user();
|
||||
|
||||
// 超级管理员专属:仅 id=1 的账号可编辑用户信息
|
||||
@@ -129,7 +129,24 @@ class UserManagerController extends Controller
|
||||
);
|
||||
$targetUser->refresh();
|
||||
}
|
||||
|
||||
// 调整经验后重新计算等级(有职务用户锁定职务等级,无职务用户按经验重算)
|
||||
$targetUser->load('activePosition.position');
|
||||
$superLevel = (int) \App\Models\Sysparam::getValue('superlevel', '100');
|
||||
if ($targetUser->activePosition?->position) {
|
||||
// 有在职职务:等级锁定为职务级,不受经验影响
|
||||
$lockedLevel = (int) $targetUser->activePosition->position->level;
|
||||
if ($lockedLevel > 0 && $targetUser->user_level !== $lockedLevel) {
|
||||
$targetUser->user_level = $lockedLevel;
|
||||
}
|
||||
} elseif ($targetUser->user_level < $superLevel) {
|
||||
// 无职务普通用户:按经验重算等级(不超过满级阈值)
|
||||
$newLevel = \App\Models\Sysparam::calculateLevel($targetUser->exp_num ?? 0);
|
||||
$safeLevel = max(1, min($newLevel, $superLevel - 1));
|
||||
$targetUser->user_level = $safeLevel;
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($validated['jjb'])) {
|
||||
$jjbDiff = $validated['jjb'] - ($targetUser->jjb ?? 0);
|
||||
if ($jjbDiff !== 0) {
|
||||
@@ -185,7 +202,7 @@ class UserManagerController extends Controller
|
||||
*/
|
||||
public function destroy(Request $request, User $user): RedirectResponse
|
||||
{
|
||||
$targetUser = $user;
|
||||
$targetUser = $user;
|
||||
$currentUser = Auth::user();
|
||||
|
||||
// 超级管理员专属:仅 id=1 的账号可删除用户
|
||||
|
||||
Reference in New Issue
Block a user