From 0e2a25b6e5c9935cd80e937c4c8eb393c527bd20 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期二, 07 五月 2019 19:59:00 +0800 Subject: [PATCH] 860312 数据库操作函数更改 --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py index f9231ca..91ad9ee 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.py @@ -79,7 +79,6 @@ # @return hurtType : HurtType 伤害结构体类 # @remarks 函数详细说明. def DoAttack(curPlayer, curTagNormalNPC, skill, skillValue, skillPercent, skillHurtList, tick): - #finalHurtPer = SkillCommon.GetSkillFinalHurtPer(curPlayer, curTagNormalNPC, skill, tick) curTagNPCHPBeforeAtk = GameObj.GetHP(curTagNormalNPC) hurtType = AttackCommon.GetHurtHP(curPlayer, curTagNormalNPC, skill, skillValue, skillPercent, tick) @@ -111,9 +110,11 @@ return if GameObj.GetHP(curTagNormalNPC) <= 0: + if not ChNPC.OnCheckCanDie(curPlayer, curTagNormalNPC, skill, tick): + return #执行击杀NPC逻辑 - FBLogic.DoFB_Player_KillNPC(curPlayer , curTagNormalNPC , tick) NPCCommon.OnPlayerAttackNPCDie(curTagNormalNPC, curPlayer, skill) + FBLogic.DoFB_Player_KillNPC(curPlayer , curTagNormalNPC , tick) #NPC死亡 curTagNormalNPCControl = NPCCommon.NPCControl(curTagNormalNPC) curTagNormalNPCControl.SetKilled() -- Gitblit v1.8.0