From a1c038b5c0837f23f05d6aad0b668b872e739f2e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 19 Apr 2023 13:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=8B=B1=E9=9B=84=E5=AE=9D=E7=89=A9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationPanelV2.lua | 4 ++-- .../~Lua/Modules/Hero/HeroManager.lua | 6 +++++- .../~Lua/Modules/RoleInfo/EquipTreasureManager.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 12 ++++++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 974dc1ab9f..44c2bbcaea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -1358,7 +1358,7 @@ function this.SetOneKeyGo() end for k, v in ipairs(heros) do local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId) - if curSingleherodata.property~=5 then + --if curSingleherodata.property~=5 then if not upHeroSidTable[curSingleherodata.id] then if #this.choosedList < 6 then for n = 1, #posArr do @@ -1372,7 +1372,7 @@ function this.SetOneKeyGo() end end end - end + --end end this.SetCardsData() diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index c622084122..ee953aa831 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3798,7 +3798,11 @@ function this.GetHeroIsUpTreasure(heroDid,pos) end end end - local allEquipTreasures = EquipTreasureManager.GetAllTreasuresByLocation(pos,heroData.changeProId) + local pro=heroData.changeProId + if heroData.changeProId==5 then + pro=0 + end + local allEquipTreasures = EquipTreasureManager.GetAllTreasuresByLocation(pos,pro) for k, v in ipairs(allEquipTreasures) do --比较战力 高战力的装备add if lackEquips[v.equipType].id == "0" then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 2b29bf4df8..24a7d9f1dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -403,7 +403,7 @@ function this.GetAllTreasuresByLocation(Location, PropertyName) for key, value in pairs(allTreasures) do if (value.upHeroDid == "" or value.upHeroDid == "0" ) and (Location == 0 or jewelConfig[value.id].Location == Location) and - jewelConfig[value.id].Race == PropertyName + (PropertyName==0 or jewelConfig[value.id].Race == PropertyName) then table.insert(curAllEquipTreasure, value) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 8de6597eef..a614dfcecc 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -328,7 +328,11 @@ function this:AllEquipUpBtnOnClick() local curPosEquip = {} local index = i if (index == 5 or index == 6) and isCanUpEquipTreasure then - curPosEquip = EquipTreasureManager.GetAllTreasuresByLocation(index - 4, curHeroData.changeProId) + local pro=curHeroData.changeProId + if curHeroData.changeProId==5 then + pro=0 + end + curPosEquip = EquipTreasureManager.GetAllTreasuresByLocation(index - 4, pro) else --获取到所有未装备的装备 curPosEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, index) @@ -704,7 +708,11 @@ function this:OnClickTabBtn(_index) elseif _index ==5 then -- body local allEquipTreasure - allEquipTreasure = EquipTreasureManager.GetAllTreasures(curHeroData.changeProId) + local pro=curHeroData.changeProId + if pro==5 then + pro=0 + end + allEquipTreasure = EquipTreasureManager.GetAllTreasures(pro) this:SortEquipDatas1(allEquipTreasure) --"装备数量:" this.itemNumText.text = Language[12181] .. LengthOfTable(allEquipTreasure)