隐身进入和房间在线列表
This commit is contained in:
@@ -850,18 +850,18 @@ class Room extends Model
|
|||||||
$text['FromUserInfo']['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1);
|
$text['FromUserInfo']['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1);
|
||||||
$text['FromUserInfo']['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
|
$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);
|
$text['FromUserInfo']['chat_bubble'] = model('api/Decorate')->user_decorate_detail($user_id,9);
|
||||||
$Nobility = model('Nobility')->getUserNobilityInfo($user_id);
|
|
||||||
$is_hide = db::name('user')->where('id', $user_id)->value('hide_status');
|
$is_hide = db::name('user')->where('id', $user_id)->value('hide_status');
|
||||||
if($is_hide != 1){
|
if($is_hide != 1){//不是隐身
|
||||||
|
$Nobility = model('Nobility')->getUserNobilityInfo($user_id);
|
||||||
$text['FromUserInfo']['enter_image'] = $Nobility['enter_image'];
|
$text['FromUserInfo']['enter_image'] = $Nobility['enter_image'];
|
||||||
$text['FromUserInfo']['enter_text'] = '欢迎 ' . $Nobility['nobility_name'] .' 进入房间';
|
$text['FromUserInfo']['enter_text'] = '欢迎 ' . $Nobility['nobility_name'] .' 进入房间';
|
||||||
|
model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id);
|
||||||
}else{
|
}else{
|
||||||
$text['FromUserInfo']['enter_image'] = '';
|
$text['FromUserInfo']['enter_image'] = '';
|
||||||
$text['FromUserInfo']['enter_text'] = '';
|
$text['FromUserInfo']['enter_text'] = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id);
|
|
||||||
|
|
||||||
//记录用户访问记录
|
//记录用户访问记录
|
||||||
if($user_id != $room_owner['user_id']){
|
if($user_id != $room_owner['user_id']){
|
||||||
model('api/User')->add_user_visit_log(2,$user_id, $room_id);
|
model('api/User')->add_user_visit_log(2,$user_id, $room_id);
|
||||||
@@ -1385,6 +1385,13 @@ class Room extends Model
|
|||||||
->select();
|
->select();
|
||||||
if ($list) {
|
if ($list) {
|
||||||
foreach ($list as &$v) {
|
foreach ($list as &$v) {
|
||||||
|
//判断用户的隐身状态,隐身用户且不在麦位上不显示
|
||||||
|
$hinde_status = db::name('user')->where('id', $v['user_id'])->value('hinde_status');
|
||||||
|
$on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $v['user_id']])->value('pit_number');
|
||||||
|
if ($hinde_status == 1 && !$on_pit) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
|
$v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
|
||||||
$v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
|
$v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
|
||||||
//用户的角色
|
//用户的角色
|
||||||
@@ -1411,6 +1418,12 @@ class Room extends Model
|
|||||||
}
|
}
|
||||||
}elseif(($label_type['data']['type_id'] == 1 || $label_type['data']['type_id'] == 3 || $label_type['data']['type_id'] == 4 || $label_type['data']['type_id'] == 8) && $label_type['data']['label_id'] == 2){
|
}elseif(($label_type['data']['type_id'] == 1 || $label_type['data']['type_id'] == 3 || $label_type['data']['type_id'] == 4 || $label_type['data']['type_id'] == 8) && $label_type['data']['label_id'] == 2){
|
||||||
foreach ($list as $val) {
|
foreach ($list as $val) {
|
||||||
|
$hinde_status = db::name('user')->where('id', $val['user_id'])->value('hinde_status');
|
||||||
|
$on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $val['user_id']])->value('pit_number');
|
||||||
|
$oompit = db::name('vs_room_pit_simulate')->where(['room_id' => $room_id,'user_id' => $val['user_id']])->find();
|
||||||
|
if ($hinde_status == 1 && !$on_pit && !$oompit) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (db::name('vs_room_pit_simulate')->where(['room_id' => $room_id,'user_id' => $val['user_id']])->find() || $val['pit_number'] > 0) {
|
if (db::name('vs_room_pit_simulate')->where(['room_id' => $room_id,'user_id' => $val['user_id']])->find() || $val['pit_number'] > 0) {
|
||||||
$lists['on_pit'][] = $val;
|
$lists['on_pit'][] = $val;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user