From 649b36b642546062ab5102b6225b9f78ea72309d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 04 十一月 2025 18:11:02 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(优化完整战报仅包含战斗相关封包,结算奖励相关如物品,经验,货币,挑战次数等统一放在战报数据B430后同步)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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..fa24dc9 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
@@ -16,15 +16,16 @@
 #-------------------------------------------------------------------------------
 
 
-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, ...]
+    if not buffStateList:
         return
     
     layerTotal = 0
     buffMgr = attacker.GetBuffManager()
-    for buff in buffMgr.FindBuffListByState(buffState):
-        layerTotal += buff.GetLayer()
-        
+    for buffState in buffStateList:
+        for buff in buffMgr.FindBuffListByState(buffState):
+            layerTotal += buff.GetLayer()
+            
     return layerTotal * layerPer

--
Gitblit v1.8.0