From f038fba3cb94d8f46d7280275a1fa12a505dbccb Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 25 Dec 2020 18:10:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=9F=E4=BC=8D?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/OnJoinCommand.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts
index 5319443..53f933f 100644
--- a/src/rooms/commands/OnJoinCommand.ts
+++ b/src/rooms/commands/OnJoinCommand.ts
@@ -12,7 +12,7 @@ export class OnJoinCommand extends Command<CardGameState, {
     client: Client
 }> {
     execute({client} = this.payload) {
-        let team = this.state.players.size / 2 | 0;
+        let team = (this.state.players.size == 1 || this.state.players.size == 2)? 1 : 0;
         // 实际的team会在PlayReadyCommand中设置
         let player = new Player(client.sessionId, 0, team);
         this.state.players.set(client.sessionId, player);

From 3504cd21369098c27cdf330072f40d638710ad77 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 25 Dec 2020 18:20:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=98=9F=E4=BC=8D?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/PlayReadyCommand.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rooms/commands/PlayReadyCommand.ts b/src/rooms/commands/PlayReadyCommand.ts
index 0778f1c..7218238 100644
--- a/src/rooms/commands/PlayReadyCommand.ts
+++ b/src/rooms/commands/PlayReadyCommand.ts
@@ -32,7 +32,7 @@ export class PlayReadyCommand extends Command<CardGameState, {
             // return [new PrepareCommand()];
             let i = 0;
             for (let [,player] of this.state.players) {
-                player.team = (i ++ / 2) | 0;
+                player.team = (i == 1 || i ++ == 2) ? 1 : 0;
             }
             await this.room.setPrivate(true);
             this.room.state.updateGameState(GameStateConst.CHANGE_HERO);

From e8349b1732621395970b9d64180e32142cc34f1c Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 25 Dec 2020 18:58:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=87=BA=E7=89=8C=E5=92=8C=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=90=83=E7=89=8C=E6=97=B6,=20=E5=8D=A1=E7=89=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEclone=E4=B8=80=E4=BB=BD=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E9=98=9F=E5=88=97=E4=B8=AD?=
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 | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/rooms/commands/DiscardCommand.ts b/src/rooms/commands/DiscardCommand.ts
index e995526..1bdfd38 100644
--- a/src/rooms/commands/DiscardCommand.ts
+++ b/src/rooms/commands/DiscardCommand.ts
@@ -35,7 +35,7 @@ export class DiscardCommand extends Command<CardGameState, { client: Client, car
                     error(`${player.id} 的手牌 ${id} 数据有问题`);
                     continue;
                 }
-                tmpCards.push(player.cards.get(id + ''));
+                tmpCards.push(player.cards.get(id + '').clone());
             } else {
                 error(`${player.id} 出的牌 ${id} 在手牌中不存在`)
                 this.room.send(client,'discard_card_s2c', {errcode: 2, errmsg: `要出的牌 ${id} 在手牌中不存在`});
diff --git a/src/rooms/commands/EatConfirmCommand.ts b/src/rooms/commands/EatConfirmCommand.ts
index efc4333..27d0645 100644
--- a/src/rooms/commands/EatConfirmCommand.ts
+++ b/src/rooms/commands/EatConfirmCommand.ts
@@ -72,13 +72,14 @@ export class EatConfirmCommand extends Command<CardGameState, { timeUp: boolean
             let currentPlayer = this.state.players.get(this.state.currentTurn);
             currentPlayer.cardQueue.clear();
             player.cardQueue.clear();
-            player.cardQueue.push(this.state.cards.values().next().value);
+            player.cardQueue.push(this.state.cards.values().next().value.clone());
             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 + ''));
+                let card = player.cards.get(id + '').clone();
+                this.state.cards.set(id + '', card);
+                player.cardQueue.push(card);
                 player.cards.delete(id + '');
                 player.cardSet.delete(id + '');
             }

From 6d208bac74775031c5879981cba1d5e2dfbe7fa7 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 25 Dec 2020 19:03:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=98=9F=E4=BC=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/PlayReadyCommand.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rooms/commands/PlayReadyCommand.ts b/src/rooms/commands/PlayReadyCommand.ts
index 7218238..6f60ceb 100644
--- a/src/rooms/commands/PlayReadyCommand.ts
+++ b/src/rooms/commands/PlayReadyCommand.ts
@@ -32,7 +32,8 @@ export class PlayReadyCommand extends Command<CardGameState, {
             // return [new PrepareCommand()];
             let i = 0;
             for (let [,player] of this.state.players) {
-                player.team = (i == 1 || i ++ == 2) ? 1 : 0;
+                player.team = (i == 1 || i == 2) ? 1 : 0;
+                i += 1;
             }
             await this.room.setPrivate(true);
             this.room.state.updateGameState(GameStateConst.CHANGE_HERO);