ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -27,12 +27,40 @@
GameWorld.ImportAll("Script\\Skill\\", "TurnBuffs")
def GetAddBuffValue(turnFight, attacker, defender, curSkill):
    if not curSkill.GetAtkType():
        return []
    callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (curSkill.GetAtkType(), "CalcBuffValue"))
    if not callFunc:
        return []
    return callFunc(turnFight, attacker, defender, curSkill)
    ret = callFunc(turnFight, attacker, defender, curSkill)
    if ret == None:
        return []
    return ret
def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False):
def CopyBuff(turnFight, curBatObj, curBuff, tagBuff, bySkill=None, isNewAdd=False, refreshTimeLayer=True):
    '''拷贝buff数据,不含目标buffID、归属,并刷新时间
    @param refreshTimeLayer: 刷新剩余时间、层级
    '''
    skillData = curBuff.GetSkillData()
    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()]))
    relatedSkillID = bySkill.GetSkillID() if bySkill else 0
    SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID, isNewAdd)
    return
def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
    ## 根据技能ID添加buff
    if not skillID:
        return
@@ -45,12 +73,12 @@
    useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData, ownerID)
    useSkill.SetTagObjList(tagObjList)
    
    isOK = OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic)
    addBuff = OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic, isSync=isSync, setLayerCnt=setLayerCnt)
    
    poolMgr.release(useSkill)
    return isOK
    return addBuff
def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False):
def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
    skillID = buffSkill.GetSkillID()
    bySkill = buffSkill.GetBySkill() if not bySkill else bySkill
    relatedSkillID = bySkill.GetSkillID() if bySkill else 0
@@ -64,26 +92,35 @@
        and batObj.CheckInState(ChConfig.BatObjState_Wudi):
        GameWorld.DebugLog("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s" 
                           % (curID, skillID, ownerID, relatedSkillID))
        return False
        return
    
    #被动触发免疫控制buff
    if buffSkill.GetSkillType() == 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 False
            return
        
    buffValueList = GetAddBuffValue(turnFight, buffOwner, batObj, buffSkill)
    GameWorld.DebugLog("OnAddBuff: curID=%s,skillID=%s,atkType=%s,buffValueList=%s,ownerID=%s,relatedSkillID=%s"
                       % (curID, skillID, buffSkill.GetAtkType(), buffValueList, ownerID, relatedSkillID))
    
    skillTypeID = buffSkill.GetSkillTypeID()
    buffRepeat = buffSkill.GetBuffRepeat()
    addLayerCnt = buffSkill.GetLayerCnt()
    addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)
    if addLayerEff:
        addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
    if setLayerCnt > 0:
        addLayerCnt = setLayerCnt
        GameWorld.DebugLog("外部直接指定添加的buff层级: setLayerCnt=%s" % setLayerCnt)
    else:
        addLayerCnt = buffSkill.GetLayerCnt()
        addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)
        if addLayerEff:
            # 可指定来源技能技能才生效,不指定的话默认生效
            if not addLayerEff.GetTriggerSrc() or addLayerEff.GetTriggerSrc() == relatedSkillID:
                addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
    maxLayerCnt = buffSkill.GetLayerMax()
    if maxLayerCnt:
        maxLayerCnt += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffLayerMax, buffSkill)
        
    GameWorld.DebugLog("OnAddBuff: curID=%s,skillID=%s,atkType=%s,buffValueList=%s,addLayerCnt=%s/%s,ownerID=%s,relatedSkillID=%s"
                       % (curID, skillID, buffSkill.GetAtkType(), buffValueList, addLayerCnt, maxLayerCnt, ownerID, relatedSkillID))
    #buff重复获得时的叠加规则
    #以下规则默认针对的是相同施法者,即相同来源的处理
    #如果有针对不同施法者的规则会说明
@@ -97,7 +134,6 @@
    buffMgr = batObj.GetBuffManager()
    
    if buffRepeat == 4: # 4 独立:回合、效果独立计算
        maxLayerCnt = buffSkill.GetLayerMax()
        # 如果有限制最大层数,达到上限时如果有新的层数进来,就替换掉持续时间最短的,只算相同来源
        if maxLayerCnt:
            buffList = buffMgr.FindBuffListBySkillTypeID(skillTypeID)
@@ -136,32 +172,30 @@
            
            updLayerCnt = addLayerCnt
            if buffRepeat == 3: # 叠加层级
                maxLayerCnt = buffSkill.GetLayerMax()
                updLayerCnt = nowLayerCnt + addLayerCnt
                if maxLayerCnt and updLayerCnt > maxLayerCnt:
                    updLayerCnt = maxLayerCnt
                GameWorld.DebugLog("        叠加层级: nowLayerCnt=%s,addLayerCnt=%s,updLayerCnt=%s" % (nowLayerCnt, addLayerCnt, updLayerCnt))
                GameWorld.DebugLog("        叠加层级: nowLayerCnt=%s,addLayerCnt=%s,updLayerCnt=%s,maxLayerCnt=%s" % (nowLayerCnt, addLayerCnt, updLayerCnt, maxLayerCnt))
            else:
                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])
            else:
            elif isSync:
                SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
                
            if nowLayerCnt != updLayerCnt:
                RefreshBuffEffect(turnFight, batObj, buff, False)
            return True
            RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=2)
            return buff
        
    __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt)
    return True
    return __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt, isSync=isSync)
def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0):
def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0, isSync=True):
    curID = batObj.GetID()
    skillID = buffSkill.GetSkillID()
    buff = buffMgr.AddBuff(skillID)
@@ -171,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)
@@ -185,14 +220,16 @@
        
    if afterLogic and bySkill:
        bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])
    else:
    elif isSync:
        SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
        
    RefreshBuffEffect(turnFight, batObj, buff, True)
    return
    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 # 是否刷属性
    
@@ -206,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)
        
@@ -223,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
@@ -295,11 +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):
@@ -322,13 +364,14 @@
        buff = buffMgr.GetBuffByIndex(index)
        layer = max(1, buff.GetLayer())
        skillData = buff.GetSkillData()
        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