From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 15 三月 2019 19:54:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py index 9436b24..a5e4bc4 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py @@ -25,6 +25,7 @@ import PlayerControl import PyGameData import IpyGameDataPY +import PlayerDBGSEvent import PlayerTeam import GameWorld import ChConfig @@ -121,7 +122,14 @@ if curPlayer.GetFamilyID() in PyGameData.g_swrhJoinRecord: PlayerControl.NotifyCode(curPlayer, "TheEmperor1") return - + #多仙盟BOSS 是否已结束 + elif tagMapID == ChConfig.Def_FBMapID_AllFamilyBoss: + if not PlayerFamilyBoss.IsInAllFamilyBoss(tagLineID): + #活动未开启 + return + if PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_AllFamilyBossTime): + #BOSS已被击杀 + return # MapServer_QueryPlayer(int srcPlayerID, int queryType, int queryID, int mapID, char *callName, char *cmd,WORD cmdLen, int RouteServerIndex) playerManager.MapServer_QueryPlayer(curPlayer.GetPlayerID(), ChConfig.queryType_EnterFB, 0, tagMapID, queryCallName, sendCMD, len(sendCMD), curPlayer.GetRouteServerIndex()) -- Gitblit v1.8.0