Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-10-25 16:47:15 +08:00
commit 9c76f42161
2 changed files with 11 additions and 18 deletions

View File

@ -264,11 +264,12 @@ end
function this.PokemonUnitAdapter(pokemonUnit,camp,_teamDamage)
-- 基础数据
--LogError("teamdamage=="..tonumber(pokemonUnit.forceScore))
local role = {
id = tonumber(pokemonUnit.unitId),
position = tonumber(pokemonUnit.position),
star = tonumber(pokemonUnit.star),
teamDamage = _teamDamage,
teamDamage = tonumber(pokemonUnit.forceScore),
camp = camp,
skill = {},
property = {},

View File

@ -310,6 +310,13 @@ function this.GetFormationPower(formationId)
ThinkingAnalyticsManager.SetSuperProperties({
fighting_capacity = power2,
})
-- 刷新后端战斗力
if power2 > PlayerManager.maxForce then
Log("发送队伍战力改变 ~~~~~~~~~~~~~~ ")
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)--targetTeamId
PlayerManager.maxForce = power2
end
-- 编队战斗力刷新
Game.GlobalEvent:DispatchEvent(GameEvent.Formation.OnFormationPowerChange, power2)
return power2
@ -348,24 +355,9 @@ function this.CheckFormationHasId(formationId, heroId)
return has
end
-- 重新算一遍战斗力
function this.UserPowerChanged()
local maxPower, targetTeamId = 0
-- for _, teamInfo in pairs(this.formationList) do
-- if #teamInfo.teamHeroInfos > 0 then
local curFormationWarPower = this.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)--teamInfo.teamId
if curFormationWarPower > maxPower then
maxPower = curFormationWarPower
-- targetTeamId = teamInfo.teamId
end
-- end
-- end
if maxPower > PlayerManager.maxForce then
Log("发送队伍战力改变 ~~~~~~~~~~~~~~ ")
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)--targetTeamId
PlayerManager.maxForce = maxPower
end
this.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
end
-- 获取相应编队的血量数据