From ace5dadbba4a16357d0aca93ee5734ab8adf7a94 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 28 十月 2025 17:57:08 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（韩遂技能；增加效果6016-对护盾造成伤害加成）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 53 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
index ad83602..f15d3a5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -27,21 +27,32 @@
GameWorld.ImportAll("Script\\Skill\\", "TurnBuffs")
def GetAddBuffValue(turnFight, attacker, defender, curSkill):
+ if not curSkill.GetAtkType():
+ return []
callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (curSkill.GetAtkType(), "CalcBuffValue"))
if not callFunc:
return []
- return callFunc(turnFight, attacker, defender, curSkill)
+ ret = callFunc(turnFight, attacker, defender, curSkill)
+ if ret == None:
+ return []
+ return ret
-def CopyBuff(turnFight, curBatObj, curBuff, tagBuff, bySkill=None, isNewAdd=False):
+def CopyBuff(turnFight, curBatObj, curBuff, tagBuff, bySkill=None, isNewAdd=False, refreshTimeLayer=True):
'''拷贝buff数据，不含目标buffID、归属，并刷新时间
+ @param refreshTimeLayer: 刷新剩余时间、层级
'''
skillData = curBuff.GetSkillData()
curBuff.SetCalcTime(turnFight.getTimeline())
- curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))
- curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))
+ if refreshTimeLayer:
+ curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))
+ curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))
+ else:
+ curBuff.SetRemainTime(tagBuff.GetRemainTime())
+ curBuff.SetLayer(tagBuff.GetLayer())
curBuff.SetValue1(tagBuff.GetValue1())
curBuff.SetValue2(tagBuff.GetValue2())
curBuff.SetValue3(tagBuff.GetValue3())
+ curBuff.SetIsCopy(1)
GameWorld.DebugLog(" 拷贝buff: curBuffID=%s,tagBuffID=%s,Remain=%s,Layer=%s,Value=%s"
% (curBuff.GetBuffID(), tagBuff.GetBuffID(), curBuff.GetRemainTime(), curBuff.GetLayer(),
[curBuff.GetValue1(), curBuff.GetValue2(), curBuff.GetValue3()]))
@@ -49,7 +60,7 @@
SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID, isNewAdd)
return
-def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False, isSync=True):
+def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
## 根据技能ID添加buff
if not skillID:
return
@@ -62,12 +73,12 @@
useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData, ownerID)
useSkill.SetTagObjList(tagObjList)
- addBuff = OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic, isSync=isSync)
+ addBuff = OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic, isSync=isSync, setLayerCnt=setLayerCnt)
poolMgr.release(useSkill)
return addBuff
-def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False, isSync=True):
+def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
skillID = buffSkill.GetSkillID()
bySkill = buffSkill.GetBySkill() if not bySkill else bySkill
relatedSkillID = bySkill.GetSkillID() if bySkill else 0
@@ -94,12 +105,16 @@
skillTypeID = buffSkill.GetSkillTypeID()
buffRepeat = buffSkill.GetBuffRepeat()
- addLayerCnt = buffSkill.GetLayerCnt()
- addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)
- if addLayerEff:
- # 可指定来源技能技能才生效，不指定的话默认生效
- if not addLayerEff.GetTriggerSrc() or addLayerEff.GetTriggerSrc() == relatedSkillID:
- addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
+ if setLayerCnt > 0:
+ addLayerCnt = setLayerCnt
+ GameWorld.DebugLog("外部直接指定添加的buff层级: setLayerCnt=%s" % setLayerCnt)
+ else:
+ addLayerCnt = buffSkill.GetLayerCnt()
+ addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)
+ if addLayerEff:
+ # 可指定来源技能技能才生效，不指定的话默认生效
+ if not addLayerEff.GetTriggerSrc() or addLayerEff.GetTriggerSrc() == relatedSkillID:
+ addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
maxLayerCnt = buffSkill.GetLayerMax()
if maxLayerCnt:
maxLayerCnt += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffLayerMax, buffSkill)
@@ -314,11 +329,13 @@
ObjPool.GetPoolMgr().release(curBuff)
return
-def DoBuffProcess(turnFight, batObj, curBuff):
+def DoBuffProcess(turnFight, batObj, curBuff, **kwargs):
skillData = curBuff.GetSkillData()
+ if not skillData.GetAtkType():
+ return
callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (skillData.GetAtkType(), "DoBuffProcess"))
if callFunc:
- callFunc(turnFight, batObj, curBuff)
+ callFunc(turnFight, batObj, curBuff, **kwargs)
return
def RefreshBuffAttr(batObj):
@@ -341,6 +358,12 @@
buff = buffMgr.GetBuffByIndex(index)
layer = max(1, buff.GetLayer())
skillData = buff.GetSkillData()
+ atkType = skillData.GetAtkType()
+ if atkType:
+ callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (atkType, "CalcBuffAttrEx"))
+ if callFunc:
+ callFunc(batObj, buff, skillData, layer, buffAttrDict)
+
for eIndex in range(skillData.GetEffectCount()):
effect = skillData.GetEffect(eIndex)
effID = effect.GetEffectID()
--
Gitblit v1.8.0