From 68e048256ca3e40cbc6e73cfd0937663cd41d63c Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 27 十二月 2019 20:50:44 +0800 Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/SnxxServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py index 046c782..0e36460 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py @@ -1339,12 +1339,13 @@ # 2013-1-3,去除npc攻击造成的伤血记录 if attackerOwner != None and attackerOwner.GetGameObjType() == IPY_GameWorld.gotPlayer: - AttackCommon.NPCAddObjInHurtList(attackerOwner, curObj, curObjHP_BeforeAttack, lostValue) #CheckAddPoisonAtkBuff(skillTypeID, attackerOwner, curObj, tick) if curObjType == IPY_GameWorld.gotPlayer: AttackCommon.OnPVPDamage(attackerOwner, lostValue, curObj, "SkillLostHP") - + elif curObjType == IPY_GameWorld.gotNPC: + AttackCommon.NPCAddObjInHurtList(attackerOwner, curObj, curObjHP_BeforeAttack, lostValue) + #统一调用攻击结束动作 if isDoAttackResult: BaseAttack.DoLogic_AttackResult(buffOwner, curObj, None, tick) -- Gitblit v1.8.0