diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index f0bf17cc3..033ae3cde 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -140,7 +140,7 @@ function TimeLimitedCall:OnShow(_sortingOrder,_parent) end) idx = idx + 1 end - + RewardPreview.new(self.reward, sortingOrder) self:RefreshGetHeroTimes() self:TimeCountDown() self:RefreshNextLevelReward() diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua index c334a4698..27b7b1c70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Daily.lua @@ -278,6 +278,9 @@ function this.SetDailyMissionBox(_missionDatas) Util.AddOnceClick(boxList[i], function() this.MissionBoxClick(boxList[i],v) end) + if i == #_missionDatas then + this.MissionBoxClick(boxList[i],v) + end end end function this.MissionBoxClick(btn,_singleData) diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua index 2ea77b7bd..628d9564a 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua @@ -276,6 +276,13 @@ function this.ShowTitleProgressRewardData() end) end) end) + if i == #rewardBtn then + if curProgressData.state == 0 then + --PopupTipPanel.ShowTip("完成任务数量不足") + UIManager.OpenPanel(UIName.BoxRewardShowPopup,allRewardTaskList[i].Reward,nil,nil,allRewardTaskList[i].TaskValue[2][1] .. GetLanguageStrById(11923)) + return + end + end end end end