From 8ec1fd986df7911b2e83aa12d89402fa76c27be4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-RH64908\\Administrator" <1545929779@qq.com> Date: Thu, 8 May 2025 17:31:41 +0800 Subject: [PATCH] 1 --- .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 12 ++++++++++-- .../~Lua/Modules/Shop/MainShopPanel.lua | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index e582fb0261..d1397bca76 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1155,7 +1155,9 @@ function this.SetRightBarSize() end function this:TabBtnAction(id,actType,data) + LogError("======================"..actType) if actType == 1 then + LogError("======================"..id) if id == ActivityTypeDef.FirstRecharge then UIManager.OpenPanel(UIName.FirstRechargePanel) elseif id == ActivityTypeDef.SevenDayCarnival then @@ -1260,6 +1262,7 @@ function this:TabBtnAction(id,actType,data) end elseif actType == 2 then + LogError("======================"..id) if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then UIManager.OpenPanel(UIName.CourtesyDressPanel) elseif id == 36 then @@ -1267,6 +1270,7 @@ function this:TabBtnAction(id,actType,data) elseif id == FUNCTION_OPEN_TYPE.EXPERT then -- UIManager.OpenPanel(UIName.ExpertPanel) UIManager.OpenPanel(UIName.ActivityMainPanel,id) + elseif id == 40 then UIManager.OpenPanel(UIName.ActivityMainPanel,id) elseif id == FUNCTION_OPEN_TYPE.LUCKYTURN then @@ -1286,7 +1290,9 @@ function this:TabBtnAction(id,actType,data) elseif id==92 then --每日礼包 JumpManager.GoJump(36001) end - else + elseif id == ActivityTypeDef.Maiduan then + JumpManager.GoJump(40083) + --this.ScenceBtnClick(FUNCTION_OPEN_TYPE.SHOP) end end @@ -1568,7 +1574,7 @@ function this.TimeFormat() activityTabs[k].timeText.text = TimeToHMS(time) end else - showTab = false + showTab = false end elseif v.ActId == 667 then local limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList() @@ -1602,6 +1608,8 @@ function this.TimeFormat() else showTab = false end + elseif v.ActId == ActivityTypeDef.Maiduan then + showTab = true elseif v.ActId == 9701 then local ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.PowerRice) if ActData then diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 598be65d07..0baabc9ff9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -36,6 +36,9 @@ local _ShopPage = { [SHOP_PAGE.YUANSHEN] = { -- 元神 default = "r_shop_yuanshen_01_zh", lock = "r_shop_yuanshen_01_zh", select = "r_shop_yuanshen_02_zh", }, + [SHOP_PAGE.MAIDUAN] = { -- 元神 + default = "md_anniu_01_zh", lock = "md_anniu_01_zh", select = "md_anniu_02_zh", + }, } this._MainShopPageList = {}