battlemanager修改提交
parent
1123b38709
commit
04fce03cd8
|
|
@ -328,7 +328,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
|||
local teamSkills = string.split(data.teamSkillList, "|") --异妖位置1#技能id1|异妖位置2#技能id2|..
|
||||
for i = 1, #teamSkills do
|
||||
local s = string.split(teamSkills[i], "#")
|
||||
fightData.playerData.teamSkill[i] = this.GetSkillData(tonumber(s[2]), tonumber(s[1]))
|
||||
fightData.playerData.teamSkill[i] = this.GetSkillData(tonumber(s[2]))
|
||||
end
|
||||
|
||||
--Log("data.teamPassiveList:"..data.teamPassiveList)
|
||||
|
|
@ -410,7 +410,6 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
|||
property = { },
|
||||
}
|
||||
end
|
||||
|
||||
if skills[1] then
|
||||
role.skill = this.GetSkillData(tonumber(skills[1]),role.skinId)
|
||||
end
|
||||
|
|
@ -433,7 +432,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
|||
local teamSkills2 = string.split(data2.teamSkillList, "|") --异妖位置1#技能id1|异妖位置2#技能id2|..
|
||||
for j = 1, #teamSkills2 do
|
||||
local s = string.split(teamSkills2[j], "#")
|
||||
fightData.enemyData[i].teamSkill[j] = this.GetSkillData(tonumber(s[2]), tonumber(s[1]))
|
||||
fightData.enemyData[i].teamSkill[j] = this.GetSkillData(tonumber(s[2]))
|
||||
end
|
||||
|
||||
-- 一些战斗外数据
|
||||
|
|
@ -463,7 +462,7 @@ function this.GetBattleData(formationId, monsterGroupId)
|
|||
local teamHeroInfos = FormationManager.formationList[formationId].teamHeroInfos
|
||||
for i = 1, #pokemonInfos do
|
||||
Log(DiffMonsterManager.GetSinglePokemonSkillIdData(pokemonInfos[i].pokemonId))
|
||||
fightData.playerData.teamSkill[i] = this.GetSkillData(DiffMonsterManager.GetSinglePokemonSkillIdData(pokemonInfos[i].pokemonId), pokemonInfos[i].position)
|
||||
fightData.playerData.teamSkill[i] = this.GetSkillData(DiffMonsterManager.GetSinglePokemonSkillIdData(pokemonInfos[i].pokemonId))
|
||||
fightData.playerData.teamPassive[i] = this.GetPassivityData(DiffMonsterManager.GetSinglePokemonPassiveSkillIdData(pokemonInfos[i].pokemonId))
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue