diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index 4175f60ba5..7e849c0329 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -75,12 +75,20 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ContinuePackagePanel:OnShow() - self.curPage = 1 + self.curPage = 3 + ContinuePackagePanel:Refresh(true,true) end function ContinuePackagePanel:Refresh(isTop,isAni) self.actData = CommonActPageManager.GetData(ActivityTypeDef.ContinuePackage,self.linkActId) + for i = 1, 3 do + LogError("i======================================="..i.. "#self.actData.rewards[i]=="..#self.actData.rewards[i]) + if self.actData and self.actData.rewards[i] and #self.actData.rewards[i] >0 then + self.curPage=i + break + end + end self:SetBtns() self:SetRewardShow(isTop,isAni) self:SetTime() diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index ae23b57ebc..01820c99db 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -148,14 +148,14 @@ function CommonActPage:OnShow(_sortingOrder) self.parent.tabbox.gameObject:SetActive(true) end if self.actType== ActivityTypeDef.yaojingleichong or self.actType== ActivityTypeDef.xianjingleichong then - self.RechraBg:SetActive(true) + self.RechraBg:SetActive(false) self.RechraBg1:SetActive(true) self.RechraBg2:SetActive(true) self.RechraText1:SetActive(true) self.RechraText2:SetActive(true) else - self.RechraBg:SetActive(true) + self.RechraBg:SetActive(false) self.RechraBg1:SetActive(false) self.RechraBg2:SetActive(false) self.RechraText1:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9dcf56c720..b24fed9ae4 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -358,6 +358,13 @@ local TypeUpdateFunc = { if not tempDataList[configData[j].Type] then tempDataList[configData[j].Type] = {} end + --不能直接往第三个位置插入数据 + if not tempDataList[1] then + tempDataList[1] = {} + end + if not tempDataList[2] then + tempDataList[2] = {} + end table.insert(tempDataList[configData[j].Type],tempData) end --每日特惠类型为2每日只显示一个,前端手动关闭