From 697e46856089c0a05d6a4c5fbee3778f8eb942fa Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 26 九月 2025 16:17:47 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（孙尚香技能；技能增加buff驱散限制字段；增加目标细分6 - 灼烧/玄火优先；增加效果5008 - 转化目标身上类型buff；优化效果5004 5006 5007；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 58 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 19 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 b319418..f96f0fa 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -32,7 +32,24 @@
return []
return callFunc(turnFight, attacker, defender, curSkill)
-def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False):
+def CopyBuff(turnFight, curBatObj, curBuff, tagBuff, bySkill=None, isNewAdd=False):
+ '''拷贝buff数据，不含目标buffID、归属，并刷新时间
+ '''
+ skillData = curBuff.GetSkillData()
+ curBuff.SetCalcTime(turnFight.getTimeline())
+ curBuff.SetRemainTime(max(tagBuff.GetRemainTime(), skillData.GetLastTime()))
+ curBuff.SetLayer(max(tagBuff.GetLayer(), skillData.GetLayerMax()))
+ curBuff.SetValue1(tagBuff.GetValue1())
+ curBuff.SetValue2(tagBuff.GetValue2())
+ curBuff.SetValue3(tagBuff.GetValue3())
+ GameWorld.DebugLog(" 拷贝buff: curBuffID=%s,tagBuffID=%s,Remain=%s,Layer=%s,Value=%s"
+ % (curBuff.GetBuffID(), tagBuff.GetBuffID(), curBuff.GetRemainTime(), curBuff.GetLayer(),
+ [curBuff.GetValue1(), curBuff.GetValue2(), curBuff.GetValue3()]))
+ relatedSkillID = bySkill.GetSkillID() if bySkill else 0
+ SyncBuffRefresh(turnFight, curBatObj, curBuff, relatedSkillID, isNewAdd)
+ return
+
+def DoAddBuffBySkillID(turnFight, batObj, skillID, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
## 根据技能ID添加buff
if not skillID:
return
@@ -45,12 +62,12 @@
useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData, ownerID)
useSkill.SetTagObjList(tagObjList)
- isOK = OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic)
+ addBuff = OnAddBuff(turnFight, batObj, useSkill, buffOwner, bySkill, afterLogic, isSync=isSync, setLayerCnt=setLayerCnt)
poolMgr.release(useSkill)
- return isOK
+ return addBuff
-def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False):
+def OnAddBuff(turnFight, batObj, buffSkill, buffOwner=None, bySkill=None, afterLogic=False, isSync=True, setLayerCnt=0):
skillID = buffSkill.GetSkillID()
bySkill = buffSkill.GetBySkill() if not bySkill else bySkill
relatedSkillID = bySkill.GetSkillID() if bySkill else 0
@@ -64,25 +81,29 @@
and batObj.CheckInState(ChConfig.BatObjState_Wudi):
GameWorld.DebugLog("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s"
% (curID, skillID, ownerID, relatedSkillID))
- return False
+ return
#被动触发免疫控制buff
if buffSkill.GetSkillType() == 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 False
+ return
buffValueList = GetAddBuffValue(turnFight, buffOwner, batObj, buffSkill)
skillTypeID = buffSkill.GetSkillTypeID()
buffRepeat = buffSkill.GetBuffRepeat()
- addLayerCnt = buffSkill.GetLayerCnt()
- addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)
- if addLayerEff:
- # 可指定来源技能技能才生效，不指定的话默认生效
- if not addLayerEff.GetTriggerSrc() or addLayerEff.GetTriggerSrc() == relatedSkillID:
- addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
+ if setLayerCnt > 0:
+ addLayerCnt = setLayerCnt
+ GameWorld.DebugLog("外部直接指定添加的buff层级: setLayerCnt=%s" % setLayerCnt)
+ else:
+ addLayerCnt = buffSkill.GetLayerCnt()
+ addLayerEff = buffSkill.GetEffectByID(ChConfig.PassiveEff_AddBuffLayerByWeight)
+ if addLayerEff:
+ # 可指定来源技能技能才生效，不指定的话默认生效
+ if not addLayerEff.GetTriggerSrc() or addLayerEff.GetTriggerSrc() == relatedSkillID:
+ addLayerCnt = GameWorld.GetResultByWeightList(addLayerEff.GetEffectValues(), addLayerCnt)
maxLayerCnt = buffSkill.GetLayerMax()
if maxLayerCnt:
maxLayerCnt += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffLayerMax, buffSkill)
@@ -154,17 +175,16 @@
buff.SetBuffValueList(buffValueList)
if afterLogic and bySkill:
bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])
- else:
+ elif isSync:
SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
if nowLayerCnt != updLayerCnt:
RefreshBuffEffect(turnFight, batObj, buff, False)
- return True
+ return buff
- __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt)
- return True
+ return __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill, afterLogic, setLayerCnt=addLayerCnt, isSync=isSync)
-def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0):
+def __addNewBuff(turnFight, batObj, buffMgr, buffSkill, buffValueList, buffOwner, bySkill=None, afterLogic=False, setLayerCnt=0, isSync=True):
curID = batObj.GetID()
skillID = buffSkill.GetSkillID()
buff = buffMgr.AddBuff(skillID)
@@ -188,11 +208,11 @@
if afterLogic and bySkill:
bySkill.AddAfterLogic(ChConfig.AfterLogic_AddBuff, [batObj, buff, buffOwner])
- else:
+ elif isSync:
SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
RefreshBuffEffect(turnFight, batObj, buff, True)
- return
+ return buff
def RefreshBuffEffect(turnFight, batObj, curBuff, isNewBuff=False):
## 刷新buff效果
--
Gitblit v1.8.0