ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -36,6 +36,7 @@
import TurnPassive
import TurnSkill
import TurnBuff
import FBCommon
import CommFunc
import ObjPool
import FBLogic
@@ -862,6 +863,15 @@
    GameWorld.DebugLog("回合制战斗请求: mapID=%s,funcLineID=%s,tagType=%s,tagID=%s,valueList=%s" 
                       % (mapID, funcLineID, tagType, tagID, valueList), curPlayer.GetPlayerID())
    
    fbIpyData = FBCommon.GetFBIpyData(mapID)
    fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, funcLineID, False)
    if fbIpyData:
        if not fbLineIpyData:
            GameWorld.DebugLog("不存在该副本功能线路! mapID=%s,funcLineID=%s" % (mapID, funcLineID))
            return
        if FBCommon.CheckCanEnterFBComm(curPlayer, mapID, funcLineID, fbIpyData, fbLineIpyData) != ShareDefine.EntFBAskRet_OK:
            return
    reqRet = FBLogic.OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList)
    if not reqRet:
        return
@@ -877,10 +887,15 @@
        
    # NPC
    else:
        ret = FBLogic.GetFBNPCLineupInfo(curPlayer, mapID, funcLineID)
        if not ret:
            return
        npcLineupIDList, strongerLV, difficulty = ret
        npcLineupIDList, strongerLV, difficulty = [], 0, 0
        if fbLineIpyData:
            npcLineupIDList = fbLineIpyData.GetLineupIDList()
        if not npcLineupIDList:
            ret = FBLogic.GetFBNPCLineupInfo(curPlayer, mapID, funcLineID)
            if not ret:
                return
            npcLineupIDList, strongerLV, difficulty = ret
        OnTurnFightVSNPC(curPlayer, mapID, funcLineID, atkLineupID, npcLineupIDList, strongerLV, difficulty)
        
    return