【灵兽系统】bug 同步到dev
parent
4201f2d7cd
commit
d5e4b46e45
|
|
@ -37,7 +37,6 @@ function this.UpdatePokemonDatas(_msgPokemonData,isRefreshFetter)--单个掉落
|
||||||
singPokemonData.dynamicId = _msgPokemonData.id
|
singPokemonData.dynamicId = _msgPokemonData.id
|
||||||
singPokemonData.star = _msgPokemonData.star
|
singPokemonData.star = _msgPokemonData.star
|
||||||
singPokemonData.lv = _msgPokemonData.level
|
singPokemonData.lv = _msgPokemonData.level
|
||||||
singPokemonData.isZhen = false
|
|
||||||
if spiritAnimal[singPokemonData.id].Live <= 0 then return end
|
if spiritAnimal[singPokemonData.id].Live <= 0 then return end
|
||||||
singPokemonData.live = GetResourcePath(spiritAnimal[singPokemonData.id].Live)
|
singPokemonData.live = GetResourcePath(spiritAnimal[singPokemonData.id].Live)
|
||||||
singPokemonData.scale = spiritAnimal[singPokemonData.id].Scale
|
singPokemonData.scale = spiritAnimal[singPokemonData.id].Scale
|
||||||
|
|
@ -155,8 +154,9 @@ end
|
||||||
--获取当前所有可吞卡灵兽数据
|
--获取当前所有可吞卡灵兽数据
|
||||||
function this.GetNoUpLvPokemonData(_id,_did)
|
function this.GetNoUpLvPokemonData(_id,_did)
|
||||||
local curAllPokemonList = {}
|
local curAllPokemonList = {}
|
||||||
|
local upZhenDids = this.GetAllPokemonFormationDids()
|
||||||
for key, value in pairs(pokemons) do
|
for key, value in pairs(pokemons) do
|
||||||
if value.isZhen == false and value.star <= 0 and value.lv <= 1 and value.id == _id and value.dynamicId ~= _did then
|
if not upZhenDids[value.dynamicId] and value.star <= 0 and value.lv <= 1 and value.id == _id and value.dynamicId ~= _did then
|
||||||
table.insert(curAllPokemonList,value)
|
table.insert(curAllPokemonList,value)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -297,7 +297,6 @@ function PokemonSummonPanel:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
|
|
||||||
function PokemonSummonPanel:OnClose()
|
function PokemonSummonPanel:OnClose()
|
||||||
orginLayer = 0
|
|
||||||
self.gameObject:SetActive(false)
|
self.gameObject:SetActive(false)
|
||||||
if self.timer then
|
if self.timer then
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
|
|
@ -314,6 +313,7 @@ function PokemonSummonPanel:OnClose()
|
||||||
end
|
end
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function PokemonSummonPanel:OnDestroy()
|
function PokemonSummonPanel:OnDestroy()
|
||||||
|
orginLayer = 0
|
||||||
SubUIManager.Close(self.upView)
|
SubUIManager.Close(self.upView)
|
||||||
if self.timer then
|
if self.timer then
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue