From fd46c6afd9024b1739a449786c284461d0394d0b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 01 十二月 2025 15:05:47 +0800
Subject: [PATCH] 358 【内政】红颜系统-服务端（白骨盈野特殊效果改为固定奖励）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 fd3b51a..a53d5a4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -34,21 +34,23 @@
def OnTriggerPassiveEffect(turnFight, batObj, triggerWay, tagObj=None, connSkill=None, connSkillTypeID=0, connBuff=None, **kwargs):
''' 触发被动效果，可能触发技能、buff，需根据优先级触发
'''
+ if not batObj.IsAlive():
+ if triggerWay not in ChConfig.DeadCanTriggerWayList:
+ return
passiveEffMgr = batObj.GetPassiveEffManager()
effInfoList = passiveEffMgr.GetPassiveEffByTrigger(triggerWay, connSkill, connSkillTypeID, connBuff)
if not effInfoList:
return
- # [["skill/buff", skillID/buffID, effIDList], ...]
+ # [["skill/buff", skillID, buffID, effIDList], ...]
tagID = tagObj.GetID() if tagObj else 0
GameWorld.DebugLog("触发被动: triggerWay=%s,objID=%s,tagID=%s,%s" % (triggerWay, batObj.GetID(), tagID, effInfoList))
for effInfo in effInfoList:
sign = effInfo[0]
+ skillID, buffID, effIDList = effInfo[1:]
if sign == "skill":
- skillID, effIDList = effInfo[1:]
__doTriggerPassiveEffectBySkill(turnFight, batObj, tagObj, triggerWay, skillID, effIDList, connSkill, connBuff, **kwargs)
elif sign == "buff":
- buffID, effIDList = effInfo[1:]
__doTriggerPassiveEffectByBuff(turnFight, batObj, tagObj, triggerWay, buffID, effIDList, connSkill, connBuff, **kwargs)
return
@@ -108,33 +110,34 @@
callFunc(turnFight, batObj, tagObj, effBuff, curEffect, connSkill, connBuff, **kwargs)
return
-def GetTriggerEffectValue(turnFight, atkObj, defObj, calcEffID, connSkill=None, **kwargs):
+def GetTriggerEffectValue(turnFight, atkObj, defObj, calcEffID, connSkill=None, connSkillTypeID=0, triggerWay=ChConfig.TriggerWay_CalcEffValue, **kwargs):
''' 获取触发被动的值，一般用于某种条件下才会产生的值，如xx情况下属性变化 或 xx情况下是否发生什么
@param calcEffID: 需要统计的效果ID，可以是属性ID或者其他自定义效果ID
@return: 触发的值，0-没有触发或本身触发的值为0；非0-触发的具体值
'''
- triggerWay = ChConfig.TriggerWay_CalcEffValue
passiveEffMgr = atkObj.GetPassiveEffManager()
- effInfoList = passiveEffMgr.GetPassiveEffByTrigger("%s_%s" % (triggerWay, calcEffID), connSkill)
+ if triggerWay == ChConfig.TriggerWay_CalcEffValue:
+ effInfoList = passiveEffMgr.GetPassiveEffByTrigger("%s_%s" % (triggerWay, calcEffID), connSkill, connSkillTypeID)
+ else:
+ effInfoList = passiveEffMgr.GetPassiveEffByTrigger(triggerWay, connSkill, connSkillTypeID)
if not effInfoList:
return 0
curValue = 0
skillMgr = atkObj.GetSkillManager()
buffMgr = atkObj.GetBuffManager()
- # [["skill/buff", skillID/buffID, effIDList], ...]
+ # [["skill/buff", skillID, buffID, effIDList], ...]
tagID = defObj.GetID() if defObj else 0
for effInfo in effInfoList:
sign = effInfo[0]
+ skillID, buffID, effIDList = effInfo[1:]
if sign == "skill":
- skillID, effIDList = effInfo[1:]
effSkill = skillMgr.FindSkillByID(skillID)
if not effSkill and connSkill and connSkill.GetSkillID() == skillID:
effSkill = connSkill
effBuff = None
elif sign == "buff":
- buffID, effIDList = effInfo[1:]
effBuff = buffMgr.GetBuff(buffID)
if not effBuff:
continue
@@ -161,7 +164,7 @@
callFunc = GameWorld.GetExecFunc(PassiveTrigger, "%s.%s" % (pyName, "GetHappenValue"))
if not callFunc:
continue
- value = callFunc(atkObj, defObj, effect, effSkill, effBuff, **kwargs)
+ value = callFunc(atkObj, defObj, effect, effSkill, effBuff, connSkill, **kwargs)
if value is None:
continue
--
Gitblit v1.8.0