From 7d2016c8126e6db7259323a3b29c21d7083a0bc5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 16 Oct 2020 17:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../ManagedResources/~Lua/Modules/Player/JumpManager.lua | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 53b4154822..3e3a26b5ad 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -906,6 +906,7 @@ JumpType = { GuildAid = 10011, --公会援助 GuildSkill = 10012, --公会技能 GuildFete = 10013, --公会祭祀 + EndlessShop = 10014, --无尽商店 } YaoHunFrame = { diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 54bcdeef63..4eda072e73 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -534,6 +534,14 @@ local jumpDic = { end, [JumpType.XuanYuanMirror] = function()--轩辕 UIManager.OpenPanel(UIName.XuanYuanMirrorPanel) + end, + [JumpType.EndlessShop] = function()--无尽商店 + local isActive, tips = ShopManager.IsActive(13) + if not isActive then + PopupTipPanel.ShowTip(tips or Language[10528]) + return + end + UIManager.OpenPanel(UIName.MainShopPanel,13) end, --Compound=66, --锻造炉 --DailyCarbon_Gold=67, --每日金币副本