diff --git a/src/global.d.ts b/src/global.d.ts index e5da63f..04bbd9e 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -186,8 +186,9 @@ declare module "colyseus" { * 弃卡, 并广播消息 * @param dstplayer 目标玩家 * @param count + * @param fromplayer */ - giveUpCard(dstplayer: string, count: number): number; + giveUpCard(dstplayer: string, count: number, fromplayer?: string): number; /** * 补卡, 并广播消息 @@ -205,14 +206,16 @@ declare module "colyseus" { * @param dstplayer * @param hp * @param reason + * @param fromplayer */ - updateHp(dstplayer: string, hp: number, reason?: string): number; + updateHp(dstplayer: string, hp: number, reason?: string, fromplayer?: string): number; /** * 更新随从信息 * @param datas + * @param fromplayer */ - updatePet(datas: PetInfo[]): void; + updatePet(datas: PetInfo[], fromplayer?: string): void; /** * 给room.mainClock设定任务 diff --git a/src/rooms/RoomExtMethod.ts b/src/rooms/RoomExtMethod.ts index 0b72981..2aedb6c 100644 --- a/src/rooms/RoomExtMethod.ts +++ b/src/rooms/RoomExtMethod.ts @@ -45,7 +45,7 @@ Object.defineProperties(Room.prototype, { } }, giveUpCard: { - value: function (dstplayer: string, count: number){ + value: function (dstplayer: string, count: number, fromplayer?: string){ let player = this.state.players.get(dstplayer); let tmpCards = gameUtil.removeCard(player, count); let time = this.battleMan.onCardDroped(player, tmpCards); @@ -105,7 +105,7 @@ Object.defineProperties(Room.prototype, { } }, updateHp: { - value: function (dstplayer: string, hp: number, reason?: string): number { + value: function (dstplayer: string, hp: number, reason?: string, fromplayer?: string): number { let player = this.state.players.get(dstplayer); if (!player) { error(`updateHp 未找到玩家 ${dstplayer}`); @@ -130,7 +130,7 @@ Object.defineProperties(Room.prototype, { * @param data */ updatePet: { - value: function (datas: PetInfo[]): void { + value: function (datas: PetInfo[], fromplayer?: string): void { let playerSet: Set = new Set(); for (let obj of datas) { let pid = obj.player;