From 71313c63c2e9b0709ed45eda245ce694b104a5be Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 13 Oct 2020 18:24:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expert/PatFacePanel.lua | 8 +++++-- .../~Lua/Modules/Main/MainPanel.lua | 22 ++++++++++++++++--- .../UpGradePackage/UpGradePackagePanel.lua | 2 ++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 8252cb934a..e52eac0201 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -125,7 +125,9 @@ function PatFacePanel:OnShowPatFaceData() self.obg4:SetActive(patFaceSingleData.Type == FacePanelType.SupremeHero) self.obg5:SetActive(false) self.obg6:SetActive(patFaceSingleData.Type == FacePanelType.FindFairy) - self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac) + self.obg7:SetActive(patFaceSingleData.Type == FacePanelType.UpgradePac or + patFaceSingleData.Type == FacePanelType.MonsterWave or + patFaceSingleData.Type == FacePanelType.MainLevel) if patFaceSingleData.Type == FacePanelType.Sbtj then self:OnShowOb1Data() elseif patFaceSingleData.Type == FacePanelType.Tesc then @@ -141,7 +143,9 @@ function PatFacePanel:OnShowPatFaceData() local artId=ConfigManager.GetConfigDataByKey(ConfigName.LoginPosterConfig,"Values",curActivityId).BackgroundString self.tipImage.sprite=Util.LoadSprite(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig,artId).Name) self:OnShowOb6Data() - elseif patFaceSingleData.Type == FacePanelType.UpgradePac then + elseif patFaceSingleData.Type == FacePanelType.UpgradePac or + patFaceSingleData.Type == FacePanelType.MonsterWave or + patFaceSingleData.Type == FacePanelType.MainLevel then self:OnShowOb7Data() elseif patFaceSingleData.Type == FacePanelType.GrowGift then self:OnShowOb8Data() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 20ec5c37d3..5402dcc994 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1576,10 +1576,26 @@ function this:GetInfoList() end end end - infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) + local infoList3 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) for index, value in pairs(infoList) do - for i = 1, #infoList2 do - if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + for i = 1, #infoList3 do + if infoList3[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + table.insert(giftList,value) + end + end + end + local infoList4 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",25) + for index, value in pairs(infoList) do + for i = 1, #infoList4 do + if infoList4[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then + table.insert(giftList,value) + end + end + end + local infoList5 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",26) + for index, value in pairs(infoList) do + for i = 1, #infoList5 do + if infoList5[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then table.insert(giftList,value) end end diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 58e4a078b6..327d8b8c77 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -18,6 +18,8 @@ local rechargeData local activityType = { [1] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 21}, [2] = {name = Language[12385],timePos = Vector3.New(0,-567,0),comp = "bg2",showType = 8}, +[3] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 25}, +[4] = {name = Language[12384],timePos = Vector3.New(0,-255.6,0),comp = "bg1",showType = 26}, } --初始化组件(用于子类重写) function this:InitComponent()