diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index b35b42222f..81ec40de6a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1375,6 +1375,15 @@ function this.TimeFormat() else showTab = false end + elseif v.ActId == 668 then + local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) + if actInfo and actInfo.value > 0 and (OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)) then + showTab = true + -- elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + -- showTab = true + -- else + showTab = false + end elseif v.ShowTime == 1 and activityTabs[k].go.gameObject.activeSelf then if v.ActiveType > 0 then local QingLong = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) @@ -1536,11 +1545,11 @@ function this.RefreshGiftBtnShow() if v.ActiveType == 78 and ishow then local showTab = activityTabs[k].go.gameObject.activeSelf local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) - if actInfo and actInfo.value > 0 then + if actInfo and actInfo.value > 0 and (OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)) then showTab = true - elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then - showTab = true - else + -- elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + -- showTab = true + -- else showTab = false end this.RefreshLayer(showTab,k,v) @@ -1572,12 +1581,12 @@ function this.RefreshActivityBtn(context) showTab = context.status == 1 elseif v.ActiveType == 78 then local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) - if actInfo and actInfo.value > 0 then - showTab = true - elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then - showTab = true - else - showTab = false + if actInfo and actInfo.value > 0 and (OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)) then + showTab = true + -- elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + -- showTab = true + -- else + showTab = false end else showTab = context.status == 1