ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Tianzi.py
@@ -85,7 +85,7 @@
    PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_FBTianzi)
    return True, funcLineID
def GetFBNPCInitAttr(curPlayer, turnFight, npcObj):
def GetFBNPCInitAttr(turnFight, npcObj):
    ## 获取副本指定NPC初始化属性
    bossID = npcObj.GetNPCID()
    ipyDataList = IpyGameDataPY.GetIpyGameDataList("Tianzi", bossID)
@@ -93,7 +93,7 @@
        return {}
    return __getBossAttrDict(ipyDataList[0])
def OnFBNPCKilledBefore(curPlayer, turnFight, gameObj, killer=None, useSkill=None):
def OnFBNPCKilledBefore(turnFight, gameObj, killer=None, useSkill=None):
    ## 副本NPC被击杀前处理,一般用于处理一些不被击杀的副本NPC逻辑
    # @return: 可否被正常击杀
    
@@ -140,21 +140,28 @@
    attrDict.update(ipyData.GetOtherAttrDict())
    return attrDict
def OnTurnFightOver(curPlayer, turnFight, mapID, funcLineID, overMsg):
def OnTurnFightOver(turnFight, mapID, funcLineID, overMsg):
    ## 回合战斗结束
    
    hpNum = turnFight.GetDictByKey("hpNum")
    batFaction = turnFight.getBatFaction(ChConfig.Def_FactionA)
    totalHurt = batFaction.getTotalHurt()
    overMsg.update({"hpNum":hpNum, "totalHurt":totalHurt})
    return
def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
    ## 回合战斗结算奖励
    if not curPlayer:
        return
    
    #isWin = turnFight.isWin
    lineID, bossID = GetTianziTodayInfo(curPlayer)
    if lineID != funcLineID:
        GameWorld.ErrLog("结算时非今日天子考验! mapID=%s,funcLineID=%s != %s,bossID=%s" % (mapID, funcLineID, lineID, bossID))
        return
    
    hpNum = turnFight.GetDictByKey("hpNum")
    batFaction = turnFight.getBatFaction(ChConfig.Def_FactionA)
    totalHurt = batFaction.getTotalHurt()
    hpNum = statMsg.get("hpNum", 0)
    totalHurt = statMsg.get("totalHurt", 0)
    
    historyHurt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TianziHisHurt % bossID)
    historyHurtEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TianziHisHurtEx % bossID)
@@ -184,20 +191,7 @@
        PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_Tianzi, todayHurtEx, todayHurt)
        
    itemList = __getTianziAwardList(totalHurt, bossID)
    overMsg.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList), "totalHurt":totalHurt, "todayHurtTotal":todayHurtTotal})
    turnFight.awardData = [lineID, bossID, itemList]
    return
def OnTurnFightAward(curPlayer, turnFight, mapID, funcLineID, awardData):
    ## 回合战斗结算奖励
    if not curPlayer:
        return
    if not awardData:
        return
    lineID, bossID, itemList = awardData
    awardDict.update({FBCommon.Over_itemInfo:FBCommon.GetJsonItemList(itemList), "totalHurt":totalHurt, "todayHurtTotal":todayHurtTotal})
    
    FBCommon.AddEnterFBCount(curPlayer, mapID)
    ItemControler.GivePlayerItemOrMail(curPlayer, itemList, event=["Tianzi", False, {}], isNotifyAward=False)