From 03a52351edaef91708442d026a22c3c0272bd904 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 30 Dec 2020 17:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9Bdelay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/DiscardCommand.ts    | 8 +++++---
 src/rooms/commands/EatConfirmCommand.ts | 8 +++++---
 src/rooms/commands/NextTurnCommand.ts   | 3 ++-
 src/rooms/commands/TurnEndCommand.ts    | 6 +++---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index c7e81fe..f36f4bd 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -22,7 +22,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
     //     return player !== undefined && gameUtil.checkCardsExists(player.cards, cards);
     // }
 
-    execute({ client, cards , dtype} = this.payload) {
+    async execute({ client, cards , dtype} = this.payload) {
         const player = this.state.players.get(client.sessionId);
         if (!player) {
             this.room.send(client,'discard_card_s2c', {errcode: 1, errmsg: 'player不存在'});
@@ -75,7 +75,8 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
         this.room.send(client,'discard_card_s2c', {errcode: 0, cards: cards, type: dtype})
         if (cards.length === 1) {
             let cardArr: Card[] = [...this.state.cards.values()];
-            this.room.battleMan.onCardDiscarded(player, cardArr[0])
+            let time =this.room.battleMan.onCardDiscarded(player, cardArr[0])
+            await this.delay(time);
             // return [new NextSubCommand()];
             if (cardArr[0].type == CardType.general || cardArr[0].type == CardType.variable_unit) {
                 return [new NextSubCommand()];
@@ -86,7 +87,8 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
             let cardArr: Card[] = [...this.state.cards.values()];
             let self = this;
             this.room.send(client,'eat_card_s2c', {player: player.id, errcode: 0, errmsg: ''});
-            this.room.battleMan.onCardLinkOver(player, cardArr);
+            let delay = this.room.battleMan.onCardLinkOver(player, cardArr);
+            await this.delay(delay);
             let time = new GameEnv().playerActTime * 1000 + player.extraTime;
             this.state.updateGameState(GameStateConst.STATE_PICK_PET);
             // 开启选随从计时, 计时结束后结束当前轮
diff --git a/src/rooms/commands/EatConfirmCommand.ts b/src/rooms/commands/EatConfirmCommand.ts
index 56fd8c8..85b733f 100644
--- a/src/rooms/commands/EatConfirmCommand.ts
+++ b/src/rooms/commands/EatConfirmCommand.ts
@@ -15,7 +15,7 @@ import gameUtil from "../../utils/game.util";
 
 export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean }> {
 
-    execute({timeUp} = this.payload) {
+    async execute({timeUp} = this.payload) {
         let giveUpCount = 0;
         const playerCount = this.room.maxClients - 1;
         const sessionIds = [...this.state.players.keys()];
@@ -98,9 +98,11 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
             this.room.broadcast('eat_card_s2c', {player: player.id, errcode: 0, errmsg: ''}, {except: client});
             this.room.send(client,'eat_card_s2c', {player: player.id, errcode: 0, errmsg: ''});
             if (fromPlayer.id !== player.id) {
-                this.room.battleMan.onCardLinkOver(player, cardArr, fromPlayer);
+                let delay = this.room.battleMan.onCardLinkOver(player, cardArr, fromPlayer);
+                await this.delay(delay);
             } else {
-                this.room.battleMan.onCardLinkOver(player, cardArr);
+                let delay = this.room.battleMan.onCardLinkOver(player, cardArr);
+                await this.delay(delay);
             }
             // 开启选随从计时, 计时结束后结束当前轮
             this.state.updateGameState(GameStateConst.STATE_PICK_PET);
diff --git a/src/rooms/commands/NextTurnCommand.ts b/src/rooms/commands/NextTurnCommand.ts
index ee3e4be..2571956 100644
--- a/src/rooms/commands/NextTurnCommand.ts
+++ b/src/rooms/commands/NextTurnCommand.ts
@@ -39,7 +39,8 @@ export class NextTurnCommand extends Command<CardGameState, {}> {
         if (!player) {
             error('未找到玩家');
         }
-        this.room.battleMan.onPlayerRoundStart(player);
+        let time = this.room.battleMan.onPlayerRoundStart(player);
+        await this.delay(time);
         if (player.state == PlayerStateConst.PLAYER_DEAD) {
             return [new TurnEndCommand()];
         } else {
diff --git a/src/rooms/commands/TurnEndCommand.ts b/src/rooms/commands/TurnEndCommand.ts
index 40d5802..e6c4bb2 100644
--- a/src/rooms/commands/TurnEndCommand.ts
+++ b/src/rooms/commands/TurnEndCommand.ts
@@ -13,12 +13,12 @@ import gameUtil from "../../utils/game.util";
  */
 export class TurnEndCommand extends Command<CardGameState, {}> {
 
-    execute() : Array<Command> | void{
-        const sessionIds = [...this.state.players.keys()];
+    async execute(): Promise<Command[]> {
         if (this.state.currentTurn) {
             let player = this.state.players.get(this.state.currentTurn);
             if (player) {
-                this.room.battleMan.onPlayerRoundEnd(player);
+                let delay = this.room.battleMan.onPlayerRoundEnd(player);
+                await this.delay(delay);
             }
         }
         // if (this.state.currentTurn