From c35e176a3b05f745600c6e60f168313d2b9e7b30 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 九月 2025 12:00:19 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(司马懿技能;增加按层级结算持续buff效果5003;增加非按攻击力计算伤害支持;技能伤害增加可限制最大攻击力百分比上限配置;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
index 9891021..d8537a5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -162,15 +162,18 @@
             if value is None:
                 continue
             
-            #if triggerType in TriggerValueMaxList:
-            #    curValue = max(curValue, value) # 取最大值
-            #elif triggerType in TriggerValueMinList:
-            #    if not curValue:
-            #        curValue = value
-            #    elif value > 0:
-            #        curValue = min(curValue, value) # 取最小值
-            #else:
-            curValue += value
+            if effID in ChConfig.PassiveEffHappenValueList:
+                if value:
+                    return value
+            elif effID in ChConfig.PassiveEffValueMaxList:
+                curValue = max(curValue, value) # 取最大值
+            elif effID in ChConfig.PassiveEffValueMinList:
+                if not curValue:
+                    curValue = value
+                elif value > 0:
+                    curValue = min(curValue, value) # 取最小值
+            else:
+                curValue += value
             #if skillTypeID not in Def_PassiveSkillValueNoCD:
             #    if curSkill.GetCoolDownTime():
             #        SkillCommon.SetSkillRemainTime(curSkill, 0, tick, attacker)

--
Gitblit v1.8.0