diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua index 1af9b97151..c80e7e0afd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua @@ -74,7 +74,7 @@ local _TriggerConfig = { end }, [10] = {--10:回合开始前 - event = BattleEventName.BattleRoundEnd, + event = BattleEventName.BattleRoundStart, triggerFunc = function(skill, ...) return true end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index c2387605ef..fc225c8923 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -280,6 +280,7 @@ end function this.InitOption() --显示倒计时 local curRound, maxRound = BattleLogic.GetCurRound() + curRound = curRound <= 0 and 1 or curRound -- 最小显示第一回合 this.roundText.text = string.format(Language[10252], curRound, maxRound) hadCounted = 0 @@ -508,6 +509,7 @@ function this.OnRoundChanged(round) -- body --显示波次 local curRound, maxRound = BattleLogic.GetCurRound() + curRound = curRound <= 0 and 1 or curRound -- 最小显示第一回合 this.roundText.text = string.format(Language[10252], curRound, maxRound) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index 762e347499..b75b99557b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -672,12 +672,10 @@ function this.SetRoleHighLight(caster, targets, func) max = max + 1 role:SetHighLight(false, 0.95, 0.2, _Count) end - LogPink("max1 = "..max) if caster and caster.role.type == BattleUnitType.Role then max = max - 1 caster:SetHighLight(true, 1.5, 0.2) end - LogPink("max2 = "..max) if targets then for _, data in ipairs(targets) do if caster ~= tbRole[data] then @@ -686,7 +684,6 @@ function this.SetRoleHighLight(caster, targets, func) end end end - LogPink("max3 = "..max) if max == 0 then if func then func() end end