From 5f9bb5660f4a62ed7a30767a23d565fd9c152e2a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 20:38:01 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（关羽全部技能； 优化技能冷却时间字段对触发被动效果的技能也有效；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 115 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 27 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index e4f017d..e031d89 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -59,13 +59,15 @@
if not skillID:
return
+ byTriggerWay = kwargs["byTriggerWay"] if "byTriggerWay" in kwargs else 0 # 不使用参数名 triggerWay, 防止传递过程中参数混乱
if not curBatObj.IsAlive():
if useSkill.GetSkillType() == ChConfig.Def_SkillType_Revive and useSkill.GetTagAim() == ChConfig.SkillTagAim_Self:
GameWorld.DebugLogEx("死亡时使用复活自己的技能! skillID=%s", skillID)
else:
- triggerWay = kwargs.get("triggerWay", 0)
- if triggerWay in ChConfig.DeadCanTriggerWayList:
- GameWorld.DebugLogEx("死亡可触发的方式触发技能可释放! skillID=%s,triggerWay=%s", skillID, triggerWay)
+ if byTriggerWay in ChConfig.DeadCanTriggerWayList:
+ GameWorld.DebugLogEx("死亡可触发的方式触发技能可释放! skillID=%s,byTriggerWay=%s", skillID, byTriggerWay)
+ elif batType == ChConfig.TurnBattleType_Enhance:
+ GameWorld.DebugLogEx("死亡状态额外技能不限制，主技能能放的话也就能放! skillID=%s", skillID)
else:
GameWorld.DebugLogEx("死亡状态下无法释放该技能! skillID=%s", skillID)
return
@@ -148,6 +150,7 @@
useSkill.SetBatType(batType)
useSkill.SetBySkill(bySkill)
useSkill.SetByBuff(byBuff)
+ useSkill.SetByTriggerWay(byTriggerWay)
isTurnNormalSkill = SkillCommon.isTurnNormalSkill(useSkill)
if isTurnNormalSkill:
@@ -176,7 +179,7 @@
else:
__doUseSkill(turnFight, curBatObj, useSkill)
- DoAttackResult(turnFight, curBatObj, useSkill)
+ DoAttackResult(turnFight, curBatObj, useSkill, **kwargs)
if useTag:
Sync_TurnFightTag(turnFight, useTag, 1)
@@ -845,8 +848,13 @@
calcCureResults = []
relativeObj = GetRelativeObj(turnFight, curBatObj)
+ multiValue = 1
+ addCureMulti = TurnPassive.GetTriggerEffectValue(turnFight, curBatObj, None, ChConfig.PassiveEff_AddCureMulti, useSkill)
+ if addCureMulti:
+ multiValue += addCureMulti / 100.0
+
for tagBatObj in useSkill.GetTagObjList():
- cureHP = CalcCureHP(turnFight, curBatObj, tagBatObj, useSkill, relativeObj=relativeObj)
+ cureHP = CalcCureHP(turnFight, curBatObj, tagBatObj, useSkill, relativeObj=relativeObj, multiValue=multiValue)
poisonCureOwner = GetPoisonCureOwner(tagBatObj)
calcCureResults.append([tagBatObj, cureHP, poisonCureOwner])
@@ -1115,7 +1123,7 @@
return
-def DoAttackResult(turnFight, curBatObj, useSkill):
+def DoAttackResult(turnFight, curBatObj, useSkill, **kwargs):
'''执行攻击结果
@param curBatObj: 施法方或buff归属方
'''
@@ -1132,6 +1140,14 @@
if useSkill.GetCoolDownTime():
useSkill.SetRemainTime(useSkill.GetCoolDownTime())
+ if "byEffSkill" in kwargs:
+ byEffSkill = kwargs["byEffSkill"]
+ cdTime = byEffSkill.GetCoolDownTime()
+ if cdTime:
+ if hasattr(byEffSkill, "GetRemainTime"):
+ byEffSkill.SetRemainTime(cdTime)
+ GameWorld.DebugLogEx("提前设置效果技能触发后CD，防止嵌套循环触发! effSkillID=%s,cdTime=%s", byEffSkill.GetSkillID(), cdTime)
+
__doCostZhanchui(turnFight, curBatObj, useSkill) # 先扣除再同步技能
# 需先技能使用 - 前端按顺序优先表现技能释放内容，前端需要动作或有伤血则通知
@@ -1279,16 +1295,14 @@
# 优先处理afterLogic，可再预先汇总一些会触发被动的信息
relatedSkillID = useSkill.GetSkillID()
- shieldBrokenList = [] # 记录盾破
+ delBuffAfterEffList = [] # buff消失后要触发的被动，一般用于后置处理的逻辑
afterLogicList = useSkill.GetAfterLogicList()
for logicType, logicData in afterLogicList:
if logicType == ChConfig.AfterLogic_DelBuff:
- buffObjID, buff, tagObjID = logicData
- buffSkillData = buff.GetSkillData()
- buffSkillTypeID = buffSkillData.GetSkillTypeID()
+ buffObjID, buff, tagObjID, afterTriggerData = logicData
TurnBuff.DoBuffDelAfterLogicOver(turnFight, buffObjID, buff, useSkill)
- if SkillCommon.isDamageShieldSkill(buffSkillData):
- shieldBrokenList.append([buffObjID, tagObjID, buffSkillTypeID])
+ if afterTriggerData:
+ delBuffAfterEffList.append([buffObjID, buff, tagObjID, afterTriggerData])
elif logicType == ChConfig.AfterLogic_AddBuff:
batObj = logicData[0]
@@ -1315,9 +1329,7 @@
TurnAttack.SetObjKilled(turnFight, tagObj, curObj, useSkill)
useSkill.SetKillObjList(killObjList)
# 判断自己，因为反弹、平摊伤害的原因，有可能自己干死自己
- selfAlive = curObj.IsAlive()
- if selfAlive and curObj.GetHP() <= 0:
- selfAlive = False
+ if curObj.IsAlive() and curObj.GetHP() <= 0:
dieObjList.append(curObj)
TurnAttack.SetObjKilled(turnFight, curObj)
@@ -1392,16 +1404,18 @@
effIgnoreObjIDList = missObjIDList + immuneObjIDList
useSkill.SetEffIgnoreObjIDList(effIgnoreObjIDList)
# 优先触发本技能额外效果，注：仅该技能释放后该技能的额外效果视为主技能的效果，优先级最高
- if selfAlive:
+ if curObj not in dieObjList:
__DoCurSkillEff(turnFight, curObj, useSkill, effIgnoreObjIDList, isUseSkill)
# ========== 以下触发被动 ==========
- # 破盾时
- for buffObjID, tagObjID, buffSkillTypeID in shieldBrokenList:
+ # buff消失后置处理的被动，优先处理，如破盾，区别于被动方式 ChConfig.TriggerWay_BuffDel(立即触发)
+ for buffObjID, buff, tagObjID, afterTriggerData in delBuffAfterEffList:
+ triggerWay, effInfoList = afterTriggerData
buffObj = batObjMgr.getBatObj(buffObjID)
- tagObj = batObjMgr.getBatObj(tagObjID)
- TurnPassive.OnTriggerPassiveEffect(turnFight, buffObj, ChConfig.TriggerWay_ShieldBroken, tagObj, connSkillTypeID=buffSkillTypeID)
+ tagObj = batObjMgr.getBatObj(tagObjID) # 导致该buff消失的目标
+ GameWorld.DebugLogEx("buff消失后置处理的被动: buffObjID=%s,tagObjID=%s,triggerWay=%s,%s", buffObjID, tagObjID, triggerWay, effInfoList)
+ TurnPassive.OnTriggerPassiveEffList(turnFight, buffObj, triggerWay, tagObj, effInfoList, connSkill=useSkill, connBuff=buff)
# 有击杀时
for index, tagObj in enumerate(killObjList):
@@ -1412,6 +1426,7 @@
if dieObjList:
for dieObj in dieObjList:
TurnPassive.OnTriggerPassiveEffect(turnFight, dieObj, ChConfig.TriggerWay_WhenDie, curObj, connSkill=useSkill)
+ __dongbaiRevive(turnFight, dieObj, useSkill) # 写死特殊处理董白复活
for faction in [ChConfig.Def_FactionA, ChConfig.Def_FactionB]:
batFaction = turnFight.getBatFaction(faction)
@@ -1456,6 +1471,7 @@
# 掉血时
if tagID in beHurtObjIDList:
TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BeHurt, curObj, connSkill=useSkill)
+ #TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_HurtTag, tagObj, connSkill=useSkill) 暂时用不到先屏蔽
# 受到任意效果时（除直接攻击外的任意效果，如buff、dot、治疗、额外怒技）
if not isAttackDirect:
@@ -1517,6 +1533,33 @@
if dieObjList:
turnFight.checkOverByKilled()
+ return
+
+def __dongbaiRevive(turnFight, batObj, useSkill):
+ '''特殊处理董白复活: 董白死亡之后的时间，若有敌方单位阵亡，董白以50%血量复活
+ '''
+ faction = batObj.GetFaction()
+ batFaction = turnFight.getBatFaction(ChConfig.Def_FactionA if faction == ChConfig.Def_FactionB else ChConfig.Def_FactionB)
+ if not batFaction:
+ return
+ batLineup = batFaction.getBatlineup(1)
+ if ChConfig.HeroID_Dongbai not in batLineup.heroObjIDDict:
+ return
+ dongbaiObj = BattleObj.GetBatObjMgr().getBatObj(batLineup.heroObjIDDict[ChConfig.HeroID_Dongbai])
+ if not dongbaiObj or dongbaiObj.IsAlive():
+ return
+ skill = dongbaiObj.GetSkillManager().FindSkillByID(ChConfig.SkillID_DongbaiRevive)
+ if not skill:
+ GameWorld.DebugLogEx("董白还还未学习特殊复活技能! %s", ChConfig.SkillID_DongbaiRevive)
+ return
+ enemyDeadCnt = dongbaiObj.GetDictByKey("EnemyDeadCnt") + 1
+ dongbaiObj.SetDict("EnemyDeadCnt", enemyDeadCnt)
+ GameWorld.DebugLogEx("董白记录自身死亡后的敌方阵亡单位数: %s" % enemyDeadCnt)
+ needDeadCnt = skill.GetEffect(0).GetEffectValue(0) # 固定配置在效果1值
+ if enemyDeadCnt < needDeadCnt:
+ return
+ dongbaiObj.SetDict("EnemyDeadCnt", 0)
+ OnUseSkill(turnFight, dongbaiObj, skill, batType=ChConfig.TurnBattleType_Passive, bySkill=useSkill)
return
def __doCostZhanchui(turnFight, curBatObj, useSkill):
@@ -1809,6 +1852,8 @@
batType = curSkill.GetBatType()
changeHurtType = TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_ChangeHurtType, curSkill)
+ if not changeHurtType:
+ changeHurtType = TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_ChangeHurtTypeByBuff, curSkill)
if changeHurtType == 1:
ignoreDef = True
GameWorld.DebugLogEx("强制变更本次伤害为无视防御! skillID=%s", skillID)
@@ -1887,6 +1932,7 @@
dFinalDamPerDef = defObj.GetBatAttrValue(ChConfig.AttrID_FinalDamPerDef) # 最终减伤
aFinalDamPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddFinalDamPer, curSkill)
+ aFinalDamPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.AttrID_FinalDamPer, curSkill)
aNormalSkillPer, dNormalSkillPerDef = 0, 0
if isTurnNormalSkill:
@@ -2008,6 +2054,7 @@
hurtAtkPerMax = curSkill.GetHurtAtkPerMax() # 最大万分比，限制最终伤害不超过攻击力万分率
if hurtAtkPerMax:
+ hurtAtkPerMax += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddHurtAtkPerMax, curSkill)
aAtk = atkObj.GetAtk()
hurtValueMax = aAtk * hurtAtkPerMax / 10000.0
hurtValue = min(hurtValue, hurtValueMax)
@@ -2127,8 +2174,10 @@
defObj, hurtValue, hurtTypes, immuneHurt = hurtInfo[:4]
isEx = hurtInfo[4] if len(hurtInfo) > 4 else 0 # 是否是额外目标
- lostHP = DoLostHP(turnFight, atkObj, defObj, hurtValue, curSkill, lostType, hpCanNegative=True, immuneHurt=immuneHurt)
-
+ lostHP, ignoreShield = DoLostHP(turnFight, atkObj, defObj, hurtValue, curSkill, lostType, hpCanNegative=True, immuneHurt=immuneHurt)
+ if ignoreShield:
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_IgnoreShield)
+
#伤害结构体
defID = defObj.GetID()
if isEx:
@@ -2415,9 +2464,10 @@
@param hpCanNegative: 扣除后的生命是否允许负值
@param immuneHurt: 免疫的伤害值
@param isSkillSelfTag: 是否技能自身的直接目标，如平摊伤害目标、溅射伤害目标这种就不算直接目标
- @return: lostHP
+ @return: lostHP, ignoreShield
'''
+ ignoreShield = None
if immuneHurt > 0:
buffMgr = defObj.GetBuffManager()
wudiBuffList = buffMgr.FindBuffListByState(ChConfig.BatObjState_Wudi)
@@ -2432,7 +2482,7 @@
defObj.GetID(), buff.GetBuffID(), buffSkillID, buffValue, immuneHurt, updBuffValue, lostType)
if hurtValue <= 0:
- return 0
+ return 0, ignoreShield
atkID = atkObj.GetID()
defID = defObj.GetID()
@@ -2443,6 +2493,11 @@
shieldBuffList = []
buffMgr = defObj.GetBuffManager()
for buff in buffMgr.FindBuffListByState(ChConfig.BatObjState_DamShield):
+ if ignoreShield == None:
+ if TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_IgnoreShield, curSkill):
+ ignoreShield = True # 无视承伤盾
+ break
+ ignoreShield = False
skillData = buff.GetSkillData()
remainTime = buff.GetRemainTime() # 剩余回合
if not skillData.GetLastTime():
@@ -2471,7 +2526,9 @@
shieldHurtValue -= decShieldValue # 承伤值
if decShieldValue >= buffValue:
GameWorld.DebugLogEx(" 删除盾: buffID=%s,剩余盾伤=%s", buffID, shieldHurtValue)
- TurnBuff.DoBuffDel(turnFight, defObj, buff, relatedSkill=curSkill, afterLogic=True, tagObj=atkObj)
+ #盾破时buff会被删除，导致绑定在该buff上的被动效果同步被清除，后续就无法触发盾破后被动，固先取出来
+ effInfoList = defObj.GetPassiveEffManager().GetPassiveEffByTrigger(ChConfig.TriggerWay_ShieldBroken, connSkillTypeID=buffSkillID)
+ TurnBuff.DoBuffDel(turnFight, defObj, buff, relatedSkill=curSkill, afterLogic=True, tagObj=atkObj, afterTriggerData=[ChConfig.TriggerWay_ShieldBroken, effInfoList])
else:
updShieldValue = buffValue - decShieldValue
GameWorld.DebugLogEx(" 更新盾: updShieldValue=%s,剩余盾伤=%s", updShieldValue, shieldHurtValue)
@@ -2492,7 +2549,7 @@
GameWorld.DebugLogEx(" 扣血: atkID=%s,defID=%s,hurtValue=%s,lostType=%s,lostHP=%s,dHP=%s,updHP=%s/%s",
atkID, defID, hurtValue, lostType, lostHP, dHP, defObj.GetHP(), defObj.GetMaxHP())
TurnAttack.AddTurnObjHurtValue(atkObj, defObj, hurtValue, lostHP, skillID, lostType)
- return lostHP
+ return lostHP, ignoreShield
def CalcBounceHP(turnFight, atkObj, defObj, hurtObj, curSkill):
'''计算反弹反弹伤害
@@ -2576,7 +2633,7 @@
TurnAttack.AddTurnObjCureHP(atkObj, atkObj, suckHP, cureHP)
return
-def CalcCureHP(turnFight, userObj, tagObj, curSkill, relativeObj=None):
+def CalcCureHP(turnFight, userObj, tagObj, curSkill, relativeObj=None, multiValue=1):
''' 计算治疗值
'''
@@ -2617,6 +2674,10 @@
cureHP += cureHPEx
GameWorld.DebugLogEx(" 额外治疗值(%s): cureType=%s,baseValue=%s,skillPer=%s,cureHP=%s", cureHPEx, cureType, baseValue, skillPer, cureHP)
+ if multiValue and multiValue != 1:
+ cureHP = int(cureHP * multiValue)
+ GameWorld.DebugLogEx(" 治疗倍值: cureHP=%s,multiValue=%s", cureHP, multiValue)
+
hurtShareEff = curSkill.GetEffectByID(ChConfig.SkillEff_HurtShare)
if hurtShareEff:
tagCnt = max(1, len(curSkill.GetTagObjList()))
--
Gitblit v1.8.0