From 9ebd4c5e05e7a1bd91e75fe38a45326528ad6012 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 May 2021 18:00:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BF=83=E6=84=BF=E6=8A=BD=E5=8D=A1?= =?UTF-8?q?=E3=80=91=E6=B8=B8=E6=88=8F=E9=87=8C=E9=81=93=E5=85=B7=E5=AF=BB?= =?UTF-8?q?=E4=BB=99=E7=8E=89=E8=B7=B3=E8=BD=AC=E4=B8=8D=E6=98=AF=E9=99=90?= =?UTF-8?q?=E6=97=B6=E5=95=86=E5=B8=82=EF=BC=8C=E8=B7=B3=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../DynamicActivity/ActivityMainPanel.lua | 20 +++++++++++++------ .../~Lua/Modules/Player/JumpManager.lua | 7 ++++++- .../Popup/RewardItemSingleShowPopup.lua | 1 + 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0e52a94d9a..0ac4482578 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1031,7 +1031,7 @@ JumpType = { XiangYaoDuoBao = 10020,--降妖夺宝 HeadChange = 10021, --巅峰赛 XianShiDuiHuan = 10022, --主题活动限时兑换 - ZhuTiHuoDong = 20000, + ZhuTiHuoDong = 20000, --主题活动任务 QianKunShangDian = 20044, --乾坤商店 SheJiDaDianShangDian = 20060, --社稷大典商店 XinJiangLaiXiShangDian = 20200, --社稷大典商店 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 13f128257a..243b2db15c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -67,8 +67,16 @@ function ActivityMainPanel:CheckActOpen(_index) if tabs[_index].IfBack == 1 then if tabs[_index].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tabs[_index].ActiveType) - if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) and (tabs[_index].ActiveType == ActivityTypeDef.DynamicAct or not GlobalActConfig[id].ShowArt or GlobalActConfig[id].ShowArt < 1 or GlobalActConfig[id].ShowArt == this.activityType) then - _CurPageIndex = _index + if id and id > 0 and ActivityGiftManager.IsQualifiled(tabs[_index].ActiveType) then + if GlobalActConfig[id].ShowArt and GlobalActConfig[id].ShowArt > 0 then + if tabs[_index].ActiveType == ActivityTypeDef.DynamicAct then + _CurPageIndex = _index + elseif GlobalActConfig[id].ShowArt == this.activityType then + _CurPageIndex = _index + end + else + _CurPageIndex = _index + end end elseif tabs[_index].FunType > 0 then if ActTimeCtrlManager.SingleFuncState(tabs[_index].FunType) then @@ -96,12 +104,12 @@ end --界面打开时调用(用于子类重写) function ActivityMainPanel:OnOpen(_activityType,_index) SoundManager.PlaySound(SoundConfig.UI_Hddakai) - LogGreen("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index)) + Log("this.activityType:"..tostring(this.activityType).." _index:"..tostring(_index)) this.activityType = _activityType DynamicActivityManager.curActivityType = this.activityType tabs = DynamicActivityManager.GetActivityTableDataByPageInde(this.activityType) _CurPageIndex = 0 - LogGreen("_index:"..tostring(_index)) + Log("#tabs:"..tostring(#tabs).." _index:"..tostring(_index)) if _index and _index > 0 then self:CheckActOpen(_index) end @@ -120,9 +128,9 @@ function ActivityMainPanel:OnOpen(_activityType,_index) end) else this:ClosePanel() - end + end end - LogGreen("_CurPageIndex:".._CurPageIndex) + Log("_CurPageIndex:".._CurPageIndex) end -- 打开,重新打开时回调 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 1bc14c6da8..ca14fbf4a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -602,7 +602,12 @@ local jumpDic = { end end, [JumpType.TimeLimiteCall] = function (data) - this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) + if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) then + this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) + else + ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + this.JumpActivity(JumpType.ZhuTiHuoDong,data[2]) + end end, [JumpType.QianKunBox] = function (data) this.JumpActivity(JumpType.ZhuTiHuoDong,data[1]) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 65d6f014d6..0bae3eeab0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -202,6 +202,7 @@ function RewardItemSingleShowPopup:BindEvent() end elseif itemConfigData then JumpManager.GoJump(itemConfigData.UseJump,function () + Log("UseJump:"..tostring(itemConfigData.UseJump)) this:ClosePanel() end) end