129 【战斗】战斗系统-服务端（修复复活可能导致的报错；）

hxp

2025-12-17 6180e24d340d7c4721046c9d433dcdb9778c0647

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py

@@ -59,13 +59,13 @@
    if not skillID:

        return

    

    byTriggerWay = kwargs["byTriggerWay"] if "byTriggerWay" in kwargs else 0 # 不使用参数名 triggerWay, 防止传递过程中参数混乱

    if not curBatObj.IsAlive():

        if useSkill.GetSkillType() == ChConfig.Def_SkillType_Revive and useSkill.GetTagAim() == ChConfig.SkillTagAim_Self:

            GameWorld.DebugLogEx("死亡时使用复活自己的技能! skillID=%s", skillID)

        else:

            triggerWay = kwargs.get("triggerWay", 0)

            if triggerWay in ChConfig.DeadCanTriggerWayList:

                GameWorld.DebugLogEx("死亡可触发的方式触发技能可释放! skillID=%s,triggerWay=%s", skillID, triggerWay)

            if byTriggerWay in ChConfig.DeadCanTriggerWayList:

                GameWorld.DebugLogEx("死亡可触发的方式触发技能可释放! skillID=%s,byTriggerWay=%s", skillID, byTriggerWay)

            elif batType == ChConfig.TurnBattleType_Enhance:

                GameWorld.DebugLogEx("死亡状态额外技能不限制，主技能能放的话也就能放! skillID=%s", skillID)                

            else:

@@ -150,6 +150,7 @@
    useSkill.SetBatType(batType)

    useSkill.SetBySkill(bySkill)

    useSkill.SetByBuff(byBuff)

    useSkill.SetByTriggerWay(byTriggerWay)

    

    isTurnNormalSkill = SkillCommon.isTurnNormalSkill(useSkill)

    if isTurnNormalSkill:

@@ -178,7 +179,7 @@
    else:

        __doUseSkill(turnFight, curBatObj, useSkill)

        

    DoAttackResult(turnFight, curBatObj, useSkill)

    DoAttackResult(turnFight, curBatObj, useSkill, **kwargs)

    

    if useTag:

        Sync_TurnFightTag(turnFight, useTag, 1)

@@ -220,7 +221,8 @@


def IsNeedSyncSkill(useSkill):

    ## 使用需要同步B427使用技能

    if useSkill.GetSkillType() in [ChConfig.Def_SkillType_Atk, ChConfig.Def_SkillType_Cure, ChConfig.Def_SkillType_Revive, ChConfig.Def_SkillType_CleanBuff]:

    if useSkill.GetSkillType() in [ChConfig.Def_SkillType_Atk, ChConfig.Def_SkillType_Cure, ChConfig.Def_SkillType_Revive, ChConfig.Def_SkillType_CleanBuff, 
                                   ChConfig.Def_SkillType_AtkEx]:

        return True

    if useSkill.GetFuncType() in [ChConfig.Def_SkillFuncType_TurnNormaSkill, ChConfig.Def_SkillFuncType_AngerSkill]:

        return True

@@ -1122,7 +1124,7 @@
        

    return



def DoAttackResult(turnFight, curBatObj, useSkill):

def DoAttackResult(turnFight, curBatObj, useSkill, **kwargs):

    '''执行攻击结果

    @param curBatObj: 施法方或buff归属方

    '''

@@ -1139,6 +1141,14 @@
    if useSkill.GetCoolDownTime():

        useSkill.SetRemainTime(useSkill.GetCoolDownTime())

        

    if "byEffSkill" in kwargs:

        byEffSkill = kwargs["byEffSkill"]

        cdTime = byEffSkill.GetCoolDownTime()

        if cdTime:

            if hasattr(byEffSkill, "GetRemainTime"):

                byEffSkill.SetRemainTime(cdTime)

                GameWorld.DebugLogEx("提前设置效果技能触发后CD，防止嵌套循环触发! effSkillID=%s,cdTime=%s", byEffSkill.GetSkillID(), cdTime)

                
    __doCostZhanchui(turnFight, curBatObj, useSkill) # 先扣除再同步技能

    

    # 需先技能使用 - 前端按顺序优先表现技能释放内容，前端需要动作或有伤血则通知

