ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -92,6 +92,8 @@
            return
        if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlDepBuff, buffSkill):
            return
        if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneBadBuff, buffSkill):
            return
        
    #被动触发免疫控制buff
    if skillType == ChConfig.Def_SkillType_Action:
@@ -226,12 +228,14 @@
    ownerID = buffOwner.GetID()
    buffID = buff.GetBuffID()
    timing = batObj.GetTiming()
    remainTime = buffSkill.GetLastTime()
    remainTime += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffTime, buffSkill)
    
    GameWorld.DebugLogEx("    __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s",
                         buffID, skillID, ownerID, relatedSkillID, timing, curID)
    GameWorld.DebugLogEx("    __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s,remainTime=%s,setLayerCnt=%s",
                         buffID, skillID, ownerID, relatedSkillID, timing, remainTime, setLayerCnt, curID)
    buff.SetAddTiming(timing) # 武将当前在什么时机就设置为什么时机
    buff.SetOwnerID(ownerID)
    buff.SetRemainTime(buffSkill.GetLastTime())
    buff.SetRemainTime(remainTime)
    buff.SetLayer(setLayerCnt)
    buff.SetBuffValueList(buffValueList)
    curBuffState = buffSkill.GetCurBuffState()
@@ -249,7 +253,7 @@
    if curBuffState and IsControlledHardState(curBuffState):
        TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BeControlledHard, tagObj=buffOwner, connSkill=buffSkill, connBuff=buff)
        batObjMgr = BattleObj.GetBatObjMgr()
        ownerBatLineup = buffOwner.GetBatLineup()
        ownerBatLineup = buffOwner.GetTFBatLineup()
        for lineupObjID in ownerBatLineup.posObjIDDict.values():
            lineupObj = batObjMgr.getBatObj(lineupObjID)
            if not lineupObj.IsAlive():
@@ -549,7 +553,7 @@
        
    # 重新添加本阵营有效光环
    batObjMgr = BattleObj.GetBatObjMgr()
    batLineup = batObj.GetBatLineup()
    batLineup = batObj.GetTFBatLineup()
    for tagObjID in batLineup.posObjIDDict.values():
        tagObj = batObjMgr.getBatObj(tagObjID)
        if not tagObj.IsAlive():