hxp
4 天以前 67a84dc38db8f7d0f85b03e2b06ba728d95c1e82
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -27,12 +27,9 @@
import FBLogic
import ItemCommon
import OperControlManager
import PetControl
import ReadChConfig
import DataRecordPack
#import ChItem
import ShareDefine
import PlayerHorse
import GameObj
import random
import NetPackCommon
@@ -40,12 +37,10 @@
import GameMap
import collections
import PassiveBuffEffMng
import ChEquip
import SkillShell
import FBCommon
import IpyGameDataPY
import PyGameData
import TurnAttack
#---------------------------------------------------------------------
GameWorld.ImportAll("Script\\Skill\\" , "GameSkills")
GameWorld.ImportAll("Script\\Skill\\" , "GameBuffs")
@@ -621,16 +616,6 @@
# @return 返回值真, 检查通过
def IsToPetOwnerSkill(curNPC, skillTag):
    if skillTag != ChConfig.Def_UseSkillTag_PetMaster:
        return False
    if not PetControl.IsPet(curNPC):
        GameWorld.ErrLog("NPCID %s AI %s 非宠物,无法获得主人释放技能"%(curNPC.GetNPCID(), curNPC.GetAIType()))
        return False
    petOwner = PetControl.GetPetOwner(curNPC)
    if petOwner == None:
        GameWorld.ErrLog("宠物(%s)对主人释放技能,找不到主人"%curNPC.GetRolePet().PetID)
        return False
        
    return True
@@ -1357,9 +1342,9 @@
    #    GameWorld.DebugLog("移动中不可使用技能")
    #    return False
    #===========================================================================
    if curPlayer.GetPlayerVehicle() == IPY_GameWorld.pvHorse:
        #GameWorld.DebugLog("骑马中不允许释放技能", curPlayerID)
        PlayerHorse.PlayerRideHorseDown(curPlayer)
    #if curPlayer.GetPlayerVehicle() == IPY_GameWorld.pvHorse:
    #    #GameWorld.DebugLog("骑马中不允许释放技能", curPlayerID)
    #    PlayerHorse.PlayerRideHorseDown(curPlayer)
    
    if not PlayerControl.PlayerCanStateTransfer(curPlayer):
        #GameWorld.DebugLog('CheckUseSkill, PlayerStateErr = %s '%( curPlayer.GetPlayerAction() ), curPlayerID )
@@ -1712,22 +1697,8 @@
        # 对自身释放或者无目标技能
        if skillAffectTag in ChConfig.Def_ST_CanNPCUseSkill or skillAim == ChConfig.Def_UseSkillAim_None:
            #释放自身类技能
            return NPCUseSkill(attacker, curSkill, tick)
        # 宠物对主人释放技能
        elif skillAffectTag == ChConfig.Def_UseSkillTag_PetMaster:
            if not PetControl.IsPet(attacker):
                GameWorld.ErrLog("该NPC非宠物,无法获得主人释放技能")
                return False
            petOwner = PetControl.GetPetOwner(attacker)
            if petOwner == None:
                GameWorld.ErrLog("宠物(%s)对主人释放技能,找不到主人"%attacker.GetRolePet().PetID)
                return False
            return NPCUseSkill(attacker, curSkill, tick)
        
            curTag = petOwner
        # 召唤兽对主人释放技能
        elif skillAffectTag == ChConfig.Def_UseSkillTag_SummonMaster:
            if not NPCCommon.IsSummonNPC(attacker):
@@ -1833,7 +1804,7 @@
    #===========================================================================
        
    if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_HorseSkill and SkillCommon.isPassiveAttr(curSkill):
        PlayerHorse.RefreshHorseAttr(curPlayer)
        pass#PlayerHorse.RefreshHorseAttr(curPlayer)
    else:
        if SkillCommon.isPassiveAttr(curSkill):
            curControl = PlayerControl.PlayerControl(curPlayer)
@@ -3661,18 +3632,6 @@
        result = DoLogic_UseSkill(attacker, target, curSkill, tick, posX, posY, isEnhanceSkill=isEnhanceSkill)
    
    else:
        if affectTag == ChConfig.Def_UseSkillTag_PetMaster:
            if not PetControl.IsPet(attacker):
                return False
            petOwner = PetControl.GetPetOwner(attacker)
            if petOwner == None:
                return False
            target = petOwner
            if GameObj.GetHP(target) <= 0:
                return False
        if affectTag not in [ChConfig.Def_UseSkillTag_None, ChConfig.Def_UseSkillTag_Self]:
            if not target:
                # 配置了可攻击目标,但没目标就不让触发