From 7dc9f2ae99ed3551ed32f97d61de132d0fb575c0 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Mon, 7 Dec 2020 13:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B8=B8=E6=88=8F=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=B9=BF=E6=92=AD=E5=8F=82=E6=95=B0=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global.d.ts                       |  2 +-
 src/rooms/commands/NextTurnCommand.ts | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/global.d.ts b/src/global.d.ts
index bfa48d3..cfbf4ae 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -117,7 +117,7 @@ declare module "colyseus" {
          * @param data
          * @param options
          */
-        bGameResult(data?: any, options: any): void;
+        bGameResult(data?: any, options?: any): void;
         /**
          * 发送给个人的消息列表
          * @param client
diff --git a/src/rooms/commands/NextTurnCommand.ts b/src/rooms/commands/NextTurnCommand.ts
index 434e3c9..f60e2b7 100644
--- a/src/rooms/commands/NextTurnCommand.ts
+++ b/src/rooms/commands/NextTurnCommand.ts
@@ -2,9 +2,8 @@ import {Command} from "@colyseus/command";
 import {CardGameState} from "../schema/CardGameState";
 import {DrawCommand} from "./DrawCommand";
 import {GameStateConst} from "../../constants/GameStateConst";
-import {singleton} from "../../common/Singleton";
-import {GameEnv} from "../../cfg/GameEnv";
-import {PartResultCommand} from "./PartResultCommand";
+import {PlayerStateConst} from "../../constants/PlayerStateConst";
+import {error} from "../../common/Debug";
 
 /**
  * 下一轮
@@ -22,7 +21,15 @@ export class NextTurnCommand extends Command<CardGameState, {}> {
         this.state.currentTurn = (this.state.currentTurn)
             ? sessionIds[(sessionIds.indexOf(this.state.currentTurn) + 1) % sessionIds.length]
             : sessionIds[0];
-        return [new DrawCommand()]
+        let player = this.state.players.get(this.state.currentTurn);
+        if (!player) {
+            error('未找到玩家');
+        }
+        if (player.state == PlayerStateConst.PLAYER_DEAD) {
+            return [new NextTurnCommand()];
+        } else {
+            return [new DrawCommand()]
+        }
     }
 
 }