From 540eced2499bf2814f3264c0d41eb0e9c52b9957 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 08 二月 2026 15:33:04 +0800
Subject: [PATCH] 462 【付费活动】限时冲刺-服务端（轮回殿）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 39 +--------------------------------------
1 files changed, 1 insertions(+), 38 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
index 7e2e8f4..1d388c0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -27,7 +27,6 @@
import FBLogic
import ItemCommon
import OperControlManager
-import PetControl
import DataRecordPack
#import ChItem
import ShareDefine
@@ -617,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
@@ -1708,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):
@@ -3657,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:
# 配置了可攻击目标，但没目标就不让触发
--
Gitblit v1.8.0