diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 363f499788..748fcb2e8f 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -236,7 +236,10 @@ end function GetTimeMaoHaoStrBySeconds(_seconds) return os.date("%M:%S", _seconds) end - +--秒转换成文字对应时间只有月日时 +function GetTimeMonthDayMinBySeconds(_seconds) + return os.date("%m月%d日%H时", _seconds) +end function PrintTable(root) local cache = { [root] = "." } local function _dump(t, space, name) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua index 4c44af02d1..68a747399e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua @@ -140,7 +140,8 @@ function this.RefreshPanel() else this.TimeCountDown(msg.overTime) end - DeathPosManager.rewardTimeTip=Language[11031]..TimeStampToDateStr(GetTimeStamp()+(msg.overTime-GetTimeStamp()))..Language[11032] + + DeathPosManager.rewardTimeTip= Language[11031]..GetTimeMonthDayMinBySeconds(msg.overTime)..Language[11032] DeathPosManager.battleTime=DeathPosManager.maxBattleTime-msg.challengeCount this.battleTime.text=Language[10520].. DeathPosManager.battleTime DeathPosManager.SetGuildInfoData(msg.infos) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua index 1121561fc0..146ba13385 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRewardPopup.lua @@ -41,7 +41,7 @@ function DeathPosRewardPopup:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosReward, this.SetIndicationData) end function DeathPosRewardPopup:OnOpen(...) - + this.SetIndicationData() end function DeathPosRewardPopup:OnShow()