129 【战斗】战斗系统-服务端（简化触发方式；优化额外触发技能；）

hxp

2025-08-26 b3d16628055d113d37021c1c55661f2cee035bdc

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py

@@ -97,6 +97,8 @@
        triggerSrc = effect.GetTriggerSrc()

        if not triggerWay:

            return

        if triggerWay == ChConfig.TriggerWay_CurSkillEff:

            return

        if triggerSrc == ChConfig.TriggerSrc_Buff:

            # buff有效的不加进来

            return

@@ -138,6 +140,8 @@
        triggerWay = effect.GetTriggerWay()

        triggerSrc = effect.GetTriggerSrc()

        if not triggerWay:

            return

        if triggerWay == ChConfig.TriggerWay_CurSkillEff:

            return

        if triggerSrc == ChConfig.TriggerSrc_Skill:

            # 技能有效的不加进来

@@ -209,12 +213,12 @@
    

class SkillEffect():

    

    def __init__(self, effID, values, triggerWay=0, triggerSrc=0, triggerParams=None):

    def __init__(self, effID, values, triggerWay=0, triggerSrc=0):

        self._effID = effID

        self._values = values

        self._triggerWay = triggerWay

        self._triggerSrc = triggerSrc

        self._triggerParams = triggerParams if triggerParams else []

        #self._triggerParams = triggerParams if triggerParams else []

        return

    

    def GetEffectID(self): return self._effID

@@ -222,7 +226,7 @@
    def GetEffectValueCount(self): return len(self._values)

    def GetTriggerWay(self): return self._triggerWay

    def GetTriggerSrc(self): return self._triggerSrc

    def GetTriggerParams(self, index): return self._triggerParams[index] if len(self._triggerParams) > index else 0

    #def GetTriggerParams(self, index): return self._triggerParams[index] if len(self._triggerParams) > index else 0

    

EmptyEffect = SkillEffect(0, [])



@@ -231,16 +235,16 @@
    def __init__(self, ipyData):

        self._ipyData = ipyData

        self._effList = [] # [Effect, ...]

        self._effDict = {} # {effID:Effect, ...}

        self._effDict = {} # {(effID, triggerWay):Effect, ...} ，确保唯一，同个技能可能配置相同的效果ID

        for num in range(1, 1 + 3):

            effID = getattr(ipyData, "GetEffectID%s" % num)()

            values = getattr(ipyData, "GetEffectValues%s" % num)()

            triggerWay = getattr(ipyData, "GetTriggerWay%s" % num)()

            triggerSrc = getattr(ipyData, "GetTriggerSrc%s" % num)()

            triggerParams = getattr(ipyData, "GetTriggerParams%s" % num)()

            effect = ObjPool.GetPoolMgr().acquire(SkillEffect, effID, values, triggerWay, triggerSrc, triggerParams)

            #triggerParams = getattr(ipyData, "GetTriggerParams%s" % num)()

            effect = ObjPool.GetPoolMgr().acquire(SkillEffect, effID, values, triggerWay, triggerSrc)

            self._effList.append(effect)

            self._effDict[effID] = effect

            self._effDict[(effID, triggerWay)] = effect

        return

    

    def GetIpyData(self): return self._ipyData

@@ -264,7 +268,7 @@
    def GetHappenRate(self): return self._ipyData.GetHappenRate() # 触发概率

    def GetEffect(self, index): return self._effList[index] if len(self._effList) > index else 0

    def GetEffectCount(self): return len(self._effList)

    def GetEffectByID(self, effID): return self._effDict.get(effID, EmptyEffect)

    def GetEffectByID(self, effID, triggerWay=0): return self._effDict.get((effID, triggerWay), EmptyEffect)

    def GetConnSkill(self): return self._ipyData.GetConnSkill()

    def GetCoolDownTime(self): return self._ipyData.GetCoolDownTime()

    def GetIgnoreStates(self): return self._ipyData.GetIgnoreStates() # 无视限制列表

@@ -274,7 +278,6 @@
    def GetLayerMax(self): return self._ipyData.GetLayerMax()

    def GetBuffRepeat(self): return self._ipyData.GetBuffRepeat() # Buff叠加规则

    def GetDieContinue(self): return self._ipyData.GetDieContinue() # Buff死亡存在

    def GetEnhanceSkillList(self): return self._ipyData.GetEnhanceSkillList() # 额外触发的技能ID列表

    def GetFightPower(self): return self._ipyData.GetFightPower()

    def GetSkillMotionName(self): return self._ipyData.GetSkillMotionName()

    

@@ -376,6 +379,12 @@
        buff = self._buffIDDict.pop(buffID)

        if buff in self._buffList:

            self._buffList.remove(buff)

        else:

            # 防范下找不到的情况

            for lBuff in self._buffList[::-1]:

                if lBuff.GetBuffID() == buffID:

                    self._buffList.remove(lBuff)

                    GameWorld.ErrLog("删除buff异常不在列表里! buffID=%s,lBuff=%s,buff=%s" % (buffID, lBuff, buff))

        #GameWorld.DebugLog("    ObjBuff:%s, buffID=%s, dict:%s, len:%s, dictKeys:%s, list:%s" % (self._batObj.GetID(), buffID, len(self._buffIDDict), len(self._buffList), self._buffIDDict.keys(), self._buffList))

        for skillTypeID, buffIDList in self._skillTypeIDBuffIDs.items():

            if buffID not in buffIDList:

@@ -472,7 +481,7 @@
    def GetHappenRate(self): return self._skillData.GetHappenRate() # 触发概率

    def GetEffect(self, index): return self._skillData.GetEffect(index)

    def GetEffectCount(self): return self._skillData.GetEffectCount()

    def GetEffectByID(self, effID): return self._skillData.GetEffectByID(effID)

    def GetEffectByID(self, effID, triggerWay=0): return self._skillData.GetEffectByID(effID, triggerWay)

    def GetConnSkill(self): return self._skillData.GetConnSkill()

    def GetCoolDownTime(self): return self._skillData.GetCoolDownTime()

    def GetIgnoreStates(self): return self._skillData.GetIgnoreStates() # 无视限制列表

@@ -482,7 +491,6 @@
    def GetLayerMax(self): return self._skillData.GetLayerMax()

    def GetBuffRepeat(self): return self._skillData.GetBuffRepeat() # Buff叠加规则

    def GetDieContinue(self): return self._skillData.GetDieContinue() # Buff死亡存在

    def GetEnhanceSkillList(self): return self._skillData.GetEnhanceSkillList() # 额外触发的技能ID列表

    def GetFightPower(self): return self._skillData.GetFightPower()

    def GetSkillMotionName(self): return self._skillData.GetSkillMotionName()