129 【战斗】战斗系统-服务端（去除0407通知；修复5011触发被动报错；）

hxp

2025-09-05 c3935a93e6be5457f7d1e90bbe91845abf3943f4

129 【战斗】战斗系统-服务端（去除0407通知；修复5011触发被动报错；）

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py

@@ -859,14 +859,15 @@
            return

        objID = batObj.objID

        GameWorld.DebugLog("回收战斗单位: objID=%s" % (objID))

        turnFight = batObj.GetTurnFight()

        if turnFight:

            # //04 07 NPC消失#tagNPCDisappear 此处通知消失，与回合制死亡区分

            clientPack = ChNetSendPack.tagNPCDisappear()

            clientPack.NPCID = [objID]

            clientPack.Count = len(clientPack.NPCID)

            turnFight.addBatPack(clientPack)

            
        #前端确认不需要通知消失

        #turnFight = batObj.GetTurnFight()

        #if turnFight:

        #    # //04 07 NPC消失#tagNPCDisappear 此处通知消失，与回合制死亡区分

        #    clientPack = ChNetSendPack.tagNPCDisappear()

        #    clientPack.NPCID = [objID]

        #    clientPack.Count = len(clientPack.NPCID)

        #    turnFight.addBatPack(clientPack)

        
        # 最后回收对象

        ObjPool.GetPoolMgr().release(batObj)

        if objID not in self._freeIDList: # 回收ID，重复利用


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.py

@@ -31,4 +31,5 @@
    return TurnSkill.OnUsePassiveSkill(turnFight, batObj, tagObj, passiveSkill, connSkill, effSkillID, effectID)



def DoBuffEffectLogic(turnFight, batObj, tagObj, effBuff, curEffect, connSkill):

    return DoSkillEffectLogic(turnFight, batObj, tagObj, None, curEffect, connSkill)

    effSkill = effBuff.GetSkillData().GetIpyData()

    return DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill)