From f0f101d1d778e26a2e3ecd368c90c8f52a7ea011 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 13 六月 2019 11:11:44 +0800
Subject: [PATCH] 7220 【后端】【2.0】灵器开发1.0版（删除绝版属性，原绝版属性转移到灵器属性）
---
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..d3dee81 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.GetID(), 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