diff --git a/src/robot/Robot.ts b/src/robot/Robot.ts index a33f4ad..262b7be 100644 --- a/src/robot/Robot.ts +++ b/src/robot/Robot.ts @@ -223,7 +223,9 @@ export class Robot { @wait('playerActTime') private async selectPet() { let data = await assistantUtil.selectPet(this.player, this.room.state); - this.reply('select_pet_c2s', data); + if (data) { + this.reply('select_pet_c2s', data); + } } diff --git a/src/robot/RobotClient.ts b/src/robot/RobotClient.ts index 183931e..b268ab3 100644 --- a/src/robot/RobotClient.ts +++ b/src/robot/RobotClient.ts @@ -230,7 +230,9 @@ export class RobotClient implements Client { @wait('playerActTime') private async selectPet() { let data = await assistantUtil.selectPet(this.selfPlayer, this.svrstate); - this.reply('select_pet_c2s', data) + if (data) { + this.reply('select_pet_c2s', data); + } } } diff --git a/src/utils/assistant.util.ts b/src/utils/assistant.util.ts index 3e900c2..f7ebec9 100644 --- a/src/utils/assistant.util.ts +++ b/src/utils/assistant.util.ts @@ -170,10 +170,7 @@ let assistantUtil = { result = spellCards.randomOne(); } if (!result) { - return { - card: result.id, - errcode: 1, - }; + return null; } let targetType: SkillTargetType = CfgMan.getTargetByCard(result.effect); let targetPlayer;