From 6b3e505e9c8f3a08dbcc9aa34944d20f64cf22b5 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 16 五月 2019 15:56:37 +0800
Subject: [PATCH] 6501 【后端】【2.0】仙盟任务(新增接口)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 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 3675312..9ddcc20 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
@@ -16,7 +16,6 @@
 #
 # 模块详细说明
 
-import LogUI
 import IPY_GameWorld
 import GameWorld
 import ChConfig
@@ -24,7 +23,7 @@
 import AttackCommon
 import GameObj
 import NPCCommon
-import GameLogic_SealDemon
+
 
 ## GM命令执行入口
 #  @param curPlayer 当前玩家
@@ -32,13 +31,7 @@
 #  @return None
 #  @remarks 函数详细说明.
 def OnExec(curPlayer, playerList):
-    if curPlayer.GetMapID() == ChConfig.Def_FBMapID_SealDemon:
-        #封魔坛击杀怪
-        gameWorld = GameWorld.GetGameWorld()
-        lineID = gameWorld.GetPropertyID() - 1
-        gameWorld.SetGameWorldDict(GameLogic_SealDemon.FBDict_RemainHP % lineID, 1)
-        return
-    
+
     isMapAllNPC = 0
     if len(playerList) > 0:
         isMapAllNPC = playerList[0]
@@ -84,9 +77,10 @@
         return
     if curNPC.GetCurAction() == IPY_GameWorld.laNPCDie:
         return
-    if curNPC.GetType() not in [IPY_GameWorld.ntMonster]:
+    if curNPC.GetType() not in [IPY_GameWorld.ntMonster, ChConfig.ntPriWoodPilePVE, ChConfig.ntPriWoodPilePVP]:
         return
-    
+    if not curNPC.GetVisible():
+        return
     curHP = GameObj.GetHP(curNPC)
     AttackCommon.NPCAddObjInHurtList(curPlayer, curNPC, curHP, curHP)
     

--
Gitblit v1.8.0