129 【战斗】战斗系统-服务端（完善战斗相关公式参数；竞技增减伤属性、战力系数改为PVP增减伤；）

hxp

2 天以前 e926fc46837c5fb26c537ecb15945a78e2f3423f

 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()]))

@@ -81,18 +87,27 @@
        buffOwner = batObj

    ownerID = buffOwner.GetID()

    

    skillType = buffSkill.GetSkillType()

    #无敌免疫持续减益buff、控制类buff

    if buffSkill.GetSkillType() in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \

    if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \

        and batObj.CheckInState(ChConfig.BatObjState_Wudi):

        GameWorld.DebugLog("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s" 

                           % (curID, skillID, ownerID, relatedSkillID))

        return

    

    #被动触发免疫控制buff

    if buffSkill.GetSkillType() == ChConfig.Def_SkillType_Action:

    if skillType == ChConfig.Def_SkillType_Action:

        if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlBuff, buffSkill):

            GameWorld.DebugLog("血量低于百分x时免疫控制buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,hp:%s/%s" 

                               % (curID, skillID, ownerID, relatedSkillID, batObj.GetHP(), batObj.GetMaxHP()))

            return

        
    #光环技能，默认施法者身上也必须有，时长与施法者身上的同步

    haloSrcBuff = None # 光源buff

    if skillType == ChConfig.Def_SkillType_Halo and ownerID != curID:

        haloSrcBuff = buffOwner.GetBuffManager().FindBuffBySkillID(skillID, ownerID)

        if not haloSrcBuff:

            GameWorld.ErrLog("添加光环技能时找不到光源! skillID=%s,ownerID=%s" % (skillID, ownerID))

            return

        

    buffValueList = GetAddBuffValue(turnFight, buffOwner, batObj, buffSkill)

@@ -174,20 +189,23 @@
                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)

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

    if skillType == ChConfig.Def_SkillType_Halo and newBuff:

        __addHaloBuffEffObjID(curID, newBuff, skillID, ownerID, haloSrcBuff)

    return newBuff



def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0, isSync=True):

    curID = batObj.GetID()

@@ -199,11 +217,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 +235,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,15 +255,72 @@
            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)

        

    return



def __addHaloBuffEffObjID(curID, newBuff, skillID, ownerID, haloSrcBuff):

    ## 添加光环buff有效的目标ID，添加光环buff时添加，不移除，由光源管理移除（光源武将死亡时删除）

    if curID == ownerID:

        newBuff.AddHaloObjID(curID) # 光源直接添加目标

        return

    haloSrcBuff.AddHaloObjID(curID) # 光源先添加新目标

    haloObjIDList = haloSrcBuff.GetHaloObjIDList()

    newBuff.SetHaloObjIDList(haloObjIDList) # 新buff直接同步设置为光源有效目标

    
    batObjMgr = BattleObj.GetBatObjMgr()

    for haloObjID in haloObjIDList:

        if haloObjID in [ownerID, curID]:

            continue

        haloObj = batObjMgr.getBatObj(haloObjID)

        if not haloObj:

            continue

        haloBuff = haloObj.GetBuffManager().FindBuffBySkillID(skillID, ownerID)

        if not haloBuff:

            continue

        haloBuff.SetHaloObjIDList(haloObjIDList) # 除光源及新加入的直接同步最新的有效目标

    return



def SetBuffRemainTime(turnFight, batObj, curBuff, remainTime):

    if remainTime <= 0:

        DoBuffDel(turnFight, batObj, curBuff)

        return

    
    buffObjID = batObj.GetID()

    ownerID = curBuff.GetOwnerID()

    skillData = curBuff.GetSkillData()

    skillID = skillData.GetSkillID()

    skillType = skillData.GetSkillType()

    
    curBuff.SetRemainTime(remainTime)

    SyncBuffRefresh(turnFight, batObj, curBuff)

    
    if skillType == ChConfig.Def_SkillType_Halo and ownerID == buffObjID:

        haloObjIDList = curBuff.GetHaloObjIDList()

        GameWorld.DebugLog("光环buff回合变更同步其他有效目标该光环: skillID=%s,ownerID=%s,haloObjIDList=%s" % (skillID, ownerID, haloObjIDList))

        batObjMgr = BattleObj.GetBatObjMgr()

        for haloObjID in haloObjIDList:

            if haloObjID == buffObjID:

                continue

            haloObj = batObjMgr.getBatObj(haloObjID)

            if not haloObj:

                continue

            haloBuff = haloObj.GetBuffManager().FindBuffBySkillID(skillID, ownerID)

            if not haloBuff:

                continue

            haloBuff.SetRemainTime(remainTime)

            SyncBuffRefresh(turnFight, haloObj, haloBuff)

            
    return



def DoBuffLayerChange(turnFight, batObj, curBuff, updLayer, relatedSkill=None):

@@ -251,7 +329,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

@@ -276,7 +354,10 @@
    buffObjID = batObj.GetID()

    buffMgr = batObj.GetBuffManager()

    buffID = curBuff.GetBuffID()

    ownerID = curBuff.GetOwnerID()

    skillData = curBuff.GetSkillData()

    skillID = skillData.GetSkillID()

    skillType = skillData.GetSkillType()

    

    # 先删除buff再触发其他内容，防止当前要删除的buff影响后续触发的内容，如无敌buff等，理论上触发的后续内容无敌buff不应该再生效

    curBuffState = skillData.GetCurBuffState()

