From bc1a22a1f9d64deec15c044f572ee39d5030ad7e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 13 May 2021 20:59:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/JumpManager.lua | 77 ++++--------------- Assets/ManagedResources/~Lua/View/UpView.lua | 4 +- 2 files changed, 16 insertions(+), 65 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 1c800be77a..fbe521ad3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -573,75 +573,26 @@ local jumpDic = { UIManager.OpenPanel(UIName.HongMengPanel) end end, - [JumpType.TimeLimiteCall] = function () - local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) - local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.TimeLimiteCall).Title - if id and id > 0 then - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.FindFairy) - else - PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) - return - end + [JumpType.TimeLimiteCall] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) end, - [JumpType.QianKunBox] = function () - local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) - local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.QianKunBox).Title - if id and id > 0 then - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.QianKunBox) - else - PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) - return - end + [JumpType.QianKunBox] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) end, - [JumpType.Celebration] = function () - local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.Celebration) - local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.Celebration).Title - if id and id > 0 then - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.Celebration) - else - PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) - return - end + [JumpType.Celebration] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) end, - [JumpType.YiJingBaoKu] = function () - local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YiJingBaoKu) - local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.YiJingBaoKu).Title - if id and id > 0 then - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.YiJingBaoKu) - else - PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) - return - end + [JumpType.YiJingBaoKu] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) end, - [JumpType.LingShouBaoGe] = function () - local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LingShouBaoGe) - local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.LingShouBaoGe).Title - if id and id > 0 then - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.LingShouBaoGe) - else - PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) - return - end + [JumpType.LingShouBaoGe] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) end, - [JumpType.XiangYaoDuoBao] = function () - local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao) - local name = ConfigManager.GetConfigDataByKey(ConfigName.JumpConfig,"Type",JumpType.XiangYaoDuoBao).Title - if id and id > 0 then - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.XiangYaoDuoBao) - else - PopupTipPanel.ShowTip(GetLanguageStrById(name)..Language[11397]) - return - end + [JumpType.XiangYaoDuoBao] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) 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 + [JumpType.XianShiDuiHuan] = function (data) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) end, [JumpType.ZhuTiHuoDong] = function (data) this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 75412e694c..4cbc95a8a8 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -331,9 +331,9 @@ function UpView:RechargeType(_type) JumpManager.GoJump(36008) end elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市 - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.DynamicAct_TimeLimitShop) + JumpManager.GoJump(40014) elseif _type == UpViewRechargeType.HuaLingFu then--跳灵兽特惠 - UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.LingShowTeHui) + JumpManager.GoJump(40010) elseif _type == UpViewRechargeType.GrowthAmulet or _type == UpViewRechargeType.Yaoh or _type == UpViewRechargeType.Panacea or