From ecec2bde4584f578e822e614548e3ceec830cfef Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 23 十二月 2025 16:04:59 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复吕玲绮队友死亡触发怒技回合受限无效bug；7009效果支持纯被动效果技能；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 18 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 e76260f..fc4ec53 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.py
@@ -17,7 +17,10 @@
import GameWorld
import PassiveTrigger
+import IpyGameDataPY
+import BattleObj
import ChConfig
+import TurnSkill
GameWorld.ImportAll("Script\\Skill\\", "PassiveTrigger")
@@ -27,28 +30,47 @@
passiveEffMgr = batObj.GetPassiveEffManager()
skillEffInfo = passiveEffMgr.RefreshSkillPassiveEffect()
buffEffInfo = passiveEffMgr.RefreshBuffPassiveEffect()
- skillEffInfo and GameWorld.DebugLog(" 被动技能效果: %s" % skillEffInfo)
- buffEffInfo and GameWorld.DebugLog(" 被动Buff效果: %s" % buffEffInfo)
+ skillEffInfo and GameWorld.DebugLogEx(" 被动技能效果: %s", skillEffInfo)
+ buffEffInfo and GameWorld.DebugLogEx(" 被动Buff效果: %s", buffEffInfo)
return
def OnTriggerPassiveEffect(turnFight, batObj, triggerWay, tagObj=None, connSkill=None, connSkillTypeID=0, connBuff=None, **kwargs):
''' 触发被动效果，可能触发技能、buff，需根据优先级触发
'''
+ if not batObj.IsAlive():
+ 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)
if not effInfoList:
return
- # [["skill/buff", skillID/buffID, effIDList], ...]
+ OnTriggerPassiveEffList(turnFight, batObj, triggerWay, tagObj, effInfoList, connSkill, connBuff, **kwargs)
+ return
+
+def OnTriggerPassiveEffList(turnFight, batObj, triggerWay, tagObj, effInfoList, connSkill=None, connBuff=None, **kwargs):
+ '''触发外部指定的被动效果列表
+ @param effInfoList: [["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))
+ GameWorld.DebugLogEx("触发被动: 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
@@ -61,13 +83,34 @@
if not effSkill:
return
+ if effSkill.GetCoolDownTime():
+ if hasattr(effSkill, "GetRemainTime") and effSkill.GetRemainTime() > 0:
+ GameWorld.DebugLogEx("被动效果技能CD中! effSkillID=%s,RemainTime=%s", skillID, effSkill.GetRemainTime())
+ return
+ kwargs["byEffSkill"] = effSkill # 目前用于触发被动技能时，该效果技能提前先设置CD，防止嵌套触发时CD后置才设置，如关羽的怒技追击
+
+ # 没有类型的，纯配被动效果，有类型的技能在 OnUseSkill 统一处理回合次数，这里只处理纯被动效果的
+ useCntLimit = None
+ if not effSkill.GetSkillType():
+ useCntLimit = TurnSkill.CheckSkillUseCntLimit(batObj, effSkill)
+ if useCntLimit:
+ return
+
+ isOK = False
+ kwargs["byTriggerWay"] = triggerWay
for effID in effIDList:
curEffect = effSkill.GetEffectByID(effID, triggerWay)
if not curEffect:
continue
- DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs)
+ if DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs):
+ isOK = True # 有效果触发就算
- return
+ if isOK:
+ if useCntLimit != None:
+ #GameWorld.DebugLogEx("增加被动效果回合触发次数! skillID=%s", effSkill.GetSkillID())
+ batObj.AddSkillUseCnt(effSkill.GetSkillID())
+
+ return isOK
def DoSkillEffectLogic(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff=None, **kwargs):
effID = curEffect.GetEffectID()
@@ -77,8 +120,17 @@
callFunc = GameWorld.GetExecFunc(PassiveTrigger, "%s.%s" % (pyName, "DoSkillEffectLogic"))
if not callFunc:
return
- callFunc(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs)
- return
+ isOK = callFunc(turnFight, batObj, tagObj, effSkill, curEffect, connSkill, connBuff, **kwargs)
+ if not isOK:
+ return
+
+ cdTime = effSkill.GetCoolDownTime()
+ if cdTime:
+ # 非触发技能的在后面设置CD即可
+ if hasattr(effSkill, "GetRemainTime"):
+ effSkill.SetRemainTime(cdTime)
+
+ return True
def __doTriggerPassiveEffectByBuff(turnFight, batObj, tagObj, triggerWay, buffID, effIDList, connSkill=None, connBuff=None, **kwargs):
buffMgr = batObj.GetBuffManager()
@@ -89,6 +141,7 @@
return
skillData = effBuff.GetSkillData()
+ kwargs["byTriggerWay"] = triggerWay
for effID in effIDList:
curEffect = skillData.GetEffectByID(effID, triggerWay)
if not curEffect:
@@ -108,33 +161,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
- GameWorld.DebugLog("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s" % (calcEffID, atkObj.GetID(), tagID, effInfoList))
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,12 +215,14 @@
callFunc = GameWorld.GetExecFunc(PassiveTrigger, "%s.%s" % (pyName, "GetHappenValue"))
if not callFunc:
continue
- value = callFunc(atkObj, defObj, effect, effSkill, **kwargs)
+ kwargs["turnFight"] = turnFight
+ value = callFunc(atkObj, defObj, effect, effSkill, effBuff, connSkill, **kwargs)
if value is None:
continue
if effID in ChConfig.PassiveEffHappenValueList:
if value:
+ GameWorld.DebugLogEx("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s,curValue=%s", calcEffID, atkObj.GetID(), tagID, effInfoList, value)
return value
elif effID in ChConfig.PassiveEffValueMaxList:
curValue = max(curValue, value) # 取最大值
@@ -181,5 +237,6 @@
# if curSkill.GetCoolDownTime():
# SkillCommon.SetSkillRemainTime(curSkill, 0, tick, attacker)
+ GameWorld.DebugLogEx("统计被动效果值: calcEffID=%s,objID=%s,tagID=%s,%s,curValue=%s", calcEffID, atkObj.GetID(), tagID, effInfoList, curValue)
return curValue
--
Gitblit v1.8.0