Merge branch 'develop_test' into develop

2026-01-05 15:44:58 +08:00
parent b30efada95 9539bc069e
commit ba78531cbe
16 changed files with 2222 additions and 146 deletions
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1283,6 +1283,11 @@ class Room extends Model
        $is_hide = db::name('user')->where('id', $user_id)->value('hide_status');
        if($is_hide != 1){//不是隐身

+            $tet['text'] = '回到房间';
+            $tet['user_id'] = $user_id;
+            $tet['type'] = 1;
+            model('api/Chat')->sendMsg(1058,$room_id,$tet);
+
            model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id);

            //当前用户不是隐身状态的时候触发CP特效