From 6e928c09df9d294e2f90cd91189a3c9abb7b007f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 十月 2025 17:58:33 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(词条技能1014 ~ 1019:增加技能初始CD支持,优化技能CD;优化技能属性、buff属性计算;修复纯buff怒技没有同步技能的bug;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.py |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.py
index d729cc2..d9422e6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.py
@@ -16,17 +16,23 @@
 #-------------------------------------------------------------------------------
 
 import TurnBuff
+import GameWorld
 
-def DoBuffEffectLogic(turnFight, batObj, tagObj, curBuff, curEffect, connSkill):
+def DoBuffEffectLogic(turnFight, batObj, tagObj, effBuff, curEffect, connSkill, connBuff, **kwargs):
     #结算一次扣除1回合
-    remainTime = max(0, curBuff.GetRemainTime() - 1)
-    curBuff.SetRemainTime(remainTime)
+    remainTime = effBuff.GetRemainTime()
     
-    TurnBuff.DoBuffProcess(turnFight, batObj, curBuff)
+    TurnBuff.DoBuffProcess(turnFight, batObj, effBuff)
     
+    if remainTime == 0:
+        GameWorld.DebugLog("永久buff,不扣回合数")
+        return True
+    
+    remainTime -= 1
     if remainTime <= 0:
-        TurnBuff.DoBuffDel(turnFight, batObj, curBuff)
+        TurnBuff.DoBuffDel(turnFight, batObj, effBuff)
     else:
-        TurnBuff.SyncBuffRefresh(turnFight, batObj, curBuff)
+        effBuff.SetRemainTime(remainTime)
+        TurnBuff.SyncBuffRefresh(turnFight, batObj, effBuff)
         
-    return
+    return True

--
Gitblit v1.8.0