From 2f97f91209b94b4938fe3c931cffbb2e655602e7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 11:18:30 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（添加仙盟拍品转移到全服拍品记录）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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..4f6d06b 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,10 @@
import GameObj
import NPCCommon
import GameLogic_SealDemon
+import GameLogic_ZhuXianBoss
+import GameLogic_ZhuXianTower
+import GameLogic_AllFamilyBoss
+import GameLogic_HorsePetBoss
## GM命令执行入口
# @param curPlayer 当前玩家
@@ -38,7 +42,26 @@
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
+ if curPlayer.GetMapID() == ChConfig.Def_FBMapID_ZhuXianTower:
+ #诛仙塔击杀怪
+ GameWorld.GetGameFB().SetGameFBDict(GameLogic_ZhuXianTower.FBDict_RemainHP, 1)
+ return
+ if curPlayer.GetMapID() == ChConfig.Def_FBMapID_AllFamilyBoss:
+ #仙盟BOSS击杀怪
+ GameWorld.GetGameWorld().SetGameWorldDict(GameLogic_AllFamilyBoss.FBDict_RemainHP, 1)
+ return
+ if curPlayer.GetMapID() == ChConfig.Def_FBMapID_HorsePetBoss:
+ #骑宠BOSS击杀怪
+ gameWorld = GameWorld.GetGameWorld()
+ lineID = gameWorld.GetPropertyID() - 1
+ gameWorld.SetGameWorldDict(GameLogic_HorsePetBoss.FBDict_RemainHP % lineID, 1)
+ return
isMapAllNPC = 0
if len(playerList) > 0:
isMapAllNPC = playerList[0]
@@ -86,13 +109,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