hxp
2 天以前 db168633a2853111b43c413779a5535228dfe61c
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -29,7 +29,6 @@
import BuffSkill
import FBLogic
import SkillShell
import PetControl
import random
import OperControlManager
import DataRecordPack
@@ -984,22 +983,20 @@
        if not curTag:
            continue
        
        #非自定义场景才需要判断
        if not attacker.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
            if curSkillUseTag == ChConfig.Def_UseSkillTag_CanAttackNPC:
                if NPCCommon.GetNpcObjOwnerIsPlayer(curTag):
                    #npc主人是玩家不能攻击
                    continue
            if GameWorld.GetDist(curTag.GetPosX(), curTag.GetPosY(), attacker.GetPosX(), attacker.GetPosY()) > attacker.GetSight():
                # 最远距离防范
                GameWorld.DebugLog("#--- 最远距离防范[%s-%s]"%(attacker.GetID(), curTag.GetID()))
        if curSkillUseTag == ChConfig.Def_UseSkillTag_CanAttackNPC:
            if NPCCommon.GetNpcObjOwnerIsPlayer(curTag):
                #npc主人是玩家不能攻击
                continue
            if CheckFunc != None:
                #检查是否受影响
                if not CheckFunc(attacker, curTag, curSkill, tick):
                    continue
        if GameWorld.GetDist(curTag.GetPosX(), curTag.GetPosY(), attacker.GetPosX(), attacker.GetPosY()) > attacker.GetSight():
            # 最远距离防范
            GameWorld.DebugLog("#--- 最远距离防范[%s-%s]"%(attacker.GetID(), curTag.GetID()))
            continue
        if CheckFunc != None:
            #检查是否受影响
            if not CheckFunc(attacker, curTag, curSkill, tick):
                continue
        
        resultList.append(curTag)
            
@@ -1247,7 +1244,6 @@
    atkObjType = attacker.GetGameObjType()
    atkObjID = attacker.GetID()  # 攻击方ID    
    mapID = GameWorld.GetMap().GetMapID()
    DataRecordPack.DR_PlayerDead(atkObjType, atkObjID, defender, mapID)
        
    return
@@ -1922,7 +1918,7 @@
    
    #宠物找到主人进入战斗状态,光环技能不进入
    if curNPC.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
        curPlayer = PetControl.GetPetOwner(curNPC)
        curPlayer = None
        
        if curPlayer != None and GameObj.GetHP(curPlayer) > 0:
            if curSkill == None or curSkill.GetSkillType() not in ChConfig.Def_NoBattleState_List: