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)