121 【武将】武将系统-服务端（修复个别情况下上阵中的生效卡被视为未生效的bug；）

hxp

2025-12-23 85a55d93ea4c99337ad1b81d2c471208effaebd1

 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):

@@ -177,18 +179,26 @@
            nowLayerCnt = buff.GetLayer()

            GameWorld.DebugLogEx("    已经存在该buff: buffID=%s,skillTypeID=%s,ownerID=%s,buffRepeat=%s", buffID, skillTypeID, ownerID, buffRepeat)

            

            resetAddTiming = False # 一般只有覆盖的才重新计算回合，视为重新添加

            remainTime = buffSkill.GetLastTime()

            updLayerCnt = addLayerCnt

            if buffRepeat == 3: # 叠加层级

                updLayerCnt = nowLayerCnt + addLayerCnt

                if maxLayerCnt and updLayerCnt > maxLayerCnt:

                    updLayerCnt = maxLayerCnt

                GameWorld.DebugLogEx("        叠加层级: nowLayerCnt=%s,addLayerCnt=%s,updLayerCnt=%s,maxLayerCnt=%s", nowLayerCnt, addLayerCnt, updLayerCnt, maxLayerCnt)

            elif buffRepeat == 1: # 延长回合

                addTime = buffSkill.GetLastTime()

                remainTime = buff.GetRemainTime() + addTime

                GameWorld.DebugLogEx("        延长回合: addTime=%s,updRemainTime=%s", addTime, remainTime)

            else:

                GameWorld.DebugLogEx("        默认覆盖")

                resetAddTiming = True

                

            # 重置回合、CD、值等

            buff.SetAddTiming(batObj.GetTiming())

            buff.SetRemainTime(buffSkill.GetLastTime())

            if resetAddTiming:

                buff.SetAddTiming(batObj.GetTiming())

            buff.SetRemainTime(remainTime)

            buff.SetLayer(updLayerCnt)

            buff.SetBuffValueList(buffValueList)

            buff.ResetEffectValueEx()

@@ -234,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效果

@@ -260,8 +283,16 @@
            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)

        

@@ -423,6 +454,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)

        

@@ -483,7 +523,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()

@@ -528,11 +568,11 @@
    '''

    

    objID = batObj.GetID()

    
    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)

    

@@ -549,6 +589,9 @@
            effect = curSkill.GetEffect(eIndex)

            effID = effect.GetEffectID()

            if effID not in ChConfig.AttrIDList:

                continue

            if effect.GetTriggerWay():

                # 需要触发才有效的不算

                continue

            if effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill]:

                # 技能属性仅技能时有效

@@ -571,11 +614,14 @@
        skillData = buff.GetSkillData()

        

        effExDict = buff.GetEffectExDict()

        for effID, effValueEx in effExDict.items():

        for effCalcInfo, effValueEx in effExDict.items():

            effID, calcType = effCalcInfo

            if effID not in ChConfig.AttrIDList:

                continue

            attrID = effID

            attrValue = effValueEx * layer

            if calcType == 2: # 减少，其他默认增加

                attrValue = -attrValue

            buffsAttrDict[attrID] = buffsAttrDict.get(attrID, 0) + attrValue

            skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue

            

@@ -631,6 +677,9 @@
        if befHP and aftMaxHP > befMaxHP:

            aftHP += (aftMaxHP - befMaxHP)

            batObj.SetHP(aftHP, isNotify)

        elif aftHP > aftMaxHP:

            aftHP = aftMaxHP

            batObj.SetHP(aftHP, isNotify)

    GameWorld.DebugLogEx("    befHP=%s/%s, aftHP=%s/%s", befHP, befMaxHP, aftHP, aftMaxHP)

    GameWorld.DebugLogEx("    最终属性 ID:%s,atk=%s,def=%s,hp=%s/%s,%s", objID, batObj.GetAtk(), batObj.GetDef(), aftHP, aftMaxHP, batObj.GetBatAttrDict())

    return