From c38249a63a1406262475f2af6cbb01139e891936 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 30 十月 2025 09:48:08 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(祝融技能;增加效果6005 6017 6018 7006 7007;优化技能CD、buff回合计算逻辑;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
index f15d3a5..aa8ad4f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -42,7 +42,7 @@
     @param refreshTimeLayer: 刷新剩余时间、层级
     '''
     skillData = curBuff.GetSkillData()
-    curBuff.SetCalcTime(turnFight.getTimeline())
+    curBuff.SetAddTiming(curBatObj.GetTiming())
     if refreshTimeLayer:
         curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))
         curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))
@@ -180,7 +180,7 @@
                 GameWorld.DebugLog("        默认覆盖")
                 
             # 重置回合、CD、值等
-            buff.SetCalcTime(turnFight.getTimeline())
+            buff.SetAddTiming(batObj.GetTiming())
             buff.SetRemainTime(buffSkill.GetLastTime())
             buff.SetLayer(updLayerCnt)
             buff.SetBuffValueList(buffValueList)
@@ -205,11 +205,12 @@
     relatedSkillID = bySkill.GetSkillID() if bySkill else 0
     ownerID = buffOwner.GetID()
     buffID = buff.GetBuffID()
+    timing = batObj.GetTiming()
     
-    GameWorld.DebugLog("    __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timeline=%s" 
-                       % (buffID, skillID, ownerID, relatedSkillID, turnFight.getTimeline()), curID)
+    GameWorld.DebugLog("    __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s" 
+                       % (buffID, skillID, ownerID, relatedSkillID, timing), curID)
+    buff.SetAddTiming(timing) # 武将当前在什么时机就设置为什么时机
     buff.SetOwnerID(ownerID)
-    buff.SetCalcTime(turnFight.getTimeline())
     buff.SetRemainTime(buffSkill.GetLastTime())
     buff.SetLayer(setLayerCnt)
     buff.SetBuffValueList(buffValueList)

--
Gitblit v1.8.0