ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Zhanchui.py
@@ -16,9 +16,12 @@
#-------------------------------------------------------------------------------
import GameWorld
import PlayerGubao
import ItemControler
import PlayerBeauty
import FBCommon
import PlayerSuccess
import ShareDefine
import PlayerTask
import ChConfig
@@ -31,13 +34,12 @@
    
    return True, funcLineID
def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
    ## 回合战斗结束
def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
    ## 回合战斗结算奖励
    if not curPlayer:
        return
    
    isWin = turnFight.isWin
    isWin = winFaction == ChConfig.Def_FactionA
    
    if not isWin:
        return
@@ -48,20 +50,7 @@
    
    itemList = FBCommon.GetPassAwardList(mapID, funcLineID)
    GameWorld.DebugLog("过关奖励: mapID=%s,funcLineID=%s,itemList=%s" % (mapID, funcLineID, itemList))
    overMsg.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
    turnFight.awardData = [itemList]
    return
def OnTurnFightAward(curPlayer, turnFight, mapID, funcLineID, awardData):
    ## 回合战斗结算奖励
    if not curPlayer:
        return
    if not awardData:
        return
    itemList = awardData[0]
    awardDict.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList)})
    
    # 首通不扣次数
    FBCommon.AddEnterFBCount(curPlayer, mapID, isFree=True)
@@ -69,6 +58,8 @@
    ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Zhanchui", False, {}], isNotifyAward=False)
    
    PlayerTask.UpdTaskValue(curPlayer, ChConfig.TaskType_FBZhanchui)
    #PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAFBZhanchui, 1)
    __onFBAward(curPlayer)
    return
    
def OnPlayerFBSweepAsk(curPlayer, mapID, lineID, sweepCnt, dataEx):
@@ -100,4 +91,11 @@
    overDict = {FBCommon.Over_itemInfo:jsonItemList, FBCommon.Over_isSweep:1}
    FBCommon.NotifyFBOver(curPlayer, mapID, lineID, isPass, overDict)
    
    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAFBZhanchui, 1)
    __onFBAward(curPlayer)
    return True
def __onFBAward(curPlayer):
    ## 过关、扫荡都算
    PlayerGubao.AddGubaoSpecEffLayer(curPlayer, PlayerGubao.GubaoEffType_Zhanchui, 1)
    return