From a65d363c813b7d554de1ce2edad271162ad86d55 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 八月 2025 17:33:53 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(计算战力支持属性系数参数,技能战力参数支持;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |  185 +++++++++++++++++++++++++++++-----------------
 1 files changed, 117 insertions(+), 68 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 adfc47f..27ddea2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -18,94 +18,100 @@
 import ChConfig
 import GameWorld
 import ChPyNetSendPack
-import SkillCommon
 import TurnBuffs
 import ObjPool
 
 GameWorld.ImportAll("Script\\Skill\\", "TurnBuffs")
 
-def OnAddBuff(turnFight, batObj, curSkill, buffOwner=None):
-    skillID = curSkill.GetSkillID()
-    bySkill = curSkill.GetBySkill()
+def GetAddBuffValue(attacker, defender, curSkill):
+    callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (curSkill.GetAtkType(), "CalcBuffValue"))
+    if not callFunc:
+        return []
+    return callFunc(attacker, defender, curSkill)
+
+def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None):
+    skillID = buffSkill.GetSkillID()
+    bySkill = buffSkill.GetBySkill()
     relatedSkillID = bySkill.GetSkillID() if bySkill else 0
     curID = batObj.GetID()
-    ownerID = buffOwner.GetID() if buffOwner else curID
-    GameWorld.DebugLog("OnAddBuff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s" % (curID, skillID, ownerID, relatedSkillID))
-    #检查是否几率触发,附加技能、被动触发的外层已检查过概率,不重复检查
-    if not (curSkill.GetIsEnhanceSkill() or SkillCommon.isPassiveTriggerSkill(curSkill)):
-        rate = curSkill.GetHappenRate()
-        if rate and rate != ChConfig.Def_MaxRateValue and not GameWorld.CanHappen(rate, ChConfig.Def_MaxRateValue):
-            GameWorld.DebugLog("    概率不触发buff!")
-            return
-        
-    skillTypeID = curSkill.GetSkillTypeID()
+    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))
+    
+    skillTypeID = buffSkill.GetSkillTypeID()
     # 先简单做下能加上即可
     buffMgr = batObj.GetBuffManager()
     buffIDList = buffMgr.FindBuffIDBySkillTypeID(skillTypeID)
     if buffIDList:
         GameWorld.DebugLog("    已经存在该buff: skillTypeID=%s,buffIDList=%s" % (skillTypeID, buffIDList))
+        # buff堆叠逻辑
+        
         return True
     
-    buff = buffMgr.AddBuff(skillID)
-    if not buff:
-        GameWorld.DebugLog("    添加buff失败! skillID=%s" % skillID)
-        return False
-    GameWorld.DebugLog("    AddBuffOK. buffID=%s" % buff.GetBuffID())
-    buff.SetOwnerID(ownerID)
-    buff.SetRemainTime(curSkill.GetLastTime())
-    #buff.SetLayer()
-    SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID)
-    
-    DoBuffAddOver(turnFight, batObj, curSkill, buff, buffOwner)
+    __AddNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner)
     return True
 
-def SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID=0):
-    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffRefresh)
-    clientPack.ObjID = curBatObj.GetID()
-    clientPack.BuffID = curBuff.GetBuffID()
-    clientPack.SkillID = curBuff.GetSkillID()
-    clientPack.RelatedSkillID = relatedSkillID
-    clientPack.LastTime = curBuff.GetRemainTime()
-    clientPack.Layer = curBuff.GetLayer()
-    clientPack.OwnerID = curBuff.GetOwnerID()
-    turnFight.addBatPack(clientPack)
+def __AddNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner):
+    skillID = buffSkill.GetSkillID()
+    bySkill = buffSkill.GetBySkill()
+    relatedSkillID = bySkill.GetSkillID() if bySkill else 0
+    curID = batObj.GetID()
+    ownerID = buffOwner.GetID()
+    buff = buffMgr.AddBuff(skillID)
+    if not buff:
+        GameWorld.DebugLog("    添加buff失败! skillID=%s" % skillID, curID)
+        return False
+    buffID = buff.GetBuffID()
+    GameWorld.DebugLog("    AddBuffOK. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timeline=%s" 
+                       % (buffID, skillID, ownerID, relatedSkillID, turnFight.getTimeline()), curID)
+    buff.SetOwnerID(ownerID)
+    buff.SetCalcTime(turnFight.getTimeline())
+    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:
+        SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID)
+        
+    DoBuffAddOver(turnFight, batObj, buffSkill, buff, buffOwner)
     return
 
-def SyncBuffDel(turnFight, curBatObj, buffID, relatedSkillID=0):
-    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffDel)
-    clientPack.ObjID = curBatObj.GetID()
-    clientPack.BuffID = buffID
-    clientPack.RelatedSkillID = relatedSkillID
-    turnFight.addBatPack(clientPack)
-    return
-
-def DoBuffAddOver(turnFight, batObj, curSkill, addBuff, buffOwner=None):
+def DoBuffAddOver(turnFight, batObj, buffSkill, addBuff, buffOwner):
     ## buff添加成功后处理
     
     isRefreshAttr = False # 是否刷属性
-    skillData = addBuff.GetSkillData()
+    
+    #atkType = buffSkill.GetAtkType()
+    #if atkType:
+    #    callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (atkType, "OnBuffAddOver"))
+    #    if callFunc:
+    #        callFunc(turnFight, batObj, buffSkill, addBuff, buffOwner)
+    
+    passiveEffMgr = batObj.GetPassiveEffManager()
     # buff效果加入
