ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MineArea.py
@@ -21,41 +21,55 @@
import PlayerControl
import GameWorld
def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagPlayerID, valueList):
def OnTurnFightRequest(curPlayer, mapID, funcLineID, tagType, tagID, valueList):
    ## 回合战斗请求 - 地图验证
    if tagType != ChConfig.TurnBattle_TagType_Player:
        GameWorld.DebugLog("请求回合战斗目标异常! mapID=%s,tagType=%s,tagID=%s" % (mapID, tagType, tagID), curPlayer.GetPlayerID())
        return
    
    # 摇人帮助
    if funcLineID == 0:
        if not tagPlayerID:
        if not tagID:
            return
        awardCount = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MineHelpAwardCount)
        awardCountMax = IpyGameDataPY.GetFuncCfg("MineAreaHelp", 1)
        if awardCountMax and awardCount >= awardCountMax:
            GameWorld.DebugLog("已达到今日福地帮助奖励次数上限! awardCount=%s" % awardCount, curPlayer.GetPlayerID())
            return
    # 自己驱赶
    elif funcLineID == 1:
        pass
    else:
        # 通过lineID扩展同个功能系统下的不同战斗需求
        pass
    
    return True
def OnTurnFightOver(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet):
def OnTurnFightOver(curPlayer, mapID, funcLineID, tagType, tagID, valueList, fightRet):
    ## 回合战斗结束
    # @return: 是否需要同步GameServer, 奖励列表, 发放方式(0-不发放, 1-TurnAttack模块统一发放, 2-功能自己决定发放逻辑)
    # @return: 是否需要同步GameServer, 奖励列表, 同步结果信息
    needSendGameServer = True
    awardItemList = []
    overInfoEx = {}
    
    # 摇人帮助
    if funcLineID == 0:
        # 无论胜负都要同步GameServer汇报结果
        isWin = fightRet[0]
        if not isWin:
            return True, [], 0
            return needSendGameServer, awardItemList, overInfoEx
        
        awardItemList = IpyGameDataPY.GetFuncEvalCfg("MineAreaHelp", 2)
        return True, awardItemList, 2
        return needSendGameServer, awardItemList, overInfoEx
    # 自己驱赶
    elif funcLineID == 1:
        return needSendGameServer, awardItemList, overInfoEx
    
    return
def OnTurnFightOver_GameServerRet(curPlayer, mapID, funcLineID, tagPlayerID, valueList, fightRet, awardItemList, ret):
def OnTurnFightOver_GameServerRet(curPlayer, mapID, funcLineID, tagType, tagID, valueList, fightRet, awardItemList, ret):
    ## 回合战斗结束 - GameServer处理完毕返回
    
    # 摇人帮助