From bf5c4197ce10ba8502b4dd702e2475292e67ae2c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 9 Jun 2021 11:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1009418=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=E3=80=91=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E5=8A=9B=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=89=8D=E5=BE=80=E6=8C=89=E9=92=AE=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=B9=B6=E6=89=93=E5=BC=80=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E5=8A=9B=E7=95=8C=E9=9D=A2?= 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/Modules/Map/EndLessMapManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 3 +++ .../ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua | 3 +++ 4 files changed, 8 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 8c074ab86a..c0cc9c69f2 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1035,6 +1035,7 @@ JumpType = { XiangYaoDuoBao = 10020,--降妖夺宝 HeadChange = 10021, --巅峰赛 XianShiDuiHuan = 10022, --主题活动限时兑换 + EndlessXingDongliBuy = 10023, --无尽行动力购买 ZhuTiHuoDong = 20000, --主题活动任务 QianKunShangDian = 20044, --乾坤商店 SheJiDaDianShangDian = 20060, --社稷大典商店 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index df8dc71fee..74be6b53cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -680,6 +680,7 @@ function this.InitMissionData() data.info = "" data.progress = 0 data.value = v.Values[2][1] + data.jump = v.Jump data.BoxReward = {} for i = 1,#v.Reward do table.insert(data.BoxReward ,v.Reward[i]) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index c837555a07..b23b66a257 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -661,6 +661,9 @@ local jumpDic = { [JumpType.FightLevel] = function (data) UIManager.OpenPanel(UIName.FightLevelChapterPanel) end, + [JumpType.EndlessXingDongliBuy] = function(data) + UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 }) + end, } function this.JumpActivity(data,skipfactor) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 1636afb7d4..68ad02d1b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -144,6 +144,9 @@ function this.SetScrollPre(root,data) Util.AddOnceClick(goBtn,function() this:ClosePanel() + if data.jump and data.jump > 0 then + JumpManager.GoJump(data.jump) + end end) Util.AddOnceClick(getBtn,function() if getFunc then