From 97036e465d228b0eb3c2187c5c2795573cf0adec Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 3 Nov 2022 16:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E5=86=B2=E7=89=B9=E6=9D=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=88=98=E6=96=97=E4=B8=89=E5=80=8D=E9=80=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattlePanel.lua | 4 ++-- .../~Lua/Modules/Operating/GMShuaChongTeQuan.lua | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 58798c6080..9dc5918fa9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -436,9 +436,9 @@ end function this.SwitchTimeScale() local _scale = math.floor(BattleManager.GetTimeScale()) --如果之前是三倍速,强制转成二倍速 - if _scale==3 then + if _scale==2 then BattleManager.SetTimeScale(BATTLE_TIME_SCALE_TWO) - _scale=2 + _scale=3 end this.TimeScaleTxt.text = _scale diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua index 82e88a7531..b271623aac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua @@ -79,6 +79,7 @@ function GMShuaChongTeQuan:InitComponent() end else self.hintTxt.gameObject:SetActive(false) + self.btn_buy:SetActive(true) end Util.AddOnceClick(self.btn_buy,function() if state==0 then @@ -152,9 +153,9 @@ function GMShuaChongTeQuan:SingleDataShow(item,data,lv) end end if privilege.IfFloat==2 then - num=num/10000 .."%" + num=num/100 .."%" end - LogError("lv=============================="..lv) + if privilege.Type==1 then item:GetComponent("Text").text =string.format(privilege.Name,num) else