From dbb57924a6d29530b7465dfcece68279ed6c80f9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 14 Sep 2020 11:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=8F=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0consumerId=20=E4=B8=BA=20=E8=A7=92=E8=89=B2id#?= =?UTF-8?q?=E5=95=86=E5=93=81id=20=20=20=20=E4=BF=AE=E5=A4=8Dsdk=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=9F=BA=E9=87=91=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Message/LoadingPanel.lua | 14 ++++++++------ .../~Lua/Modules/Pay/PayManager.lua | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua index 2511a8c70e..500e60f9cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua @@ -17,12 +17,14 @@ local curIndex = 0 local lerp = 0 local maxIndex = 0 local function update() - lerp = math.clamp(lerp + Time.fixedDeltaTime * 15,0,1) - local curValue = this.Slider.value * (1-lerp) + curIndex * lerp - this.Slider.value = curValue - local curTextValue = math.floor(((this.Slider.value * (1-lerp) + curIndex * lerp)/32)*100) - curTextValue = curTextValue > 100 and 100 or curTextValue - this.SliderText.text = curTextValue .."%" + if this.Slider then + lerp = math.clamp(lerp + Time.fixedDeltaTime * 15,0,1) + local curValue = this.Slider.value * (1-lerp) + curIndex * lerp + this.Slider.value = curValue + local curTextValue = math.floor(((this.Slider.value * (1-lerp) + curIndex * lerp)/32)*100) + curTextValue = curTextValue > 100 and 100 or curTextValue + this.SliderText.text = curTextValue .."%" + end end function LoadingPanel.AddStep(func) diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 7c8b4cf937..9a02c01a60 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -109,7 +109,7 @@ function this.RequestPay(context) params.serverID = PlayerManager.serverInfo.server_id params.serverName = PlayerManager.serverInfo.name -- 角色相关 - params.roleID = tostring(PlayerManager.uid) + params.roleID = tostring(PlayerManager.uid).."#"..tostring(context.Id) params.roleName = PlayerManager.nickName params.roleLevel = PlayerManager.level params.vip = tostring(VipManager.GetVipLevel())