Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
573fc1d5f8
|
|
@ -1533,10 +1533,10 @@ function this.GetAllHeroTeamAddProVal(teamHeroInfos,curteamHeroDid)
|
||||||
end
|
end
|
||||||
--灵兽编队加成
|
--灵兽编队加成
|
||||||
local pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(heroAllNum)
|
local pokemonFormationAllHeroProVal = PokemonManager.GetPokemonFormationTeamAddPro(heroAllNum)
|
||||||
-- for key, value in pairs(pokemonFormationAllHeroProVal) do
|
|
||||||
-- LogPink("灵兽编队加成 "..value)
|
|
||||||
-- end
|
|
||||||
this.DoubleTableCompound(teamProVal, pokemonFormationAllHeroProVal)
|
this.DoubleTableCompound(teamProVal, pokemonFormationAllHeroProVal)
|
||||||
|
--灵兽羁绊加成
|
||||||
|
local pokemonFetterAddPro = PokemonManager.GetAllPokemonFetterAddPros()
|
||||||
|
this.DoubleTableCompound(teamProVal, pokemonFetterAddPro)
|
||||||
--光环加成
|
--光环加成
|
||||||
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
|
local aureoleProAdd = FormationManager.GetCurFormationElementAdd(teamHeroInfos)
|
||||||
this.DoubleTableCompound(teamProVal, aureoleProAdd)
|
this.DoubleTableCompound(teamProVal, aureoleProAdd)
|
||||||
|
|
@ -1709,13 +1709,13 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
|
||||||
--灵兽羁绊单加战力 暂时去掉
|
--灵兽羁绊单加战力 暂时去掉
|
||||||
-- local allPokemonFetterAddWarPowerVal = PokemonManager.GetAllPokemonFetterAddProsSWarPower()--allSoulPrintAddWarPowerVal--
|
-- local allPokemonFetterAddWarPowerVal = PokemonManager.GetAllPokemonFetterAddProsSWarPower()--allSoulPrintAddWarPowerVal--
|
||||||
-- LogError("灵兽羁绊加成静态战力 "..allPokemonFetterAddWarPowerVal)
|
-- LogError("灵兽羁绊加成静态战力 "..allPokemonFetterAddWarPowerVal)
|
||||||
--if pokemonFetterAddPro and LengthOfTable(pokemonFetterAddPro) > 0 then
|
-- if pokemonFetterAddPro and LengthOfTable(pokemonFetterAddPro) > 0 then
|
||||||
-- for i, v in pairs(pokemonFetterAddPro) do
|
-- for i, v in pairs(pokemonFetterAddPro) do
|
||||||
-- if v > 0 then
|
-- if v > 0 then
|
||||||
-- LogError("灵兽羁绊加成 "..i.." "..v)
|
-- LogError("灵兽羁绊加成 "..i.." "..v)
|
||||||
-- end
|
-- end
|
||||||
-- end
|
-- end
|
||||||
--end
|
-- end
|
||||||
|
|
||||||
--单体所有属性合并
|
--单体所有属性合并
|
||||||
this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro)
|
this.DoubleTableCompound(allAddProVal, allPokemonPeiJianAddPro)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue