From 6e85f0b43d92ae01de2432e8da0dd41646c7361c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 04 十二月 2025 14:54:38 +0800
Subject: [PATCH] 16 卡牌服务端（修复重读脚本后db报错： 重读后导致类继承出现问题，固重读时过滤掉py库及第三方库不重读；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 201 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 183 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 ca8d91f..831c4f4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -78,7 +78,7 @@
poolMgr.release(useSkill)
return addBuff
-def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
+def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, **kwargs):
skillID = buffSkill.GetSkillID()
bySkill = buffSkill.GetBySkill() if not bySkill else bySkill
relatedSkillID = bySkill.GetSkillID() if bySkill else 0
@@ -87,24 +87,34 @@
buffOwner = batObj
ownerID = buffOwner.GetID()
+ skillType = buffSkill.GetSkillType()
#无敌免疫持续减益buff、控制类buff
- if buffSkill.GetSkillType() in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \
+ if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \
and batObj.CheckInState(ChConfig.BatObjState_Wudi):
GameWorld.DebugLog("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s"
% (curID, skillID, ownerID, relatedSkillID))
return
#被动触发免疫控制buff
- if buffSkill.GetSkillType() == ChConfig.Def_SkillType_Action:
+ if skillType == ChConfig.Def_SkillType_Action:
if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlBuff, buffSkill):
GameWorld.DebugLog("血量低于百分x时免疫控制buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,hp:%s/%s"
% (curID, skillID, ownerID, relatedSkillID, batObj.GetHP(), batObj.GetMaxHP()))
+ return
+
+ #光环技能，默认施法者身上也必须有，时长与施法者身上的同步
+ haloSrcBuff = None # 光源buff
+ if skillType == ChConfig.Def_SkillType_Halo and ownerID != curID:
+ haloSrcBuff = buffOwner.GetBuffManager().FindBuffBySkillID(skillID, ownerID)
+ if not haloSrcBuff:
+ GameWorld.ErrLog("添加光环技能时找不到光源! skillID=%s,ownerID=%s" % (skillID, ownerID))
return
buffValueList = GetAddBuffValue(turnFight, buffOwner, batObj, buffSkill)
skillTypeID = buffSkill.GetSkillTypeID()
buffRepeat = buffSkill.GetBuffRepeat()
+ setLayerCnt = kwargs.get("setLayerCnt", 0)
if setLayerCnt > 0:
addLayerCnt = setLayerCnt
GameWorld.DebugLog("外部直接指定添加的buff层级: setLayerCnt=%s" % setLayerCnt)
@@ -115,6 +125,7 @@
# 可指定来源技能技能才生效，不指定的话默认生效
if not addLayerEff.GetTriggerSrc() or addLayerEff.GetTriggerSrc() == relatedSkillID:
addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
+ addLayerCnt += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffLayer, buffSkill)
maxLayerCnt = buffSkill.GetLayerMax()
if maxLayerCnt:
maxLayerCnt += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffLayerMax, buffSkill)
@@ -193,7 +204,10 @@
RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=2)
return buff
- return __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt, isSync=isSync)
+ newBuff = __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt, isSync=isSync)
+ if skillType == ChConfig.Def_SkillType_Halo and newBuff:
+ __addHaloBuffEffObjID(curID, newBuff, skillID, ownerID, haloSrcBuff)
+ return newBuff
def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0, isSync=True):
curID = batObj.GetID()
@@ -243,7 +257,7 @@
continue
if curEffect.GetTriggerWay():
- if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf] and refreshType == 1:
+ if refreshType == 1 and curEffect.GetTriggerBuffEnable():
passiveEffMgr.AddBuffPassiveEffect(curBuff, skillData, curEffect)
elif effectID in ChConfig.AttrIDList:
@@ -257,6 +271,60 @@
return
+def __addHaloBuffEffObjID(curID, newBuff, skillID, ownerID, haloSrcBuff):
+ ## 添加光环buff有效的目标ID，添加光环buff时添加，不移除，由光源管理移除（光源武将死亡时删除）
+ if curID == ownerID:
+ newBuff.AddHaloObjID(curID) # 光源直接添加目标
+ return
+ haloSrcBuff.AddHaloObjID(curID) # 光源先添加新目标
+ haloObjIDList = haloSrcBuff.GetHaloObjIDList()
+ newBuff.SetHaloObjIDList(haloObjIDList) # 新buff直接同步设置为光源有效目标
+
+ batObjMgr = BattleObj.GetBatObjMgr()
+ for haloObjID in haloObjIDList:
+ if haloObjID in [ownerID, curID]:
+ continue
+ haloObj = batObjMgr.getBatObj(haloObjID)
+ if not haloObj:
+ continue
+ haloBuff = haloObj.GetBuffManager().FindBuffBySkillID(skillID, ownerID)
+ if not haloBuff:
+ continue
+ haloBuff.SetHaloObjIDList(haloObjIDList) # 除光源及新加入的直接同步最新的有效目标
+ return
+
+def SetBuffRemainTime(turnFight, batObj, curBuff, remainTime):
+ if remainTime <= 0:
+ DoBuffDel(turnFight, batObj, curBuff)
+ return
+
+ buffObjID = batObj.GetID()
+ ownerID = curBuff.GetOwnerID()
+ skillData = curBuff.GetSkillData()
+ skillID = skillData.GetSkillID()
+ skillType = skillData.GetSkillType()
+
+ curBuff.SetRemainTime(remainTime)
+ SyncBuffRefresh(turnFight, batObj, curBuff)
+
+ if skillType == ChConfig.Def_SkillType_Halo and ownerID == buffObjID:
+ haloObjIDList = curBuff.GetHaloObjIDList()
+ GameWorld.DebugLog("光环buff回合变更同步其他有效目标该光环: skillID=%s,ownerID=%s,haloObjIDList=%s" % (skillID, ownerID, haloObjIDList))
+ batObjMgr = BattleObj.GetBatObjMgr()
+ for haloObjID in haloObjIDList:
+ if haloObjID == buffObjID:
+ continue
+ haloObj = batObjMgr.getBatObj(haloObjID)
+ if not haloObj:
+ continue
+ haloBuff = haloObj.GetBuffManager().FindBuffBySkillID(skillID, ownerID)
+ if not haloBuff:
+ continue
+ haloBuff.SetRemainTime(remainTime)
+ SyncBuffRefresh(turnFight, haloObj, haloBuff)
+
+ return
+
def DoBuffLayerChange(turnFight, batObj, curBuff, updLayer, relatedSkill=None):
## buff层级变更
if updLayer > 0:
@@ -268,15 +336,17 @@
DoBuffDel(turnFight, batObj, curBuff, relatedSkill)
return
-def DoBuffDel(turnFight, batObj, curBuff, relatedSkill=None, afterLogic=False, tagObj=None):
+def DoBuffDel(turnFight, batObj, curBuff, relatedSkill=None, afterLogic=False, tagObj=None, noRefreshAttr=False, isSync=True):
'''删除buff
@param relatedSkill: 关联的技能
@param afterLogic: 是否需要在关联技能处理完毕后才处理删除后续逻辑，如通知，触发被动等
@param tagObj: 由谁引起的buff删除
+ @param noRefreshAttr: 不刷新属性
+ @return: isRefreshAttr 是否需要刷属性，如果设置了 noRefreshAttr，则要在外层刷属性
'''
- release = True
- isSync = True
+ release = True # 释放buff实例
+ #isSync = True
relatedSkillID = relatedSkill.GetSkillID() if relatedSkill else 0
if afterLogic and relatedSkill:
release = False
@@ -288,7 +358,10 @@
buffObjID = batObj.GetID()
buffMgr = batObj.GetBuffManager()
buffID = curBuff.GetBuffID()
+ ownerID = curBuff.GetOwnerID()
skillData = curBuff.GetSkillData()
+ skillID = skillData.GetSkillID()
+ skillType = skillData.GetSkillType()
# 先删除buff再触发其他内容，防止当前要删除的buff影响后续触发的内容，如无敌buff等，理论上触发的后续内容无敌buff不应该再生效
curBuffState = skillData.GetCurBuffState()
@@ -315,7 +388,7 @@
if triggerWay == ChConfig.TriggerWay_BuffDel:
TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BuffDel, connBuff=curBuff)
- if curEffect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf]:
+ if curEffect.GetTriggerBuffEnable():
haveBuffPassiveEff = True
elif effectID in ChConfig.AttrIDList:
@@ -324,9 +397,24 @@
if haveBuffPassiveEff:
batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)
- if isRefreshAttr:
+ if isRefreshAttr and not noRefreshAttr:
RefreshBuffAttr(batObj)
- return
+
+ if skillType == ChConfig.Def_SkillType_Halo and ownerID == buffObjID:
+ haloObjIDList = curBuff.GetHaloObjIDList()
+ GameWorld.DebugLog("光环buff删除同步删除其他有效目标该光环: skillID=%s,ownerID=%s,haloObjIDList=%s" % (skillID, ownerID, haloObjIDList))
+ batObjMgr = BattleObj.GetBatObjMgr()
+ for haloObjID in haloObjIDList:
+ if haloObjID == buffObjID:
+ continue
+ haloObj = batObjMgr.getBatObj(haloObjID)
+ if not haloObj:
+ continue
+ haloBuff = haloObj.GetBuffManager().FindBuffBySkillID(skillID, ownerID)
+ if not haloBuff:
+ continue
+ DoBuffDel(turnFight, haloObj, haloBuff, relatedSkill, afterLogic, tagObj)
+ return isRefreshAttr
def DoBuffDelAfterLogicOver(turnFight, buffObjID, curBuff, relatedSkill):
## buff删除后续处理逻辑处理完毕
@@ -343,8 +431,74 @@
if callFunc:
callFunc(turnFight, batObj, curBuff, **kwargs)
return
+
+def DoBuffByDead(turnFight, batObj):
+ ## 死亡处理buff
+ isRefreshAttr = False
+ objID = batObj.GetID()
+ buffMgr = batObj.GetBuffManager()
+ for index in range(buffMgr.GetBuffCount())[::-1]:
+ buff = buffMgr.GetBuffByIndex(index)
+ buffID = buff.GetBuffID()
+ skillID = buff.GetSkillID()
+ if buff.GetBuffRetain()&pow(2, ChConfig.BuffRetainType_Dead):
+ GameWorld.DebugLog("死亡不清除的buff: objID=%s,buffID=%s,skillID=%s" % (objID, buffID, skillID))
+ continue
+ if DoBuffDel(turnFight, batObj, buff, noRefreshAttr=True, isSync=False): # 可不通知，前端默认都清除，复活后重新同步
+ isRefreshAttr = True
+
+ if isRefreshAttr:
+ RefreshBuffAttr(batObj)
+
+ return
+
+def DoBuffByRevive(turnFight, batObj):
+ ## 复活处理buff
-def RefreshBuffAttr(batObj):
+ isRefreshAttr = False
+ objID = batObj.GetID()
+ buffMgr = batObj.GetBuffManager()
+ for index in range(buffMgr.GetBuffCount()):
+ buff = buffMgr.GetBuffByIndex(index)
+ buffID = buff.GetBuffID()
+ skillID = buff.GetSkillID()
+ if buff.GetBuffRetain()&pow(2, ChConfig.BuffRetainType_Revive):
+ GameWorld.DebugLog("复活不清除的buff: objID=%s,buffID=%s,skillID=%s" % (objID, buffID, skillID))
+ SyncBuffRefresh(turnFight, batObj, buff, isNewAdd=True) # 复活时还存在的buff通知前端视为新添加的
+ continue
+ if DoBuffDel(turnFight, batObj, buff, noRefreshAttr=True, isSync=False): # 复活可不通知删除的buff
+ isRefreshAttr = True
+
+ if isRefreshAttr:
+ RefreshBuffAttr(batObj)
+
+ # 重新添加本阵营有效光环
+ batObjMgr = BattleObj.GetBatObjMgr()
+ batLineup = batObj.GetBatLineup()
+ for tagObjID in batLineup.posObjIDDict.values():
+ tagObj = batObjMgr.getBatObj(tagObjID)
+ if not tagObj.IsAlive():
+ continue
+ tagBuffMgr = tagObj.GetBuffManager()
+ for index in range(tagBuffMgr.GetBuffCount()):
+ buff = tagBuffMgr.GetBuffByIndex(index)
+ haloObjIDList = buff.GetHaloObjIDList()
+ if not haloObjIDList or objID not in haloObjIDList:
+ continue
+ if buff.GetOwnerID() != tagObjID:
+ # 非光源
+ continue
+ haloSkillID = buff.GetSkillID()
+ GameWorld.DebugLog("复活后重新添加本阵营光环: objID=%s,ownerID=%s,haloSkillID=%s" % (objID, tagObjID, haloSkillID))
+ haloSkill = tagObj.GetSkillManager().FindSkillByID(haloSkillID)
+ if not haloSkill:
+ continue
+ OnAddBuff(turnFight, batObj, haloSkill, buffOwner=tagObj)
+
+ # 光源重新添加有效光环，根据光源是否还有效规则优化，待处理
+ return
+
+def RefreshBuffAttr(batObj, isInit=False):
''' 刷新buff属性，如果有涉及到buff属性变更的，只能全部buff重新刷
'''
@@ -371,8 +525,8 @@
effID = effect.GetEffectID()
if effID not in ChConfig.AttrIDList:
continue
- if effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill, ChConfig.TriggerSrc_SkillSelf]:
- # 技能时仅技能有效
+ if effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Skill]:
+ # 技能属性仅技能时有效
continue
attrID = effID
attrValue = effect.GetEffectValue(0)
@@ -391,16 +545,25 @@
layer = max(1, buff.GetLayer())
skillData = buff.GetSkillData()
+ effExDict = buff.GetEffectExDict()
+ for effID, effValueEx in effExDict.items():
+ if effID not in ChConfig.AttrIDList:
+ continue
+ attrID = effID
+ attrValue = effValueEx * layer
+ buffsAttrDict[attrID] = buffsAttrDict.get(attrID, 0) + attrValue
+ skbufAttrDict[attrID] = skbufAttrDict.get(attrID, 0) + attrValue
+
for eIndex in range(skillData.GetEffectCount()):
effect = skillData.GetEffect(eIndex)
effID = effect.GetEffectID()
if effID not in ChConfig.AttrIDList:
continue
- if effect.GetTriggerSrc() and effect.GetTriggerSrc() not in [ChConfig.TriggerSrc_Buff, ChConfig.TriggerSrc_BuffSelf]:
+ if not (not effect.GetTriggerSrc() or effect.GetTriggerBuffEnable()):
# buff时，不配默认有效，或仅buff有效
continue
attrID = effID
- attrValue = (effect.GetEffectValue(0) + buff.GetEffectValueEx(attrID)) * layer
+ attrValue = effect.GetEffectValue(0) * layer
calcType = effect.GetEffectValue(1)
if calcType == 2: # 减少，其他默认增加
attrValue = -attrValue
@@ -438,15 +601,17 @@
aftHP = batObj.GetHP()
aftMaxHP = batObj.GetMaxHP()
if aftMaxHP != befMaxHP:
- batObj.SetMaxHP(aftMaxHP, True)
+ isNotify = not isInit
+ batObj.SetMaxHP(aftMaxHP, isNotify)
if befHP and aftMaxHP > befMaxHP:
aftHP += (aftMaxHP - befMaxHP)
- batObj.SetHP(aftHP, True)
+ batObj.SetHP(aftHP, isNotify)
GameWorld.DebugLog(" befHP=%s/%s, aftHP=%s/%s" % (befHP, befMaxHP, aftHP, aftMaxHP))
GameWorld.DebugLog(" 最终属性 ID:%s,atk=%s,def=%s,hp=%s/%s,%s" % (objID, batObj.GetAtk(), batObj.GetDef(), aftHP, aftMaxHP, batObj.GetBatAttrDict()))
return
def SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID=0, isNewAdd=False):
+ ## @param curBatObj: 该buff的持有者，即在谁身上
clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffRefresh)
clientPack.ObjID = curBatObj.GetID()
clientPack.BuffID = curBuff.GetBuffID()
--
Gitblit v1.8.0