From 637e783b5caca75b201e1dffd54b89bd7b37bb0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 26 三月 2019 16:09:53 +0800
Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单（增加竞价时间通知）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
index 2400b12..dd9aa79 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFB.py
@@ -21,10 +21,12 @@
#---------------------------------------------------------------------
import GameWorldBoss
import PlayerFamilyBoss
+import PlayerHorsePetBoss
import GameWorldFamilyWar
import PlayerControl
import PyGameData
import IpyGameDataPY
+import PlayerDBGSEvent
import PlayerTeam
import GameWorld
import ChConfig
@@ -102,12 +104,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 +123,22 @@
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
+ #骑宠BOSS 是否已结束
+ elif tagMapID == ChConfig.Def_FBMapID_HorsePetBoss:
+ if not PlayerHorsePetBoss.IsInHorsePetBoss():
+ #活动未开启
+ return
+ if PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_HorsePetBossTime % tagLineID):
+ #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