@@ -1417,6 +1427,7 @@
    if dieObjList:

        for dieObj in dieObjList:

            TurnPassive.OnTriggerPassiveEffect(turnFight, dieObj, ChConfig.TriggerWay_WhenDie, curObj, connSkill=useSkill)

            __dongbaiRevive(turnFight, dieObj, useSkill) # 写死特殊处理董白复活

            

        for faction in [ChConfig.Def_FactionA, ChConfig.Def_FactionB]:

            batFaction = turnFight.getBatFaction(faction)

@@ -1461,6 +1472,7 @@
        # 掉血时

        if tagID in beHurtObjIDList:

            TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BeHurt, curObj, connSkill=useSkill)

            #TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_HurtTag, tagObj, connSkill=useSkill) 暂时用不到先屏蔽

            

        #  受到任意效果时（除直接攻击外的任意效果，如buff、dot、治疗、额外怒技）

        if not isAttackDirect:

@@ -1522,6 +1534,33 @@
    if dieObjList:

        turnFight.checkOverByKilled()

        

    return



def __dongbaiRevive(turnFight, batObj, useSkill):

    '''特殊处理董白复活: 董白死亡之后的时间，若有敌方单位阵亡，董白以50%血量复活

    '''

    faction = batObj.GetFaction()

    batFaction = turnFight.getBatFaction(ChConfig.Def_FactionA if faction == ChConfig.Def_FactionB else ChConfig.Def_FactionB)

    if not batFaction:

        return

    batLineup = batFaction.getBatlineup(1)

    if ChConfig.HeroID_Dongbai not in batLineup.heroObjIDDict:

        return

    dongbaiObj = BattleObj.GetBatObjMgr().getBatObj(batLineup.heroObjIDDict[ChConfig.HeroID_Dongbai])

    if not dongbaiObj or dongbaiObj.IsAlive():

        return

    skill = dongbaiObj.GetSkillManager().FindSkillByID(ChConfig.SkillID_DongbaiRevive)

    if not skill:

        GameWorld.DebugLogEx("董白还还未学习特殊复活技能! %s", ChConfig.SkillID_DongbaiRevive)

        return

    enemyDeadCnt = dongbaiObj.GetDictByKey("EnemyDeadCnt") + 1

    dongbaiObj.SetDict("EnemyDeadCnt", enemyDeadCnt)

    GameWorld.DebugLogEx("董白记录自身死亡后的敌方阵亡单位数: %s" % enemyDeadCnt)

    needDeadCnt = skill.GetEffect(0).GetEffectValue(0) # 固定配置在效果1值

    if enemyDeadCnt < needDeadCnt:

        return

    dongbaiObj.SetDict("EnemyDeadCnt", 0)

    OnUseSkill(turnFight, dongbaiObj, skill, batType=ChConfig.TurnBattleType_Passive, bySkill=useSkill)

    return



def __doCostZhanchui(turnFight, curBatObj, useSkill):

@@ -1894,6 +1933,7 @@
    dFinalDamPerDef = defObj.GetBatAttrValue(ChConfig.AttrID_FinalDamPerDef) # 最终减伤

    

    aFinalDamPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddFinalDamPer, curSkill)

    aFinalDamPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.AttrID_FinalDamPer, curSkill)

    

    aNormalSkillPer, dNormalSkillPerDef = 0, 0

    if isTurnNormalSkill:

@@ -2015,6 +2055,7 @@
        

    hurtAtkPerMax = curSkill.GetHurtAtkPerMax() # 最大万分比，限制最终伤害不超过攻击力万分率

    if hurtAtkPerMax:

        hurtAtkPerMax += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddHurtAtkPerMax, curSkill)

        aAtk = atkObj.GetAtk()

        hurtValueMax = aAtk * hurtAtkPerMax / 10000.0

        hurtValue = min(hurtValue, hurtValueMax)