diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index ae4c925888..6a72c90e3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1290,8 +1290,9 @@ end function this.SingleJourneyWithWindRewardNoGet(curRewardTaskData) if curRewardTaskData then local dayNumConFig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,curRewardTaskData.missionId) + local curServerDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - PlayerManager.userCreateTime)/86400) -- LogYellow(curRewardTaskData.missionId .. " curRewardTaskData.state "..curRewardTaskData.state.." curRewardTaskData.progress "..curRewardTaskData.progress.." JourneyWithWindDayAmount[dayNumConFig.Values[1][2]] "..JourneyWithWindDayAmount[dayNumConFig.Values[1][2]]) - if curRewardTaskData.state == 0 and dayNumConFig and curRewardTaskData.progress >= JourneyWithWindDayAmount[dayNumConFig.Values[1][2]] then + if curRewardTaskData.state == 0 and dayNumConFig and curServerDay >= dayNumConFig.Values[1][2] and curRewardTaskData.progress >= JourneyWithWindDayAmount[dayNumConFig.Values[1][2]] then return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua index a3c4048bf8..dc533d2ed5 100644 --- a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua @@ -164,7 +164,7 @@ function this.SingleDayBtnDataShow(_go,data,index) this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0) ActivityGiftManager.SetJourneyWithWindPlayerPrefs(curDayIndex,1) end - if activityData then + if activityData and curServerDay >= data.Values[1][2] then for j = 1, #activityData.mission do if activityData.mission[j].missionId == data.Id then redState = ActivityGiftManager.SingleJourneyWithWindRewardNoGet(activityData.mission[j])