From f495e827e71313698f618ffdd5c09c73ef72b403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Mon, 10 Nov 2025 18:44:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E9=BA=A6=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=88=B5=E4=BD=8D=E6=8E=A8=E9=80=81=E9=87=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/RoomPit.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index f90796f..c220032 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -62,6 +62,11 @@ class RoomPit extends Model $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 $FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1); $FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm'); + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $FromUserInfo['nobility_info'] = $Nobility; + $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $FromUserInfo['nobility_image'] = $Nobility['play_image']; + $FromUserInfo['nickname_color'] = $Nobility['nick_name_color']; //推送告诉前端上了几号麦位 if($pit_number == 9){ $pit_text = '主持麦'; @@ -155,6 +160,11 @@ class RoomPit extends Model $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标 $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $FromUserInfo['nobility_info'] = $Nobility; + $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $FromUserInfo['nobility_image'] = $Nobility['play_image']; + $FromUserInfo['nickname_color'] = $Nobility['nick_name_color']; if($pit_number == 888){ $text['text'] = $FromUserInfo['nickname'].' 下了拍卖位 '; $text['type'] = 2 ; From a8f224c6d3b15780c009e2497fbe121e27cb0989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Mon, 10 Nov 2025 18:47:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A3=85=E6=89=AE=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Decorate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index 9286f98..33ec7bf 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -336,7 +336,7 @@ class Decorate extends Model $text['jia_jia'] = model('Decorate')->user_decorate_detail($uid,2); $text['FromUserInfo'] = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find(); $text['FromUserInfo']['dress'] = model('Decorate')->user_decorate_detail($uid,1); - $text['FromUserInfo']['mic_dress'] = model('Decorate')->user_decorate_detail($uid,4); + $text['FromUserInfo']['mic_cycle'] = model('Decorate')->user_decorate_detail($uid,3); $text['FromUserInfo']['chat_dress'] = model('Decorate')->user_decorate_detail($uid,5); $text['text'] = '用户 ' . $text['FromUserInfo']['nickname'] .' 修改了信息'; model('Chat')->sendMsg(1035,$room_id,$text,$uid); From 5eb016a65c054264042461dfab4b280ce1db04ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Mon, 10 Nov 2025 18:55:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=87=E6=AD=8C=20=20=E6=8D=A2=E9=BA=A6?= =?UTF-8?q?=20=E7=88=B5=E4=BD=8D=E4=BF=A1=E6=81=AF=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Room.php | 5 +++++ application/api/model/RoomPit.php | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 57488d5..e68c15e 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -932,6 +932,8 @@ class Room extends Model $song_list = null; $next_song_info = null; if($song){ + $Nobility = model('api/Nobility')->getUserNobilityInfo($song['user_id']); + $song_list = [ 'did' => $song['did'], 'song_code' => $song['song_code'], @@ -944,6 +946,9 @@ class Room extends Model 'nickname' => db::name('user')->where('id',$song['user_id'])->value('nickname'), 'avatar' => db::name('user')->where('id',$song['user_id'])->value('avatar'), 'charm' => db::name('vs_room_user_charm')->where(['user_id' =>$song['user_id'],'room_id' => $room_id])->value('charm'), + 'mic_cycle' => model('api/Decorate')->user_decorate_detail($song['user_id'],3), + 'nobility_image' => $Nobility['play_image'], + 'nickname_color' => $Nobility['nick_name_color'], ]; } //下一首歌 diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index c220032..893ac73 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -294,6 +294,11 @@ class RoomPit extends Model $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 $FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1); $FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm'); + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $FromUserInfo['nobility_info'] = $Nobility; + $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $FromUserInfo['nobility_image'] = $Nobility['play_image']; + $FromUserInfo['nickname_color'] = $Nobility['nick_name_color']; if($pit_number == 9){ $pit_text = '主持麦'; }elseif ($pit_number == 10) { From 86b15c001732dd69c68da1c4af77d8dc396b77b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Mon, 10 Nov 2025 18:58:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=88=B5=E4=BD=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Room.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/application/api/model/Room.php b/application/api/model/Room.php index e68c15e..e8a9552 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -933,7 +933,6 @@ class Room extends Model $next_song_info = null; if($song){ $Nobility = model('api/Nobility')->getUserNobilityInfo($song['user_id']); - $song_list = [ 'did' => $song['did'], 'song_code' => $song['song_code'], @@ -1045,6 +1044,11 @@ class Room extends Model $auction['gift_name'] = db::name('vs_gift')->where('gid',$auction['gift_id'])->value('gift_name'); $auction['time_day'] = $auction['time_day'] / 60 / 60; $auction['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $auction['user_id']])->value('charm') ?? 0; + $Nobility = model('api/Nobility')->getUserNobilityInfo($auction['user_id']); + $auction['nobility_info'] = $Nobility; + $auction['mic_cycle'] = model('api/Decorate')->user_decorate_detail($auction['user_id'],3); + $auction['nobility_image'] = $Nobility['play_image']; + $auction['nickname_color'] = $Nobility['nick_name_color']; $auction_list = model('api/RoomAuction')->room_auction_list_on($auction['auction_id']); $auction_user = $auction; if($auction['user_id'] == $user_id){ From 6eca2f374d652d609d53ff16b6cd94659f1260af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Tue, 11 Nov 2025 10:27:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=20=20?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BF=A1=E6=81=AF=20=E7=88=B5=E4=BD=8D?= =?UTF-8?q?=E5=92=8C=E8=81=8A=E5=A4=A9=E6=B0=94=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Room.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/api/model/Room.php b/application/api/model/Room.php index e8a9552..f336866 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -848,8 +848,10 @@ class Room extends Model $text['jia_jia'] = model('api/Decorate')->user_decorate_detail($user_id,2); $text['FromUserInfo'] = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $text['FromUserInfo']['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1); - $text['FromUserInfo']['mic_dress'] = model('api/Decorate')->user_decorate_detail($user_id,4); - $text['FromUserInfo']['chat_dress'] = model('api/Decorate')->user_decorate_detail($user_id,5); + $text['FromUserInfo']['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $text['FromUserInfo']['chat_bubble'] = model('api/Decorate')->user_decorate_detail($user_id,9); + $Nobility = model('Nobility')->getUserNobilityInfo($user_id); + $text['FromUserInfo']['enter_image'] = $Nobility['enter_image']; model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id); //记录用户访问记录