ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -37,8 +37,17 @@
    ''' 触发被动效果,可能触发技能、buff,需根据优先级触发
    '''
    if not batObj.IsAlive():
        if triggerWay in ChConfig.DeadCanTriggerWayList or (connSkill and connSkill.GetBatType() == ChConfig.TurnBattleType_Enhance):
        if triggerWay in ChConfig.DeadCanTriggerWayList:
            pass # 死亡状态下可触发的被动
        elif connSkill:
            if connSkill.GetBatType() == ChConfig.TurnBattleType_Enhance:
                pass # 子技能不限制死亡触发,由主技能决定,主技能能触发了,才会执行到子技能,那么子技能也一定能触发
            elif connSkill.GetByTriggerWay() in ChConfig.DeadCanTriggerWayList:
                pass
                #GameWorld.DebugLogEx("关联技能是由死亡状态下可触发的方式触发的,则也可触发! triggerWay=%s,connSkillID=%s,byTriggerWay=%s",
                #                     triggerWay, connSkill.GetSkillID(), connSkill.GetByTriggerWay())
            else:
                return
        else:
            return
    passiveEffMgr = batObj.GetPassiveEffManager()
@@ -73,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:
@@ -90,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):
@@ -102,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: