Commit aec23f8e authored by Maxim Schedriviy's avatar Maxim Schedriviy

Merge branch 'master' into 'master'

fix "removeRankBadgeIcon" parameter on statisticForm

See merge request !133
parents 1ffb9b02 8094345a
Pipeline #127425152 passed with stage
in 0 seconds
......@@ -175,7 +175,7 @@ package com.xvm.battle.classic.fullStats
override public function setBadge(_badgeVO:BadgeVisualVO, _hasBadge:Boolean):void
{
_badgeVO = cfg.removeRankBadgeIcon ? null : _badgeVO
_hasBadge = cfg.removeRankBadgeIcon ? false : _hasBadge
super.setBadge(_badgeVO, _hasBadge);
}
......
......@@ -178,7 +178,7 @@ package com.xvm.battle.ranked.fullStats
override public function setBadge(_badgeVO:BadgeVisualVO, _hasBadge:Boolean):void
{
_badgeVO = cfg.removeRankBadgeIcon ? null : _badgeVO
_hasBadge = cfg.removeRankBadgeIcon ? false : _hasBadge
super.setBadge(_badgeVO, _hasBadge);
}
......
......@@ -459,10 +459,10 @@ package com.xvm.lobby.ui.tankcarousel
_setupStandardTextField(renderer.content.statsTF, cfg.fields.stats, 0);
}
//
//private var orig_txtInfo_x:Number = NaN;
//private var orig_txtInfo_y:Number = NaN;
//private var orig_infoImg_x:Number = NaN;
//private var orig_infoImg_y:Number = NaN;
private var orig_txtInfo_x:Number = NaN;
private var orig_txtInfo_y:Number = NaN;
private var orig_infoImg_x:Number = NaN;
private var orig_infoImg_y:Number = NaN;
private function _setupStandardFieldInfo():void
{
var cfgInfo:CCarouselCellStandardField = null;
......@@ -485,18 +485,18 @@ package com.xvm.lobby.ui.tankcarousel
var field:TextField = renderer.content.txtInfo;
var tf:TextFormat = field.getTextFormat();
var img:Image = renderer.content.infoImg as Image;
//if (isNaN(orig_txtInfo_x))
//{
//orig_txtInfo_x = field.x;
//orig_txtInfo_y = field.y;
//orig_infoImg_x = img.x;
//orig_infoImg_y = img.y;
//}
var orig_txtInfo_x:Number = field.x;
var orig_txtInfo_y:Number = field.y;
var orig_infoImg_x:Number = img.x;
var orig_infoImg_y:Number = img.y;
if (isNaN(orig_txtInfo_x))
{
orig_txtInfo_x = field.x;
orig_txtInfo_y = field.y;
orig_infoImg_x = img.x;
orig_infoImg_y = img.y;
}
//var orig_txtInfo_x:Number = field.x;
//var orig_txtInfo_y:Number = field.y;
//var orig_infoImg_x:Number = img.x;
//var orig_infoImg_y:Number = img.y;
_setupStandardFieldAlpha(field, cfgInfo);
_setupStandardFieldScale(field, cfgInfo);
......
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