5866 【后端】【1.5】线上服务器更新到1.5版本中级神兵石替换方案

xdh

2019-01-15 12af2492b41c1946ec7a977db64ea516b0ba4135

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

@@ -41,8 +41,8 @@
        # 避免配表错误导致报错

        return False



    if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_GatherSoul and buffOwner and curObj.GetGameObjType() == IPY_GameWorld.gotNPC:

        if buffOwner.GetGameObjType() == IPY_GameWorld.gotPlayer or (buffOwner.GetGameObjType() == IPY_GameWorld.gotNPC and NPCCommon.GetNpcObjOwnerIsPlayer(buffOwner)):

    if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_GatherSoul and curObj.GetGameObjType() == IPY_GameWorld.gotNPC:

        if curSkill.GetSkillTypeID() != 23052:

            #GameWorld.DebugLog('聚魂副本玩家不能对怪物上buff curSkill=%s,buffOwner=%s'%(curSkill.GetSkillTypeID(),buffOwner.GetID()))

            return True

        #GameWorld.DebugLog('聚魂副本对怪物上buff curSkill=%s,buffOwner=%s'%(curSkill.GetSkillTypeID(),buffOwner.GetID()))

@@ -380,7 +380,7 @@
    # 通知客户端

    #buffState.Sync_AddBuffEx()

    if isNotify:

        PYSync_RefreshBuff(curObj, addBuff, SkillCommon.GetBuffType(curSkill), notifyAll=False)

        PYSync_RefreshBuff(curObj, addBuff, SkillCommon.GetBuffType(curSkill), notifyAll=False, owner = buffOwner)



    #检查是否属于刷新BUFF

    #===========================================================================

@@ -729,6 +729,47 @@
    if passiveEff:

        passiveEff.DelBuffInfo(skillData)

    return





#---------------------------------------------------------------------

## 执行buff消失触发逻辑，不处理buff的功能逻辑，只处理需要的必须状态逻辑

#  如不处理buff的 伤害，爆炸等，但必须处理恢复眩晕状态等

def DoBuffDisApperEx( curObj, curBuff, tick ):

    #这个函数里面不能做Buff添加和删除逻辑!!!!!不然指针会错乱

    curSkill = curBuff.GetSkill()



    skillData = GameWorld.GetGameData().GetSkillBySkillID(curSkill.GetSkillID())

    
    #是否是持续性技能

    isLstSkill = curSkill.GetSkillType() in ChConfig.Def_LstBuff_List

    
    PassiveBuffEffMng.OnPassiveSkillTrigger(curObj, None, curSkill, ChConfig.TriggerType_BuffDisappear, tick)

    
    #buff消失的触发

    for effectIndex in range( 0, curSkill.GetEffectCount() ):

        curEffect = curSkill.GetEffect( effectIndex )

        effectID = curEffect.GetEffectID()

        
        if not effectID:

            continue

        
        if isLstSkill:

            callFunc = GameWorld.GetExecFunc( GameBuffs, "BuffProcess_%d.%s"%( effectID, "OnBuffDisappearEx") )

            if not callFunc:

                callFunc = GameWorld.GetExecFunc( GameBuffs, "Buff_%d.%s"%( effectID, "OnBuffDisappearEx") )

        else:        
            callFunc = GameWorld.GetExecFunc( GameBuffs, "Buff_%d.%s"%( effectID, "OnBuffDisappearEx") )

        
        if not callFunc:

            continue

        
        callFunc( curObj, curSkill, curBuff, curEffect, tick )

            
    passiveEff = PassiveBuffEffMng.GetPassiveEffManager().GetPassiveEff(curObj)

    if passiveEff:

        passiveEff.DelBuffInfo(skillData)

    return



#---------------------------------------------------------------------

## buff消失

#  @param curObj 当前目标

@@ -917,7 +958,7 @@
    

    return DelBuffBySkillID(curObj, skillID, tick)



def PYSync_RefreshBuff(gameObj, curBuff, buffType, notifyAll=True):

def PYSync_RefreshBuff(gameObj, curBuff, buffType, notifyAll=True, owner = None):

    sendPack = ChNetSendPack.tagObjAddBuff()



    sendPack.ObjType = gameObj.GetGameObjType()

@@ -929,6 +970,9 @@
    sendPack.Value1 = curBuff.GetValue1();

    sendPack.Value2 = curBuff.GetValue2();

    sendPack.Layer = curBuff.GetLayer();

    if owner:

        sendPack.OwnerID = owner.GetID()

        sendPack.OwnerType = owner.GetGameObjType()

    if notifyAll or gameObj.GetGameObjType() != IPY_GameWorld.gotPlayer:

        gameObj.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength());

    else: