diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index c42cd3decf..6f8dd2f960 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -194,9 +194,9 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) canGet = true end end - LogYellow("MonsterCampManager.monsterWave"..MonsterCampManager.monsterWave-1) - LogGreen("canGet:"..tostring(canGet)) - LogRed("@@@@@@@@@@@@@@@@@@@@:"..RedPointManager.PlayerPrefsGetStr(v.Id..PlayerManager.level.."MonsterWavePatFace")) + -- LogYellow("MonsterCampManager.monsterWave"..MonsterCampManager.monsterWave-1) + -- LogGreen("canGet:"..tostring(canGet)) + -- LogRed("@@@@@@@@@@@@@@@@@@@@:"..RedPointManager.PlayerPrefsGetStr(v.Id..PlayerManager.level.."MonsterWavePatFace")) if canGet then if RedPointManager.PlayerPrefsGetStr(v.Id..(MonsterCampManager.monsterWave-1).."MonsterWavePatFace") == "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 e52eac0201..91b9cf6c6a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -146,7 +146,7 @@ function PatFacePanel:OnShowPatFaceData() elseif patFaceSingleData.Type == FacePanelType.UpgradePac or patFaceSingleData.Type == FacePanelType.MonsterWave or patFaceSingleData.Type == FacePanelType.MainLevel then - self:OnShowOb7Data() + self:OnShowOb7Data(patFaceSingleData.Type) elseif patFaceSingleData.Type == FacePanelType.GrowGift then self:OnShowOb8Data() end @@ -331,8 +331,15 @@ function PatFacePanel:OnShowOb6Data() end --第七种 升级限时礼包 -function PatFacePanel:OnShowOb7Data() - OperatingManager.upGradePackagePanelType = 1 +function PatFacePanel:OnShowOb7Data(Type) + OperatingManager.upGradePackagePanelIndex = 0 + if Type == FacePanelType.UpgradePac then + OperatingManager.upGradePackagePanelType = 1 + elseif Type == FacePanelType.MonsterWave then + OperatingManager.upGradePackagePanelType = 4 + elseif Type == FacePanelType.MainLevel then + OperatingManager.upGradePackagePanelType = 3 + end UIManager.OpenPanel(UIName.UpGradePackagePanel,function() self:ClosePanel() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 26a45274ee..7014d78879 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -18,8 +18,8 @@ local luxuryConfig = ConfigManager.GetConfig(ConfigName.LuxuryFundConfig) --后端数据 goodsId;//商品id buyTimes; //购买次数 startTime;//开始时间 endTime; //结束时间 dynamicBuyTimes; //可购买次数 local giftGoodsInfo -this.upGradePackagePanelType = 1 -this.upGradePackagePanelIndex = 1 +this.upGradePackagePanelType = 0 +this.upGradePackagePanelIndex = 0 this.IsShowFiveStarPatch = true --初始化 function this.Initialize() diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 55049c2a4a..da091bd5e7 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -148,8 +148,8 @@ end function this:SetCurTypeAndIndex() curType = OperatingManager.upGradePackagePanelType and OperatingManager.upGradePackagePanelType or 1 - curIndex = OperatingManager.upGradePackagePanelIndex and OperatingManager.upGradePackagePanelIndex or 1 - if curGiftList[curType] and #curGiftList[curType] > 0 and curGiftList[curType][curIndex] then + curIndex = OperatingManager.upGradePackagePanelIndex and OperatingManager.upGradePackagePanelIndex or 0 + if curGiftList[curType] and #curGiftList[curType] > 0 and curGiftList[curType][curIndex] then elseif curGiftList[curType] and #curGiftList[curType] > 0 and (not curGiftList[curType][curIndex]) then curIndex = #curGiftList[curType] return curGiftList[curType][curIndex] @@ -157,7 +157,7 @@ function this:SetCurTypeAndIndex() for k,v in pairs(curGiftList) do if v and #v > 0 then curType = k - curIndex = 1 + curIndex = #curGiftList[curType] return curGiftList[curType][curIndex] end end