From 95e5cc37cc097f506004f31cdfff1118953296f6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 15:58:24 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（董白全部技能； 增加效果5024 5504；buff持续规则字段支持配置每大回合-1层；动态属性ID变化增加计算方式11-根据自己已损失血量百分比；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 02af5af..2aa5c13 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -37,8 +37,17 @@
''' 触发被动效果，可能触发技能、buff，需根据优先级触发
'''
if not batObj.IsAlive():
- if triggerWay in ChConfig.DeadCanTriggerWayList or (connSkill and connSkill.GetBatType() == ChConfig.TurnBattleType_Enhance):
+ if triggerWay in ChConfig.DeadCanTriggerWayList:
pass # 死亡状态下可触发的被动
+ elif connSkill:
+ if connSkill.GetBatType() == ChConfig.TurnBattleType_Enhance:
+ pass # 子技能不限制死亡触发，由主技能决定，主技能能触发了，才会执行到子技能，那么子技能也一定能触发
+ elif connSkill.GetByTriggerWay() in ChConfig.DeadCanTriggerWayList:
+ pass
+ #GameWorld.DebugLogEx("关联技能是由死亡状态下可触发的方式触发的，则也可触发! triggerWay=%s,connSkillID=%s,byTriggerWay=%s",
+ # triggerWay, connSkill.GetSkillID(), connSkill.GetByTriggerWay())
+ else:
+ return
else:
return
passiveEffMgr = batObj.GetPassiveEffManager()
--
Gitblit v1.8.0