ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -82,7 +82,13 @@
    if not effSkill:
        return
    
    kwargs["triggerWay"] = triggerWay
    if effSkill.GetCoolDownTime():
        if hasattr(effSkill, "GetRemainTime") and effSkill.GetRemainTime() > 0:
            GameWorld.DebugLogEx("被动效果技能CD中! effSkillID=%s,RemainTime=%s", skillID, effSkill.GetRemainTime())
            return
        kwargs["byEffSkill"] = effSkill # 目前用于触发被动技能时,该效果技能提前先设置CD,防止嵌套触发时CD后置才设置,如关羽的怒技追击
    kwargs["byTriggerWay"] = triggerWay
    for effID in effIDList:
        curEffect = effSkill.GetEffectByID(effID, triggerWay)
        if not curEffect:
@@ -99,7 +105,16 @@
    callFunc = GameWorld.GetExecFunc(PassiveTrigger, "%s.%s" % (pyName, "DoSkillEffectLogic"))
    if not callFunc:
        return
    callFunc(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs)
    isOK = callFunc(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs)
    if not isOK:
        return
    cdTime = effSkill.GetCoolDownTime()
    if cdTime:
        # 非触发技能的在后面设置CD即可
        if hasattr(effSkill, "GetRemainTime"):
            effSkill.SetRemainTime(cdTime)
    return
def __doTriggerPassiveEffectByBuff(turnFight, batObj, tagObj, triggerWay, buffID, effIDList, connSkill=None, connBuff=None, **kwargs):
@@ -111,7 +126,7 @@
        return
    skillData = effBuff.GetSkillData()
    
    kwargs["triggerWay"] = triggerWay
    kwargs["byTriggerWay"] = triggerWay
    for effID in effIDList:
        curEffect = skillData.GetEffectByID(effID, triggerWay)
        if not curEffect: