YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-12-17 11:44:38 +08:00
parent 5ec94fda56 8ed22d99be
commit aa498d682a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/api/model/Room.php
View File

@@ -1289,13 +1289,20 @@ class Room extends Model
$roomInfoStep = db::name('vs_room')->where(['id' => $room_id])->value('step');
$room_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();
if($roomInfoStep == 1 || ($roomInfoStep == 2 && ($room_pit && $room_pit['pit_number'] == 9 || $room_pit['pit_number'] == 10))){
if($roomInfoStep == 1){
if($room_pit){
model('api/RoomPit')->DownPit($user_id, $room_id, $room_pit['pit_number']);
}
}else{
return ['code' => 0, 'msg' => '互娱游戏麦不能退出', 'data' => null];
}
if($room_pit){
if($roomInfoStep == 2 && ( $room_pit['pit_number'] == 9 || $room_pit['pit_number'] == 10)){
model('api/RoomPit')->DownPit($user_id, $room_id, $room_pit['pit_number']);
}else{
return ['code' => 0, 'msg' => '互娱游戏麦不能退出', 'data' => null];
}
}
}elseif ($apply_type == 4){
model('api/Friend')->outRoom($uid, $room_id);