diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 963305c680..247243f690 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -439,28 +439,6 @@ function RewardItemSingleShowPopup:OnShow() else isShow = false end - elseif JumpConfig[jumpDataList[i]].Type == JumpType.recharge then - local actConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"PageType",JumpType.recharge,"Sort",JumpConfig[jumpDataList[i]].Skipfactor[1]) - local list = OperatingManager.GetGiftGoodsInfoList(actConfig.ShopData[1][2]) - local goodIdList = {} - for i = 1,#list do - local rechargeConfig = RechargeCommodityConfig[list[i].goodsId] - if rechargeConfig.Limit == 0 or rechargeConfig.Limit - list[i].buyTimes > 0 then - if rechargeConfig.ShowType == actConfig.ShopData[1][3] then - for j = 1,#rechargeConfig.RewardShow do - if rechargeConfig.RewardShow[j][1] == heroConfig.Id or rechargeConfig.RewardShow[j][1] == heroConfig.PiecesId then - table.insert(goodIdList,rechargeConfig.Id) - break - end - end - end - end - end - if #goodIdList < 1 then - isShow = false - else - isShow = true - end end if isShow then local tempView = SubUIManager.Open(SubUIConfig.JumpViewNew, this.equipProGrid.transform, jumpDataList[i],heroConfig,self) diff --git a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua index ed7918209e..b1acbed0b0 100644 --- a/Assets/ManagedResources/~Lua/View/JumpViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/JumpViewNew.lua @@ -202,23 +202,7 @@ function JumpViewNew:GoToJumpData() elseif self.jumpSData.Type == JumpType.XingChenShangDian then ShopManager.SetSelectIndex(self.shopType,{self.ShopId}) elseif self.jumpSData.Type == JumpType.recharge then - local actConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"PageType",JumpType.recharge,"Sort",self.jumpSData.Skipfactor[1]) - local list = OperatingManager.GetGiftGoodsInfoList(actConfig.ShopData[1][2]) - local goodIdList = {} - for i = 1,#list do - local rechargeConfig = RechargeCommodityConfig[list[i].goodsId] - if rechargeConfig.Limit == 0 or rechargeConfig.Limit - list[i].buyTimes > 0 then - if rechargeConfig.ShowType == actConfig.ShopData[1][3] then - for j = 1,#rechargeConfig.RewardShow do - if rechargeConfig.RewardShow[j][1] == self.heroId or rechargeConfig.RewardShow[j][1] == self.needChipId then - table.insert(goodIdList,rechargeConfig.Id) - break - end - end - end - end - end - DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList) + DynamicActivityManager.curLevel = 6 elseif (self.jumpSData.type ~= JumpType.firstRecharge or self.jumpSData.type ~= JumpType.ZhiZunJiangShi) then PlayerManager.RewardItemSingleShowPopupIsRoleUpStarLayout2 = false end