From 329365650741e68caeb9fba8701963e795e07313 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 21 Oct 2021 13:06:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E7=99=BE=E5=AE=9D=E5=95=86?= =?UTF-8?q?=E4=BC=9A=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + Assets/ManagedResources/~Lua/Data/UIData.lua | 1 + Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 15eb644412..4fa07c0e49 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1316,6 +1316,7 @@ ActivityTypeDef = { DynamicAct_Treasure = 20002,--主题活动珍奇宝阁 LimitUpHero = 20003, --限时up活动 (祈愿) TreasureStore = 6000,--百宝商会 + TreasureStoreSeason2 = 6001,--新百宝商会 YiJingBaoKu = 8000,--易经宝库 MeiRiLiBao = 10004, diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index f7221e60d6..96f1d52ae8 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -422,6 +422,7 @@ UIName = { GeneralTreasurePanel=420, --通用秘宝界面 YuJianXingPanel = 428,--御剑行界面 CultivationPanel = 429,--主角修为界面 + TreasureStoreSeason2 = 431,--新百宝商会 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 9206521a91..271c03bc71 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1018,6 +1018,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.MissionDailyPanel,2,1) elseif id == ActivityTypeDef.TreasureStore then UIManager.OpenPanel(UIName.TreasureStorePopup) + elseif id == ActivityTypeDef.TreasureStoreSeason2 then + UIManager.OpenPanel(UIName.TreasureStoreSeason2) elseif id == ActivityTypeDef.DynamicAct then -- local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) -- local curindex = 1