From ccaefa2a93fb82d0db5fc7e74832a292fb860984 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 22 一月 2019 14:23:20 +0800
Subject: [PATCH] 5919 【后端】【1.5.100】诛仙塔功能开发
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py
index 1d9e8f3..81fe457 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py
@@ -25,6 +25,7 @@
import GameObj
import NPCCommon
import GameLogic_SealDemon
+import GameLogic_ZhuXianBoss
## GM命令执行入口
# @param curPlayer 当前玩家
@@ -37,6 +38,12 @@
gameWorld = GameWorld.GetGameWorld()
lineID = gameWorld.GetPropertyID() - 1
gameWorld.SetGameWorldDict(GameLogic_SealDemon.FBDict_RemainHP % lineID, 1)
+ return
+ if curPlayer.GetMapID() == ChConfig.Def_FBMapID_ZhuXianBoss:
+ #诛仙BOSS击杀怪
+ gameWorld = GameWorld.GetGameWorld()
+ lineID = gameWorld.GetPropertyID() - 1
+ gameWorld.SetGameWorldDict(GameLogic_ZhuXianBoss.FBDict_RemainHP % lineID, 1)
return
isMapAllNPC = 0
@@ -86,13 +93,16 @@
return
if curNPC.GetType() not in [IPY_GameWorld.ntMonster]:
return
-
+ if not curNPC.GetVisible():
+ return
curHP = GameObj.GetHP(curNPC)
- if curPlayer.GetTeamID() > 0:
- AttackCommon.AddHurtValue(curNPC, curPlayer.GetTeamID(), ChConfig.Def_NPCHurtTypeTeam, curHP)
- AttackCommon.AddTeamPlayerHurtValue(curNPC, curPlayer.GetTeamID(), curPlayer.GetPlayerID(), curHP)
- else:
- AttackCommon.AddHurtValue(curNPC, curPlayer.GetPlayerID(), ChConfig.Def_NPCHurtTypePlayer, curHP)
+ AttackCommon.NPCAddObjInHurtList(curPlayer, curNPC, curHP, curHP)
+
+ #if curPlayer.GetTeamID() > 0:
+ # AttackCommon.AddHurtValue(curNPC, curPlayer.GetTeamID(), ChConfig.Def_NPCHurtTypeTeam, curHP)
+ # AttackCommon.AddTeamPlayerHurtValue(curNPC, curPlayer.GetTeamID(), curPlayer.GetPlayerID(), curHP)
+ #else:
+ # AttackCommon.AddHurtValue(curNPC, curPlayer.GetPlayerID(), ChConfig.Def_NPCHurtTypePlayer, curHP)
#统一调用攻击结束动作
GameObj.SetHP(curNPC, 0)
--
Gitblit v1.8.0