diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 30a7608688..f14a95944d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -223,13 +223,15 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) table.insert(patFaceAllData,v) end end - -- elseif v.Type == 12 then--福星高照活动 - -- local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) - -- if ActData then - -- if RedPointManager.PlayerPrefsGetStr(v.Id..PlayerManager.level.."TimeLimitSkin") == "0" then - -- table.insert(patFaceAllData,v) - -- end - -- end + elseif v.Type == 12 then--福星高照活动 + local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FuXingGaoZhao) + local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") + local time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() + if time >0 then + if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then + table.insert(patFaceAllData,v) + end + end else if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then table.insert(patFaceAllData,v) diff --git a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua index 9ed96d1515..a265bbe09c 100644 --- a/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua @@ -117,7 +117,7 @@ function FuXingGaoZhao:SetTime() self.timer = nil end local time = data.startTime + tonumber(timeData[1])*86400 - GetTimeStamp() - self.time.text = string.format("剩余接受时间:%s",TimeToFelaxible(time)) + self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) self.timer = Timer.New(function() time = time - 1 if time < 1 then @@ -125,7 +125,7 @@ function FuXingGaoZhao:SetTime() self.timer = nil self:ClosePanel() end - self.time.text = string.format("剩余接受时间:%s",TimeToFelaxible(time)) + self.time.text = string.format("剩余结束时间:%s",TimeToFelaxible(time)) end, 1, -1, true) self.timer:Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 4451ce6ad7..9d385e80dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1000,6 +1000,9 @@ function this.TimeFormat() local data = string.split(ConfigManager.GetConfigDataByKey(ConfigName.SpecialConfig,"Id",109).Value,"#") local time = ActData.startTime + tonumber(data[1])*86400 - GetTimeStamp() activityTabs[k].timeText.text = TimeToFelaxible(time) + if time <= 0 then + activityTabs[k].go.gameObject:SetActive(false) + end end else activityTabs[k].go.gameObject:SetActive(false)