【战斗】=================被动修改提交

dev_one_discount
wangzhenxing 2023-08-25 16:03:57 +08:00
parent 91c292a809
commit d9778dbae4
3 changed files with 25 additions and 8 deletions

View File

@ -370,6 +370,7 @@ function BuffManager:Update()
buff:OnEnd()
buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff)
BattleLogic.Event:DispatchEvent(BattleEventName.BuffEnd, buff)
BattleLogic.Event:DispatchEvent(BattleEventName.BuffBeClear, buff)
putBuff(buff)
buffList:Remove(index)
else

View File

@ -12473,11 +12473,11 @@ local passivityList = {
if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then
return
end
if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then
if BattleLogic.BuffMgr:HasBuff(skill.owner, t1, function(buff)
return buff.caster == role and buff.signType == t2 end) then
BattleLogic.WaitForTrigger(2, function () --延迟一帧移除事件,防止触发帧和结束帧为同一帧时,被动未移除
BattleUtil.CalRage(role, skill.owner, v1, ct)
end)
end
end
@ -12493,13 +12493,17 @@ local passivityList = {
-- 释放技能后
local onSkillEnd = function(skiller)
skiller.notAction=false
--skiller.notAction=false
if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then
BattleUtil.RandomAction(v1, function()
skiller.notAction=true
end)
end
local onTurnEnd = function(turner)
turner.notAction= false
end
skiller.Event:AddEvent(BattleEventName.RoleTurnEnd, onTurnEnd,nil,nil,role)
end
BattleLogic.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillEnd,nil,nil,role)
end,
@ -12511,16 +12515,25 @@ local passivityList = {
local t2 = args[2]
local v1 = args[3]
local triggerRole={}
-- 释放技能后
local onSkillEnd = function(skiller)
if BattleUtil.ChecklistIsContainValue(triggerRole,skiller) then
return
end
if BattleLogic.BuffMgr:HasBuff(skiller, t1, function(buff) return buff.signType == t2 and buff.caster==role end) then
BattleUtil.RandomAction(v1, function()
BattleLogic.InsertSkillRole(skiller)
table.insert(triggerRole,skiller)
end)
end
end
BattleLogic.Event:AddEvent(BattleEventName.RoleTurnStart, onSkillEnd,nil,nil,role)
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEnd,function(curRound)
triggerRole={}
end)
end,
-- [a]效果[b]状态的buff消失时有[c]%概率额外行动一次
@ -12531,17 +12544,19 @@ local passivityList = {
local v1 = args[3]
local OnBuffEnd=function(buff)
if buff.type~= t1 and buff.signType~=t2 then
return
end
if buff.caster~=role then
return
end
BattleUtil.RandomAction(1, function()
if buff.type~= t1 or buff.signType~=t2 then
return
end
BattleUtil.RandomAction(v1, function()
BattleLogic.InsertSkillRole(role)
end)
end
BattleLogic.Event:AddEvent(BattleEventName.BuffEnd, OnBuffEnd,nil,nil,role)
BattleLogic.Event:AddEvent(BattleEventName.BuffBeClear, OnBuffEnd,nil,nil,role)
end,
-- 处于[a]效果[b]状态的目标,且怒气[c]于[d]点,受到的伤害[e]改变[f]%,伤害类型[g]

View File

@ -144,6 +144,7 @@ BattleEventName = {
BuffTrigger = indexAdd(),
BuffBeAdd=indexAdd(),
BuffEnd = indexAdd(),
BuffBeClear = indexAdd(),
BuffCountChange = indexAdd(),
BuffCover = indexAdd(),
BuffRoundChange = indexAdd(),