From f397f8712fb5297a8dc44f02e4470cbbc93e755f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 12:13:16 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(武将招募未激活永久卡时不增加幸运;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py |   19 ++++++++++++-------
 1 files changed, 12 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..97b22e7 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,20 @@
 #-------------------------------------------------------------------------------
 
 
-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-对方
+    if not buffStateList:
         return
     
     layerTotal = 0
-    buffMgr = attacker.GetBuffManager()
-    for buff in buffMgr.FindBuffListByState(buffState):
-        layerTotal += buff.GetLayer()
-        
+    if checkTag:
+        buffMgr = defender.GetBuffManager()
+    else:
+        buffMgr = attacker.GetBuffManager()
+    for buffState in buffStateList:
+        for buff in buffMgr.FindBuffListByState(buffState):
+            layerTotal += buff.GetLayer()
+            
     return layerTotal * layerPer

--
Gitblit v1.8.0