-    for effectIndex in range(0, skillData.GetEffectCount()):
-        curEffect = skillData.GetEffect(effectIndex)
+    for effectIndex in range(0, buffSkill.GetEffectCount()):
+        curEffect = buffSkill.GetEffect(effectIndex)
         effectID = curEffect.GetEffectID()
         if effectID == 0:
             continue
         
-        if effectID in ChConfig.AttrIDList:
+        if curEffect.GetTriggerWay():
+            if curEffect.GetTriggerSrc() == 2:
+                passiveEffMgr.AddBuffPassiveEffect(addBuff, buffSkill, curEffect)
+                
+        elif effectID in ChConfig.AttrIDList:
             isRefreshAttr = True
             
-        callFunc = GameWorld.GetExecFunc(TurnBuffs, "Buff_%d.%s" % (effectID, "OnBuffAddOver"))
-        if callFunc:
-            GameWorld.DebugLog("OnBuffAddOver, objID=%s,buffID=%s,effectID=%s" % (batObj.GetID(), addBuff.GetBuffID(), effectID))
-            callFunc(turnFight, batObj, curSkill, addBuff, curEffect, buffOwner)
-            
-        #被动触发的
-        #triggerType = PassiveBuffEffMng.GetBuffTriggerTypeByEffectID(effectID)
-        #if triggerType == -1:
-        #    continue
-        #passiveEff = PassiveBuffEffMng.GetPassiveEffManager().InitObjPassiveEff(curObj)
-        #passiveEff.AddBuffInfoByEffect(curEffect, skillID, onwerID, onwerType)
-        
+        else:
+            callFunc = GameWorld.GetExecFunc(TurnBuffs, "Buff_%d.%s" % (effectID, "OnBuffAddOver"))
+            if callFunc:
+                callFunc(turnFight, batObj, buffSkill, addBuff, curEffect, buffOwner)
+                
     if isRefreshAttr:
         RefreshBuffAttr(batObj)
         
@@ -113,6 +119,9 @@
 
 def DoBuffDel(turnFight, batObj, curBuff):
     ## 删除buff
+    
+    isRefreshAttr = False # 是否刷属性
+    haveBuffPassiveEff = False
     
     buffMgr = batObj.GetBuffManager()
     buffID = curBuff.GetBuffID()
@@ -125,20 +134,40 @@
         if not effectID:
             continue
         
-        callFunc = GameWorld.GetExecFunc(TurnBuffs, "Buff_%d.%s" % (effectID, "OnBuffDel"))
-        
-        if callFunc:
-            callFunc(turnFight, batObj, curBuff, curEffect)
+        if curEffect.GetTriggerWay():
+            if curEffect.GetTriggerSrc() == 2:
+                haveBuffPassiveEff = True
+                
+        elif effectID in ChConfig.AttrIDList:
+            isRefreshAttr = True
             
-    #passiveEff = PassiveBuffEffMng.GetPassiveEffManager().GetPassiveEff(curObj)
-    #if passiveEff:
-    #    passiveEff.DelBuffInfo(skillData)
-    
+        else:
+            callFunc = GameWorld.GetExecFunc(TurnBuffs, "Buff_%d.%s" % (effectID, "OnBuffDel"))
+            if callFunc:
+                callFunc(turnFight, batObj, curBuff, curEffect)
+                
+    if haveBuffPassiveEff:
+        batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)
+        
+    buffStates = skillData.GetBuffStates()
+    for buffState in buffStates:
+        buffMgr.DelBuffState(buffState, buffID)
+        
     # 最后删除buff、通知
     buffMgr.DelBuff(buffID)
     SyncBuffDel(turnFight, batObj, buffID)
+    
+    if isRefreshAttr:
+        RefreshBuffAttr(batObj)
     return
 
+def DoBuffProcess(turnFight, batObj, curBuff):
+    skillData = curBuff.GetSkillData()
+    callFunc = GameWorld.GetExecFunc(TurnBuffs, "BuffAtkType_%d.%s" % (skillData.GetAtkType(), "DoBuffProcess"))
+    if callFunc:
+        callFunc(turnFight, batObj, curBuff)
+    return
+    
 def RefreshBuffAttr(batObj):
     ''' 刷新buff属性,如果有涉及到buff属性变更的,只能全部buff重新刷
     '''
@@ -206,3 +235,23 @@
     GameWorld.DebugLog("    befHP=%s/%s, aftHP=%s/%s" % (befHP, befMaxHP, aftHP, aftMaxHP))
     GameWorld.DebugLog("    最终属性 ID:%s,atk=%s,def=%s,hp=%s/%s" % (objID, batObj.GetAtk(), batObj.GetDef(), aftHP, aftMaxHP))
     return
+
+def SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID=0):
+    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffRefresh)
+    clientPack.ObjID = curBatObj.GetID()
+    clientPack.BuffID = curBuff.GetBuffID()
+    clientPack.SkillID = curBuff.GetSkillID()
+    clientPack.RelatedSkillID = relatedSkillID
+    clientPack.LastTime = curBuff.GetRemainTime()
+    clientPack.Layer = curBuff.GetLayer()
+    clientPack.OwnerID = curBuff.GetOwnerID()
+    turnFight.addBatPack(clientPack)
+    return
+
+def SyncBuffDel(turnFight, curBatObj, buffID, relatedSkillID=0):
+    clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCBuffDel)
+    clientPack.ObjID = curBatObj.GetID()
+    clientPack.BuffID = buffID
+    clientPack.RelatedSkillID = relatedSkillID
+    turnFight.addBatPack(clientPack)
+    return

--
Gitblit v1.8.0