From e8ddc4112f0c16fc63ebf0993ee80bf6613c007b Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Mon, 21 Dec 2020 19:38:54 +0800
Subject: [PATCH] =?UTF-8?q?player=E5=A2=9E=E5=8A=A0cardQueue=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E8=AE=B0=E5=BD=95=E4=B8=8A=E4=B8=80=E6=89=8B=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/DiscardCommand.ts    | 2 +-
 src/rooms/commands/EatConfirmCommand.ts | 8 +++++---
 src/rooms/commands/NextTurnCommand.ts   | 1 +
 src/rooms/schema/Player.ts              | 8 +++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index 7a048d6..bed0169 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -53,9 +53,9 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
             let newCount = player.extraTime -  Math.min(count, 0);
             player.extraTime = Math.max(newCount, 0);
         }
-        let tmpCard = player.cards.get(cards[0] + '');
         for (let id of cards) {
             this.state.cards.set(id+'', player.cards.get(id + ''));
+            player.cardQueue.push(player.cards.get(id + ''));
             player.cards.delete(id + '');
             player.cardSet.delete(id + '');
         }
diff --git a/src/rooms/commands/EatConfirmCommand.ts b/src/rooms/commands/EatConfirmCommand.ts
index 97c4c3a..66fd33e 100644
--- a/src/rooms/commands/EatConfirmCommand.ts
+++ b/src/rooms/commands/EatConfirmCommand.ts
@@ -69,11 +69,13 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
             debugRoom(`真的开始吃牌了: ${player.id}, 场上牌: ${this.state.cards.size}, isFirst: ${isFirst}, timeUp: ${timeUp}`);
             // 如果有吃牌计时的话,停止吃牌计时
             this.room.stopSchedule('eat_round');
-            // if (this.room.mainClock?.active) {
-            //     this.room.mainClock.clear();
-            // }
+            let currentPlayer = this.state.players.get(this.state.currentTurn);
+            currentPlayer.cardQueue.clear();
+            player.cardQueue.clear();
+            player.cardQueue.push(this.state.cards.values().next().value);
             for (let id of cards) {
                 this.state.cards.set(id + '', player.cards.get(id + ''));
+                player.cardQueue.push(player.cards.get(id + ''));
                 player.cards.delete(id + '');
                 player.cardSet.delete(id + '');
             }
diff --git a/src/rooms/commands/NextTurnCommand.ts b/src/rooms/commands/NextTurnCommand.ts
index da6b82c..ee3e4be 100644
--- a/src/rooms/commands/NextTurnCommand.ts
+++ b/src/rooms/commands/NextTurnCommand.ts
@@ -35,6 +35,7 @@ export class NextTurnCommand extends Command<CardGameState, {}> {
             ? sessionIds[(sessionIds.indexOf(this.state.currentTurn) + 1) % sessionIds.length]
             : sessionIds[0]);
         let player = this.state.players.get(this.state.currentTurn);
+        player.cardQueue.clear();
         if (!player) {
             error('未找到玩家');
         }
diff --git a/src/rooms/schema/Player.ts b/src/rooms/schema/Player.ts
index 1fd29af..f4574fe 100644
--- a/src/rooms/schema/Player.ts
+++ b/src/rooms/schema/Player.ts
@@ -1,4 +1,4 @@
-import {filter, MapSchema, Schema, SetSchema, type} from "@colyseus/schema";
+import {ArraySchema, filter, MapSchema, Schema, SetSchema, type} from "@colyseus/schema";
 import {Pet} from "./Pet";
 import {Card} from "./Card";
 import {GameEnv} from "../../cfg/GameEnv";
@@ -22,6 +22,12 @@ export class Player extends Schema {
 
     @type({ set: "string" })
     cardSet = new SetSchema<string>();
+
+    /**
+     * 玩家出的牌
+     */
+    @type([Card])
+    cardQueue = new ArraySchema<Card>();
     /**
      * 当前hp
      */