From 6253040e3470059c4ef906da2d7122fc48e681e5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 三月 2020 17:39:08 +0800
Subject: [PATCH] 8401 【后端】BOSS复活修改（全服奖励邮件、排名奖励邮件发放） 新增发送全服邮件；新增伤血列表邮件发放奖励模块管理；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
index d7e67ba..02e8d34 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.py
@@ -59,6 +59,10 @@
if attackerCampType != defenderCampType:
return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
+ #机器人可以打机器人
+ if attacker.GetType() == ChConfig.ntRobot and defender.GetType() == ChConfig.ntRobot:
+ return ChConfig.Type_Relation_Enemy, ChConfig.Def_PASysMessage_None
+
return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
@@ -100,7 +104,8 @@
#普通NPC
if GameObj.GetHP(defender) <= 0:
-
+ if not ChNPC.OnCheckCanDie(attacker, defender, skill, tick):
+ return
#副本
FBLogic.DoFB_Npc_KillNPC(attacker, defender, tick)
--
Gitblit v1.8.0