Merge remote-tracking branch 'origin/xma/dev' into master_xma_local
commit
59fdb6d2aa
|
|
@ -441,7 +441,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
|||
fightData.enemyData[i].outData = data2.specialPassive
|
||||
-- 灵兽数据
|
||||
fightData.enemyData[i].monsterList ={}
|
||||
if data.pokemonUnitList then
|
||||
if data2.pokemonUnitList then
|
||||
for k = 1, #data2.pokemonUnitList do
|
||||
fightData.enemyData[i].monsterList[k] = this.PokemonUnitAdapter(data2.pokemonUnitList[k],1)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue