From 1b3cf4e85f52ba30008b3699ceb50d3b73125e30 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 30 十二月 2025 19:30:10 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（貂蝉所有技能；增加效果6034 6035；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 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 5dae661..4497f1d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.py
@@ -85,12 +85,16 @@
ownerID = buffOwner.GetID()
skillType = buffSkill.GetSkillType()
- #无敌免疫持续减益buff、控制类buff
- if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_Action] \
- and batObj.CheckInState(ChConfig.BatObjState_Wudi):
- GameWorld.DebugLogEx("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s", curID, skillID, ownerID, relatedSkillID)
- return
-
+ #免疫减益buff、控制类buff
+ if skillType in [ChConfig.Def_SkillType_LstDepBuff, ChConfig.Def_SkillType_DepBuff, ChConfig.Def_SkillType_Action]:
+ if batObj.CheckInState(ChConfig.BatObjState_Wudi):
+ GameWorld.DebugLogEx("无敌状态下免疫该buff: curID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s", curID, skillID, ownerID, relatedSkillID)
+ return
+ if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlDepBuff, buffSkill):
+ return
+ if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneBadBuff, buffSkill):
+ return
+
#被动触发免疫控制buff
if skillType == ChConfig.Def_SkillType_Action:
if TurnPassive.GetTriggerEffectValue(turnFight, batObj, buffOwner, ChConfig.PassiveEff_ImmuneControlBuff, buffSkill):
@@ -224,12 +228,14 @@
ownerID = buffOwner.GetID()
buffID = buff.GetBuffID()
timing = batObj.GetTiming()
+ remainTime = buffSkill.GetLastTime()
+ remainTime += TurnPassive.GetTriggerEffectValue(turnFight, buffOwner, batObj, ChConfig.PassiveEff_AddBuffTime, buffSkill)
- GameWorld.DebugLogEx(" __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s",
- buffID, skillID, ownerID, relatedSkillID, timing, curID)
+ GameWorld.DebugLogEx(" __addNewBuff. buffID=%s,skillID=%s,ownerID=%s,relatedSkillID=%s,timing=%s,remainTime=%s,setLayerCnt=%s",
+ buffID, skillID, ownerID, relatedSkillID, timing, remainTime, setLayerCnt, curID)
buff.SetAddTiming(timing) # 武将当前在什么时机就设置为什么时机
buff.SetOwnerID(ownerID)
- buff.SetRemainTime(buffSkill.GetLastTime())
+ buff.SetRemainTime(remainTime)
buff.SetLayer(setLayerCnt)
buff.SetBuffValueList(buffValueList)
curBuffState = buffSkill.GetCurBuffState()
@@ -242,7 +248,29 @@
SyncBuffRefresh(turnFight, batObj, buff, relatedSkillID, isNewAdd=True)
RefreshBuffEffect(turnFight, batObj, buff, buffSkill, buffOwner, refreshType=1)
+
+ #受控时
+ if curBuffState and IsControlledHardState(curBuffState):
+ TurnPassive.OnTriggerPassiveEffect(turnFight, batObj, ChConfig.TriggerWay_BeControlledHard, tagObj=buffOwner, connSkill=buffSkill, connBuff=buff)
+ batObjMgr = BattleObj.GetBatObjMgr()
+ ownerBatLineup = buffOwner.GetBatLineup()
+ for lineupObjID in ownerBatLineup.posObjIDDict.values():
+ lineupObj = batObjMgr.getBatObj(lineupObjID)
+ if not lineupObj.IsAlive():
+ continue
+ # 敌方被控时
+ if lineupObj.GetFaction() != batObj.GetFaction():
+ TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_EnemyBeControlledHard, batObj, connSkill=buffSkill)
+
return buff
+
+def IsControlledHardState(state):
+ stateGroup = "1"
+ buffStateGroupDict = IpyGameDataPY.GetFuncEvalCfg("BuffStateGroup", 1, {})
+ if stateGroup not in buffStateGroupDict:
+ return
+ return state in buffStateGroupDict[stateGroup]
+
def RefreshBuffEffect(turnFight, batObj, curBuff, buffSkill=None, buffOwner=None, refreshType=0):
## 刷新buff效果
@@ -269,15 +297,16 @@
if refreshType and buffSkill and buffOwner:
TurnPassive.OnTriggerPassiveEffect(turnFight, buffOwner, ChConfig.TriggerWay_BuffAddByOwner, tagObj=batObj, connSkill=buffSkill, connBuff=curBuff)
- # 判断是否有额外属性的
- if not isRefreshAttr:
- effExDict = curBuff.GetEffectExDict()
- for effCalcInfo in effExDict.keys():
- effID = effCalcInfo[0]
- if effID in ChConfig.AttrIDList:
- isRefreshAttr = True
- break
-
+
+ # 判断是否有额外属性的
+ if not isRefreshAttr:
+ effExDict = curBuff.GetEffectExDict()
+ for effCalcInfo in effExDict.keys():
+ effID = effCalcInfo[0]
+ if effID in ChConfig.AttrIDList:
+ isRefreshAttr = True
+ break
+
if isRefreshAttr:
RefreshBuffAttr(batObj)
@@ -439,6 +468,15 @@
if haveBuffPassiveEff:
batObj.GetPassiveEffManager().DelBuffPassiveEffect(buffID)
+ # 判断是否有额外属性的
+ if not isRefreshAttr:
+ effExDict = curBuff.GetEffectExDict()
+ for effCalcInfo in effExDict.keys():
+ effID = effCalcInfo[0]
+ if effID in ChConfig.AttrIDList:
+ isRefreshAttr = True
+ break
+
if isRefreshAttr and not noRefreshAttr:
RefreshBuffAttr(batObj)
@@ -499,7 +537,7 @@
isRefreshAttr = False
objID = batObj.GetID()
buffMgr = batObj.GetBuffManager()
- for index in range(buffMgr.GetBuffCount()):
+ for index in range(buffMgr.GetBuffCount())[::-1]:
buff = buffMgr.GetBuffByIndex(index)
buffID = buff.GetBuffID()
skillID = buff.GetSkillID()
@@ -606,6 +644,9 @@
effID = effect.GetEffectID()
if effID not in ChConfig.AttrIDList:
continue
+ if effect.GetTriggerWay():
+ # 有需要触发才生效的属性在buff中不生效，由触发规则决定
+ continue
if not (not effect.GetTriggerSrc() or effect.GetTriggerBuffEnable()):
# buff时，不配默认有效，或仅buff有效
continue
--
Gitblit v1.8.0