From 921ba9c6e954f2f1377cb08d5a8476c9e6c2b30e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 17:44:27 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（给非拍卖物品为拍品时优化）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
index 2400b12..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
@@ -102,12 +103,8 @@
PlayerTeam.OnEnterFBTeamAsk(curPlayer, PlayerTeam.TeamFBAskType_Enter, tagMapID, tagLineID, tick)
return
-# # 如果是进入跨服PK地图的
-# if GameWorldMergePK.OnRequestEnterMergePKMap(curPlayer, mapInfo[0], mapInfo[1]):
-# return
-#
#封魔坛副本判断里面的BOSS是否到了刷新时间
- if tagMapID == ChConfig.Def_FBMapID_SealDemon:
+ if tagMapID in ChConfig.WorldBossFBMapIDList:
bossID = mapInfo[2]
if not GameWorldBoss.GetBossIsAliveOrCanReborn(bossID):
return
@@ -125,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