From 00e0aeff4806fa1cc8e7962802d88df91ab75c5b Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 23 Dec 2020 12:05:42 +0800
Subject: [PATCH] =?UTF-8?q?pet=E5=A2=9E=E5=8A=A0=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E7=89=8C=E6=95=B0=E9=87=8F=E5=92=8C=E7=82=B9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/message/PetInfo.ts     | 2 ++
 src/rooms/MSender.ts       | 2 ++
 src/rooms/RoomExtMethod.ts | 2 ++
 src/rooms/schema/Pet.ts    | 8 ++++++++
 4 files changed, 14 insertions(+)

diff --git a/src/message/PetInfo.ts b/src/message/PetInfo.ts
index 55cd992..7f938d7 100644
--- a/src/message/PetInfo.ts
+++ b/src/message/PetInfo.ts
@@ -15,6 +15,8 @@ export class PetInfo {
     extSkills: number[];
     em: number; // 法强
     silence: number; //是否被沉默, 剩几回合
+    effectCount: number; // 效果牌数量
+    point: number; // 点数
 }
 export class PetInfoMsg implements IMsg {
     data: any;
diff --git a/src/rooms/MSender.ts b/src/rooms/MSender.ts
index 301fbbd..c329a31 100644
--- a/src/rooms/MSender.ts
+++ b/src/rooms/MSender.ts
@@ -88,6 +88,8 @@ Object.defineProperties(Room.prototype, {
             pet.state = 1;
             pet.em = obj.em;
             pet.silence = obj.silence;
+            pet.effectCount = obj.effectCount;
+            pet.point = obj.point;
             if (obj.skills) {
                 pet.skills.length = 0;
                 for (let s of obj.skills) {
diff --git a/src/rooms/RoomExtMethod.ts b/src/rooms/RoomExtMethod.ts
index 2ebf424..397c140 100644
--- a/src/rooms/RoomExtMethod.ts
+++ b/src/rooms/RoomExtMethod.ts
@@ -140,6 +140,8 @@ Object.defineProperties(Room.prototype, {
                 pet.harmReduce = obj.harmReduce;
                 pet.skills.length = 0;
                 pet.state = obj.ap <=0 ? 2: 1;
+                pet.effectCount = obj.effectCount;
+                pet.point = obj.point;
                 pet.em = obj.em;
                 pet.silence = obj.silence;
                 if (obj.skills) {
diff --git a/src/rooms/schema/Pet.ts b/src/rooms/schema/Pet.ts
index 02ab10b..fdea2cc 100644
--- a/src/rooms/schema/Pet.ts
+++ b/src/rooms/schema/Pet.ts
@@ -36,6 +36,14 @@ export class Pet extends Schema {
     @type("number")
     silence?: number;
 
+    // 效果牌数量
+    @type("number")
+    effectCount: number;
+
+    // 点数
+    @type("number")
+    point: number;
+
     /**
      * 随从状态
      * 0 : 未放置随从