From 7ec568e48ddcf8fe34be2f76b96b025800752eaf Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 6 May 2021 17:49:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=99=90=E6=97=B6=E5=85=91=E6=8D=A2=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Modules/Player/JumpManager.lua | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index af9bdad82f..7e468e897f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1007,7 +1007,7 @@ JumpType = { LingShouBaoGe = 10019,--灵兽宝阁 XiangYaoDuoBao = 10020,--降妖夺宝 HeadChange = 10021, --巅峰赛 - + XianShiDuiHuan = 10022, --主题活动限时兑换 } YaoHunFrame = { --[6] = "r_tongyong_yaohunkuang002", diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 9cd14090bd..804f729edf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -632,6 +632,16 @@ local jumpDic = { return end end, + [JumpType.XianShiDuiHuan] = function () + local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange) + local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.XianShiDuiHuan).Title + if id and id > 0 then + UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.LimitExchange) + else + PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) + return + end + end, } function this.JumpActivity(data,skipfactor)