From 84ede803777ff10b5cbe93b1ec0168af08f55d5e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 一月 2021 18:11:26 +0800
Subject: [PATCH] 8677 【BT】【后端】跨服冲榜活动; 新增跨服活动时间管理模块、跨服榜单；跨服邮件；跨服广播优化；相关GM命令、后台工具；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..ebb1910 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
@@ -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)
#添加技能伤害通知列表,(用于攻击结束,统一通知客户端)
@@ -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