From 1dd88339c1cfd0ce976a04191274e867194472d7 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Sat, 20 Feb 2021 17:37:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=83=E7=89=8C=E5=90=8E=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E7=8E=A9=E5=AE=B6=E7=9A=84=E5=87=BA=E7=89=8C?=
 =?UTF-8?q?=E9=98=9F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/RoomExtMethod.ts           | 2 +-
 src/rooms/commands/DiscardCommand.ts | 5 ++++-
 src/utils/assistant.util.ts          | 4 +++-
 src/utils/game.util.ts               | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/rooms/RoomExtMethod.ts b/src/rooms/RoomExtMethod.ts
index 37d5ba5..46cbaa6 100644
--- a/src/rooms/RoomExtMethod.ts
+++ b/src/rooms/RoomExtMethod.ts
@@ -133,7 +133,7 @@ Object.defineProperties(Room.prototype, {
                     sourceP.statData.inc(StateTypeEnum.DMG, Math.min(-hp, player.hp));
                     player.statData.inc(StateTypeEnum.TDMG, Math.min(-hp, player.hp));
                 }
-                debugRoom(`更新血量: ${player.id}  ${player.hp} -> ${hp}, reason: ${reason}`);
+                debugRoom(`更新血量: ${player.id}  ${player.hp} -> ${hp}, reason: ${reason}, from: ${fromplayer}`);
                 if (dstHp <= 0) {
                     dstHp = 0;
                     this.dispatcher.dispatch(new PlayDeadCommand(), {player: player});
diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index f9fff99..afd3ad6 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -57,7 +57,10 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
                 this.room.send(client,'discard_card_s2c', {errcode: 5, errmsg: '找不到要吃的牌'});
                 return;
             }
-            tmpCards = tmpCards.concat(...this.state.cards.values())
+            let targetCard = this.state.cards.values().next().value.clone()
+            let targetPlayer = this.state.players.get(targetCard.owner)
+            targetPlayer?.cardQueue.clear()
+            tmpCards.push(targetCard)
             if (!gameUtil.checkDiscard(tmpCards, new GameEnv().otherEatCount)) {
                 this.room.send(client,'discard_card_s2c', {errcode: 4, errmsg: '出牌不符合规则'});
                 return;
diff --git a/src/utils/assistant.util.ts b/src/utils/assistant.util.ts
index b2040c2..58d5c04 100644
--- a/src/utils/assistant.util.ts
+++ b/src/utils/assistant.util.ts
@@ -178,7 +178,9 @@ let assistantUtil = {
 
         for (let card of cards) {
             if (card.type == CardType.variable_unit) {
-                petCards.push(card);
+                if (dstPlayer.unitCfgs.has(card.effect + '')) {
+                    petCards.push(card);
+                }
             } else if (card.type == CardType.general) {
                 spellCards.push(card);
             }
diff --git a/src/utils/game.util.ts b/src/utils/game.util.ts
index 948debb..971d56d 100644
--- a/src/utils/game.util.ts
+++ b/src/utils/game.util.ts
@@ -239,6 +239,7 @@ let gameUtil = {
             if (card.type == CardType.variable_unit && effectMap.get(card.effect).type_id == EffectType.variable_unit) {
                 card.effect = this.getRandomServant(player);
             }
+            card.owner = player.id
             realCards.push(card)
             player.cards.set(card.id + '', card);
             player.cardSet.add(card.id + '');