129 【战斗】战斗系统-服务端（张星彩怒技，觉醒技能；增加buff消失后触发时机；增加效果6007 6008 7001 7002；技能友好目标增加类...

hxp

1 天以前 4ec47a0dab32729d20389078ee78f89b64c12cab

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

@@ -22,6 +22,7 @@
import TurnBuffs

import BattleObj

import ObjPool

import TurnPassive



GameWorld.ImportAll("Script\\Skill\\", "TurnBuffs")



@@ -65,6 +66,13 @@
                           % (curID, skillID, ownerID, relatedSkillID))

        return False

    

    #被动触发免疫控制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

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

@@ -241,6 +249,19 @@
    buffMgr = batObj.GetBuffManager()

    buffID = curBuff.GetBuffID()

    skillData = curBuff.GetSkillData()

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

    curBuffState = skillData.GetCurBuffState()

    if curBuffState:

        buffMgr.DelBuffState(curBuffState, buffID)

        
    buffMgr.DelBuff(buffID, release)

    if isSync:

        SyncBuffDel(turnFight, buffObjID, buffID, relatedSkillID)

    if afterLogic and relatedSkill:

        tagObjID = tagObj.GetID() if tagObj else buffObjID

        relatedSkill.AddAfterLogic(ChConfig.AfterLogic_DelBuff, [buffObjID, curBuff, tagObjID])

        
    #buff消失的触发

    for effectIndex in range(0, skillData.GetEffectCount()):

        curEffect = skillData.GetEffect(effectIndex)

@@ -249,32 +270,19 @@
        if not effectID:

            continue

        

        if curEffect.GetTriggerWay():

        triggerWay = curEffect.GetTriggerWay()

        if triggerWay:

            if triggerWay == ChConfig.TriggerWay_BuffDel:

                TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BuffDel, connBuff=curBuff)

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

                haveBuffPassiveEff = True

                

        elif effectID in ChConfig.AttrIDList:

            isRefreshAttr = True

            

        else:

            callFunc = GameWorld.GetExecFunc(TurnBuffs, "Buff_%d.%s" % (effectID, "OnBuffDel"))

            if callFunc:

                callFunc(turnFight, batObj, curBuff, curEffect)

                
    if haveBuffPassiveEff:

        batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)

        
    curBuffState = skillData.GetCurBuffState()

    if curBuffState:

        buffMgr.DelBuffState(curBuffState, buffID)

        
    # 最后删除buff、通知

    buffMgr.DelBuff(buffID, release)

    if isSync:

        SyncBuffDel(turnFight, buffObjID, buffID, relatedSkillID)

    if afterLogic and relatedSkill:

        tagObjID = tagObj.GetID() if tagObj else buffObjID

        relatedSkill.AddAfterLogic(ChConfig.AfterLogic_DelBuff, [buffObjID, curBuff, tagObjID])

        

    if isRefreshAttr:

        RefreshBuffAttr(batObj)