ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
@@ -498,7 +498,7 @@
            playerZoneID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqCrossFBZoneID)
            playerFuncLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqCrossFBFuncLine)
            # 跨服排位分区与玩家分区可能不一样
            if (fbZoneID != playerZoneID or fbFuncLineID != playerFuncLineID) and mapID not in [ChConfig.Def_FBMapID_CrossChampionship]:
            if (fbZoneID != playerZoneID or fbFuncLineID != playerFuncLineID) and mapID not in []:
                GameWorld.ErrLog("DoEnterFB 玩家与当前副本线路所属分区或功能分线不同,踢出玩家!fbZoneID=%s,playerZoneID=%s,fbFuncLineID=%s,playerFuncLineID=%s" 
                                 % (fbZoneID, playerZoneID, fbFuncLineID, playerFuncLineID), curPlayerID)
                CrossRealmPlayer.PlayerExitCrossServer(curPlayer)
@@ -1069,13 +1069,6 @@
    for key, mapIDList in ChConfig.Def_FB_MapID.items():
        if not mapIDList:
            continue
        mapID = mapIDList[0]
        ipyData = FBCommon.GetFBIpyData(mapID)
        if ipyData and ipyData.GetDayResetType():
            if onDayType != ipyData.GetDayResetType():
                continue
        elif onDayType != ShareDefine.Def_OnEventTypeEx:
            continue
        callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (key, "OnFBPlayerOnDay"))
        if callFunc:
            callFunc(curPlayer)
@@ -1531,19 +1524,18 @@
    return callFunc(curPlayer, addExp, expViewType)
## 副本扫荡询问
def OnPlayerFBSweepAsk(curPlayer, mapID, lineID, cnt, isFinish, dataEx):
def OnPlayerFBSweepAsk(curPlayer, mapID, lineID, cnt, dataEx):
    do_FBLogic_ID = __GetFBLogic_MapID(mapID)
    
    callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "OnPlayerFBSweepAsk"))
    
    # 没有额外条件判断默认返回True
    if callFunc == None:
        return True
        return
    return callFunc(curPlayer, mapID, lineID, cnt, isFinish, dataEx)
    return callFunc(curPlayer, mapID, lineID, cnt, dataEx)
## 副本扫荡结果
def OnPlayerFBSweepResult(curPlayer, mapID, lineID, cnt, isFinish, dataEx):
def OnPlayerFBSweepResult(curPlayer, mapID, lineID, cnt, dataEx):
    do_FBLogic_ID = __GetFBLogic_MapID(mapID)
    
    callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "OnPlayerFBSweepResult"))
@@ -1551,7 +1543,7 @@
    if callFunc == None:
        return False
    return callFunc(curPlayer, mapID, lineID, cnt, isFinish, dataEx)
    return callFunc(curPlayer, mapID, lineID, cnt, dataEx)
## 开始公共CD副本扫荡
def OnStartPubCDFBSweep(curPlayer, mapID, lineID, cnt, dataEx):
@@ -2249,17 +2241,6 @@
    if callFunc == None:
        return
    return callFunc()
## 是否需要做进入副本通用检查条件逻辑,默认需要检查
def OnNeedCheckCanEnterFBComm(curPlayer, mapID, lineID):
    do_FBLogic_ID = __GetFBLogic_MapID(mapID)
    callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "OnNeedCheckCanEnterFBComm"))
    if callFunc == None:
        return True
    return callFunc(curPlayer, mapID, lineID)
def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList):
    ## 回合战斗请求 - 地图验证