129 【战斗】战斗系统-服务端（NPC表加特长字段；）

hxp

6 天以前 2b34924e06c0c36d77d9ccec4c4f10f1ebd16e84

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py

@@ -62,6 +62,11 @@
    

    skillTypeID = buffSkill.GetSkillTypeID()

    buffRepeat = buffSkill.GetBuffRepeat()

    addLayerCnt = buffSkill.GetLayerCnt()

    addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)

    if addLayerEff:

        addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)

        
    #buff重复获得时的叠加规则

    #以下规则默认针对的是相同施法者，即相同来源的处理

    #如果有针对不同施法者的规则会说明

@@ -86,30 +91,45 @@
            # 删除相同状态的buff

            DoBuffDel(turnFight, batObj, buff, bySkill, afterLogic, buffOwner)

    else:

        buffList = buffMgr.FindBuffBySkillTypeID(skillTypeID)

        buffList = buffMgr.FindBuffListBySkillTypeID(skillTypeID)

        if buffList:

            for buff in buffList:

                if not buff:

                    continue

                if buff.GetOwnerID() != ownerID:

                    continue

                GameWorld.DebugLog("    已经存在该buff，默认覆盖: buffID=%s,skillTypeID=%s,ownerID=%s" % (buff.GetBuffID(), skillTypeID, ownerID))

                buffID = buff.GetBuffID()

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

                
                updLayerCnt = addLayerCnt

                if buffRepeat == 3: # 叠加层级

                    nowLayerCnt = buff.GetLayer()

                    maxLayerCnt = buffSkill.GetLayerMax()

                    updLayerCnt = nowLayerCnt + addLayerCnt

                    if maxLayerCnt and updLayerCnt > maxLayerCnt:

                        updLayerCnt = maxLayerCnt

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

                else:

                    GameWorld.DebugLog("        默认覆盖")

                    
                # 重置回合、CD、值等

                buff.SetCalcTime(turnFight.getTimeline())

                buff.SetRemainTime(buffSkill.GetLastTime())

                buff.SetLayer(buffSkill.GetLayerCnt())

                buff.SetLayer(updLayerCnt)

                buff.SetBuffValueList(buffValueList)

                if afterLogic and bySkill:

                    bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])

                else:

                    SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)

                    

                break

            
            return True

        

    __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic)

    __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt)

    return True



def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False):

def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0):

    curID = batObj.GetID()

    skillID = buffSkill.GetSkillID()

    buff = buffMgr.AddBuff(skillID)

@@ -125,7 +145,7 @@
    buff.SetOwnerID(ownerID)

    buff.SetCalcTime(turnFight.getTimeline())

    buff.SetRemainTime(buffSkill.GetLastTime())

    buff.SetLayer(buffSkill.GetLayerCnt())

    buff.SetLayer(setLayerCnt)

    buff.SetBuffValueList(buffValueList)

    curBuffState = buffSkill.GetCurBuffState()

    if curBuffState:

@@ -159,7 +179,7 @@
            continue

        

        if curEffect.GetTriggerWay():

            if curEffect.GetTriggerSrc() != ChConfig.TriggerSrc_Skill:

            if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf]:

                passiveEffMgr.AddBuffPassiveEffect(addBuff, buffSkill, curEffect)

                

        elif effectID in ChConfig.AttrIDList:

@@ -173,6 +193,21 @@
    if isRefreshAttr:

        RefreshBuffAttr(batObj)

        

    return



def DecBuffLayer(turnFight, batObj, curBuff, decLayer=1, relatedSkillID=0):

    ## 减少buff层级

    curLayer = curBuff.GetLayer()

    if not curLayer:

        return

    updLayer = max(0, curLayer - decLayer)

    curBuff.SetLayer(updLayer)

    if updLayer > 0:

        SyncBuffRefresh(turnFight, batObj, curBuff, relatedSkillID)

        return

    objID = batObj.GetID()

    buffID = curBuff.GetBuffID()

    SyncBuffDel(turnFight, objID, buffID, relatedSkillID)

    return



def DoBuffDel(turnFight, batObj, curBuff, relatedSkill=None, afterLogic=False, tagObj=None):

@@ -205,7 +240,7 @@
            continue

        

        if curEffect.GetTriggerWay():

            if curEffect.GetTriggerSrc() != ChConfig.TriggerSrc_Skill:

            if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf]:

                haveBuffPassiveEff = True

                

        elif effectID in ChConfig.AttrIDList:

@@ -293,7 +328,7 @@
        if attrValue <= 0:

            continue

        updValue = int(attrValue * (10000 + attrPerValue) / 10000.0)

        updValue = max(0, updValue) # 最多减到0，最大无上限

        #updValue = max(0, updValue) # 最多减到0，最大无上限

        batObj.SetBatAttrValue(attrID, updValue)

        GameWorld.DebugLog("    attrID=%s(PerID:%s),attrValue=%s(PerValue:%s),updValue=%s" % (attrID, attrPerID, attrValue, attrPerValue, updValue))

        

@@ -302,7 +337,8 @@
        if attrID in perIDList:

            continue

        attrValue = batObj.GetBatAttrValue(attrID, False)

        updValue = max(0, attrValue + addValue) # 最多减到0，最大无上限

        updValue = attrValue + addValue

        #updValue = max(0, attrValue + addValue) # 最多减到0，最大无上限

        batObj.SetBatAttrValue(attrID, updValue)

        GameWorld.DebugLog("    attrID=%s,attrValue=%s,addValue=%s,updValue=%s" % (attrID, attrValue, addValue, updValue))

        

@@ -314,7 +350,7 @@
            aftHP += (aftMaxHP - befMaxHP)

            batObj.SetHP(aftHP, True)

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

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

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

    return



def SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID=0, isNewAdd=False):