@@ -314,6 +395,21 @@
        

    if isRefreshAttr:

        RefreshBuffAttr(batObj)

        
    if skillType == ChConfig.Def_SkillType_Halo and ownerID == buffObjID:

        haloObjIDList = curBuff.GetHaloObjIDList()

        GameWorld.DebugLog("光环buff删除同步删除其他有效目标该光环: skillID=%s,ownerID=%s,haloObjIDList=%s" % (skillID, ownerID, haloObjIDList))

        batObjMgr = BattleObj.GetBatObjMgr()

        for haloObjID in haloObjIDList:

            if haloObjID == buffObjID:

                continue

            haloObj = batObjMgr.getBatObj(haloObjID)

            if not haloObj:

                continue

            haloBuff = haloObj.GetBuffManager().FindBuffBySkillID(skillID, ownerID)

            if not haloBuff:

                continue

            DoBuffDel(turnFight, haloObj, haloBuff, relatedSkill, afterLogic, tagObj)

    return



def DoBuffDelAfterLogicOver(turnFight, buffObjID, curBuff, relatedSkill):

@@ -323,16 +419,16 @@
    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):

def RefreshBuffAttr(batObj, isInit=False):

    ''' 刷新buff属性，如果有涉及到buff属性变更的，只能全部buff重新刷

    '''

    

@@ -345,40 +441,66 @@
    GameWorld.DebugLog("RefreshBuffAttr ID:%s,atk=%s,def=%s,hp=%s/%s,batAttrDict=%s" 

                       % (objID, batObj.GetAtk(), batObj.GetDef(), befHP, befMaxHP, batAttrDict))

    

    skbufAttrDict = {}

    
    # 属性技能

    skillAttrDict = {}

    skillManager = batObj.GetSkillManager()

    for index in range(0, skillManager.GetSkillCount()):

        curSkill = skillManager.GetSkillByIndex(index)

        if not curSkill:

            continue

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

            effect = curSkill.GetEffect(eIndex)

            effID = effect.GetEffectID()

            if effID not in ChConfig.AttrIDList:

                continue

            if effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf]:

                # 技能时仅技能有效

                continue

            attrID = effID

            attrValue = effect.GetEffectValue(0)

            calcType = effect.GetEffectValue(1)

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

                attrValue = -attrValue

            skillAttrDict[attrID] = skillAttrDict.get(attrID, 0) + attrValue

            skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue

    skillAttrDict and GameWorld.DebugLog("    skillAttrDict=%s" % skillAttrDict)

    
    # buff

    buffAttrDict = {} # buff属性 {attrID:value, } value可能是负值

    buffsAttrDict = {} # buff属性 {attrID:value, } value可能是负值

    buffMgr = batObj.GetBuffManager()

    for index in range(buffMgr.GetBuffCount()):

        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

            if effect.GetTriggerSrc() and effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Buff, ChConfig.TriggerSrc_BuffSelf]:

                # buff时，不配默认有效，或仅buff有效

                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

            buffAttrDict[attrID] = buffAttrDict.get(attrID, 0) + attrValue

            buffsAttrDict[attrID] = buffsAttrDict.get(attrID, 0) + attrValue

            skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue

            

    GameWorld.DebugLog("    buffAttrDict=%s" % buffAttrDict)

    buffsAttrDict and GameWorld.DebugLog("    buffsAttrDict=%s" % buffsAttrDict)

    GameWorld.DebugLog("    skbufAttrDict=%s" % skbufAttrDict)

    

    objID = batObj.GetID()

    # 先计算百分比加成或降低的

    perIDList = ChConfig.AttrPerDict.values()

    for attrID, attrPerID in ChConfig.AttrPerDict.items():

        if attrPerID not in buffAttrDict:

        if attrPerID not in skbufAttrDict:

            continue

        attrPerValue = buffAttrDict[attrPerID] # 可能是负值

        attrPerValue = skbufAttrDict[attrPerID] # 可能是负值

        attrValue = batObj.GetBatAttrValue(attrID, False)

        if attrValue <= 0:

            continue

@@ -388,7 +510,7 @@
        GameWorld.DebugLog("    attrID=%s(PerID:%s),attrValue=%s(PerValue:%s),updValue=%s" % (attrID, attrPerID, attrValue, attrPerValue, updValue))

        

    # 再累加非百分比的固定值

    for attrID, addValue in buffAttrDict.items():

    for attrID, addValue in skbufAttrDict.items():

        if attrID in perIDList:

            continue

        attrValue = batObj.GetBatAttrValue(attrID, False)

@@ -400,15 +522,17 @@
    aftHP = batObj.GetHP()

    aftMaxHP = batObj.GetMaxHP()

    if aftMaxHP != befMaxHP:

        batObj.SetMaxHP(aftMaxHP, True)

        isNotify = not isInit

        batObj.SetMaxHP(aftMaxHP, isNotify)

        if befHP and aftMaxHP > befMaxHP:

            aftHP += (aftMaxHP - befMaxHP)

            batObj.SetHP(aftHP, True)

            batObj.SetHP(aftHP, isNotify)

    GameWorld.DebugLog("    befHP=%s/%s, aftHP=%s/%s" % (befHP, befMaxHP, aftHP, aftMaxHP))

    GameWorld.DebugLog("    最终属性 ID:%s,atk=%s,def=%s,hp=%s/%s,%s" % (objID, batObj.GetAtk(), batObj.GetDef(), aftHP, aftMaxHP, batObj.GetBatAttrDict()))

    return



def SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID=0, isNewAdd=False):

    ## @param curBatObj: 该buff的持有者，即在谁身上

    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffRefresh)

    clientPack.ObjID = curBatObj.GetID()

    clientPack.BuffID = curBuff.GetBuffID()