送礼优化 相关
This commit is contained in:
@@ -577,7 +577,7 @@ class Room extends Model
|
||||
return ['code' => 0, 'msg' => '房间不存在了', 'data' => ''];
|
||||
}
|
||||
|
||||
$black = db::name('vs_room_black')->where(['room_id' => $room_id, 'black_id' => $user_id])->find();
|
||||
$black = db::name('vs_room_black')->where(['room_id' => $room_id, 'black_id' => $user_id])->order('id desc')->find();
|
||||
//判断用户是被拉入黑名单
|
||||
if (isset($black) && $black['type'] == 2) {
|
||||
return ['code' => 0, 'msg' => '您被拉入黑名单,请联系房主', 'data' => ''];
|
||||
@@ -1912,7 +1912,7 @@ class Room extends Model
|
||||
}
|
||||
|
||||
|
||||
//房间送礼
|
||||
//房间送礼【1.6废弃】
|
||||
public function room_gift($uid, $to_uid, $gift_id, $gift_num,$type, $room_id, $pit_number, $heart_id,$give_gift_ext="")
|
||||
{
|
||||
$label_type = model('Room')->get_room_label($room_id);
|
||||
@@ -1954,6 +1954,7 @@ class Room extends Model
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//背包礼物一键全清
|
||||
public function room_gift_all_clear($uid, $room_id, $user_id,$heart_id,$auction_id = 0)
|
||||
{
|
||||
@@ -1965,14 +1966,14 @@ class Room extends Model
|
||||
if($auction_id){//竞拍
|
||||
model('RoomAuction')->room_auction_join($auction_id,$uid,$v['gid'],$v['num'],2);
|
||||
}else{
|
||||
$this->room_gift($uid, $user_id, $v['gid'], $v['num'],2,$room_id, 0,$heart_id);
|
||||
model('api/SendGift')->send_gift($uid, $user_id, $v['gid'], $v['num'],2,$room_id,0,$heart_id);
|
||||
}
|
||||
}
|
||||
return ['code' => 1, 'msg' => '成功', 'data' => null];
|
||||
}
|
||||
|
||||
|
||||
//房间在线列表
|
||||
//房间在线列表【1.6废弃】
|
||||
public function room_online_lists($room_id, $page, $limit)
|
||||
{
|
||||
$lists['on_pit'] = [];
|
||||
@@ -2093,7 +2094,7 @@ class Room extends Model
|
||||
}
|
||||
|
||||
|
||||
//房间在线列表
|
||||
//房间在线列表【1.6废弃】
|
||||
public function room_online_list1($room_id, $page, $limit)
|
||||
{
|
||||
if (!$room_id) {
|
||||
@@ -2885,7 +2886,7 @@ class Room extends Model
|
||||
}
|
||||
|
||||
|
||||
//房间的类型
|
||||
//房间的类型(同意上麦和退出房间 在使用 ,其他已经修改了)
|
||||
public function get_room_label($room_id)
|
||||
{
|
||||
$room_info = db::name('vs_room')->where(['id' => $room_id])->field('id,label_id,type_id')->find();
|
||||
@@ -2911,7 +2912,7 @@ class Room extends Model
|
||||
}
|
||||
|
||||
|
||||
//房间信息
|
||||
//房间信息【1.6废弃】
|
||||
public function room_infos($user_id, $room_id)
|
||||
{
|
||||
if(!$room_id){
|
||||
@@ -3931,9 +3932,6 @@ class Room extends Model
|
||||
}
|
||||
|
||||
//用户重连
|
||||
|
||||
|
||||
|
||||
//用户在房间内切后台保留机制
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user