From d69d0cd898405aa741ae65ad4458fe81afef9f32 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 18 十二月 2025 17:26:38 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(庞统所有技能;目标范围增加8-继承主技能友军;目标细分增加9-仅流血目标;增加触发方式48 49 50;增效效果5506;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
index a65e3e0..0fc0d02 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.py
@@ -348,6 +348,7 @@
         self._ipyData = ipyData
         self._skillID = self._ipyData.GetSkillID()
         self._skillTypeID = self._ipyData.GetSkillTypeID()
+        self._cdTime = self._ipyData.GetCoolDownTime()
         self._effList = [] # [Effect, ...]
         self._effDict = {} # {(effID, triggerWay):Effect, ...} ,确保唯一,同个技能可能配置相同的效果ID
         for num in range(1, 1 + 3):
@@ -393,7 +394,7 @@
             return self._effDict[(effID, triggerWay)]
     def GetConnSkill(self): return self._ipyData.GetConnSkill()
     def GetCoolDownInit(self): return self._ipyData.GetCoolDownInit()
-    def GetCoolDownTime(self): return self._ipyData.GetCoolDownTime()
+    def GetCoolDownTime(self): return self._cdTime
     def GetBuffStateLimit(self): return self._ipyData.GetBuffStateLimit()
     def GetCurBuffState(self): return self._ipyData.GetCurBuffState()
     def GetLastTime(self): return self._ipyData.GetLastTime() # 持续时间
@@ -645,6 +646,7 @@
         self._skillData = SklllData(ipyData)
         self._skillID = self._skillData.GetSkillID()
         self._skillTypeID = self._skillData.GetSkillTypeID()
+        self._cdTime = self._skillData.GetCoolDownTime()
         self._remainTime = 0
         self._batType = 0 # 战斗类型,普通、连击、反击、追击等
         self._tagObjList = [] # 本次技能主要目标列表 [BatObj, ...]
@@ -712,7 +714,7 @@
     def GetEffectByID(self, effID, triggerWay=0): return self._skillData.GetEffectByID(effID, triggerWay)
     def GetConnSkill(self): return self._skillData.GetConnSkill()
     def GetCoolDownInit(self): return self._skillData.GetCoolDownInit()
-    def GetCoolDownTime(self): return self._skillData.GetCoolDownTime()
+    def GetCoolDownTime(self): return self._cdTime
     def GetBuffStateLimit(self): return self._skillData.GetBuffStateLimit()
     def GetCurBuffState(self): return self._skillData.GetCurBuffState()
     def GetLastTime(self): return self._skillData.GetLastTime() # 持续时间
@@ -721,7 +723,7 @@
     def GetLayerMax(self): return self._skillData.GetLayerMax()
     def GetBuffRepeat(self): return self._skillData.GetBuffRepeat() # Buff叠加规则
     def GetDispersedLimit(self): return self._skillData.GetDispersedLimit() # 驱散限制
-    def GetBuffRetain(self): return self._ipyData.GetBuffRetain()
+    def GetBuffRetain(self): return self._skillData.GetBuffRetain()
     def GetFightPower(self): return self._skillData.GetFightPower()
     
     ## ---------------------------------- 非技能表内容 ----------------------------------

--
Gitblit v1.8.0