From d975f564c34b08c1b6d110ab86492cf0e4169cc6 Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Wed, 10 Mar 2021 16:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B3=95=E5=BC=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/Handler/PetHandler.ts    | 5 +++--
 src/rooms/logic/Handler/PlayerHandler.ts | 4 ++--
 src/rooms/logic/skill/Skill.ts           | 2 +-
 src/rooms/logic/skill/SkillConst.ts      | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts
index 5ffcc4e..8d0834b 100644
--- a/src/rooms/logic/Handler/PetHandler.ts
+++ b/src/rooms/logic/Handler/PetHandler.ts
@@ -376,9 +376,10 @@ export class PetHandler {
         return value;
     };
 
-    public addEM(value: number): number{
+    public addEM(value: number, from: PetHandler): number{
         let res = this._addEM(value);
         this._owner.onEMChanged(res);
+        (res != 0) && this.dataChanged(from);
         return res;
     };
 
@@ -387,7 +388,7 @@ export class PetHandler {
         this._enmagic += value;
         if(this._enmagic < 0){
             this._enmagic = 0;
-            return tmp;
+            return -tmp;
         }
         return value;
     };
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index 2894415..813acfd 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -349,8 +349,8 @@ export class PlayerHandler {
         return this._self? this._self._hps: 0;
     };
 
-    public addEM(value: number): number{
-        return this._self? this._self.addEM(value): 0;
+    public addEM(value: number, from: PetHandler): number{
+        return this._self? this._self.addEM(value, from): 0;
     };
 
     public getEM(): number{
diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts
index ababe68..44bbf09 100644
--- a/src/rooms/logic/skill/Skill.ts
+++ b/src/rooms/logic/skill/Skill.ts
@@ -644,7 +644,7 @@ export class Skill {
         let efftype = SkillEffectType.ENHANCE_MAGIC;  
         if(tgt.dsttype != GameUnitType.NONE){
             let obj = tgt.dst;
-            let n = obj.addEM(effvalue);
+            let n = obj.addEM(effvalue, tgt.srcPet());
             if(n >= 0){
                 tgt.success(efftype, n);
             }else{
diff --git a/src/rooms/logic/skill/SkillConst.ts b/src/rooms/logic/skill/SkillConst.ts
index 54ae3ea..bb1edec 100644
--- a/src/rooms/logic/skill/SkillConst.ts
+++ b/src/rooms/logic/skill/SkillConst.ts
@@ -380,6 +380,11 @@ export const enum PowerValueType {
  * 2.红色标识敌方单位
  * 3.蓝色标识自己单位
  * 4.蓝色标识（自己以外）友方单位
+ * 5：红色标识敌方一个“英雄和随从全体”
+ * 6：蓝色标记自己或友方“英雄”
+ * 7：蓝色标记自己或友方“英雄和随从全体”
+ * 11：确认召唤随从
+ * 12：确认发动法术
  */
 export const enum SkillTargetType {
    NONE = 0,
@@ -387,6 +392,9 @@ export const enum SkillTargetType {
    ENEMY_PET = 2,
    SELF_PET = 3,
    FRIEND_PET = 4,
+   ENEMY_TEAM = 5,
+   FIREND_HERO = 6,
+   FIREND_TEAM = 7,
 };
 
 // 技能使用者类型