From 1890f0643483194e41668032aa75eb755c8a1aad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 12 八月 2025 17:23:43 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(主阵容变更时重新开始战斗;主阵容属性变化时实时更新主线战斗;主线战斗请求CD限制1秒;计算buff属性、buff添加删除通用逻辑;4012效果状态逻辑;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |  142 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 138 insertions(+), 4 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 7d4a172..adfc47f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -18,17 +18,21 @@
 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()
-    enhanceBySkill = curSkill.GetEnhanceBySkill()
-    relatedSkillID = enhanceBySkill.GetSkillID() if enhanceBySkill else 0
+    bySkill = curSkill.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 enhanceBySkill:
+    #检查是否几率触发,附加技能、被动触发的外层已检查过概率,不重复检查
+    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!")
@@ -51,6 +55,8 @@
     buff.SetRemainTime(curSkill.GetLastTime())
     #buff.SetLayer()
     SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID)
+    
+    DoBuffAddOver(turnFight, batObj, curSkill, buff, buffOwner)
     return True
 
 def SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID=0):
@@ -72,3 +78,131 @@
     clientPack.RelatedSkillID = relatedSkillID
     turnFight.addBatPack(clientPack)
     return
+
+def DoBuffAddOver(turnFight, batObj, curSkill, addBuff, buffOwner=None):
+    ## buff添加成功后处理
+    
+    isRefreshAttr = False # 是否刷属性
+    skillData = addBuff.GetSkillData()
+    # buff效果加入
+    for effectIndex in range(0, skillData.GetEffectCount()):
+        curEffect = skillData.GetEffect(effectIndex)
+        effectID = curEffect.GetEffectID()
+        if effectID == 0:
+            continue
+        
+        if 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)
+        
+    if isRefreshAttr:
+        RefreshBuffAttr(batObj)
+        
+    return
+
+def DoBuffDel(turnFight, batObj, curBuff):
+    ## 删除buff
+    
+    buffMgr = batObj.GetBuffManager()
+    buffID = curBuff.GetBuffID()
+    skillData = curBuff.GetSkillData()
+    #buff消失的触发
+    for effectIndex in range(0, skillData.GetEffectCount()):
+        curEffect = skillData.GetEffect(effectIndex)
+        effectID = curEffect.GetEffectID()
+        
+        if not effectID:
+            continue
+        
+        callFunc = GameWorld.GetExecFunc(TurnBuffs, "Buff_%d.%s" % (effectID, "OnBuffDel"))
+        
+        if callFunc:
+            callFunc(turnFight, batObj, curBuff, curEffect)
+            
+    #passiveEff = PassiveBuffEffMng.GetPassiveEffManager().GetPassiveEff(curObj)
+    #if passiveEff:
+    #    passiveEff.DelBuffInfo(skillData)
+    
+    # 最后删除buff、通知
+    buffMgr.DelBuff(buffID)
+    SyncBuffDel(turnFight, batObj, buffID)
+    return
+
+def RefreshBuffAttr(batObj):
+    ''' 刷新buff属性,如果有涉及到buff属性变更的,只能全部buff重新刷
+    '''
+    
+    objID = batObj.GetID()
+    befHP = batObj.GetHP()
+    befMaxHP = batObj.GetMaxHP()
+    
+    batAttrDict = batObj.ResetBattleEffect()
+    
+    GameWorld.DebugLog("RefreshBuffAttr ID:%s,atk=%s,def=%s,hp=%s/%s,batAttrDict=%s" 
+                       % (objID, batObj.GetAtk(), batObj.GetDef(), befHP, befMaxHP, batAttrDict))
+    
+    # buff
+    buffAttrDict = {} # buff属性 {attrID:value, } value可能是负值
+    buffMgr = batObj.GetBuffManager()
+    for index in range(buffMgr.GetBuffCount()):
+        buff = buffMgr.GetBuffByIndex(index)
+        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)
+            calcType = effect.GetEffectValue(1)
+            if calcType == 2: # 减少,其他默认增加
+                attrValue = -attrValue
+            buffAttrDict[attrID] = buffAttrDict.get(attrID, 0) + attrValue
+            
+    GameWorld.DebugLog("    __addBuffAttr buffAttrDict=%s" % buffAttrDict)
+    
+    objID = batObj.GetID()
+    # 先计算百分比加成或降低的
+    perIDList = ChConfig.AttrPerDict.values()
+    for attrID, attrPerID in ChConfig.AttrPerDict.items():
+        if attrPerID not in buffAttrDict:
+            continue
+        attrPerValue = buffAttrDict[attrPerID] # 可能是负值
+        attrValue = batObj.GetBatAttrValue(attrID, False)
+        if attrValue <= 0:
+            continue
+        updValue = int(attrValue * (10000 + attrPerValue) / 10000.0)
+        updValue = max(0, updValue) # 最多减到0,最大无上限
+        batObj.SetBatAttrValue(attrID, updValue)
+        GameWorld.DebugLog("    attrID=%s(PerID:%s),attrValue=%s(PerValue:%s),updValue=%s" % (attrID, attrPerID, attrValue, attrPerValue, updValue))
+        
+    # 再累加非百分比的固定值
+    for attrID, addValue in buffAttrDict.items():
+        if attrID in perIDList:
+            continue
+        attrValue = batObj.GetBatAttrValue(attrID, False)
+        updValue = max(0, attrValue + addValue) # 最多减到0,最大无上限
+        batObj.SetBatAttrValue(attrID, updValue)
+        GameWorld.DebugLog("    attrID=%s,attrValue=%s,addValue=%s,updValue=%s" % (attrID, attrValue, addValue, updValue))
+        
+    aftHP = batObj.GetHP()
+    aftMaxHP = batObj.GetMaxHP()
+    if aftMaxHP != befMaxHP:
+        batObj.SetMaxHP(aftMaxHP, True)
+        if befHP and aftMaxHP > befMaxHP:
+            aftHP += (aftMaxHP - befMaxHP)
+            batObj.SetHP(aftHP, True)
+    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

--
Gitblit v1.8.0