From 835483bc32701697aff668b2e6ad706c0a2abb92 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Mon, 21 Dec 2020 11:56:21 +0800
Subject: [PATCH] =?UTF-8?q?pet=E5=A2=9E=E5=8A=A0=E6=B3=95=E5=BC=BA?=
 =?UTF-8?q?=E5=92=8C=E6=98=AF=E5=90=A6=E6=B2=89=E9=BB=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/message/PetInfo.ts     |  4 +++-
 src/rooms/MSender.ts       |  2 ++
 src/rooms/RoomExtMethod.ts |  2 ++
 src/rooms/schema/Pet.ts    | 12 ++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/message/PetInfo.ts b/src/message/PetInfo.ts
index 63e3178..55cd992 100644
--- a/src/message/PetInfo.ts
+++ b/src/message/PetInfo.ts
@@ -12,7 +12,9 @@ export class PetInfo {
     extAp: number;
     harmReduce?: number;
     skills: number[];
-    extSkills: number[]
+    extSkills: number[];
+    em: number; // 法强
+    silence: number; //是否被沉默, 剩几回合
 }
 export class PetInfoMsg implements IMsg {
     data: any;
diff --git a/src/rooms/MSender.ts b/src/rooms/MSender.ts
index ce25426..301fbbd 100644
--- a/src/rooms/MSender.ts
+++ b/src/rooms/MSender.ts
@@ -86,6 +86,8 @@ Object.defineProperties(Room.prototype, {
             pet.harmReduce = obj.harmReduce;
             pet.skills.length = 0;
             pet.state = 1;
+            pet.em = obj.em;
+            pet.silence = obj.silence;
             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 f6ba8af..4ea9929 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.em = obj.em;
+                pet.silence = obj.silence;
                 if (obj.skills) {
                     pet.skills.length = 0;
                     for (let s of obj.skills) {
diff --git a/src/rooms/schema/Pet.ts b/src/rooms/schema/Pet.ts
index 9e04539..02ab10b 100644
--- a/src/rooms/schema/Pet.ts
+++ b/src/rooms/schema/Pet.ts
@@ -24,6 +24,17 @@ export class Pet extends Schema {
 
     @type("boolean")
     isHero:boolean = false;
+    /**
+     * 法强
+     */
+    @type("number")
+    em?: number;
+
+    /**
+     * 是否被沉默, 剩几回合
+     */
+    @type("number")
+    silence?: number;
 
     /**
      * 随从状态
@@ -37,6 +48,7 @@ export class Pet extends Schema {
         super();
         this.pos = index;
         this.ap = 0;
+        this.em = 0;
     }