From 2254dade50ca3fc156c47292c992f8fc770290d0 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 25 Dec 2020 16:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=90=83=E7=89=8C=E6=97=B6,?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=8D=A1=E7=89=8C=E6=98=AF=E5=90=A6=E5=9C=A8?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=89=8B=E7=89=8C=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/EatCardCommand.ts    | 27 ++++++++++++++++---------
 src/rooms/commands/EatConfirmCommand.ts |  3 +++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/rooms/commands/EatCardCommand.ts b/src/rooms/commands/EatCardCommand.ts
index c6ff729..be2f94b 100644
--- a/src/rooms/commands/EatCardCommand.ts
+++ b/src/rooms/commands/EatCardCommand.ts
@@ -5,6 +5,7 @@ import gameUtil from "../../utils/game.util";
 import {GameStateConst} from "../../constants/GameStateConst";
 import {EatConfirmCommand} from "./EatConfirmCommand";
 import {GameEnv} from "../../cfg/GameEnv";
+import {error} from "../../common/Debug";
 
 /**
  * 吃牌
@@ -16,9 +17,18 @@ export class EatCardCommand extends Command<CardGameState, { client: Client, car
             this.room.send(client,'eat_card_s2c', {errcode: 1, errmsg: 'player不存在或者'});
             return;
         }
-        if (!gameUtil.checkCardsExists(player.cards, cards)) {
-            this.room.send(client,'eat_card_s2c', {errcode: 2, errmsg: '要出的牌在手牌中不存在'});
-            return;
+        let tmpCards = [];
+        for (let id of cards) {
+            if (player.cards.has(id + '')) {
+                if (!player.cards.get(id + '').number) {
+                    error(`${player.id} 的手牌 ${id} 数据有问题`);
+                }
+                tmpCards.push(player.cards.get(id + ''));
+            } else {
+                error(`${player.id} 出的牌 ${id} 在手牌中不存在`)
+                this.room.send(client,'eat_card_s2c', {errcode: 2, errmsg: `要出的牌 ${id} 在手牌中不存在`});
+                return;
+            }
         }
         if (this.state.currentTurn == client.sessionId) {
             this.room.send(client,'eat_card_s2c', {errcode: 3, errmsg: '不能吃自己的牌'});
@@ -28,22 +38,19 @@ export class EatCardCommand extends Command<CardGameState, { client: Client, car
             this.room.send(client,'eat_card_s2c', {errcode: 4, errmsg: '找不到要吃的牌'});
             return;
         }
-        let tmpCards = [];
-        for (let id of cards) {
-            tmpCards.push(player.cards.get(id + ''));
-        }
+
         tmpCards.push(this.state.cards.get(target + ''));
         if (!gameUtil.checkDiscard(tmpCards, new GameEnv().otherEatCount)) {
-            this.room.send(client,'discard_card_s2c', {errcode: 5, errmsg: '不符合吃牌规则'});
+            this.room.send(client,'eat_card_s2c', {errcode: 5, errmsg: '不符合吃牌规则'});
             return;
         }
         if (this.state.gameState !== GameStateConst.STATE_BEGIN_EAT) {
-            this.room.send(client,'discard_card_s2c', {errcode: 7, errmsg: '不是吃牌轮'});
+            this.room.send(client,'eat_card_s2c', {errcode: 7, errmsg: '不是吃牌轮'});
             return;
         }
         //将吃牌数据临时保存
         if (this.state.tmpActionMap.has(client.sessionId)) {
-            this.room.send(client,'discard_card_s2c', {errcode: 8, errmsg: '不可更改操作'});
+            this.room.send(client,'eat_card_s2c', {errcode: 8, errmsg: '不可更改操作'});
             return ;
         }
         this.state.tmpActionMap.set(client.sessionId, cards);
diff --git a/src/rooms/commands/EatConfirmCommand.ts b/src/rooms/commands/EatConfirmCommand.ts
index 0a4524f..efc4333 100644
--- a/src/rooms/commands/EatConfirmCommand.ts
+++ b/src/rooms/commands/EatConfirmCommand.ts
@@ -74,6 +74,9 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
             player.cardQueue.clear();
             player.cardQueue.push(this.state.cards.values().next().value);
             for (let id of cards) {
+                if (!player.cards.has(id + '')) {
+                    continue;
+                }
                 this.state.cards.set(id + '', player.cards.get(id + ''));
                 player.cardQueue.push(player.cards.get(id + ''));
                 player.cards.delete(id + '');