From e4eccd8e4b2ee4758faf94eb88edbe5b5325fa1d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 十月 2025 11:59:59 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（词条技能1011 1012 1013：增加属性ID19-怒气恢复加成；增加技能伤害计算类型7-按最后受到攻击的技能伤害；5001效果支持永久buff不扣除回合数；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 117 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 33 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..38d17f3 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()))
+ curBuff.SetAddTiming(curBatObj.GetTiming())
+ 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)
@@ -165,17 +180,17 @@
GameWorld.DebugLog(" 默认覆盖")
# 重置回合、CD、值等
- buff.SetCalcTime(turnFight.getTimeline())
+ buff.SetAddTiming(batObj.GetTiming())
buff.SetRemainTime(buffSkill.GetLastTime())
buff.SetLayer(updLayerCnt)
buff.SetBuffValueList(buffValueList)
+ buff.ResetEffectValueEx()
if afterLogic and bySkill:
bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])
elif isSync:
SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
- if nowLayerCnt != updLayerCnt:
- RefreshBuffEffect(turnFight, batObj, buff, False)
+ RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=2)
return buff
return __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt, isSync=isSync)
@@ -190,11 +205,12 @@
relatedSkillID = bySkill.GetSkillID() if bySkill else 0
ownerID = buffOwner.GetID()
buffID = buff.GetBuffID()
+ timing = batObj.GetTiming()
- GameWorld.DebugLog(" __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timeline=%s"
- % (buffID, skillID, ownerID, relatedSkillID, turnFight.getTimeline()), curID)
+ GameWorld.DebugLog(" __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s"
+ % (buffID, skillID, ownerID, relatedSkillID, timing), curID)
+ buff.SetAddTiming(timing) # 武将当前在什么时机就设置为什么时机
buff.SetOwnerID(ownerID)
- buff.SetCalcTime(turnFight.getTimeline())
buff.SetRemainTime(buffSkill.GetLastTime())
buff.SetLayer(setLayerCnt)
buff.SetBuffValueList(buffValueList)
@@ -207,11 +223,13 @@
elif isSync:
SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
- RefreshBuffEffect(turnFight, batObj, buff, True)
+ RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=1)
return buff
-def RefreshBuffEffect(turnFight, batObj, curBuff, isNewBuff=False):
+def RefreshBuffEffect(turnFight, batObj, curBuff, buffSkill=None, buffOwner=None, refreshType=0):
## 刷新buff效果
+ # @param buffSkill: 添加该buff时对应的buff技能ID，可能为None，如非添加时的刷新
+ # @param refreshType: 0-普通刷新；1-新添加刷新；2-覆盖刷新
isRefreshAttr = False # 是否刷属性
@@ -225,12 +243,15 @@
continue
if curEffect.GetTriggerWay():
- if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf] and isNewBuff:
+ if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf] and refreshType == 1:
passiveEffMgr.AddBuffPassiveEffect(curBuff, skillData, curEffect)
elif effectID in ChConfig.AttrIDList:
isRefreshAttr = True
+ if refreshType and buffSkill and buffOwner:
+ TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, connSkill=buffSkill, connBuff=curBuff)
+
if isRefreshAttr:
RefreshBuffAttr(batObj)
@@ -242,7 +263,7 @@
curBuff.SetLayer(updLayer)
relatedSkillID = relatedSkill.GetSkillID() if relatedSkill else 0
SyncBuffRefresh(turnFight, batObj, curBuff, relatedSkillID)
- RefreshBuffEffect(turnFight, batObj, curBuff, False)
+ RefreshBuffEffect(turnFight, batObj, curBuff)
return
DoBuffDel(turnFight, batObj, curBuff, relatedSkill)
return
@@ -314,11 +335,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):
@@ -334,34 +357,62 @@
GameWorld.DebugLog("RefreshBuffAttr ID:%s,atk=%s,def=%s,hp=%s/%s,batAttrDict=%s"
% (objID, batObj.GetAtk(), batObj.GetDef(), befHP, befMaxHP, batAttrDict))
+ skbufAttrDict = {}
+
+ # 属性技能
+ skillAttrDict = {}
+ skillManager = batObj.GetSkillManager()
+ for index in range(0, skillManager.GetSkillCount()):
+ curSkill = skillManager.GetSkillByIndex(index)
+ if not curSkill:
+ continue
+ for eIndex in range(curSkill.GetEffectCount()):
+ effect = curSkill.GetEffect(eIndex)
+ effID = effect.GetEffectID()
+ if effID not in ChConfig.AttrIDList:
+ continue
+ if effect.GetTriggerWay():
+ continue
+ attrID = effID
+ attrValue = effect.GetEffectValue(0)
+ calcType = effect.GetEffectValue(1)
+ if calcType == 2: # 减少，其他默认增加
+ attrValue = -attrValue
+ skillAttrDict[attrID] = skillAttrDict.get(attrID, 0) + attrValue
+ skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue
+ skillAttrDict and GameWorld.DebugLog(" skillAttrDict=%s" % skillAttrDict)
+
# buff
- buffAttrDict = {} # buff属性 {attrID:value, } value可能是负值
+ buffsAttrDict = {} # buff属性 {attrID:value, } value可能是负值
buffMgr = batObj.GetBuffManager()
for index in range(buffMgr.GetBuffCount()):
buff = buffMgr.GetBuffByIndex(index)
layer = max(1, buff.GetLayer())
skillData = buff.GetSkillData()
+
for eIndex in range(skillData.GetEffectCount()):
effect = skillData.GetEffect(eIndex)
effID = effect.GetEffectID()
if effID not in ChConfig.AttrIDList:
continue
attrID = effID
- attrValue = effect.GetEffectValue(0) * layer
+ attrValue = (effect.GetEffectValue(0) + buff.GetEffectValueEx(attrID)) * layer
calcType = effect.GetEffectValue(1)
if calcType == 2: # 减少，其他默认增加
attrValue = -attrValue
- buffAttrDict[attrID] = buffAttrDict.get(attrID, 0) + attrValue
+ buffsAttrDict[attrID] = buffsAttrDict.get(attrID, 0) + attrValue
+ skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue
- GameWorld.DebugLog(" buffAttrDict=%s" % buffAttrDict)
+ buffsAttrDict and GameWorld.DebugLog(" buffsAttrDict=%s" % buffsAttrDict)
+ GameWorld.DebugLog(" skbufAttrDict=%s" % skbufAttrDict)
objID = batObj.GetID()
# 先计算百分比加成或降低的
perIDList = ChConfig.AttrPerDict.values()
for attrID, attrPerID in ChConfig.AttrPerDict.items():
- if attrPerID not in buffAttrDict:
+ if attrPerID not in skbufAttrDict:
continue
- attrPerValue = buffAttrDict[attrPerID] # 可能是负值
+ attrPerValue = skbufAttrDict[attrPerID] # 可能是负值
attrValue = batObj.GetBatAttrValue(attrID, False)
if attrValue <= 0:
continue
@@ -371,7 +422,7 @@
GameWorld.DebugLog(" attrID=%s(PerID:%s),attrValue=%s(PerValue:%s),updValue=%s" % (attrID, attrPerID, attrValue, attrPerValue, updValue))
# 再累加非百分比的固定值
- for attrID, addValue in buffAttrDict.items():
+ for attrID, addValue in skbufAttrDict.items():
if attrID in perIDList:
continue
attrValue = batObj.GetBatAttrValue(attrID, False)
--
Gitblit v1.8.0