From efb7e570e8aee945dedc80e2be76becca1ea7ba5 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 六月 2019 16:43:36 +0800
Subject: [PATCH] 6374 封魔坛、雷罚进入限制

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.py |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 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 81fe457..94a6d4a 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,8 +23,7 @@
 import AttackCommon
 import GameObj
 import NPCCommon
-import GameLogic_SealDemon
-import GameLogic_ZhuXianBoss
+
 
 ## GM命令执行入口
 #  @param curPlayer 当前玩家
@@ -33,19 +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
-    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
     if len(playerList) > 0:
         isMapAllNPC = playerList[0]
@@ -91,10 +77,12 @@
         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
+    if curPlayer.GetSightLevel() != curNPC.GetSightLevel():
+        return
     curHP = GameObj.GetHP(curNPC)
     AttackCommon.NPCAddObjInHurtList(curPlayer, curNPC, curHP, curHP)
     

--
Gitblit v1.8.0