郑晓宇 6 年之前
父節點
當前提交
ea0e0d2abf
共有 3 個文件被更改,包括 17 次插入3 次删除
  1. 5 2
      app/Console/Commands/gamematch.php
  2. 1 1
      app/Console/Commands/robot.php
  3. 11 0
      app/Home/Controllers/UserController.php

+ 5 - 2
app/Console/Commands/gamematch.php

@@ -131,7 +131,8 @@ class gamematch extends Command
                     //清理不在房间的用户
                     RoomUser::whereNotIn('user_id', array_values($group_users))->delete();
                 }
-                $info['players'] = User::select('user_id', 'avatar', 'name', 'win_count', 'lose_count')->whereIn("user_id", array_values($group_users))->get();
+                $players = User::select('user_id', 'avatar', 'name', 'win_count', 'lose_count')->whereIn("user_id", array_values($group_users))->get();
+                $info['players'] = $players;
                 //发送可以开始消息
                 $message = [
                     "type" => 'player_join',
@@ -185,9 +186,10 @@ class gamematch extends Command
                     'created_at' => date('Y-m-d H:i:s'),
                     'updated_at' => date('Y-m-d H:i:s'),
                 ]);
-                //把当前用户加入当前房间 保险点获取用户最新 client_id
+                //把当前用户加入当前房间
                 Gateway::joinGroup($user->client_id, $room_id);
                 echo "玩家新建房间: {$user_id}\n";
+                /*
                 if($user->win_count == 0 || ($user->win_count == 0 && $user->lose_count == 0)){
                     $win_rate = 0;
                 }else{
@@ -210,6 +212,7 @@ class gamematch extends Command
                     "info" => $info
                 ];
                 Gateway::sendToGroup($room_id, json_encode($message));
+                 */
             }
         }
     }

+ 1 - 1
app/Console/Commands/robot.php

@@ -123,7 +123,7 @@ class robot extends Command
                             'client_id' => $client_id,
                         ]
                     ]);
-                    var_dump($response->getBody()->getContents());
+                    var_dump($response->getBody()->getContents()) . "\n";
                     echo "{$client_id} 成功加入匹配\n";
                 }
 

+ 11 - 0
app/Home/Controllers/UserController.php

@@ -148,6 +148,17 @@ class UserController extends Controller
         if($room_id && !$is_end){
             Gateway::joinGroup($client_id, $room_id);
             $response['info']['in_game'] = 1;
+            //获取房间玩家信息
+            $group_users = Gateway::getUidListByGroup($room_id);
+            $players = User::select('user_id', 'avatar', 'name', 'win_count', 'lose_count')->whereIn("user_id", array_values($group_users))->get();
+            $info['players'] = $players;
+            //发送可以开始消息
+            $message = [
+                "type" => 'player_join',
+                "msg" => "玩家加入房间",
+                "info" => $info
+            ];
+            Gateway::sendToGroup($room_id, json_encode($message));
         }elseif($room_id && $is_end){
             unset($update_data);
             $update_data['state'] = 2;