From 06eca6807f072bce778fa42f7910ebcc0025a38a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 24 十月 2018 14:58:09 +0800
Subject: [PATCH] 2111 【主干】GM工具清开服功能异常

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
index d1bdcc9..8fa3d9f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -3426,9 +3426,11 @@
 
     if skillAim == ChConfig.Def_UseSkillAim_None:
         if curSkill.GetSkillType() in ChConfig.Def_CanAttackSkill_List:
-            if target and target.GetGameObjType() == IPY_GameWorld.gotNPC and target.GetType() == IPY_GameWorld.ntElf:
-                # 有害技能特殊处理,不能对自己的召唤物释放
-                target = None
+            if target and target.GetGameObjType() == IPY_GameWorld.gotNPC and target.GetGameNPCObjType() == IPY_GameWorld.gnotSummon:
+                owner = NPCCommon.GetNpcObjOwnerDetail(target)
+                if owner and owner.GetID() == attacker.GetID():
+                    # 有害技能特殊处理,不能对自己的召唤物释放
+                    target = None
                 
             result = DoLogic_UseSkill(attacker, target, curSkill, tick, attacker.GetPosX(), attacker.GetPosY(), isEnhanceSkill=isEnhanceSkill)
         else:

--
Gitblit v1.8.0