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