From 6b3b8976f49b47754a57cc710bf20a0682a80f78 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 30 十月 2025 17:09:48 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复主线拾取掉落战利品为绑定的bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 f15d3a5..d101084 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -42,7 +42,7 @@
@param refreshTimeLayer: 刷新剩余时间、层级
'''
skillData = curBuff.GetSkillData()
- curBuff.SetCalcTime(turnFight.getTimeline())
+ curBuff.SetAddTiming(curBatObj.GetTiming())
if refreshTimeLayer:
curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))
curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))
@@ -180,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)
@@ -205,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)
@@ -222,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 # 是否刷属性
@@ -240,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)
@@ -257,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
@@ -358,19 +364,14 @@
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()
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
--
Gitblit v1.8.0