From d3a0d64d7ee737c68e336cc4cd699c31b3c62eb6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 二月 2019 16:51:30 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（增加拍卖物品表）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py
index f145367..be3835c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.py
@@ -75,7 +75,6 @@
# @return hurtType ： HurtType 伤害结构体类
# @remarks 攻击
def DoAttack(curPet, curTagNPC, skill, skillValue, skillPercent, skillHurtList, tick):
- #finalHurtPer = SkillCommon.GetSkillFinalHurtPer(curPet, curTagNPC, skill, tick)
curTagNPCHPBeforeAtk = GameObj.GetHP(curTagNPC)
hurtType = AttackCommon.GetHurtHP(curPet, curTagNPC, skill, skillValue, skillPercent, tick)
hurtHP = hurtType.HurtHP
@@ -111,6 +110,9 @@
#执行击杀NPC逻辑
curPlayer = PetControl.GetPetOwner(curPet) # 宠物主人
+ if not ChNPC.OnCheckCanDie(curPlayer, curTagNPC, skill, tick):
+ return
+
if curPlayer != None:
FBLogic.DoFB_Player_KillNPC(curPlayer, curTagNPC, tick)
NPCCommon.OnPlayerAttackNPCDie(curTagNPC, curPlayer, skill)
--
Gitblit v1.8.0