From 14152740d0f39e7fe38f5a2608f67346415125d8 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 6 Jan 2021 13:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0hp,=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=9A=8F=E4=BB=8E=E4=BF=A1=E6=81=AF,=20=E5=BC=83=E5=8D=A1,=20?=
 =?UTF-8?q?=E8=BF=993=E4=B8=AA=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0fromplay?=
 =?UTF-8?q?er?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/global.d.ts            | 9 ++++++---
 src/rooms/RoomExtMethod.ts | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

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<string> = new Set();
             for (let obj of datas) {
                 let pid = obj.player;