From adbac922fdce017605381c4040d4bedbc24dcd1a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 31 十二月 2025 19:50:37 +0800
Subject: [PATCH] 358 【内政】红颜系统-服务端(红颜效果支持多个相同效果叠加;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py
index 50abc29..be6b8d7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py
@@ -15,16 +15,28 @@
 #"""Version = 2025-09-24 19:00"""
 #-------------------------------------------------------------------------------
 
+import TurnBuff
 
-def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, **skillkwargs):
+def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, connSkill, **skillkwargs):
     layerPer = curEffect.GetEffectValue(0) # 每层增加的万分比
-    buffState = curEffect.GetEffectValue(1) # buff状态
-    if not buffState:
+    buffStateList = curEffect.GetEffectValue(1) # buff状态 [状态1, 状态2, ...]
+    checkTag = curEffect.GetEffectValue(2) # buff检查自己还是对方: 0-自己,1-对方
+    isDelBuff = curEffect.GetEffectValue(3) # 触发效果后是否扣除buff
+    if not buffStateList:
         return
     
-    layerTotal = 0
-    buffMgr = attacker.GetBuffManager()
-    for buff in buffMgr.FindBuffListByState(buffState):
-        layerTotal += buff.GetLayer()
+    if isDelBuff:
+        if "turnFight" not in skillkwargs:
+            return
+        turnFight = skillkwargs["turnFight"]
         
+    layerTotal = 0
+    buffObj = defender if checkTag else attacker
+    buffMgr = buffObj.GetBuffManager()
+    for buffState in buffStateList:
+        for buff in buffMgr.FindBuffListByState(buffState)[::-1]:
+            layerTotal += buff.GetLayer()
+            if isDelBuff:
+                TurnBuff.DoBuffDel(turnFight, buffObj, buff, connSkill)
+                
     return layerTotal * layerPer

--
Gitblit v1.8.0