diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 789606f1fc..1b7ead46cb 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1553,6 +1553,15 @@ function TimeStampToDateStr3(second) return string.format("%02d:%02d:%02d", hour, minute, sec) end +function TimeStampToDateStr5(timestamp) + local date = os.date("*t", timestamp) + local cdate = os.date("*t", GetTimeStamp()) + if date.year == cdate.year and date.month == cdate.month and date.day == cdate.day then + return string.format("%02d:%02d:%02d", date.hour, date.min, date.sec) + end + return string.format(Language[12056], date.year, date.month, date.day, date.hour, date.min) +end + --- 根据id获取资源 function GetResourcePath(id) return GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig, id).Name) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua index 5487f37509..97185a00ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord.lua @@ -43,10 +43,10 @@ function this:SetSingleData(_go,_data,_index) local time = Util.GetGameObject(_go,"Time"):GetComponent("Text") local desc = Util.GetGameObject(_go,"Desc"):GetComponent("Text") - time.text = TimeStampToDateStr3(_data.time) - if _data.type == 1 then + time.text = TimeStampToDateStr5(_data.time) + if _data.type == 0 then desc.text = string.format("经过一番激烈的战斗,最终击败%s,占领%s,开始收集灵脉资源",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name) - elseif _data.type == 2 then + elseif _data.type == 1 then desc.text = string.format("大战过后,我方神将不敌%s,丢失%s",PracticeManager.SetNameColor(_data.defName,_data.practiceLevel),lodeConfig[_data.lingMaiId].Name) end end diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index 6c6226c6de..d2f3bea6e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -153,7 +153,7 @@ function LingMaiMiJingPanel:SetMydata() self.TextTip:SetActive(true) self.rewardGrid:SetActive(false) end - self.battleTime.text = string.format("剩余挑战次数:%s",5) + self.battleTime.text = string.format("剩余挑战次数:%s",PrivilegeManager.GetPrivilegeRemainValue(2030)) ForceRebuildLayout(self.bottom.transform) end