From 031895a9d1a421700b81f906eeb32ee0b81370c1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 22 Oct 2021 17:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E9=99=8D=E4=B8=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=BB=93=E6=9D=9F=E4=B8=8D=E5=85=B3=E9=97=AD=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Main/MainPanel.lua | 16 ++++++++-------- .../Modules/Popup/RewardItemSingleShowPopup.lua | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index bb7297ee84..17af440204 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1360,9 +1360,9 @@ function this.TimeFormat() local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if QingLong and QingLong > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.ActiveType == 42 then - if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then - showTab = false - else + -- if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then + -- showTab = false + -- else local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) if endTime - PlayerManager.serverTime > 0 then local time = endTime - PlayerManager.serverTime @@ -1374,7 +1374,7 @@ function this.TimeFormat() else showTab = false end - end + --end elseif v.ActiveType == ActivityTypeDef.TreasureStore then local endTime = CalculateSecondsNowTo_N_OClock(24) if endTime > 0 then @@ -1617,16 +1617,16 @@ function this.RefreshActivityShow() local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.ActiveType == 42 then - if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then - showTab = false - else + -- if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then + -- showTab = false + -- else local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) if endTime - PlayerManager.serverTime > 0 then showTab = true else showTab = false end - end + --end elseif v.FunType and v.FunType == 41 then showTab = DailyRechargeManager.GetDailyRechargeExist() elseif v.ActiveType == 78 then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 2149224515..1178e4e204 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -384,16 +384,16 @@ function RewardItemSingleShowPopup:OnShow() elseif JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi then local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) if id and id > 0 then - if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then - isShow = false - else + -- if ActivityGiftManager.CheckSupremeMission(1,true) and ActivityGiftManager.CheckSupremeMission(2,true) then + -- isShow = false + -- else local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.SupremeHero) if endTime - PlayerManager.serverTime > 0 then isShow = true else isShow = false end - end + --end else isShow = false end