diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 4041f8daad..608b52c43e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1882,6 +1882,8 @@ FacePanelType = { Championship = 6, --巅峰战 FindFairy = 7, --寻仙 UpgradePac = 8,--升级限时礼包 + MonsterWave = 9,--心魔试炼限时礼包 + MainLevel = 10,--主线限时礼包 } --迷宫寻宝条件类型 FindTreasureNeedType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index a9a1404b62..a5977791a4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -173,6 +173,35 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) table.insert(patFaceAllData,v) end end + elseif v.Type == 9 then--心魔试炼限时礼包 + local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,90).Value + local str = string.split(specialConfig,"|") + local nums = string.split(str[1],"#") + local canGet = false + local value = MonsterCampManager.monsterWave + if value == tonumber(nums[1]) or value == tonumber(nums[2]) or value == tonumber(nums[3]) or + ((value - tonumber(nums[3]))%(tonumber(str[2]))) == 0 then + canGet = true + end + if canGet then + if RedPointManager.PlayerPrefsGetStr(v.Id..value.."MonsterWavePatFace") == "0" then + table.insert(patFaceAllData,v) + end + end + elseif v.Type == 10 then--主线关卡限时礼包 + local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,91).Value + local fightLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) + local num = tonumber(specialConfig) + local canGet = false + local value = fightLevelConfig[FightPointPassManager.lastPassFightId].SortId + if value%num == 0 then + canGet = true + end + if canGet then + if RedPointManager.PlayerPrefsGetStr(v.Id..value.."MainLevelPatFace") == "0" then + table.insert(patFaceAllData,v) + end + end else if RedPointManager.PlayerPrefsGetStr(v.Id.."PatFace") == "0" then table.insert(patFaceAllData,v) 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 5716a0aecb..51525ed6af 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -17,6 +17,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()