From 0f542f5938f5281588d4ded8f3ba16ee661c4c5e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 06 一月 2026 19:46:12 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(Hero命令优化一键满级可指定等级、星级、突破、觉醒;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6011.py |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 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 fa24dc9..ff365f8 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,17 +15,40 @@
 #"""Version = 2025-09-24 19:00"""
 #-------------------------------------------------------------------------------
 
+import TurnBuff
+import BattleObj
 
 def GetHappenValue(attacker, defender, curEffect, effSkill, effBuff, connSkill, **skillkwargs):
     layerPer = curEffect.GetEffectValue(0) # 每层增加的万分比
     buffStateList = curEffect.GetEffectValue(1) # buff状态 [状态1, 状态2, ...]
+    checkTag = curEffect.GetEffectValue(2) # buff检查自己还是对方: 0-自己,1-对方,2-主技能目标
+    isDelBuff = curEffect.GetEffectValue(3) # 触发效果后是否扣除buff
     if not buffStateList:
         return
     
+    if isDelBuff:
+        if "turnFight" not in skillkwargs:
+            return
+        turnFight = skillkwargs["turnFight"]
+        
     layerTotal = 0
-    buffMgr = attacker.GetBuffManager()
-    for buffState in buffStateList:
-        for buff in buffMgr.FindBuffListByState(buffState):
-            layerTotal += buff.GetLayer()
-            
+    if checkTag == 2:
+        objMgr = BattleObj.GetBatObjMgr()
+        for tagID in attacker.GetMainTagIDList():
+            buffObj = objMgr.getBatObj(tagID)
+            if not buffObj:
+                continue
+            buffMgr = buffObj.GetBuffManager()
+            for buffState in buffStateList:
+                for buff in buffMgr.FindBuffListByState(buffState)[::-1]:
+                    layerTotal += buff.GetLayer()
+    else:
+        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