From e6d59c4b43397413073159b2801cee6a8add1083 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 05 三月 2019 13:43:39 +0800
Subject: [PATCH] 6307 【后端】【2.0】多套装备开发单(默认第1套)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index f6214b7..c17651a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -54,6 +54,7 @@
import PlayerFairyCeremony
import PlayerNewFairyCeremony
import PlayerWeekParty
+import PlayerActLogin
import FamilyRobBoss
import IpyGameDataPY
import PlayerState
@@ -2167,6 +2168,7 @@
PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)
PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_WorldBOSS, 1)
+ PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_WorldBOSS, 1)
if mapID == ChConfig.Def_FBMapID_BossHome:
#BOSS之家
@@ -3029,7 +3031,7 @@
# GameWorld.DebugLog("伤血玩家血量为0，清除该伤血!playerID=%s" % hurtID)
# return True
- if not hurtPlayer.GetVisible():
+ if hurtPlayer.GetInitOK() and not hurtPlayer.GetVisible():
GameWorld.DebugLog("伤血玩家不可见，清除该伤血!playerID=%s" % hurtID)
return True
@@ -3066,7 +3068,7 @@
#GameWorld.DebugLog("队员不在本线路，不计！playerID=%s" % playerID)
continue
- if not curTeamPlayer.GetVisible():
+ if curTeamPlayer.GetInitOK() and not curTeamPlayer.GetVisible():
#GameWorld.DebugLog("队员不可见，不计！playerID=%s" % playerID)
continue
@@ -3087,7 +3089,7 @@
teamHurtPlayerIDList.append(playerID)
if not teamHurtPlayerIDList:
- GameWorld.DebugLog("伤血队伍没有活着的队员在boss区域内，清除该伤血!teamID=%s,mapTeamPlayerIDList=%s" % (teamID, mapTeamPlayerIDList))
+ GameWorld.DebugLog("伤血队伍没有符合条件的队员在boss区域内，清除该伤血!teamID=%s,mapTeamPlayerIDList=%s" % (teamID, mapTeamPlayerIDList))
return teamHurtPlayerIDList
def RefreshHurtList(self, tick, refreshInterval=3000):
--
Gitblit v1.8.0