From 9c2dee5856ef374fd20c90816dcbccbea37380c7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 7 Jul 2021 15:56:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BC=A5=E7=BC=88=E4=B9=8B=E6=97=85?= =?UTF-8?q?=E3=80=91=E6=B2=A1=E8=A7=A3=E9=94=81=E5=A4=A9=E6=95=B0=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=BA=86=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=81=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 3 ++- .../~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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])