Commit 1eef3563 authored by Maxim Schedriviy's avatar Maxim Schedriviy

Merge branch 'master' into 'master'

sync decompiled swfs

See merge request !131
parents 1adfc8d4 b7471fd5
Pipeline #125813530 passed with stage
in 0 seconds
......@@ -62,15 +62,15 @@
// Supported version of the game.
// Поддерживаемая версия игры.
"gameVersion": "1.8.0.0",
"gameVersion": "1.8.0.1",
// The minimum required version of the XVM mod.
// Минимально необходимая версия мода XVM.
"modMinVersion": "8.3.2",
"modMinVersion": "8.3.3",
// Config last modified.
// Дата последней модификации конфига.
"date": "02.03.2020"
"date": "12.03.2020"
},
// Parameters for login screen.
......
XVM-8.3.2:
XVM-8.3.3:
[GENERAL]
* World of Tanks 1.8.0.1
XVM-8.3.2:
[GENERAL]
* World of Tanks 1.8.0.0
......
XVM-8.3.2:
XVM-8.3.3:
[ОБЩЕЕ]
* World of Tanks 1.8.0.1
XVM-8.3.2:
[ОБЩЕЕ]
* World of Tanks 1.8.0.0
......
......@@ -1339,6 +1339,14 @@ package
public static const REWARDWINDOW_TWITCH9_BTNLABEL:String = "#ingame_gui:rewardWindow/twitch9/btnLabel";
public static const REWARDWINDOW_TWITCH10_HEADERTEXT:String = "#ingame_gui:rewardWindow/twitch10/headerText";
public static const REWARDWINDOW_TWITCH10_SUBHEADERTEXT:String = "#ingame_gui:rewardWindow/twitch10/subHeaderText";
public static const REWARDWINDOW_TWITCH10_DESCTEXT:String = "#ingame_gui:rewardWindow/twitch10/descText";
public static const REWARDWINDOW_TWITCH10_BTNLABEL:String = "#ingame_gui:rewardWindow/twitch10/btnLabel";
public static const REWARDWINDOW_LOOTBOX_WINHEADERTEXT:String = "#ingame_gui:rewardWindow/lootbox/winHeaderText";
public static const REWARDWINDOW_LOOTBOX_HEADERTEXT:String = "#ingame_gui:rewardWindow/lootbox/headerText";
......
This diff is collapsed.
......@@ -21,6 +21,8 @@ package net.wg.gui.battle.views.epicSpectatorView
private static const DAMAGE_PANEL_OVERLAY_START_FRAME:int = 2;
private static const VEHICLE_PANEL_OFFSET_X:int = 30;
public var damagePanelOverlay:MovieClip = null;
public var postmortemPanelOverlay:MovieClip = null;
......@@ -63,7 +65,7 @@ package net.wg.gui.battle.views.epicSpectatorView
{
playerInfoTF.x = this._stageWidth - playerInfoTF.width >> 1;
playerInfoTF.y = (this._stageHeight >> 1) - PLAYER_INFO_DELTA_Y;
vehiclePanel.x = this._stageWidth - vehiclePanel.width >> 1;
vehiclePanel.x = (this._stageWidth - vehiclePanel.width >> 1) + VEHICLE_PANEL_OFFSET_X;
vehiclePanel.y = (this._stageHeight >> 1) + VEHICLE_PANEL_OFFSET_Y;
deadReasonTF.y = (this._stageHeight >> 1) + VEHICLE_PANEL_OFFSET_Y - GAP_VEHICLE_PANEL_DEAD_REASON - deadReasonTF.height;
deadReasonTF.x = this._stageWidth - deadReasonTF.width >> 1;
......
......@@ -157,11 +157,6 @@ package net.wg.gui.battle.views.postmortemPanel
invalidate(INVALID_PLAYER_INFO_POSITION);
}
private function updateDeadReason(param1:Event) : void
{
this.updateElementsPosition();
}
protected function updatePlayerInfoPosition() : void
{
this.playerInfoTF.y = -PLAYER_INFO_DELTA_Y - (App.appHeight >> 1);
......@@ -185,5 +180,10 @@ package net.wg.gui.battle.views.postmortemPanel
this._userName.visible = param1;
}
}
private function updateDeadReason(param1:Event) : void
{
this.updateElementsPosition();
}
}
}
......@@ -10,6 +10,8 @@ package net.wg.infrastructure.managers.impl
public class CommonsBattle extends CommonsBase
{
private static const IGR_TYPE_PREMIUM:int = 2;
public function CommonsBattle()
{
super();
......@@ -102,5 +104,15 @@ package net.wg.infrastructure.managers.impl
param1.textColor = _loc9_;
return _loc11_;
}
override public function getFullPlayerName(param1:IUserProps, param2:Boolean = false) : String
{
if(param1.isAnonymized && param2)
{
return param1.prefix + param1.fakeName + param1.suffix;
}
var _loc3_:String = (param1.igrType == IGR_TYPE_PREMIUM?IMG_TAG_OPEN_PREMIUM:IMG_TAG_OPEN_BASIC) + param1.igrVspace + IMG_TAG_CLOSE;
return param1.prefix + param1.userName + (param1.clanAbbrev?CLAN_TAG_OPEN + param1.clanAbbrev + CLAN_TAG_CLOSE:Values.EMPTY_STR) + (param1.region?Values.SPACE_STR + param1.region:Values.EMPTY_STR) + (param1.igrType > 0?Values.SPACE_STR + _loc3_:Values.EMPTY_STR) + param1.suffix;
}
}
}
......@@ -1339,6 +1339,14 @@ package
public static const REWARDWINDOW_TWITCH9_BTNLABEL:String = "#ingame_gui:rewardWindow/twitch9/btnLabel";
public static const REWARDWINDOW_TWITCH10_HEADERTEXT:String = "#ingame_gui:rewardWindow/twitch10/headerText";
public static const REWARDWINDOW_TWITCH10_SUBHEADERTEXT:String = "#ingame_gui:rewardWindow/twitch10/subHeaderText";
public static const REWARDWINDOW_TWITCH10_DESCTEXT:String = "#ingame_gui:rewardWindow/twitch10/descText";
public static const REWARDWINDOW_TWITCH10_BTNLABEL:String = "#ingame_gui:rewardWindow/twitch10/btnLabel";
public static const REWARDWINDOW_LOOTBOX_WINHEADERTEXT:String = "#ingame_gui:rewardWindow/lootbox/winHeaderText";
public static const REWARDWINDOW_LOOTBOX_HEADERTEXT:String = "#ingame_gui:rewardWindow/lootbox/headerText";
......
......@@ -1609,6 +1609,10 @@ package
public static const CAMOUFLAGE_PIXEL_WINTER_DESCRIPTION:String = "#vehicle_customization:camouflage/pixel_winter/description";
public static const CAMOUFLAGE_CLAN_RIVALS_LABEL:String = "#vehicle_customization:camouflage/clan_rivals/label";
public static const CAMOUFLAGE_CLAN_RIVALS_DESCRIPTION:String = "#vehicle_customization:camouflage/clan_rivals/description";
public static const EMBLEM:String = "#vehicle_customization:emblem";
public static const EMBLEM_CLAN_CONTENT:String = "#vehicle_customization:emblem/clan_content";
......@@ -2809,6 +2813,16 @@ package
public static const EMBLEM_SPECIAL_STICKER_540:String = "#vehicle_customization:emblem/special/sticker_540";
public static const EMBLEM_SPECIAL_STICKER_541:String = "#vehicle_customization:emblem/special/sticker_541";
public static const EMBLEM_SPECIAL_STICKER_541_DESC:String = "#vehicle_customization:emblem/special/sticker_541_desc";
public static const EMBLEM_SPECIAL_STICKER_543:String = "#vehicle_customization:emblem/special/sticker_543";
public static const EMBLEM_SPECIAL_STICKER_544:String = "#vehicle_customization:emblem/special/sticker_544";
public static const EMBLEM_SPECIAL_STICKER_545:String = "#vehicle_customization:emblem/special/sticker_545";
public static const INSCRIPTION:String = "#vehicle_customization:inscription";
public static const INSCRIPTION_HISTORICAL:String = "#vehicle_customization:inscription/historical";
......@@ -4125,6 +4139,8 @@ package
public static const INSCRIPTION_SPECIAL_SPECIAL_311:String = "#vehicle_customization:inscription/special/special_311";
public static const INSCRIPTION_SPECIAL_SPECIAL_313:String = "#vehicle_customization:inscription/special/special_313";
public static const ITEM_EMBLEM1:String = "#vehicle_customization:item/emblem1";
public static const ITEM_EMBLEM2:String = "#vehicle_customization:item/emblem2";
......@@ -6199,6 +6215,18 @@ package
public static const SPECIAL_STYLE_PIXEL_DESC:String = "#vehicle_customization:special_style/pixel_desc";
public static const SPECIAL_STYLE_CLAN_RIVALS_BRONZE:String = "#vehicle_customization:special_style/clan_rivals_bronze";
public static const SPECIAL_STYLE_CLAN_RIVALS_BRONZE_DESC:String = "#vehicle_customization:special_style/clan_rivals_bronze_desc";
public static const SPECIAL_STYLE_CLAN_RIVALS_SILVER:String = "#vehicle_customization:special_style/clan_rivals_silver";
public static const SPECIAL_STYLE_CLAN_RIVALS_SILVER_DESC:String = "#vehicle_customization:special_style/clan_rivals_silver_desc";
public static const SPECIAL_STYLE_CLAN_RIVALS_GOLD:String = "#vehicle_customization:special_style/clan_rivals_gold";
public static const SPECIAL_STYLE_CLAN_RIVALS_GOLD_DESC:String = "#vehicle_customization:special_style/clan_rivals_gold_desc";
public static const CUSTOMIZATION_POPOVER_STYLE_SUMMER:String = "#vehicle_customization:customization/popover/style/summer";
public static const CUSTOMIZATION_POPOVER_STYLE_DESERT:String = "#vehicle_customization:customization/popover/style/desert";
......@@ -6951,6 +6979,10 @@ package
public static const PROJECTION_DECALS_SPECIAL_PROJECTION_DECAL_59:String = "#vehicle_customization:projection_decals/special/projection_decal_59";
public static const PROJECTION_DECALS_SPECIAL_PROJECTION_DECAL_60:String = "#vehicle_customization:projection_decals/special/projection_decal_60";
public static const PROJECTION_DECALS_SPECIAL_PROJECTION_DECAL_60_DESCRIPTION:String = "#vehicle_customization:projection_decals/special/projection_decal_60/description";
public static const PROPERTYSHEET_KEYBOARD_HINT:String = "#vehicle_customization:propertySheet/keyboard/hint";
public static const PROPERTYSHEET_INSCRIPTIONCONTROLLER_INVALID_INSCRIPTION:String = "#vehicle_customization:propertySheet/inscriptionController/invalid_inscription";
......
......@@ -139,7 +139,7 @@ diff -Naur lobby.orig/net/wg/gui/lobby/hangar/Hangar.as lobby/net/wg/gui/lobby/h
diff -Naur lobby.orig/net/wg/gui/lobby/hangar/ammunitionPanel/AmmunitionPanel.as lobby/net/wg/gui/lobby/hangar/ammunitionPanel/AmmunitionPanel.as
--- lobby.orig/net/wg/gui/lobby/hangar/ammunitionPanel/AmmunitionPanel.as 2020-02-28 20:16:18.177148500 +0200
+++ lobby/net/wg/gui/lobby/hangar/ammunitionPanel/AmmunitionPanel.as 2020-02-28 20:19:21.853659000 +0200
@@ -1042,12 +1042,14 @@
@@ -1050,12 +1050,14 @@
private function animationCompleteHandler(param1:Event) : void
{
......
......@@ -1339,6 +1339,14 @@ package
public static const REWARDWINDOW_TWITCH9_BTNLABEL:String = "#ingame_gui:rewardWindow/twitch9/btnLabel";
public static const REWARDWINDOW_TWITCH10_HEADERTEXT:String = "#ingame_gui:rewardWindow/twitch10/headerText";
public static const REWARDWINDOW_TWITCH10_SUBHEADERTEXT:String = "#ingame_gui:rewardWindow/twitch10/subHeaderText";
public static const REWARDWINDOW_TWITCH10_DESCTEXT:String = "#ingame_gui:rewardWindow/twitch10/descText";
public static const REWARDWINDOW_TWITCH10_BTNLABEL:String = "#ingame_gui:rewardWindow/twitch10/btnLabel";
public static const REWARDWINDOW_LOOTBOX_WINHEADERTEXT:String = "#ingame_gui:rewardWindow/lootbox/winHeaderText";
public static const REWARDWINDOW_LOOTBOX_HEADERTEXT:String = "#ingame_gui:rewardWindow/lootbox/headerText";
......
This diff is collapsed.
......@@ -1609,6 +1609,10 @@ package
public static const CAMOUFLAGE_PIXEL_WINTER_DESCRIPTION:String = "#vehicle_customization:camouflage/pixel_winter/description";
public static const CAMOUFLAGE_CLAN_RIVALS_LABEL:String = "#vehicle_customization:camouflage/clan_rivals/label";
public static const CAMOUFLAGE_CLAN_RIVALS_DESCRIPTION:String = "#vehicle_customization:camouflage/clan_rivals/description";
public static const EMBLEM:String = "#vehicle_customization:emblem";
public static const EMBLEM_CLAN_CONTENT:String = "#vehicle_customization:emblem/clan_content";
......@@ -2809,6 +2813,16 @@ package
public static const EMBLEM_SPECIAL_STICKER_540:String = "#vehicle_customization:emblem/special/sticker_540";
public static const EMBLEM_SPECIAL_STICKER_541:String = "#vehicle_customization:emblem/special/sticker_541";
public static const EMBLEM_SPECIAL_STICKER_541_DESC:String = "#vehicle_customization:emblem/special/sticker_541_desc";
public static const EMBLEM_SPECIAL_STICKER_543:String = "#vehicle_customization:emblem/special/sticker_543";
public static const EMBLEM_SPECIAL_STICKER_544:String = "#vehicle_customization:emblem/special/sticker_544";
public static const EMBLEM_SPECIAL_STICKER_545:String = "#vehicle_customization:emblem/special/sticker_545";
public static const INSCRIPTION:String = "#vehicle_customization:inscription";
public static const INSCRIPTION_HISTORICAL:String = "#vehicle_customization:inscription/historical";
......@@ -4125,6 +4139,8 @@ package
public static const INSCRIPTION_SPECIAL_SPECIAL_311:String = "#vehicle_customization:inscription/special/special_311";
public static const INSCRIPTION_SPECIAL_SPECIAL_313:String = "#vehicle_customization:inscription/special/special_313";
public static const ITEM_EMBLEM1:String = "#vehicle_customization:item/emblem1";
public static const ITEM_EMBLEM2:String = "#vehicle_customization:item/emblem2";
......@@ -6199,6 +6215,18 @@ package
public static const SPECIAL_STYLE_PIXEL_DESC:String = "#vehicle_customization:special_style/pixel_desc";
public static const SPECIAL_STYLE_CLAN_RIVALS_BRONZE:String = "#vehicle_customization:special_style/clan_rivals_bronze";
public static const SPECIAL_STYLE_CLAN_RIVALS_BRONZE_DESC:String = "#vehicle_customization:special_style/clan_rivals_bronze_desc";
public static const SPECIAL_STYLE_CLAN_RIVALS_SILVER:String = "#vehicle_customization:special_style/clan_rivals_silver";
public static const SPECIAL_STYLE_CLAN_RIVALS_SILVER_DESC:String = "#vehicle_customization:special_style/clan_rivals_silver_desc";
public static const SPECIAL_STYLE_CLAN_RIVALS_GOLD:String = "#vehicle_customization:special_style/clan_rivals_gold";
public static const SPECIAL_STYLE_CLAN_RIVALS_GOLD_DESC:String = "#vehicle_customization:special_style/clan_rivals_gold_desc";
public static const CUSTOMIZATION_POPOVER_STYLE_SUMMER:String = "#vehicle_customization:customization/popover/style/summer";
public static const CUSTOMIZATION_POPOVER_STYLE_DESERT:String = "#vehicle_customization:customization/popover/style/desert";
......@@ -6951,6 +6979,10 @@ package
public static const PROJECTION_DECALS_SPECIAL_PROJECTION_DECAL_59:String = "#vehicle_customization:projection_decals/special/projection_decal_59";
public static const PROJECTION_DECALS_SPECIAL_PROJECTION_DECAL_60:String = "#vehicle_customization:projection_decals/special/projection_decal_60";
public static const PROJECTION_DECALS_SPECIAL_PROJECTION_DECAL_60_DESCRIPTION:String = "#vehicle_customization:projection_decals/special/projection_decal_60/description";
public static const PROPERTYSHEET_KEYBOARD_HINT:String = "#vehicle_customization:propertySheet/keyboard/hint";
public static const PROPERTYSHEET_INSCRIPTIONCONTROLLER_INVALID_INSCRIPTION:String = "#vehicle_customization:propertySheet/inscriptionController/invalid_inscription";
......
......@@ -83,6 +83,7 @@ package net.wg.gui.lobby.components
{
stop();
App.utils.scheduler.cancelTask(gotoAndPlay);
App.utils.scheduler.cancelTask(this.onStartFadeIn);
this.ribbonAward.dispose();
this.ribbonAward = null;
this._frameHelper.dispose();
......
......@@ -21,11 +21,9 @@ package net.wg.gui.lobby.hangar
private static const SEPARATOR:String = "_";
private static const HELP_OFFSET_WIDTH:int = 56;
private static const HELP_OFFSET_HEIGHT:int = -3;
private static const HELP_OFFSET_WIDTH_GAP:int = 199;
private static const HELP_OFFSET_X:int = -30;
public var mcBackground:Sprite;
......@@ -115,7 +113,7 @@ package net.wg.gui.lobby.hangar
{
var _loc1_:HelpLayoutVO = new HelpLayoutVO();
var _loc2_:Rectangle = this.questsFlags.getHitRect();
_loc1_.x = this.questsFlags.x + _loc2_.x;
_loc1_.x = this.questsFlags.x + _loc2_.x + HELP_OFFSET_X;
_loc1_.y = this.questsFlags.y;
_loc1_.width = _loc2_.width;
_loc1_.height = _loc2_.height + HELP_OFFSET_HEIGHT;
......@@ -123,20 +121,7 @@ package net.wg.gui.lobby.hangar
_loc1_.extensibilityDirection = Directions.RIGHT;
_loc1_.id = name + SEPARATOR + Math.random();
_loc1_.scope = this;
var _loc3_:HelpLayoutVO = new HelpLayoutVO();
_loc3_.x = _loc1_.x + _loc1_.width;
_loc3_.y = this.questsFlags.y;
_loc3_.width = -_loc3_.x + HELP_OFFSET_WIDTH;
_loc3_.height = _loc1_.height;
_loc3_.message = LOBBY_HELP.HANGAR_HEADER_VEHICLE;
_loc3_.extensibilityDirection = Directions.RIGHT;
_loc3_.id = name + SEPARATOR + Math.random();
_loc3_.scope = this;
if(_loc3_.width > HELP_OFFSET_WIDTH_GAP)
{
_loc3_.width = HELP_OFFSET_WIDTH_GAP;
}
return new <HelpLayoutVO>[_loc1_,_loc3_];
return new <HelpLayoutVO>[_loc1_];
}
public function getQuestGroupByType(param1:String) : IHeaderQuestsContainer
......
......@@ -50,7 +50,7 @@ package net.wg.gui.lobby.hangar.ammunitionPanel
private static const INV_TUNING_BUTTON_STATE:String = "InvTuningState";
private static const OFFSET_BTN_TO_RENT:Number = 2;
private static const OFFSET_BTN_TO_RENT:int = 2;
private static const SHELLS_VO_SIZE_CORRECTION:int = 10;
......@@ -124,6 +124,8 @@ package net.wg.gui.lobby.hangar.ammunitionPanel
private var _boosterHelpLayoutId:String = "";
private var _vehicleStateHelpLayoutId:String = "";
private var _panelEnabled:Boolean = true;
private var _battleAbilitiesVisible:Boolean = false;
......@@ -553,7 +555,8 @@ package net.wg.gui.lobby.hangar.ammunitionPanel
var _loc3_:HelpLayoutVO = this.createHelpLayoutData(this.shell1.x,this.shell1.y,this.shell3.x + this.shell3.width - this.shell1.x - SHELLS_VO_SIZE_CORRECTION,this.shell1.height - SHELLS_VO_SIZE_CORRECTION,LOBBY_HELP.HANGAR_SHELLS,this._shellsHelpLayoutId);
var _loc4_:HelpLayoutVO = this.createHelpLayoutData(this.equipment1.x,this.equipment1.y,this.equipment3.x + this.equipment3.width - this.equipment1.x,this.equipment1.height,LOBBY_HELP.HANGAR_EQUIPMENT,this._equipmentHelpLayoutId);
var _loc5_:HelpLayoutVO = this.createHelpLayoutData(this.booster.x,this.booster.y,this.booster.width,this.booster.height,LOBBY_HELP.HANGAR_BOOSTER,this._boosterHelpLayoutId);
return new <HelpLayoutVO>[_loc1_,_loc2_,_loc3_,_loc4_,_loc5_];
var _loc6_:HelpLayoutVO = this.createHelpLayoutData(this.vehicleStateMsg.x - (this.vehicleStateMsg.width >> 1),this.vehicleStateMsg.y,this.vehicleStateMsg.width,this.vehicleStateMsg.height,LOBBY_HELP.HANGAR_HEADER_VEHICLE,this._vehicleStateHelpLayoutId);
return new <HelpLayoutVO>[_loc1_,_loc2_,_loc3_,_loc4_,_loc5_,_loc6_];
}
public function setBattleAbilitiesVisibility(param1:Boolean) : void
......@@ -704,26 +707,23 @@ package net.wg.gui.lobby.hangar.ammunitionPanel
private function centerPanel() : void
{
var _loc2_:* = NaN;
var _loc1_:Number = 2 * this._buttonWidth + INDENT_BETWEEN_BUTTONS;
if(this._changeNationBtnVisible)
{
_loc1_ = _loc1_ + (this._buttonWidth + INDENT_BETWEEN_BUTTONS);
}
var _loc3_:Number = 0;
var _loc2_:* = 0;
if(this._battleAbilitiesVisible && this._screenWidth <= BREAKPOINT_SLOT_CENTERING)
{
this.x = OFFSET_MINRES_LEFT;
_loc2_ = (this._screenWidth - this.vehicleStateMsg.width >> 1) - OFFSET_MINRES_LEFT;
_loc3_ = (this._screenWidth - _loc1_ >> 1) - OFFSET_MINRES_LEFT;
_loc2_ = (this._screenWidth - _loc1_ >> 1) - OFFSET_MINRES_LEFT;
}
else
{
this.x = this._screenWidth - this._fakeWidth >> 1;
_loc2_ = this._fakeWidth - this.vehicleStateMsg.width >> 1;
_loc3_ = this._fakeWidth - _loc1_ >> 1;
_loc2_ = this._fakeWidth - _loc1_ >> 1;
}
this.maintenanceBtn.x = _loc3_;
this.maintenanceBtn.x = _loc2_;
this.tuningBtn.x = this.maintenanceBtn.x + this._buttonWidth + INDENT_BETWEEN_BUTTONS;
this.changeNationBtn.x = this.tuningBtn.x + this._buttonWidth + INDENT_BETWEEN_BUTTONS;
dispatchEvent(new Event(Event.RESIZE));
......@@ -765,6 +765,14 @@ package net.wg.gui.lobby.hangar.ammunitionPanel
{
this._boosterHelpLayoutId = this.generateHelpLayoutId();
}
if(this._boosterHelpLayoutId == Values.EMPTY_STR)
{
this._boosterHelpLayoutId = this.generateHelpLayoutId();
}
if(this._vehicleStateHelpLayoutId == Values.EMPTY_STR)
{
this._vehicleStateHelpLayoutId = this.generateHelpLayoutId();
}
}
private function createHelpLayoutData(param1:int, param2:int, param3:int, param4:int, param5:String, param6:String) : HelpLayoutVO
......
......@@ -57,37 +57,40 @@ package net.wg.gui.lobby.hangar.ammunitionPanel
override protected function draw() : void
{
var _loc1_:* = NaN;
var _loc2_:* = NaN;
var _loc1_:* = 0;
var _loc2_:* = 0;
super.draw();
if(this._data && isInvalid(InvalidationType.DATA))
if(this._data)
{
this.vehicleMsg.htmlText = this._data.message;
this.vehicleLevel.text = this._data.vehicleLevel;
this.vehicleName.text = this._data.vehicleName;
this.tankTypeIcon.type = this._data.tankType;
this.tankTypeIcon.validateNow();
this.statusBg.visible = this.vehicleMsg.visible = this._data.message.length > 0;
invalidateSize();
}
if(isInvalid(InvalidationType.SIZE))
{
this.vehicleLevel.x = 0;
this.vehicleName.width = this.vehicleName.textWidth + TEXT_PADDING;
this.vehicleLevel.width = this.vehicleLevel.textWidth + TEXT_PADDING;
this.vehicleMsg.width = this.vehicleMsg.textWidth + TEXT_PADDING;
this.vehicleMsg.height = this.vehicleMsg.textHeight + TEXT_PADDING;
_loc1_ = this._data.isElite?ELITE_TYPE_GAP:COMMON_TYPE_GAP;
this.tankTypeIcon.x = this.vehicleLevel.x + this.vehicleLevel.width + this.tankTypeIcon.width + _loc1_ ^ 0;
this.vehicleName.x = this.tankTypeIcon.x + this.tankTypeIcon.width + _loc1_ ^ 0;
_loc2_ = this.vehicleName.x + this.vehicleName.width >> 1;
this.vehicleLevel.x = this.vehicleLevel.x - _loc2_;
this.tankTypeIcon.x = this.tankTypeIcon.x - _loc2_;
this.vehicleName.x = this.vehicleName.x - _loc2_;
this.vehicleMsg.x = -this.vehicleMsg.width >> 1;
this.statusBg.x = this.vehicleMsg.x + (this.vehicleMsg.width >> 1);
this.statusBg.y = this.vehicleMsg.y + (this.vehicleMsg.height >> 1) + BG_OFFSET;
dispatchEvent(new AmmunitionPanelEvents(AmmunitionPanelEvents.VEHICLE_STATE_MSG_RESIZE));
if(isInvalid(InvalidationType.DATA))
{
this.vehicleMsg.htmlText = this._data.message;
this.vehicleLevel.text = this._data.vehicleLevel;
this.vehicleName.text = this._data.vehicleName;
this.tankTypeIcon.type = this._data.tankType;
this.tankTypeIcon.validateNow();
this.statusBg.visible = this.vehicleMsg.visible = this._data.message.length > 0;
invalidateSize();
}
if(isInvalid(InvalidationType.SIZE))
{
this.vehicleLevel.x = 0;
this.vehicleName.width = this.vehicleName.textWidth + TEXT_PADDING;
this.vehicleLevel.width = this.vehicleLevel.textWidth + TEXT_PADDING;
this.vehicleMsg.width = this.vehicleMsg.textWidth + TEXT_PADDING;
this.vehicleMsg.height = this.vehicleMsg.textHeight + TEXT_PADDING;
_loc1_ = this._data.isElite?ELITE_TYPE_GAP:COMMON_TYPE_GAP;
this.tankTypeIcon.x = this.vehicleLevel.x + this.vehicleLevel.width + this.tankTypeIcon.width + _loc1_ ^ 0;
this.vehicleName.x = this.tankTypeIcon.x + this.tankTypeIcon.width + _loc1_ ^ 0;
_loc2_ = this.vehicleName.x + this.vehicleName.width >> 1;
this.vehicleLevel.x = this.vehicleLevel.x - _loc2_;
this.tankTypeIcon.x = this.tankTypeIcon.x - _loc2_;
this.vehicleName.x = this.vehicleName.x - _loc2_;
this.vehicleMsg.x = -this.vehicleMsg.width >> 1;
this.statusBg.x = this.vehicleMsg.x + (this.vehicleMsg.width >> 1);
this.statusBg.y = this.vehicleMsg.y + (this.vehicleMsg.height >> 1) + BG_OFFSET;
dispatchEvent(new AmmunitionPanelEvents(AmmunitionPanelEvents.VEHICLE_STATE_MSG_RESIZE));
}
}
}
......
......@@ -11,11 +11,13 @@ package net.wg.gui.lobby.hangar.quests
private static const BP_ENTRY_POINT_SIDE_INDENT:int = 2;
private static const BP_ENTRY_POINT_SMALL_WIDTH:int = 100;
private static const BP_ENTRY_POINT_MARGIN_X:int = 30;
private static const BP_ENTRY_POINT_SMALL_WIDTH:int = 100 + BP_ENTRY_POINT_MARGIN_X * 2;
private static const BP_ENTRY_POINT_SMALL_HEIGHT:int = 120;
private static const BP_ENTRY_POINT_WIDTH:int = 142;
private static const BP_ENTRY_POINT_WIDTH:int = 142 + BP_ENTRY_POINT_MARGIN_X * 2;
private static const BP_ENTRY_POINT_HEIGHT:int = 160;
......@@ -62,5 +64,10 @@ package net.wg.gui.lobby.hangar.quests
setIsSmallS(this._isSmall);
}
}
public function get marginX() : Number
{
return BP_ENTRY_POINT_MARGIN_X;
}
}
}
......@@ -547,12 +547,12 @@ package net.wg.gui.lobby.hangar.quests
private function getInitialRightSideX() : int
{
return this.battlePassEntryPointX + this.battlePassEntryPointWidth + QUESTS_GROUP_OFFSET + RIGHT_SIDE_GROUP_X_OFFSET;
return this.battlePassEntryPointX + this.battlePassEntryPointWidth + QUESTS_GROUP_OFFSET - this.battlePassEntryPointmMrginX + RIGHT_SIDE_GROUP_X_OFFSET;
}
private function getInitialLeftSideX(param1:int) : int
{
return this.battlePassEntryPointX - (param1 >> 1) - QUESTS_GROUP_OFFSET;
return this.battlePassEntryPointX - (param1 >> 1) - QUESTS_GROUP_OFFSET + this.battlePassEntryPointmMrginX;
}
private function onMoveContainerCompleted() : void
......@@ -565,6 +565,11 @@ package net.wg.gui.lobby.hangar.quests
return this._battlePassEntryPoint?this._battlePassEntryPoint.width:0;
}
private function get battlePassEntryPointmMrginX() : int
{
return this._battlePassEntryPoint?this._battlePassEntryPoint.marginX:0;
}
private function get battlePassEntryPointX() : int
{
return this._battlePassEntryPoint?this._battlePassEntryPoint.x:0;
......
......@@ -2,34 +2,47 @@ package net.wg.gui.lobby.window
{
import net.wg.infrastructure.base.meta.impl.BattlePassBadgesDemoWindowMeta;
import flash.utils.Dictionary;
import scaleform.clik.utils.Padding;
import net.wg.gui.components.advanced.BadgeSizes;
import net.wg.gui.components.controls.ScrollPane;
import scaleform.clik.controls.ScrollBar;
import net.wg.gui.components.controls.BadgeComponent;
import net.wg.utils.StageSizeBoundaries;
import net.wg.infrastructure.interfaces.IWindow;
import net.wg.infrastructure.constants.WindowViewInvalidationType;
import net.wg.gui.components.windows.WindowEvent;
import net.wg.gui.components.controls.VO.BadgeVisualVO;
import flash.display.MovieClip;
import net.wg.data.constants.Linkages;
import net.wg.gui.components.windows.Window;
public class BattlePassBadgesDemoWindow extends BattlePassBadgesDemoWindowMeta
{
private static const SIZES:Dictionary = new Dictionary();
private static const OFFSETS:Dictionary = new Dictionary();
private static const SIZES_STR:Array = [BadgeSizes.X24,BadgeSizes.X48,BadgeSizes.X80,BadgeSizes.X220];
private static const WIDTH:int = 1500;
private static const SCROLL_WIDTH:int = 13;
private static const OFFSET:int = 50;
private static const WINDOW_OFFSET:int = 88;
private static const TARGET_OFFSET:int = 200;
private static const PADDING:Padding = new Padding(38,13,16,16);
{
SIZES[BadgeSizes.X24] = 24;
SIZES[BadgeSizes.X48] = 48;
SIZES[BadgeSizes.X80] = 80;
SIZES[BadgeSizes.X220] = 220;
OFFSETS[BadgeSizes.X24] = 0;
OFFSETS[BadgeSizes.X48] = 55;
OFFSETS[BadgeSizes.X80] = 250;
OFFSETS[BadgeSizes.X220] = 710;
}
public var scroll:ScrollPane;
public var skinsScrollBar:ScrollBar;
private var _badges:Vector.<BadgeComponent>;
public function BattlePassBadgesDemoWindow()
......@@ -38,28 +51,85 @@ package net.wg.gui.lobby.window
super();
}
override public function setWindow(param1:IWindow) : void
{
super.setWindow(param1);
if(param1)
{
param1.useBottomBtns = true;
param1.contentPadding = PADDING;
param1.title = "badges";
param1.setWindowContent(this);
param1.invalidate(WindowViewInvalidationType.POSITION_INVALID);
this.scroll.setSize(param1.width,param1.height);
this.skinsScrollBar.visible = true;
this.skinsScrollBar.setSize(13,param1.height);
}
}
override protected function configUI() : void
{
super.configUI();
window.title = "badges";
window.setMaxHeight(StageSizeBoundaries.HEIGHT_1080);
window.setMaxWidth(StageSizeBoundaries.WIDTH_1920);
updateStage(App.appWidth,App.appHeight);
window.addEventListener(WindowEvent.SCALE_Y_CHANGED,this.onWindowScaleYChangedHandler);
}
override protected function draw() : void
{
var _loc1_:* = 0;
var _loc2_:* = NaN;
var _loc3_:* = 0;
var _loc4_:* = 0;
var _loc5_:* = 0;
var _loc6_:* = 0;
var _loc7_:* = 0;
var _loc8_:BadgeComponent = null;