From 563e6d6c9bb5e09f7ef7d3534466acd2dbc2aa36 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 04 十一月 2021 14:33:42 +0800
Subject: [PATCH] 9325 【BT3】【BT4】【BT5】【主干】【后端】日常扫荡优化

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
index 647fb07..94ad794 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
@@ -87,7 +87,7 @@
     lastHP = curNPCBeHP - GameObj.GetHP(curNormalNPC)
     if lastHP > 0 :
         #添加伤血列表
-        AttackCommon.NPCAddObjInHurtList(curTagPlayer, curNormalNPC, curNPCBeHP, lastHP)
+        AttackCommon.NPCAddObjInHurtList(curTagPlayer, curNormalNPC, curNPCBeHP, lastHP, True)
     #给这个玩家的召唤兽增加仇恨
     AttackCommon.SummonAddAngryByOwner(curNormalNPC, curTagPlayer, hurtHP)
     #添加技能伤害通知列表,(用于攻击结束,统一通知客户端)
@@ -104,7 +104,7 @@
 def AttackResult(curNormalNPC, curTagPlayer, skill, tick):
 
     #玩家活着
-    if curTagPlayer.GetHP() > 0:
+    if GameObj.GetHP(curTagPlayer) > 0:
         #被攻击玩家进入战斗状态
         AttackCommon.OnNPCHitPlayer(curNormalNPC, curTagPlayer, tick)
         AttackCommon.SetPlayerBattleState(curTagPlayer, tick)
@@ -114,7 +114,7 @@
         #通知玩家
         if curTagPlayer.GetMapID() != ChConfig.Def_FBMapID_XMZZ:
             if curNormalNPC.GetType() == ChConfig.ntRobot:
-                PlayerControl.NotifyCode(curTagPlayer, 'RobotKill_1', [curNormalNPC.GetObjID(), curNormalNPC.GetNPCID()])
+                PlayerControl.NotifyCode(curTagPlayer, 'RobotKill_1', [curNormalNPC.GetID(), curNormalNPC.GetNPCID()])
             else:
                 PlayerControl.NotifyCode(curTagPlayer, 'GeRen_chenxin_279029', [curNormalNPC.GetNPCID()])
         #玩家已经死亡

--
Gitblit v1.8.0