From d44f00c29f646b6af6d0243117ac36d52339a256 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 29 Jan 2021 13:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B7=BB=E5=8A=A0=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E8=87=B3=E7=94=A8=E6=88=B7=E7=9A=84=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/commands/OnJoinCommand.ts | 8 +-------
 src/utils/game.util.ts              | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/rooms/commands/OnJoinCommand.ts b/src/rooms/commands/OnJoinCommand.ts
index 8538185..d1909bc 100644
--- a/src/rooms/commands/OnJoinCommand.ts
+++ b/src/rooms/commands/OnJoinCommand.ts
@@ -22,7 +22,6 @@ export class OnJoinCommand extends Command<CardGameState, {
     if (count >= this.room.maxClients) {
       return;
     }
-    let isRobot = false;
     // begin of set seat and team
     let idx = count;
     let seatSet = new Set([0,1,2,3])
@@ -50,12 +49,7 @@ export class OnJoinCommand extends Command<CardGameState, {
       let high = (this.room.score * fc.get(70035).number / 100) | 0;
       uinfo = await randomUserInfo(low, high, accounts)
     }
-    if (accountId && accountId == 'robot') {
-      isRobot = true;
-      accountId = uinfo.accountid
-    } else if (!accountId) {
-      accountId = uinfo.accountid
-    }
+    accountId = uinfo.accountid
 
     const team = (idx == 1 || idx == 2) ? 1 : 0;
     // end of set seat and team
diff --git a/src/utils/game.util.ts b/src/utils/game.util.ts
index 894ba2d..3f77f92 100644
--- a/src/utils/game.util.ts
+++ b/src/utils/game.util.ts
@@ -219,6 +219,7 @@ let gameUtil = {
     },
     pushInPlayerCards(player: Player, cards: Card[]) {
         const effectMap = global.$cfg.get(BaseConst.EFFECTCARD);
+        cardLog(`add: ${player.id} ${cards.map(o => [o.id, o.effect, o.type])}`)
         for (let card of cards) {
             // 如果card的type == 11, 说明是自选随从卡, 则替换成玩家牌组中的卡
             if (card.type == CardType.variable_unit && effectMap.get(card.effect).type_id == EffectType.variable_unit) {
@@ -227,7 +228,6 @@ let gameUtil = {
             player.cards.set(card.id + '', card);
             player.cardSet.add(card.id + '');
         }
-        cardLog(`add: ${player.id} ${cards.map(o => [o.id, o.effect, o.type])}`)
     },
     /**
      * 往玩家的卡组里添加卡