From 2bcc092eaf3d04df4934b6493847086929f988a0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 17 十一月 2025 15:21:42 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(增加每大回合每武将最大反击次数限制;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py |   98 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 92 insertions(+), 6 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..17425ce 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -87,18 +87,27 @@
         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)
@@ -193,7 +202,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()
@@ -257,6 +269,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:
@@ -288,7 +354,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()
@@ -326,6 +395,21 @@
         
     if isRefreshAttr:
         RefreshBuffAttr(batObj)
+        
+    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
 
 def DoBuffDelAfterLogicOver(turnFight, buffObjID, curBuff, relatedSkill):
@@ -344,7 +428,7 @@
         callFunc(turnFight, batObj, curBuff, **kwargs)
     return
     
-def RefreshBuffAttr(batObj):
+def RefreshBuffAttr(batObj, isInit=False):
     ''' 刷新buff属性,如果有涉及到buff属性变更的,只能全部buff重新刷
     '''
     
@@ -438,15 +522,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