parent
0a7415917a
commit
6065193f9d
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue