129 【战斗】战斗系统-服务端(董卓技能;增加目标细分8-承伤盾目标优先 ; 增加效果7010;)
2个文件已修改
79 ■■■■ 已修改文件
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -1354,7 +1354,8 @@
SkillTagAffect_AtkHighest, # 攻击力最高 5
SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
SkillTagAffect_PoisonCure, # 仅焚血(毒奶)目标 7
) = range(8)
SkillTagAffect_DamShield, # 承伤盾目标优先 8
) = range(9)
#技能施法目标
Def_UseSkillAim_Type = 3
@@ -4046,6 +4047,7 @@
SkillEff_AngerSkillNoXP = 7007 # 无论多少怒气均可释放该怒气技能
SkillEff_UseSkillHarmSelf = 7008 # 释放技能时自残(先扣血)
SkillEff_SkillUseCntLimit = 7009 # 限制技能最多触发次数
SkillEff_UseSkillStealBuff = 7010 # 释放技能前偷取buff
(
TriggerType_BeSuperHit, # 被暴击触发技能 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -401,18 +401,12 @@
    # 灼烧/玄火目标优先
    elif tagAffect == ChConfig.SkillTagAffect_Burn:
        atkBackTagFrist = False
        relativeObj = __GetRelativeObjDefault(batObjMgr, curBatObj, posNum, batLineup)
        sortObjList = [] # 优先灼烧目标,再对位
        for aimObj in aimObjList:
            sortValue = 0
            buffMgr = aimObj.GetBuffManager()
            if buffMgr.FindBuffListByState(ChConfig.BatObjState_Burn) or buffMgr.FindBuffListByState(ChConfig.BatObjState_BurnPlus):
                sortValue = 2
            elif relativeObj and relativeObj.GetID() == aimObj.GetID():
                sortValue = 1
            sortObjList.append([sortValue, aimObj])
        sortObjList.sort(reverse=True)
        aimObjList = [s[1] for s in sortObjList]
        aimObjList = __getBuffStateFirst(batObjMgr, curBatObj, posNum, batLineup, aimObjList, [ChConfig.BatObjState_Burn, ChConfig.BatObjState_BurnPlus])
    # 承伤盾目标优先
    elif tagAffect == ChConfig.SkillTagAffect_DamShield:
        atkBackTagFrist = False
        aimObjList = __getBuffStateFirst(batObjMgr, curBatObj, posNum, batLineup, aimObjList, [ChConfig.BatObjState_DamShield])
        
    # 仅焚血(毒奶)目标
    elif tagAffect == ChConfig.SkillTagAffect_PoisonCure:
@@ -447,6 +441,20 @@
        aimObjList = aimObjList[:tagCount]
        
    return aimObjList
def __getBuffStateFirst(batObjMgr, curBatObj, posNum, batLineup, aimObjList, checkStateList):
    ## 获取处于xxbuff状态优先,然后再对位目标
    relativeObj = __GetRelativeObjDefault(batObjMgr, curBatObj, posNum, batLineup)
    sortObjList = [] # 优先灼烧目标,再对位
    for aimObj in aimObjList:
        sortValue = 0
        if aimObj.CheckInState(checkStateList):
            sortValue = 2
        elif relativeObj and relativeObj.GetID() == aimObj.GetID():
            sortValue = 1
        sortObjList.append([sortValue, aimObj])
    sortObjList.sort(reverse=True)
    return [s[1] for s in sortObjList]
def CheckChangeTagEff(turnFight, curBatObj, useSkill):
    ## 技能自身设定强制修改目标,目前暂定优先级最高,无视软控
@@ -624,6 +632,7 @@
    atkType = useSkill.GetAtkType()
    GameWorld.DebugLog("__doUseSkill: curID=%s,skillID=%s,atkType=%s" % (curBatObj.GetID(), useSkill.GetSkillID(), atkType))
    
    __doStealBuff(turnFight, curBatObj, useSkill)
    __doHarmSelf(turnFight, curBatObj, useSkill)
    
    # 通用攻击
@@ -654,6 +663,38 @@
    elif atkType == 9:
        SkillModule_9(turnFight, curBatObj, useSkill)
        
    return
def __doStealBuff(turnFight, curBatObj, useSkill):
    ## 施法前偷取buff
    stealEff = useSkill.GetEffectByID(ChConfig.SkillEff_UseSkillStealBuff)
    if not stealEff:
        return
    buffState = stealEff.GetEffectValue(0) # buff״̬
    stealCnt = stealEff.GetEffectValue(1) # 偷取个数 0-全部;>0-个数
    isAll = True if stealCnt == 0 else False
    for tagObj in useSkill.GetTagObjList():
        if not isAll and stealCnt <= 0:
            break
        tagBuffList = tagObj.GetBuffManager().FindBuffListByState(buffState)
        if not tagBuffList:
            continue
        if not isAll and len(tagBuffList) > stealCnt:
            random.shuffle(tagBuffList) # 随机
        for tagBuff in tagBuffList:
            skillID = tagBuff.GetSkillID()
            buffOwner = curBatObj
            GameWorld.DebugLog("使用技能前偷取buff: tagID=%s,tagBuffID=%s,buffSkillID=%s" % (tagObj.GetID(), tagBuff.GetBuffID(), skillID))
            addBuff = TurnBuff.DoAddBuffBySkillID(turnFight, curBatObj, skillID, buffOwner, useSkill, isSync=False)
            if not addBuff:
                continue
            stealCnt -= 1
            TurnBuff.CopyBuff(turnFight, curBatObj, addBuff, tagBuff, useSkill, True, refreshTimeLayer=False)
            TurnBuff.DoBuffDel(turnFight, tagObj, tagBuff, relatedSkill=useSkill)
    return
def __doHarmSelf(turnFight, curBatObj, useSkill):
@@ -926,7 +967,7 @@
        
    Sync_UseSkill(turnFight, atkObj, useSkill)
    
    DoBeAttackResult(turnFight, atkObj, useSkill)
    DoBeAttackResult(turnFight, atkObj, useSkill, curBuff)
    
    # 通知结束标签
    Sync_TurnFightTag(turnFight, useTag, 1)
@@ -1024,7 +1065,7 @@
    __doCostZhanchui(turnFight, curBatObj, useSkill)
    __doSkillUserAnger(turnFight, curBatObj, useSkill)
    
    DoBeAttackResult(turnFight, curBatObj, useSkill, True)
    DoBeAttackResult(turnFight, curBatObj, useSkill)
    return
def DoCombo(turnFight, atkObj, useSkill):
@@ -1149,13 +1190,13 @@
            return useSkill
    return
def DoBeAttackResult(turnFight, curObj, useSkill, isUseSkill=False):
def DoBeAttackResult(turnFight, curObj, useSkill, curBuff=None):
    '''被攻击结果
    @param curObj: 施法方或buff归属方
    @param isUseSkill: 是否是直接使用技能的攻击结果,否则视为持续性的
    '''
    
    #curID = curObj.GetID()
    isUseSkill = False if curBuff else True # buff的视为持续性的,否则为直接使用技能的攻击结果
    isTurnNormalSkill = SkillCommon.isTurnNormalSkill(useSkill)
    isAngerSkill = SkillCommon.isAngerSkill(useSkill)
    
@@ -2559,7 +2600,7 @@
    
    Sync_UseSkill(turnFight, atkObj, useSkill)
    
    DoBeAttackResult(turnFight, atkObj, useSkill)
    DoBeAttackResult(turnFight, atkObj, useSkill, curBuff)
    
    # 通知结束标签
    Sync_TurnFightTag(turnFight, useTag, 1)