129 【战斗】战斗系统-服务端（何太后技能；优化孙坚技能buff额外属性逻辑；增加技能计算伤害类型6-按自残血量值；增加效果7008 5021 50...

hxp

2025-10-30 f611ba2ca93e527c98b2d05ffefdcc21a6ed0bd1

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

@@ -37,16 +37,22 @@
        return []

    return ret



def CopyBuff(turnFight, curBatObj, curBuff, tagBuff, bySkill=None, isNewAdd=False):

def CopyBuff(turnFight, curBatObj, curBuff, tagBuff, bySkill=None, isNewAdd=False, refreshTimeLayer=True):

    '''拷贝buff数据，不含目标buffID、归属，并刷新时间

    @param refreshTimeLayer: 刷新剩余时间、层级

    '''

    skillData = curBuff.GetSkillData()

    curBuff.SetCalcTime(turnFight.getTimeline())

    curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))

    curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))

    curBuff.SetAddTiming(curBatObj.GetTiming())

    if refreshTimeLayer:

        curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))

        curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))

    else:

        curBuff.SetRemainTime(tagBuff.GetRemainTime())

        curBuff.SetLayer(tagBuff.GetLayer())

    curBuff.SetValue1(tagBuff.GetValue1())

    curBuff.SetValue2(tagBuff.GetValue2())

    curBuff.SetValue3(tagBuff.GetValue3())

    curBuff.SetIsCopy(1)

    GameWorld.DebugLog("    拷贝buff: curBuffID=%s,tagBuffID=%s,Remain=%s,Layer=%s,Value=%s" 

                       % (curBuff.GetBuffID(), tagBuff.GetBuffID(), curBuff.GetRemainTime(), curBuff.GetLayer(), 

                          [curBuff.GetValue1(), curBuff.GetValue2(), curBuff.GetValue3()]))

@@ -174,17 +180,17 @@
                GameWorld.DebugLog("        默认覆盖")

                

            # 重置回合、CD、值等

            buff.SetCalcTime(turnFight.getTimeline())

            buff.SetAddTiming(batObj.GetTiming())

            buff.SetRemainTime(buffSkill.GetLastTime())

            buff.SetLayer(updLayerCnt)

            buff.SetBuffValueList(buffValueList)

            buff.ResetEffectValueEx()

            if afterLogic and bySkill:

                bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])

            elif isSync:

                SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)

                

            if nowLayerCnt != updLayerCnt:

                RefreshBuffEffect(turnFight, batObj, buff, False)

            RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=2)

            return buff

        

    return __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt, isSync=isSync)

@@ -199,11 +205,12 @@
    relatedSkillID = bySkill.GetSkillID() if bySkill else 0

    ownerID = buffOwner.GetID()

    buffID = buff.GetBuffID()

    timing = batObj.GetTiming()

    

    GameWorld.DebugLog("    __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timeline=%s" 
                       % (buffID, skillID, ownerID, relatedSkillID, turnFight.getTimeline()), curID)

    GameWorld.DebugLog("    __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s" 
                       % (buffID, skillID, ownerID, relatedSkillID, timing), curID)

    buff.SetAddTiming(timing) # 武将当前在什么时机就设置为什么时机

    buff.SetOwnerID(ownerID)

    buff.SetCalcTime(turnFight.getTimeline())

    buff.SetRemainTime(buffSkill.GetLastTime())

    buff.SetLayer(setLayerCnt)

    buff.SetBuffValueList(buffValueList)

@@ -216,11 +223,13 @@
    elif isSync:

        SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)

        

    RefreshBuffEffect(turnFight, batObj, buff, True)

    RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=1)

    return buff



def RefreshBuffEffect(turnFight, batObj, curBuff, isNewBuff=False):

def RefreshBuffEffect(turnFight, batObj, curBuff, buffSkill=None, buffOwner=None, refreshType=0):

    ## 刷新buff效果

    # @param buffSkill: 添加该buff时对应的buff技能ID，可能为None，如非添加时的刷新

    # @param refreshType: 0-普通刷新；1-新添加刷新；2-覆盖刷新

    

    isRefreshAttr = False # 是否刷属性

    

@@ -234,12 +243,15 @@
            continue

        

        if curEffect.GetTriggerWay():

            if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf] and isNewBuff:

            if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf] and refreshType == 1:

                passiveEffMgr.AddBuffPassiveEffect(curBuff, skillData, curEffect)

                

        elif effectID in ChConfig.AttrIDList:

            isRefreshAttr = True

            

    if refreshType and buffSkill and buffOwner:

        TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, connSkill=buffSkill, connBuff=curBuff)

        
    if isRefreshAttr:

        RefreshBuffAttr(batObj)

        

@@ -251,7 +263,7 @@
        curBuff.SetLayer(updLayer)

        relatedSkillID = relatedSkill.GetSkillID() if relatedSkill else 0

        SyncBuffRefresh(turnFight, batObj, curBuff, relatedSkillID)

        RefreshBuffEffect(turnFight, batObj, curBuff, False)

        RefreshBuffEffect(turnFight, batObj, curBuff)

        return

    DoBuffDel(turnFight, batObj, curBuff, relatedSkill)

    return

@@ -323,13 +335,13 @@
    ObjPool.GetPoolMgr().release(curBuff)

    return



def DoBuffProcess(turnFight, batObj, curBuff):

def DoBuffProcess(turnFight, batObj, curBuff, **kwargs):

    skillData = curBuff.GetSkillData()

    if not skillData.GetAtkType():

        return

    callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (skillData.GetAtkType(), "DoBuffProcess"))

    if callFunc:

        callFunc(turnFight, batObj, curBuff)

        callFunc(turnFight, batObj, curBuff, **kwargs)

    return

    

def RefreshBuffAttr(batObj):

@@ -352,19 +364,14 @@
        buff = buffMgr.GetBuffByIndex(index)

        layer = max(1, buff.GetLayer())

        skillData = buff.GetSkillData()

        atkType = skillData.GetAtkType()

        if atkType:

            callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (atkType, "CalcBuffAttrEx"))

            if callFunc:

                callFunc(batObj, buff, skillData, layer, buffAttrDict)

                
        
        for eIndex in range(skillData.GetEffectCount()):

            effect = skillData.GetEffect(eIndex)

            effID = effect.GetEffectID()

            if effID not in ChConfig.AttrIDList:

                continue

            attrID = effID

            attrValue = effect.GetEffectValue(0) * layer

            attrValue = (effect.GetEffectValue(0) + buff.GetEffectValueEx(attrID)) * layer

            calcType = effect.GetEffectValue(1)

            if calcType == 2: # 减少，其他默认增加

                attrValue = -attrValue