From 6de92f3692d5deed025f9b45f0e1800df06c3ef8 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 2 Nov 2020 19:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=87=A4=E5=87=B0=E6=8A=80=E8=83=BD=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E5=9B=9E=E5=90=88=E6=97=A0=E6=B3=95=E8=A7=A6=E5=8F=91=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=88=98=E6=96=97?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9B=9E=E5=90=88=E6=95=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Monster/MonsterSkill/MTrigger.lua | 2 +- .../ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua | 2 ++ .../ManagedResources/~Lua/Modules/Battle/View/BattleView.lua | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) 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