From 02ee675843fed10fbe9aa0169ad87c90a0667922 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 29 Mar 2021 20:20:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=B1=AA=E7=A4=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Main/MainPanel.lua | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 526b4e6710..8e535f4eaf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1057,6 +1057,7 @@ function this.TimeFormat() supremHadSet = true end elseif v.FunType and v.FunType == 41 then + LogGreen("3333333333333333333333333333:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else local info = ActivityGiftManager.GetActivityTypeInfo(v.ActiveType) @@ -1185,20 +1186,26 @@ end function this.RefreshActivityBtn(context) LogGreen("context.type1 " .. context.type .. " " .. context.status) for k,v in ipairs(activitys) do - if v.ActiveType > 0 and v.ActiveType == context.type then - local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) + if v.ActiveType > 0 and v.ActiveType == context.type then + local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then - activityTabs[k].go.gameObject:SetActive(context.status == 1) - elseif v.FunType and v.FunType == 41 then - activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) + if v.FunType and v.FunType == 41 then + LogGreen("22222222222222222222:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) + activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) + else + activityTabs[k].go.gameObject:SetActive(context.status == 1) + end else activityTabs[k].go.gameObject:SetActive(false) end elseif v.FunType > 0 and v.FunType == context.type then if ActTimeCtrlManager.SingleFuncState(v.FunType) then - activityTabs[k].go.gameObject:SetActive(context.status == 1) - elseif v.FunType and v.FunType == 41 then - activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) + if v.FunType and v.FunType == 41 then + LogGreen("11111111111111111:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) + activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) + else + activityTabs[k].go.gameObject:SetActive(context.status == 1) + end else activityTabs[k].go.gameObject:SetActive(false) end @@ -1273,10 +1280,11 @@ function this.RefreshActivityShow() activityTabs[k].go.gameObject:SetActive(false) end elseif v.FunType and v.FunType == 41 then + LogGreen("444444444444444444444444444444:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else activityTabs[k].go.gameObject:SetActive(true) - end + end else activityTabs[k].go.gameObject:SetActive(false) end From eba43f84e2427def3368e5fe0f54aea773b8a354 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 29 Mar 2021 20:27:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 8e535f4eaf..a353eb5065 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1057,7 +1057,6 @@ function this.TimeFormat() supremHadSet = true end elseif v.FunType and v.FunType == 41 then - LogGreen("3333333333333333333333333333:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else local info = ActivityGiftManager.GetActivityTypeInfo(v.ActiveType) @@ -1190,7 +1189,6 @@ function this.RefreshActivityBtn(context) local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.FunType and v.FunType == 41 then - LogGreen("22222222222222222222:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else activityTabs[k].go.gameObject:SetActive(context.status == 1) @@ -1201,7 +1199,6 @@ function this.RefreshActivityBtn(context) elseif v.FunType > 0 and v.FunType == context.type then if ActTimeCtrlManager.SingleFuncState(v.FunType) then if v.FunType and v.FunType == 41 then - LogGreen("11111111111111111:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else activityTabs[k].go.gameObject:SetActive(context.status == 1) @@ -1280,7 +1277,6 @@ function this.RefreshActivityShow() activityTabs[k].go.gameObject:SetActive(false) end elseif v.FunType and v.FunType == 41 then - LogGreen("444444444444444444444444444444:"..tostring(DailyRechargeManager.GetDailyRechargeExist())) activityTabs[k].go.gameObject:SetActive(DailyRechargeManager.GetDailyRechargeExist()) else activityTabs[k].go.gameObject:SetActive(true)