From d5703bd99a8e847b6334bc712ed48a2be89715b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 2 Jan 2026 15:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E7=BB=93=E6=9D=9F=203?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E4=B8=8D=E6=93=8D=E4=BD=9C=E5=8D=A1=E6=97=A0?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 3e0ea303..b8329d87 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -114,8 +114,8 @@ class Friend extends Model
             $return['heart_value'] = $originalPairs['heart_value'];
             $return['heart_id'] = $originalPairs['id'];
             $room_updatatime = db::name('vs_room')->where(['id' => $room_id,'step' => $step])->value('updatetime');
-            if($room_updatatime){ //60秒内没操作 则创建关系无
-                if(time() - $room_updatatime > 60){
+            if($room_updatatime){ //180秒内没操作 则创建关系无(元旦 泽喜 说的）
+                if(time() - $room_updatatime > 180){
                     $this->createRelation(0,$room_id,$id,$return['user1_id'],$return['user2_id'],0);
                     return ['code' => 1, 'msg' => '操作成功！', 'data' => $return];
                 }
@@ -131,7 +131,7 @@ class Friend extends Model
             $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
             if($on_pit){
                 foreach ($on_pit as $pit){
-                    model('RoomPit')->DownPit($pit['user_id'], $room_id,$pit['pit_number']);
+                    model('api/RoomPit')->DownPit($pit['user_id'], $room_id,$pit['pit_number']);
                 }
             }
             $return = null;
@@ -147,7 +147,7 @@ class Friend extends Model
         $text['friend_user'] = $return;
         $text['friend_id'] = $id;
         model('api/Chat')->sendMsg(1049,$room_id,$text);
-        model('Room')->clear_user_charm(db::name('vs_room')->where(['id' => $room_id])->value('user_id'), $room_id);
+        model('api/Room')->clear_user_charm(db::name('vs_room')->where(['id' => $room_id])->value('user_id'), $room_id);
        return ['code' => 1, 'msg' => '操作成功！', 'data' => $return];
     }