Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
afaf672de4
|
@ -277,8 +277,10 @@ function this.PokemonUnitAdapter(pokemonUnit,camp,_teamDamage)
|
|||
local skills = string.split(pokemonUnit.unitSkillIds, "#")
|
||||
if pokemonUnit.position==100 then -- 特殊处理位置 100 是玩家技能数据
|
||||
for i = 1, #skills do
|
||||
local newSkill=this.PlayerSkillAdapter(tonumber(skills[i]))
|
||||
role.skill[i] = newSkill
|
||||
if skills[i] and skills[i]~="" then
|
||||
local newSkill=this.PlayerSkillAdapter(tonumber(skills[i]))
|
||||
role.skill[i] = newSkill
|
||||
end
|
||||
end
|
||||
else
|
||||
for i = 1, #skills do
|
||||
|
|
|
@ -678,7 +678,6 @@ function this.OnAddMonster(data)
|
|||
go.transform.localPosition = Vector3.zero
|
||||
go.transform.anchoredPosition = Vector2.zero
|
||||
if posIndex>=100 then
|
||||
LogError(">>>>>>>>>>>>>100")
|
||||
go:SetActive(false)
|
||||
else
|
||||
go:SetActive(true)
|
||||
|
|
|
@ -115,7 +115,7 @@ function this.UpdateFormation(msg)
|
|||
end
|
||||
end
|
||||
-- 获取数据时检测一下公会战防守数据
|
||||
this.CheckGuildFightDefendFormation()
|
||||
-- this.CheckGuildFightDefendFormation()
|
||||
end
|
||||
--刷新临时编队数据
|
||||
function this.UpdateTemporaryFormation(teamId, TeamPosInfo)
|
||||
|
|
|
@ -471,10 +471,10 @@ function this.GetHeroFormationStr2(teamId)
|
|||
return Language[11108], FormationTypeDef.FORMATION_ARENA_ATTACK
|
||||
elseif teamId == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||
return Language[10692], FormationTypeDef.FORMATION_ENDLESS_MAP
|
||||
elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND then
|
||||
return Language[10682], FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND
|
||||
elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK then
|
||||
return Language[10683], FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK
|
||||
-- elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND then
|
||||
-- return Language[10682], FormationTypeDef.FORMATION_GUILD_FIGHT_DEFEND
|
||||
-- elseif teamId == FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK then
|
||||
-- return Language[10683], FormationTypeDef.FORMATION_GUILD_FIGHT_ATTACK
|
||||
elseif teamId == FormationTypeDef.BLOODY_BATTLE_ATTACK then
|
||||
return Language[11109], FormationTypeDef.BLOODY_BATTLE_ATTACK
|
||||
elseif teamId == FormationTypeDef.EXPEDITION then
|
||||
|
|
Loading…
Reference in New Issue