From af8dccbe27e22eeed5c6b49427acba1a74443be5 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Fri, 25 Dec 2020 11:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/robot/Robot.ts          | 7 ++++---
 src/robot/RobotClient.ts    | 1 +
 src/utils/assistant.util.ts | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/robot/Robot.ts b/src/robot/Robot.ts
index 619295a..81e5005 100644
--- a/src/robot/Robot.ts
+++ b/src/robot/Robot.ts
@@ -55,8 +55,8 @@ export class Robot {
                 case 'player_ready_s2c':
                     break;
                 case 'eat_card_s2c':
-                    debug("[ROBOT] received message:", type, "=>", data);
                     if (data.errcode == 0 && data.player == self.sessionId) {
+                        debug(`吃牌成功: ${self.sessionId}`);
                         self.selectPet();
                     }
                     break;
@@ -64,7 +64,7 @@ export class Robot {
         });
 
         this.room.onLeave(function () {
-            debug("[ROBOT] LEFT ROOM", arguments);
+            debug("LEFT ROOM", arguments);
             self.room.removeAllListeners();
             self.room.leave();
         });
@@ -165,6 +165,7 @@ export class Robot {
             return;
         }
         let cardIds = cards.map(o => o.id);
+        log(`discard: ${self.sessionId} ${cardIds}`);
         self.reply('discard_card_c2s', {
             cards: cardIds
         });
@@ -200,7 +201,7 @@ export class Robot {
      * @private
      */
     private eatCard(cardIds: number[], target: number) {
-        log(`${this.sessionId} 吃牌 ${cardIds} -> ${target}`);
+        log(`吃牌: ${this.sessionId}  ${cardIds} -> ${target}`);
         this.reply('eat_card_c2s', {
             cards: cardIds,
             target
diff --git a/src/robot/RobotClient.ts b/src/robot/RobotClient.ts
index 568d6c1..bda767b 100644
--- a/src/robot/RobotClient.ts
+++ b/src/robot/RobotClient.ts
@@ -142,6 +142,7 @@ export class RobotClient implements Client {
             return;
         }
         let cardIds = cards.map(o => o.id);
+        log(`discard: ${self.sessionId} ${cardIds}`);
         self.reply('discard_card_c2s', {
             cards: cardIds
         });
diff --git a/src/utils/assistant.util.ts b/src/utils/assistant.util.ts
index ae6154e..9baff0d 100644
--- a/src/utils/assistant.util.ts
+++ b/src/utils/assistant.util.ts
@@ -189,7 +189,7 @@ let assistantUtil = {
             error(`无法选择随从或法术, 随从数: ${petCount}, 法术牌数量: ${spellCards.length}`);
             return null;
         }
-        robotLog(`选择: ${result.effect} 类型: ${effectMap.get(result.effect).type_id}`)
+        robotLog(`选择随从或法术 ${dstPlayer.id}: ${result.effect} 类型: ${effectMap.get(result.effect).type_id == EffectType.variable_unit ? '随从' : '法术'}`)
         let targetType: SkillTargetType = CfgMan.getTargetByCard(result.effect);
         let targetPlayer;
         let targetPos;