From 6065193f9daa8d0f7f8ee2b5f9619cacdbc6f221 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 16 Aug 2024 17:44:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E8=AE=AD=E5=90=9E=E7=81=B5=E5=85=BD?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=20=E4=B8=80=E4=B8=AA=E4=B8=8A=E9=98=B5?= =?UTF-8?q?=E9=83=BD=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Pokemon/PokemonManager.lua | 17 +++++++++++++++++ .../RoleInfo/SpecailTrainingInfoPopup.lua | 7 ++++--- .../Modules/RoleInfo/TrainingItemListPanel.lua | 10 ++++++---- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index 0b50e2d39b..447fa98ab6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -139,6 +139,23 @@ function this.GetCanUpZhenPokemonDatas(curUpZhenPokemonData) end return curAllPokemonList end + + +--获取当前可以上阵的灵兽数据 +function this.GetNoUpFigthPokemonDatas() + local upZhenSidList = this.GetAllPokemonFormationDids() + local curAllPokemonList = {} + for key, value in pairs(pokemons) do + if not upZhenSidList[value.dynamicId] then + table.insert(curAllPokemonList,value) + end + end + return curAllPokemonList +end + + + + --移除灵兽数据 function this.RemoveSinglePokemonData(_did) if not _did then return end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua index 14e3015fc3..562dfb61b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/SpecailTrainingInfoPopup.lua @@ -430,11 +430,12 @@ function SpecailTrainingInfoPopup:SetSingleData(index,_go,_data) elseif tData.NeedItem1[i][1]== 53 then tmpData[i].type=4 end - if tData.NeedItem1[i][1]== 56 then - tmpData[i].Name= ItemBaseTypeName[tData.NeedItem1[i][2]] + if tData.NeedItem1[i][1]== 56 then + tmpData[i].Name=ItemBaseTypeName[tData.NeedItem1[i][2]] else - tmpData[i].Name= ItemTypeName[tData.NeedItem1[i][1]] + tmpData[i].Name=ItemTypeName[tData.NeedItem1[i][1]] end + tmpData[i].qua=tData.NeedItem1[i][3] end local index=#tmpData for i=index+1,index+#tData.NeedHero do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua index 6f37e90a63..9758066979 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua @@ -117,7 +117,7 @@ function TrainingItemListPanel:OnOpen(_curData,_func,NeedNum,selectItems1,select end elseif _curData.type==3 then - local pokemonList = PokemonManager.GetCanUpZhenPokemonDatas() + local pokemonList = PokemonManager.GetNoUpFigthPokemonDatas() local index=0 for i=1,#pokemonList do local v={} @@ -136,9 +136,11 @@ function TrainingItemListPanel:OnOpen(_curData,_func,NeedNum,selectItems1,select v.returnCoin=config.CoinReturn v.frame=GetHeroQuantityImageByquality(config.Quality) v.num=1 - table.insert(heroOrItemDataList,v) - - + --LogError("v.quality==================="..v.quality) + --LogError("curdata.qua=================="..curData.qua) + if curData.qua==v.quality then + table.insert(heroOrItemDataList,v) + end -- heroOrItemDataList[i]=itemDatas[i] end elseif _curData.type == 4 then