From 43c60b415b189a40294e6fad3d96cc2cda9d9ea5 Mon Sep 17 00:00:00 2001 From: zhl Date: Fri, 4 Dec 2020 16:39:32 +0800 Subject: [PATCH] =?UTF-8?q?petinfo=E5=A2=9E=E5=8A=A0pos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global.d.ts | 2 +- src/message/PetInfo.ts | 1 + src/rooms/RoomExtMethod.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/global.d.ts b/src/global.d.ts index 48fd4e5..784292e 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -130,7 +130,7 @@ declare module "colyseus" { * @param dstplayer 目标玩家 * @param count 抽卡数量 */ - drawCardFromPlayer(srcplayer: string, dstplayer: string, count: number) :boolean; + drawCardFromPlayer(srcplayer: string, dstplayer: string, count: number) :number; /** * 弃卡, 并广播消息 diff --git a/src/message/PetInfo.ts b/src/message/PetInfo.ts index e7cd318..293bbb0 100644 --- a/src/message/PetInfo.ts +++ b/src/message/PetInfo.ts @@ -12,6 +12,7 @@ export class PetInfoMsg implements IMsg { id: number isHero: boolean, ap: number, + pos: number, extAp: number, harmReduce?: number, skills: number[], diff --git a/src/rooms/RoomExtMethod.ts b/src/rooms/RoomExtMethod.ts index 969a600..b444b85 100644 --- a/src/rooms/RoomExtMethod.ts +++ b/src/rooms/RoomExtMethod.ts @@ -9,7 +9,7 @@ import {error} from "../common/Debug"; */ Object.defineProperties(Room.prototype, { drawCardFromPlayer: { - value: function (srcplayer: string, dstplayer: string, count: number) { + value: function (srcplayer: string, dstplayer: string, count: number): number { let player1 = this.state.players.get(dstplayer); let tmpCards = gameUtil.removeCard(player1, count); let player0 = this.state.players.get(srcplayer); @@ -29,7 +29,7 @@ Object.defineProperties(Room.prototype, { cards: tmpCards } this.sStealCard(client, sMsgData); - return true; + return tmpCards.length; } }, giveUpCard: {