From 8b176b2f1af997f16531f0ee82f8ceeb7ba3ca07 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 19 十一月 2018 21:44:41 +0800
Subject: [PATCH] 4885 【1.3】【后端】潜力技能支持某个字段增加生命值配置

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py |    9 ++++++---
 1 files changed, 6 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 e652130..647fb07 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
@@ -22,7 +22,7 @@
 import ChEquip
 import GameWorld
 import EventShell
-import SkillShell
+import FBLogic
 import GameObj
 import NPCCommon
 import ChNPC
@@ -113,11 +113,14 @@
     else:
         #通知玩家
         if curTagPlayer.GetMapID() != ChConfig.Def_FBMapID_XMZZ:
-            PlayerControl.NotifyCode(curTagPlayer, 'GeRen_chenxin_279029', [curNormalNPC.GetNPCID()])
+            if curNormalNPC.GetType() == ChConfig.ntRobot:
+                PlayerControl.NotifyCode(curTagPlayer, 'RobotKill_1', [curNormalNPC.GetObjID(), curNormalNPC.GetNPCID()])
+            else:
+                PlayerControl.NotifyCode(curTagPlayer, 'GeRen_chenxin_279029', [curNormalNPC.GetNPCID()])
         #玩家已经死亡
         playerControl = PlayerControl.PlayerControl(curTagPlayer)
         playerControl.SetDead()
-        
+        FBLogic.DoFBOnNPCKill_Player(curNormalNPC, curTagPlayer, tick)
         #触发玩家死亡事件
         EventShell.EventRespons_PlayerEvent(curTagPlayer, "player_dead")
     return True

--
Gitblit v1.8.0