diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 9d27a306cf..09701123b6 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1042,6 +1042,7 @@ ActivityTypeDef = { OpenSeverWelfare=55,--开服福利 EightDayGift = 56,--八日登陆 SignInfo = 57,--三日七日签到 + Celebration = 60,--主题活动 社稷大典 --主题活动 FindFairy=43,--限时招募 @@ -1800,6 +1801,9 @@ RANK_TYPE = { XUANYUANMIRROR_RANK=24,-- 竞技场积分排名 前端自己添加 FAST_EXPLORE=25,--极速达人排行 GUILDTRANSCRIPT=26,--公会排行 + + CELEBRATION_PERSON = 27,--社稷大典个人 + CELEBRATION_GUILD = 28,--社稷大典工会 } --东海寻仙弹窗类型 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 6734b45940..f82b0da42d 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1149,6 +1149,25 @@ function CalculateSecondsNowTo_N_OClock(n) end end +function TimeToFelaxible(second)--大于一天用多少天多少小时,小于一天用00:00:00 + if second <= 86400 then + if not second or second < 0 then + return "00:00:00" + end + local _sec = second % 60 + local allMin = math.floor(second / 60) + local _min = allMin % 60 + local _hour = math.floor(allMin / 60) + return string.format("%02d:%02d:%02d", _hour, _min, _sec), _hour, _min, _sec + elseif second > 86400 then + 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(Language[12278],day, hour) + end + +end --- 将一段时间转换为天时分秒 function TimeToDHMS(second) local day = math.floor(second / (24 * 3600))