From fc5ed734678ca2e3490cba411db5bbdd5c98c773 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 20 九月 2018 16:06:15 +0800
Subject: [PATCH] 2615 【后端】神兽强化功能修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py
index 1d9e8f3..b876c90 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py
@@ -86,13 +86,16 @@
         return
     if curNPC.GetType() not in [IPY_GameWorld.ntMonster]:
         return
-    
+    if not curNPC.GetVisible():
+        return
     curHP = GameObj.GetHP(curNPC)
-    if curPlayer.GetTeamID() > 0:
-        AttackCommon.AddHurtValue(curNPC, curPlayer.GetTeamID(), ChConfig.Def_NPCHurtTypeTeam, curHP)
-        AttackCommon.AddTeamPlayerHurtValue(curNPC, curPlayer.GetTeamID(), curPlayer.GetPlayerID(), curHP)
-    else:
-        AttackCommon.AddHurtValue(curNPC, curPlayer.GetPlayerID(), ChConfig.Def_NPCHurtTypePlayer, curHP)
+    AttackCommon.NPCAddObjInHurtList(curPlayer, curNPC, curHP, curHP)
+    
+    #if curPlayer.GetTeamID() > 0:
+    #    AttackCommon.AddHurtValue(curNPC, curPlayer.GetTeamID(), ChConfig.Def_NPCHurtTypeTeam, curHP)
+    #    AttackCommon.AddTeamPlayerHurtValue(curNPC, curPlayer.GetTeamID(), curPlayer.GetPlayerID(), curHP)
+    #else:
+    #    AttackCommon.AddHurtValue(curNPC, curPlayer.GetPlayerID(), ChConfig.Def_NPCHurtTypePlayer, curHP)
     
     #统一调用攻击结束动作
     GameObj.SetHP(curNPC, 0)

--
Gitblit v1.8.0