Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
cddc94f41e
|
|
@ -37,7 +37,6 @@ function this.UpdatePokemonDatas(_msgPokemonData,isRefreshFetter)--单个掉落
|
|||
singPokemonData.dynamicId = _msgPokemonData.id
|
||||
singPokemonData.star = _msgPokemonData.star
|
||||
singPokemonData.lv = _msgPokemonData.level
|
||||
singPokemonData.isZhen = false
|
||||
if spiritAnimal[singPokemonData.id].Live <= 0 then return end
|
||||
singPokemonData.live = GetResourcePath(spiritAnimal[singPokemonData.id].Live)
|
||||
singPokemonData.scale = spiritAnimal[singPokemonData.id].Scale
|
||||
|
|
@ -155,8 +154,9 @@ end
|
|||
--获取当前所有可吞卡灵兽数据
|
||||
function this.GetNoUpLvPokemonData(_id,_did)
|
||||
local curAllPokemonList = {}
|
||||
local upZhenDids = this.GetAllPokemonFormationDids()
|
||||
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)
|
||||
end
|
||||
end
|
||||
|
|
@ -517,7 +517,7 @@ end
|
|||
--上阵灵兽升星红点2
|
||||
function this.GetSinglePokemonUpStarRedPoint(curPokemonData)
|
||||
if curPokemonData and curPokemonData.star < spiritAnimal[curPokemonData.id].MaxStar then
|
||||
local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star + 1)
|
||||
local curUpStarConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalStar,"Quality", spiritAnimal[curPokemonData.id].Quality, "Star", curPokemonData.star)
|
||||
if curUpStarConfig then
|
||||
local upStarMaterialsData = {{curPokemonData.id,curUpStarConfig.ConsumeItemNum}}
|
||||
for j = 1, #curUpStarConfig.ConsumeRes do
|
||||
|
|
|
|||
|
|
@ -297,7 +297,6 @@ function PokemonSummonPanel:OnSortingOrderChange()
|
|||
end
|
||||
|
||||
function PokemonSummonPanel:OnClose()
|
||||
orginLayer = 0
|
||||
self.gameObject:SetActive(false)
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
|
|
@ -314,6 +313,7 @@ function PokemonSummonPanel:OnClose()
|
|||
end
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function PokemonSummonPanel:OnDestroy()
|
||||
orginLayer = 0
|
||||
SubUIManager.Close(self.upView)
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
|
|
|
|||
Loading…
Reference in New Issue