From d3490f0c52cf8415dc0d34929bef8849cb37c32e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 18:14:52 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复强壮词条bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py | 14 +++++++++++++-
1 files changed, 13 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 1609937..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,7 +37,18 @@
''' 触发被动效果，可能触发技能、buff，需根据优先级触发
'''
if not batObj.IsAlive():
- if triggerWay not in ChConfig.DeadCanTriggerWayList:
+ 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()
effInfoList = passiveEffMgr.GetPassiveEffByTrigger(triggerWay, connSkill, connSkillTypeID, connBuff)
@@ -174,6 +185,7 @@
callFunc = GameWorld.GetExecFunc(PassiveTrigger, "%s.%s" % (pyName, "GetHappenValue"))
if not callFunc:
continue
+ kwargs["turnFight"] = turnFight
value = callFunc(atkObj, defObj, effect, effSkill, effBuff, connSkill, **kwargs)
if value is None:
continue
--
Gitblit v1.8.0