135 【挑战】战锤秘境-服务端（白骨盈野；副本基础；副本扫荡；广告奖励支持；）

hxp

昨天 d7f44d8d871a90c818bdb3ffe9a60af875b7100a

 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

@@ -750,7 +751,7 @@
        heroID = heroInfo.get("HeroID", 0)

        skinID = heroInfo.get("SkinID", 0)

        lv = heroInfo.get("LV", 1)

        specialty, atkDistType, country, sex = 0, 1, 0, 1

        specialty, atkDistType, country, sex, job = 0, 1, 0, 1, 0

        heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) if heroID else None

        if heroIpyData:

            objName = heroIpyData.GetName()

@@ -758,6 +759,7 @@
            atkDistType = heroIpyData.GetAtkDistType()

            country = heroIpyData.GetCountry()

            sex = heroIpyData.GetSex()

            job = heroIpyData.GetJob()

            

        if lineupPlayerID:

            fightPower = heroInfo.get("FightPower", 0)

@@ -789,6 +791,7 @@
        batObj.SetSpecialty(specialty)

        batObj.SetCountry(country)

        batObj.SetSex(sex)

        batObj.SetJob(job)

        batObj.SetHero(heroID, skinID)

        

        skillManager = batObj.GetSkillManager()

@@ -860,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

@@ -875,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