From 69af48cc1a7c0a6b71b3464b15bd8ffba4958b5c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 22 十一月 2018 20:42:32 +0800
Subject: [PATCH] 4919 [主干]增加玩家战力流向记录

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index 07d6881..129f1b8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -58,6 +58,7 @@
 import NetPackCommon
 import FamilyRobBoss
 import FBCommon
+import ChNPC
 
 import datetime
 import math
@@ -2457,7 +2458,7 @@
 # @param curObjDetel 对象实例
 # @return 返回值无意义
 # @remarks 理对象死亡逻辑
-def DoLogic_ObjDead(curObjDetel):
+def DoLogic_ObjDead(atkObj, curObjDetel, curSkill, tick):
     if GameObj.GetHP(curObjDetel) > 0:
         return
     
@@ -2468,6 +2469,10 @@
         return
     
     #---NPC处理---
+    if not ChNPC.OnCheckCanDie(atkObj, curObjDetel, curSkill, tick):
+        GameObj.SetHP(curObjDetel, 1)
+        return
+    
     npcControl = NPCCommon.NPCControl(curObjDetel)
     npcControl.SetKilled()
     return

--
Gitblit v1.8.0