ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
@@ -344,6 +344,7 @@
        self._buffList = []
        self._buffIDDict = {}
        self._skillTypeIDBuffIDs = {}
        self._buffStateDict = {}
        self._buffID = 0
        return
    
@@ -548,6 +549,7 @@
    
    def GetSkillCount(self): return len(self._skillList)
    def GetSkillByIndex(self, index): return self._skillList[index]
    def GetSkillIDList(self): return self._skillDict.keys()
    def FindSkillByID(self, skillID): return self._skillDict.get(skillID, None)
    def FindSkillByTypeID(self, skillTypeID):
        skill = None
@@ -597,6 +599,7 @@
        self.skinID = 0
        self.country = 0
        self.atkDistType = 0
        self.specialty = 0 # 特长
        self.sex = 0
        self.lv = 1
        self.fightPower = 0
@@ -666,6 +669,8 @@
    def SetCountry(self, country): self.country = country
    def GetAtkDistType(self): return self.atkDistType
    def SetAtkDistType(self, atkDistType): self.atkDistType = atkDistType
    def GetSpecialty(self): return self.specialty
    def SetSpecialty(self, specialty): self.specialty = specialty
    def GetSex(self): return self.sex
    def SetSex(self, sex): self.sex = sex
    def GetNPCID(self): return self.npcID # 如果是NPC战斗单位,则该值非0
@@ -858,14 +863,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,重复利用