Commit a28e4539 authored by Maxim Schedriviy's avatar Maxim Schedriviy

Merge branch 'master' into 'master'

Master

See merge request !127
parents 8758d2f6 1e40a249
Pipeline #123495074 passed with stage
in 0 seconds
......@@ -220,9 +220,16 @@ package com.xvm.battle.shared.battleloading
_model = model;
if (cfg.removeRankBadgeIcon)
{
if (this._badge)
//_model.badgeVO = null;
//temporary solution
if (_model.badgeVO)
{
this._badge.visible = false;
_model.badgeVO.icon = "";
_model.badgeVO.content = "";
_model.badgeVO.sizeContent = "";
_model.badgeVO.isDynamic = false;
_model.badgeVO.isAtlasSource = false;
}
}
if (cfg.removeTesterIcon)
......
......@@ -116,7 +116,7 @@ package com.xvm.battle.vo
internal function set_badgeVO(value:*):void
{
_badgeVO = value;
if ((!_suffixBadgeType) && _badgeVO && _badgeVO.icon)
if (_badgeVO && _badgeVO.icon)
{
__badgeId = _badgeVO.icon.replace("badge_", "");
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment