推送礼包

ZhangBiao 2020-10-13 18:24:11 +08:00
parent 5efebacbbb
commit 71313c63c2
3 changed files with 27 additions and 5 deletions

View File

@ -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()

View File

@ -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

View File

@ -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()