From c6391090f26c4fbb05232ce412f38866713a257d Mon Sep 17 00:00:00 2001 From: JieLing Date: Sun, 27 Sep 2020 16:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=95=8C=E9=99=A4=E9=AD=94=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 9 +++++++++ Assets/ManagedResources/~Lua/Data/UIData.lua | 2 ++ 2 files changed, 11 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 927b4177bc..bb62a07596 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1134,6 +1134,15 @@ function TimeToDHMS(second) return string.format(Language[10548],day, hour, minute, sec) end +--- 将一段时间转换为天时分 +function TimeToDHM(second) + local day = math.floor(second / (24 * 3600)) + local minute = math.floor(second / 60) % 60 + local sec = second % 60 + local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) + return string.format("%d天%02d时%02d分",day, hour, minute) +end + --- 将一段时间转换为天时 function TimeToDH(second) local day = math.floor(second / (24 * 3600)) diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 75527bcb1f..6ea2728df3 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -332,6 +332,8 @@ UIName = { XuanYuanMirrorRewardSortPopup = 331,--轩辕宝镜奖励 GuildTranscriptMainPopup = 332,--公会副本 GuildTranscriptRewardSortPanel = 333,--公会副本奖励排行 + GuideBattlePanel = 334, --引导战斗 + DemonSlayer = 335,--三界除魔 } SubUIConfig = {