diff --git a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua index 9e483d454a..5bd0f00a3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftManager.lua @@ -61,5 +61,17 @@ function this.CheckRedPoint() end return false end +--是否全部领取完奖励 +function this.IsGetAllReward() + local getFinish = true + if Data then + for i = 1, #Data.rewards do + if Data.rewards[i].State == 0 then + getFinish = false + end + end + end + return getFinish +end return FifteenDayGiftManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 87e07f03a4..c62fe6ba38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1365,7 +1365,8 @@ function this.RefreshEightGiftPreview() if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FifteenDayGift) then FifteenDayGiftManager.InitRewardData() local bool = FifteenDayGiftManager.CheckRedPoint() - if bool then + local IsGetAllReward = FifteenDayGiftManager.IsGetAllReward() + if bool or not IsGetAllReward then this.fgBtn:SetActive(true) this.rpFifteenDayEffect:SetActive(true) CheckRedPointStatus(RedPointType.FifteenDayGift_1)