From e337559c30506ce5abca96dacd45bcc0a23b8137 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 16 May 2022 13:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=E5=B1=8F=E8=94=BD=E6=88=98=E6=96=97=E4=B8=89?= =?UTF-8?q?=E5=80=8D=E6=95=B0=EF=BC=8C2=E5=80=8D=E9=80=9F=E6=94=B9?= =?UTF-8?q?=E4=B8=BA2.5=E5=80=8D=E9=80=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/BattleManager.lua | 2 +- .../~Lua/Modules/Battle/View/BattlePanel.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 794304a344..cbcf692e7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -907,7 +907,7 @@ end -- 战斗加速控制 BATTLE_TIME_SCALE_ZERO = 0 BATTLE_TIME_SCALE_ONE= 1.1 -BATTLE_TIME_SCALE_TWO = 2 +BATTLE_TIME_SCALE_TWO = 2.5 BATTLE_TIME_SCALE_THREE = 3 this.TimeScale = 0 function this.InitTimeScale() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 55f643d0c9..5a704205d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -171,11 +171,11 @@ function this:BindEvent() BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO) elseif scale == BATTLE_TIME_SCALE_TWO then -- 2倍速时判断是否解锁了3倍速,没解锁就回到1倍速 - if BattleManager.IsUnlockBattleSpeedThree() then - BattleManager.SetTimeScale(BATTLE_TIME_SCALE_THREE) - else + -- if BattleManager.IsUnlockBattleSpeedThree() then + -- BattleManager.SetTimeScale(BATTLE_TIME_SCALE_THREE) + --else BattleManager.SetTimeScale(BATTLE_TIME_SCALE_ONE) - end + --end elseif scale == BATTLE_TIME_SCALE_THREE then -- 三倍速回到一倍速 BattleManager.SetTimeScale(BATTLE_TIME_SCALE_ONE)