Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

jiaoyangna 2020-10-26 16:01:34 +08:00
commit 573fc1d5f8
1 changed files with 5 additions and 5 deletions

View File

@ -1533,10 +1533,10 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
end
--灵兽编队加成
local pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(heroAllNum)
-- for key, value in pairs(pokemonFormationAllHeroProVal) do
-- LogPink("灵兽编队加成 "..value)
-- end
this.DoubleTableCompound(teamProVal, pokemonFormationAllHeroProVal)
--灵兽羁绊加成
local pokemonFetterAddPro = PokemonManager.GetAllPokemonFetterAddPros()
this.DoubleTableCompound(teamProVal, pokemonFetterAddPro)
--光环加成
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
this.DoubleTableCompound(teamProVal, aureoleProAdd)