diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 9dc9cec164..24dc5eafec 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -47,35 +47,27 @@ local tabs = { default = "s_shibukedang_bicon1", lock = "s_shibukedang_bicon1", select = "s_shibukedang_bicon2", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [11] = { --社稷大典 - default = "r_guanka_sheji_anniu_02", lock = "r_guanka_sheji_anniu_02", select = "r_guanka_sheji_anniu_01", - rpType = RedPointType.Celebration,panelType = PanelType.Celebration,ActType = ActivityTypeDef.Celebration - }, - [12] = { --限时召唤 + [11] = { --限时召唤 default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01", rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,ActType = ActivityTypeDef.FindFairy }, - [13] = { --乾坤宝盒 + [12] = { --乾坤宝盒 default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,ActType = ActivityTypeDef.QianKunBox }, - [14] = { --珍奇礼包 + [13] = { --珍奇礼包 default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_Treasure }, - [15] = { --累计充值 一天一刷 + [14] = { --累计充值 default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.AccumulativeRechargeExper }, - [16] = { --累计充值 一周一刷 - default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", - rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge - }, - [17] = { --限时商市 + [15] = { --限时商市 default = "x_xianshishangshi_anniu_02", lock = "x_xianshishangshi_anniu_02", select = "x_xianshishangshi_anniu_01", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_TimeLimitShop }, - [18] = { --限时兑换 + [16] = { --限时兑换 default = "r_xianshiduihuan_anniu_01", lock = "r_xianshiduihuan_anniu_01", select = "r_xianshiduihuan_anniu", rpType = "",panelType = PanelType.Main,ActType = ActivityTypeDef.LimitExchange }, @@ -96,9 +88,7 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 [13] = 4, [14] = 5, [15] = 6, - [16] = 6, - [17] = 7, - [18] = 8, + [16] = 7, } local TimeLimitedCall = require("Modules/DynamicActivity/TimeLimitedCall") @@ -107,7 +97,6 @@ local DynamicActPage=require("Modules/DynamicActivity/DynamicTaskPage") local ZhenQiYiBaoPage=require("Modules/DynamicActivity/ZhenQiYiBaoPage") local LeiJiChongZhiPage=require("Modules/DynamicActivity/LeiJiChongZhiPage") local XianShiShangShi=require("Modules/DynamicActivity/XianShiShangShi") -local SheJiDaDian=require("Modules/DynamicActivity/SheJiDaDian") local XianShiDuiHuan=require("Modules/Expert/DynamicActivityExChange") --初始化组件(用于子类重写) @@ -119,13 +108,12 @@ function DynamicActivityPanel:InitComponent() this.PageList = { [1] = DynamicActPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), - [2] = SheJiDaDian.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_8")), - [3] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), - [4] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), - [5] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), - [6] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), - [7] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), - [8] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")), + [2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), + [3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), + [4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), + [5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")), + [6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")), + [7] = XianShiDuiHuan.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_7")), } -- 上部货币显示 @@ -216,7 +204,6 @@ function this.PageTabAdapter(tab, index, status) if GlobalActConfig[id].Type == ActivityTypeDef.LimitExchange then tab.gameObject:SetActive(GlobalActConfig[id].ShowArt ~= 1) end - --累计充值特殊处理 if GlobalActConfig[id].Type == ActivityTypeDef.AccumulativeRechargeExper then if GlobalActConfig[id] and GlobalActConfig[id].ShowArt ~= 1 then @@ -224,8 +211,6 @@ function this.PageTabAdapter(tab, index, status) else tab.gameObject:SetActive(false) end - elseif GlobalActConfig[id].Type == ActivityTypeDef.DynamicAct_recharge then - tab.gameObject:SetActive(true) end else tab.gameObject:SetActive(false) @@ -247,7 +232,7 @@ function this.OnPageTabChange(index) this.PageList[i].gameObject:SetActive(false) end end - this.PageList[_PageInfo[index]]:OnShow(this.sortingOrder,this,tabs[index].ActType) + this.PageList[_PageInfo[index]]:OnShow(this.sortingOrder,this) this.PageList[_PageInfo[index]].gameObject:SetActive(true) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = tabs[index].panelType }) end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 9c3e723bb2..3ae44eb2f4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -382,7 +382,18 @@ function ExpertPanel:RefreshActivityBtn(context) elseif context.type == ActivityTypeDef.GrowthReward then tabBtns[18]:SetActive(false) elseif context.type == ActivityTypeDef.AccumulativeRechargeExper then - tabBtns[7]:SetActive(context.status == 1) + local tempId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper) + if tempId then + local config = ConfigManager.GetConfigData(ConfigName.GlobalActivity,tempId) + if config.ShowArt == 1 then + tabBtns[7]:SetActive(context.status == 1) + else + tabBtns[7]:SetActive(false) + end + else + tabBtns[7]:SetActive(false) + end + --elseif context.type == ActivityTypeDef.LuckyTurnTable_One then -- tabBtns[6]:SetActive(context.status == 1) -- elseif context.type == ActivityTypeDef.SevenDayRegister then @@ -422,7 +433,17 @@ function ExpertPanel:RefreshActivityShow() tabBtns[1]:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SevenDayRegister)) tabBtns[5]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyCat)) tabBtns[6]:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One))--探宝长久关闭 - tabBtns[7]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper)) + local tempId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper) + if tempId then + local config = ConfigManager.GetConfigData(ConfigName.GlobalActivity,tempId) + if config.ShowArt == 1 then + tabBtns[7]:SetActive(context.status == 1) + else + tabBtns[7]:SetActive(false) + end + else + tabBtns[7]:SetActive(false) + end tabBtns[9]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.UpStarExper)) tabBtns[10]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FastExplore)) tabBtns[11]:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AreaExper)) @@ -589,13 +610,30 @@ function ExpertPanel:SetOpenActiveBtn() --所有达人 for i, v in pairs(numExChange) do local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v) - if curActiveData then - if defaultIndex == 0 or defaultIndex > i then - defaultIndex = i - end - tabBtns[i]:SetActive(true) + if i == ActivityTypeDef.AccumulativeRechargeExper then + local tempId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper) + if tempId and curActiveData then + local config = ConfigManager.GetConfigData(ConfigName.GlobalActivity,tempId) + if config.ShowArt == 1 then + if defaultIndex == 0 or defaultIndex > i then + defaultIndex = i + end + tabBtns[i]:SetActive(true) + else + tabBtns[i]:SetActive(false) + end + else + tabBtns[i]:SetActive(false) + end else - tabBtns[i]:SetActive(false) + if curActiveData then + if defaultIndex == 0 or defaultIndex > i then + defaultIndex = i + end + tabBtns[i]:SetActive(true) + else + tabBtns[i]:SetActive(false) + end end end --限时兑换