From 95c731d5e1a9aadb610ac9f6ecbc6b74b919ab60 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 28 二月 2026 17:05:35 +0800
Subject: [PATCH] 417 【武将】吞噬返还优化(固定额外返还一个本体遣散道具;优化吞噬星级溢出逻辑;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
index 5560b0a..c87ffcd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
@@ -25,11 +25,8 @@
 import ReadChConfig
 import random
 import BaseAttack
-import PetControl
 import SkillShell
 import DataRecordPack
-import ChPyNetSendPack
-import NetPackCommon
 import ShareDefine
 import GameObj
 import PassiveBuffEffMng
@@ -101,9 +98,9 @@
     coolDownTime = curSkill.GetCoolDownTime()
     remainTime = coolDownTime
     
-    skillTypeID = curSkill.GetSkillTypeID()
-    if atkObj and skillTypeID in IpyGameDataPY.GetFuncEvalCfg("SkillCD", 1):
-        reduceSkillCDPer += PlayerControl.GetTheFBSkillsCD(atkObj)
+    #skillTypeID = curSkill.GetSkillTypeID()
+    #if atkObj and skillTypeID in IpyGameDataPY.GetFuncEvalCfg("SkillCD", 1):
+    #    reduceSkillCDPer += PlayerControl.GetTheFBSkillsCD(atkObj)
         
     if isPassiveSkill(curSkill):
         if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill:
@@ -1153,7 +1150,7 @@
     elif curObjType == IPY_GameWorld.gotNPC:
         #宠物回血
         if curObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
-            PetControl.SetPetHP(curObj, remainHP)
+            pass
         #普通NPC回血
         else:
             GameObj.SetHP(curObj, remainHP, False) # 先不通知
@@ -1214,7 +1211,7 @@
     if curObjType == IPY_GameWorld.gotNPC:
         #宠物特殊处理
         if curObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
-            PetControl.SetPetHP(curObj, remainHP)
+            pass
         else:
             timeLostHPIpyData = IpyGameDataPY.GetIpyGameDataNotLog("NPCTimeLostHP", curObj.GetNPCID())
             if timeLostHPIpyData:
@@ -1848,6 +1845,10 @@
     #0通哟  1 PVP类型  2PVE类型  
     return curSkill.GetHurtType() % 10
 
+def GetSkillIDBySkillTypeID(skillTypeID, skillLV=1):
+    skillID = skillTypeID + skillLV - 1
+    return skillID
+
 def isDamageShieldSkill(skillData):
     ## 是否承伤盾技能
     return skillData.GetAtkType() == ChConfig.BuffAtkType_DamageShield
@@ -1860,9 +1861,9 @@
     ## 是否回合普攻技能,区别与无技能的普通A一下,该普攻同样可以有各种技能效果,只是他属于普攻
     return curSkill and curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_TurnNormaSkill
 
-def isAtkbackSkill(curSkill):
-    ## 是否反击技能
-    return curSkill and curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_AtkbackSkill
+def isAttackDirectSkill(curSkill):
+    ## 是否直接攻击技能
+    return curSkill and not IsBuff(curSkill) and curSkill.GetSkillType() in [ChConfig.Def_SkillType_Atk]
 
 ## 检查技能是否为被动技能, 用于控制不可释放技能
 def isPassiveSkill(curSkill):

--
Gitblit v1.8.0