From 7a07e584581d05c65759e64f97ebf7946f116759 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 26 四月 2019 16:00:08 +0800
Subject: [PATCH] 6607 【2.0】【后端】技能升级功能改版(StateSkillLV=需要基础属性ID*100000+需要属性点)

---
 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