ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -85,12 +85,14 @@
    ownerID = buffOwner.GetID()
    
    skillType = buffSkill.GetSkillType()
    #无敌免疫持续减益buff、控制类buff
    if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \
        and batObj.CheckInState(ChConfig.BatObjState_Wudi):
        GameWorld.DebugLogEx("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s", curID, skillID, ownerID, relatedSkillID)
        return
    #免疫减益buff、控制类buff
    if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_DepBuff, ChConfig.Def_SkillType_Action]:
        if batObj.CheckInState(ChConfig.BatObjState_Wudi):
            GameWorld.DebugLogEx("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s", curID, skillID, ownerID, relatedSkillID)
            return
        if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlDepBuff, buffSkill):
            return
    #被动触发免疫控制buff
    if skillType == ChConfig.Def_SkillType_Action:
        if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlBuff, buffSkill):
@@ -242,7 +244,20 @@
        SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
        
    RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=1)
    #受控时
    if curBuffState and IsControlledHardState(curBuffState):
        TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BeControlledHard, tagObj=buffOwner, connSkill=buffSkill, connBuff=buff)
    return buff
def IsControlledHardState(state):
    stateGroup = "1"
    buffStateGroupDict = IpyGameDataPY.GetFuncEvalCfg("BuffStateGroup", 1, {})
    if stateGroup not in buffStateGroupDict:
        return
    return state in buffStateGroupDict[stateGroup]
def RefreshBuffEffect(turnFight, batObj, curBuff, buffSkill=None, buffOwner=None, refreshType=0):
    ## 刷新buff效果
@@ -268,8 +283,17 @@
            isRefreshAttr = True
            
    if refreshType and buffSkill and buffOwner:
        TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, connSkill=buffSkill, connBuff=curBuff)
        TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, tagObj=batObj, connSkill=buffSkill, connBuff=curBuff)
        
    # 判断是否有额外属性的
    if not isRefreshAttr:
        effExDict = curBuff.GetEffectExDict()
        for effCalcInfo in effExDict.keys():
            effID = effCalcInfo[0]
            if effID in ChConfig.AttrIDList:
                isRefreshAttr = True
                break
    if isRefreshAttr:
        RefreshBuffAttr(batObj)
        
@@ -431,6 +455,15 @@
    if haveBuffPassiveEff:
        batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)
        
    # 判断是否有额外属性的
    if not isRefreshAttr:
        effExDict = curBuff.GetEffectExDict()
        for effCalcInfo in effExDict.keys():
            effID = effCalcInfo[0]
            if effID in ChConfig.AttrIDList:
                isRefreshAttr = True
                break
    if isRefreshAttr and not noRefreshAttr:
        RefreshBuffAttr(batObj)
        
@@ -491,7 +524,7 @@
    isRefreshAttr = False
    objID = batObj.GetID()
    buffMgr = batObj.GetBuffManager()
    for index in range(buffMgr.GetBuffCount()):
    for index in range(buffMgr.GetBuffCount())[::-1]:
        buff = buffMgr.GetBuffByIndex(index)
        buffID = buff.GetBuffID()
        skillID = buff.GetSkillID()
@@ -537,10 +570,10 @@
    
    objID = batObj.GetID()
    
    batAttrDict = batObj.ResetBattleEffect()
    befHP = batObj.GetHP()
    befMaxHP = batObj.GetMaxHP()
    batAttrDict = batObj.ResetBattleEffect()
    GameWorld.DebugLogEx("RefreshBuffAttr ID:%s,atk=%s,def=%s,hp=%s/%s,batAttrDict=%s", 
                         objID, batObj.GetAtk(), batObj.GetDef(), befHP, befMaxHP, batAttrDict)
    
@@ -558,6 +591,9 @@
            effID = effect.GetEffectID()
            if effID not in ChConfig.AttrIDList:
                continue
            if effect.GetTriggerWay():
                # 需要触发才有效的不算
                continue
            if effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill]:
                # 技能属性仅技能时有效
                continue