diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua index 6fa04e9adb..d07a2a9439 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishEquipDraw.lua @@ -162,14 +162,14 @@ function this:SetUpHero() end function this:SetHeroList(isTop,isAni) - local heroList = RecruitManager.GetCurHeroTalismanaList(0) + local heroList =RecruitManager.allTailsMans --RecruitManager.GetCurHeroTalismanaList(0) self.scrollView:SetData(heroList, function (index, item) this:ShowSingleHero(item, heroList[index],index) end,not isTop,not isAni) end function this:ShowSingleHero(go,data,index) - local equipId=heroConfig[data].EquipTalismana[2] + local equipId=data local heroData = itemConfig[equipId] self.itemList[self.curSelect][index] = go Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetBgByHeroNatural(heroData.Quantity)) @@ -177,7 +177,7 @@ function this:ShowSingleHero(go,data,index) --Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName)) Util.GetGameObject(go, "proIcon"):SetActive(false) Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.Name - Util.GetGameObject(go, "heroName"):GetComponent("Text").text=heroConfig[data].ReadingName + Util.GetGameObject(go, "heroName"):GetComponent("Text").text= itemConfig[data].Name local starGrid = Util.GetGameObject(go, "star") -- SetHeroStars(self.spLoader,starGrid, heroData.Star) self.maskList[self.curSelect][index] = Util.GetGameObject(go, "choosed") @@ -185,6 +185,7 @@ function this:ShowSingleHero(go,data,index) Util.SetGray(self.itemList[self.curSelect][index],false) local value = RecruitManager.CheckCurTalismanaState(equipId) + LogError("value==========================================="..value) if value == 0 then--上方存在相同阵营 Util.SetGray(self.itemList[self.curSelect][index],true) Util.AddOnceClick(go,function () diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua index d45961aeac..a9389d78d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyOnePanel.lua @@ -156,7 +156,14 @@ function WishEquipBuyOnePanel:OnOpen(...) Util.ClearChild(Util.GetTransform(this.content, "itemContent1")) this.itemDataList={} - this.itemDataList=BagManager.GetTableByBackDropData(this.drop) + local list=BagManager.GetTableByBackDropData(this.drop) + for k, v in pairs(list) do + if v.sId~=94 then + table.insert(this.itemDataList,v) + end + end + + LogError("this.itemDataList==================="..#this.itemDataList) this.view = SubUIManager.Open(SubUIConfig.ItemView,Util.GetTransform(this.content, "itemContent1")) this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua index af0030d4c1..531e843ddc 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishEquipBuyTenPanel.lua @@ -147,7 +147,13 @@ function WishEquipBuyTenPanel:OnOpen(...) this.itemIcon3.sprite=this.spLoader:LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) local itemDataList={} - itemDataList=BagManager.GetTableByBackDropData(this.drop) + local list=BagManager.GetTableByBackDropData(this.drop) + for k, v in pairs(list) do + if v.sId~=94 then + table.insert(itemDataList,v) + end + end + LogError("itemDataList len==============="..#itemDataList) this.openTenAgainButton:GetComponent("Button").enabled=false this.btnBack:GetComponent("Button").enabled=false callList:Clear() diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishGemBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishGemBuyTenPanel.lua index 9bf247b8e5..e216c928be 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/WishGemBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/WishGemBuyTenPanel.lua @@ -61,7 +61,7 @@ function WishGemBuyTenPanel:BindEvent() PopupTipPanel.ShowTip(GetLanguageStrById(ItemConfig[itemId].Name)..Language[10486]) return end - NetManager.GemNewDrawRequest(this.recruitType,costId,function(msg) + NetManager.GemNewDrawRequest(this.recruitType,10,function(msg) UIManager.OpenPanel(UIName.WishGemBuyTenPanel,msg.drop,this.recruitType,costId,activityId) --CheckRedPointStatus(self.config.RpType) end)