From 49bf0b384a8577610f9f9e71a0698a87e41db2d8 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 26 Sep 2023 16:21:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8480=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 6 +++--- .../~Lua/Modules/Battle/Logic/BattleLogic.lua | 1 + .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index e36bd49c5c..14e5e534d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -12725,12 +12725,12 @@ local passivityList = { [480]=function(role,args,id,judge) local num=args[1] local onRoundChange=function(round) - if round<2 then + if round<1 then return end - role:AddSkill(BattleSkillType.Special, false, false, nil,false) + role:AddSkill(BattleSkillType.Special, false,true, nil,true) end - BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEnd, onRoundChange,nil,nil,role) + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEndBefore, onRoundChange,nil,nil,role) end, --释放技能如果造成减怒,对目标造成 减除怒气*属性[a][b]%的伤害,每回合最多触发[c]次 --a[int],b[float],c[int] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index f556910c3c..422d8a1c8b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -286,6 +286,7 @@ function BattleLogic.TurnRound(debugTurn) return else -- 上一轮结束 + BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundEndBefore, CurRound) BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundEnd, CurRound) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index a7007d49e6..66d642f4b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -54,7 +54,7 @@ BattleEventName = { BattleRoundStart = indexAdd(), BattleRoundChange = indexAdd(), BattleRoundEnd = indexAdd(), - + BattleRoundEndBefore = indexAdd(), RoleBeDamaged = indexAdd(), RoleDamage = indexAdd(), RoleBeDamagedBefore = indexAdd(),