From cc2207557c22a88475e28f6a05a416c0fa97e527 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 八月 2025 18:53:15 +0800
Subject: [PATCH] 1111 删除不需要内容；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 116 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 31 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 27ddea2..68799eb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -18,44 +18,70 @@
import ChConfig
import GameWorld
import ChPyNetSendPack
+import IpyGameDataPY
import TurnBuffs
+import BattleObj
import ObjPool
GameWorld.ImportAll("Script\\Skill\\", "TurnBuffs")
-def GetAddBuffValue(attacker, defender, curSkill):
+def GetAddBuffValue(turnFight, attacker, defender, curSkill):
callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (curSkill.GetAtkType(), "CalcBuffValue"))
if not callFunc:
return []
- return callFunc(attacker, defender, curSkill)
+ return callFunc(turnFight, attacker, defender, curSkill)
-def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None):
+def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False):
+ ## 根据技能ID添加buff
+ if not skillID:
+ return
+ skillIpyData = IpyGameDataPY.GetIpyGameData("Skill", skillID)
+ if not skillIpyData:
+ return
+ tagObjList = [batObj]
+ poolMgr = ObjPool.GetPoolMgr()
+ useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData)
+ useSkill.SetTagObjList(tagObjList)
+
+ OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic)
+
+ poolMgr.release(useSkill)
+ return
+
+def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False):
skillID = buffSkill.GetSkillID()
- bySkill = buffSkill.GetBySkill()
+ bySkill = buffSkill.GetBySkill() if not bySkill else bySkill
relatedSkillID = bySkill.GetSkillID() if bySkill else 0
curID = batObj.GetID()
if not buffOwner:
buffOwner = batObj
ownerID = buffOwner.GetID()
- buffValueList = GetAddBuffValue(buffOwner, batObj, buffSkill)
- GameWorld.DebugLog("OnAddBuff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,buffValueList=%s" % (curID, skillID, ownerID, relatedSkillID, buffValueList))
+ buffValueList = GetAddBuffValue(turnFight, buffOwner, batObj, buffSkill)
+ GameWorld.DebugLog("OnAddBuff: curID=%s,skillID=%s,atkType=%s,buffValueList=%s,ownerID=%s,relatedSkillID=%s"
+ % (curID, skillID, buffSkill.GetAtkType(), buffValueList, ownerID, relatedSkillID))
skillTypeID = buffSkill.GetSkillTypeID()
# 先简单做下能加上即可
buffMgr = batObj.GetBuffManager()
- buffIDList = buffMgr.FindBuffIDBySkillTypeID(skillTypeID)
- if buffIDList:
- GameWorld.DebugLog(" 已经存在该buff: skillTypeID=%s,buffIDList=%s" % (skillTypeID, buffIDList))
- # buff堆叠逻辑
-
+ buffList = buffMgr.FindBuffBySkillTypeID(skillTypeID)
+ if buffList:
+ # buff堆叠逻辑，待处理，先直接通知
+ for buff in buffList:
+ if not buff:
+ continue
+ GameWorld.DebugLog(" 已经存在该buff: buffID=%s,skillTypeID=%s" % (buff.GetBuffID(), skillTypeID))
+ if afterLogic and bySkill:
+ bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])
+ else:
+ SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID)
+
return True
- __AddNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner)
+ __AddNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic)
return True
-def __AddNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner):
+def __AddNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False):
skillID = buffSkill.GetSkillID()
- bySkill = buffSkill.GetBySkill()
relatedSkillID = bySkill.GetSkillID() if bySkill else 0
curID = batObj.GetID()
ownerID = buffOwner.GetID()
@@ -71,11 +97,13 @@
buff.SetRemainTime(buffSkill.GetLastTime())
buff.SetLayer(buffSkill.GetLayerCnt())
buff.SetBuffValueList(buffValueList)
- buffStates = buffSkill.GetBuffStates()
- for buffState in buffStates:
- buffMgr.AddBuffState(buffState, buffID)
- isNotify = True
- if isNotify:
+ curBuffState = buffSkill.GetCurBuffState()
+ if curBuffState:
+ buffMgr.AddBuffState(curBuffState, buffID)
+
+ if afterLogic and bySkill:
+ bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])
+ else:
SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID)
DoBuffAddOver(turnFight, batObj, buffSkill, buff, buffOwner)
@@ -101,7 +129,7 @@
continue
if curEffect.GetTriggerWay():
- if curEffect.GetTriggerSrc() == 2:
+ if curEffect.GetTriggerSrc() != ChConfig.TriggerSrc_Skill:
passiveEffMgr.AddBuffPassiveEffect(addBuff, buffSkill, curEffect)
elif effectID in ChConfig.AttrIDList:
@@ -117,12 +145,24 @@
return
-def DoBuffDel(turnFight, batObj, curBuff):
- ## 删除buff
+def DoBuffDel(turnFight, batObj, curBuff, relatedSkill=None, afterLogic=False, tagObj=None):
+ '''删除buff
+ @param relatedSkill: 关联的技能
+ @param afterLogic: 是否需要在关联技能处理完毕后才处理删除后续逻辑，如通知，触发被动等
+ @param tagObj: 由谁引起的buff删除
+ '''
+ release = True
+ isSync = True
+ relatedSkillID = relatedSkill.GetSkillID() if relatedSkill else 0
+ if afterLogic and relatedSkill:
+ release = False
+ isSync = False
+
isRefreshAttr = False # 是否刷属性
haveBuffPassiveEff = False
+ buffObjID = batObj.GetID()
buffMgr = batObj.GetBuffManager()
buffID = curBuff.GetBuffID()
skillData = curBuff.GetSkillData()
@@ -135,7 +175,7 @@
continue
if curEffect.GetTriggerWay():
- if curEffect.GetTriggerSrc() == 2:
+ if curEffect.GetTriggerSrc() != ChConfig.TriggerSrc_Skill:
haveBuffPassiveEff = True
elif effectID in ChConfig.AttrIDList:
@@ -149,16 +189,27 @@
if haveBuffPassiveEff:
batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)
- buffStates = skillData.GetBuffStates()
- for buffState in buffStates:
- buffMgr.DelBuffState(buffState, buffID)
+ curBuffState = skillData.GetCurBuffState()
+ if curBuffState:
+ buffMgr.DelBuffState(curBuffState, buffID)
# 最后删除buff、通知
- buffMgr.DelBuff(buffID)
- SyncBuffDel(turnFight, batObj, buffID)
-
+ buffMgr.DelBuff(buffID, release)
+ if isSync:
+ SyncBuffDel(turnFight, buffObjID, buffID, relatedSkillID)
+ if afterLogic and relatedSkill:
+ tagObjID = tagObj.GetID() if tagObj else buffObjID
+ relatedSkill.AddAfterLogic(ChConfig.AfterLogic_DelBuff, [buffObjID, curBuff, tagObjID])
+
if isRefreshAttr:
RefreshBuffAttr(batObj)
+ return
+
+def DoBuffDelAfterLogicOver(turnFight, buffObjID, curBuff, relatedSkill):
+ ## buff删除后续处理逻辑处理完毕
+ relatedSkillID = relatedSkill.GetSkillID() if relatedSkill else 0
+ SyncBuffDel(turnFight, buffObjID, curBuff.GetBuffID(), relatedSkillID)
+ ObjPool.GetPoolMgr().release(curBuff)
return
def DoBuffProcess(turnFight, batObj, curBuff):
@@ -245,12 +296,15 @@
clientPack.LastTime = curBuff.GetRemainTime()
clientPack.Layer = curBuff.GetLayer()
clientPack.OwnerID = curBuff.GetOwnerID()
+ clientPack.Value1 = curBuff.GetValue1()
+ clientPack.Value2 = curBuff.GetValue2()
+ clientPack.Value3 = curBuff.GetValue3()
turnFight.addBatPack(clientPack)
return
-def SyncBuffDel(turnFight, curBatObj, buffID, relatedSkillID=0):
+def SyncBuffDel(turnFight, objID, buffID, relatedSkillID=0):
clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffDel)
- clientPack.ObjID = curBatObj.GetID()
+ clientPack.ObjID = objID
clientPack.BuffID = buffID
clientPack.RelatedSkillID = relatedSkillID
turnFight.addBatPack(clientPack)
--
Gitblit v1.8.0