4

xuxhong · Apr 4, 2018 · 5efdc3a · 5efdc3a
1 parent ae4d220
commit 5efdc3a
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/server/src/app/Controllers/GameController.php b/server/src/app/Controllers/GameController.php
@@ -387,24 +387,24 @@ public function getGame(){
         $dapai = [];
         $gameInfo = $this->gameInfo;
         //房间内准备状态  并且游戏数据有
-//        if($this->roomInfo['status'] == 0 || empty($gameInfo['users'][$this->mid]['shoupai'])){
-//
-//            $data = [
-//              'status'=> 0,
-//              'users'=>$this->userInfo,
-//              'roomInfo'=>$this->roomInfo
-//            ];
-//
-//            $jinru = $data;
-//            $data = [
-//                'jiesan'=>[],
-//                'jixu'=>[],
-//                'jinru'=>$jinru,
-//                'dapai'=>[]
-//            ];
-//            $this->send(reData('getGame',$data));
-//            return;
-//        }
+        if($this->roomInfo['status'] == 0 || empty($gameInfo['users'][$this->mid]['shoupai'])){
+
+            $data = [
+              'status'=> 0,
+              'users'=>$this->userInfo,
+              'roomInfo'=>$this->roomInfo
+            ];
+
+            $jinru = $data;
+            $data = [
+                'jiesan'=>[],
+                'jixu'=>[],
+                'jinru'=>$jinru,
+                'dapai'=>[]
+            ];
+            $this->send(reData('getGame',$data));
+            return;
+        }
         $roomInfo =  $this->roomInfo;
         $weizhi =  $roomInfo['weizhi'];
         $gameInfo =  $this->gameInfo;