From 3e9ed638b415aecb33f219e2f92b7b56383dc98e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 29 Mar 2022 11:54:41 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=3D=3D=3D=3D=3D=E5=91=BD=E7=9F=B3=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BD=A6=E8=BF=9F=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 2 +- .../~Lua/Modules/Popup/RewardGemSingleShowPopup.lua | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index a96ec1291c..a4710670c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -422,7 +422,7 @@ function this._TimeUpdate() --LogError("timeStamp=="..limitTime-GetTimeStamp()) local cha =limitTime-GetTimeStamp() if cha>86400 then - this.timeText.text = string.format("%s后开启",TimeToD(limitTime-GetTimeStamp())) + this.timeText.text = string.format("%s天后开启",TimeToD(limitTime-GetTimeStamp())) elseif cha>3600 then this.timeText.text = string.format("%s后开启",TimeToH(limitTime-GetTimeStamp())) else diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua index c331698737..973340e567 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardGemSingleShowPopup.lua @@ -243,7 +243,13 @@ function this.SetGemProperty() this.proList[i] = go end go:SetActive(true) - go:GetComponent("Text").text = string.format( "全体神将%s+%s",PropertyConfig[data[i][1]].Info,data[i][2]/100).."%" + local str="" + if PropertyConfig[data[i][1]].Style==1 then + str=string.format( "全体神将%s+%s",PropertyConfig[data[i][1]].Info,data[i][2]) + elseif PropertyConfig[data[i][1]].Style==2 then + str=string.format( "全体神将%s+%s",PropertyConfig[data[i][1]].Info,data[i][2]/100).."%" + end + go:GetComponent("Text").text = str end end