From 776cf3759b9801f3795ee975cd77078f505b90d6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 06 一月 2024 14:49:08 +0800
Subject: [PATCH] 10071 【后端】灵宠改版
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.py
index 790207b..90d0128 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.py
@@ -306,10 +306,15 @@
return False
#CD时间
- if tick - useSkill.GetLastUseTick() < useSkill.GetCoolDownTime():
- #GameWorld.Log('检查CD时间触发失败 = %s'%(useSkill.GetSkillName()))
- return False
-
+ if curNPC.GetDictByKey(ChConfig.Def_Obj_Dict_TurnFightNum):
+ if useSkill.GetRemainTime():
+ #GameWorld.Log('技能回合CD中 = %s, %s'%(useSkill.GetSkillName(), useSkill.GetRemainTime()))
+ return False
+ else:
+ if tick - useSkill.GetLastUseTick() < useSkill.GetCoolDownTime():
+ #GameWorld.Log('检查CD时间触发失败 = %s'%(useSkill.GetSkillName()))
+ return False
+
curSkillUseTag = SkillShell.GetSkillAffectTag(useSkill)
if curSkillUseTag == ChConfig.Def_UseSkillTag_CanAttackPlayer:
if curTag.GetGameObjType() != IPY_GameWorld.gotPlayer:
@@ -360,11 +365,11 @@
#---对宠物主人释放---
if skillTag == ChConfig.Def_UseSkillTag_PetMaster:
- if not PetControl.IsPet(curNPC):
+ if not PetControl.IsPetNPC(curNPC):
GameWorld.ErrLog("该NPC非宠物，无法获得主人释放技能")
return False
- petOwner = PetControl.GetPetOwner(curNPC)
+ petOwner = PetControl.GetPetNPCOwner(curNPC)
if petOwner == None:
GameWorld.ErrLog("宠物（%s）对主人释放技能，找不到主人"%curNPC.GetRolePet().PetID)
--
Gitblit v1.8.0