diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index c73422277a..4ce4881ece 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -6443,7 +6443,7 @@ local passivityList = { local f2=args[2] local onRoleHit = function(deadRole) BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () - if deadRole.camp~=role.camp then + if deadRole.camp~=role.camp and not role:IsDead() then role:InsertExtraSkill(f1,f2) end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index 6eda1237e5..8b372480a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -123,9 +123,11 @@ function this.CheckTurnRound() if this.TurnRoundFunc then BattleLogic.WaitForTrigger(0.3, function() -- 清除数量限制 - this.CurSkillCount = 0 - this.TurnRoundFunc() - this.TurnRoundFunc = nil + if this.TurnRoundFunc then + this.CurSkillCount = 0 + this.TurnRoundFunc() + this.TurnRoundFunc = nil + end end) end end