Commit ba3ada86 authored by max's avatar max

WoT 1.7.0.0 CT2

parent cddf947b
Pipeline #97699622 passed with stage
in 0 seconds
package fl.motion.easing
{
public class Linear extends Object
{
public function Linear()
{
super();
}
public static function easeNone(param1:Number, param2:Number, param3:Number, param4:Number) : Number
{
return param3 * param1 / param4 + param2;
}
public static function easeIn(param1:Number, param2:Number, param3:Number, param4:Number) : Number
{
return param3 * param1 / param4 + param2;
}
public static function easeOut(param1:Number, param2:Number, param3:Number, param4:Number) : Number
{
return param3 * param1 / param4 + param2;
}
public static function easeInOut(param1:Number, param2:Number, param3:Number, param4:Number) : Number
{
return param3 * param1 / param4 + param2;
}
}
}
......@@ -12,12 +12,14 @@ package net.wg.data.VO
private var _dbID:Number = 0;
private var _fullName:String = "";
private var _fakeName:String = "";
private var _userName:String = "";
private var _clanAbbrev:String = "";
private var _fullName:String = "";
private var _region:String = "";
private var _igrType:int = 0;
......@@ -36,7 +38,7 @@ package net.wg.data.VO
{
this._tags = [];
super(param1);
this._userProps = App.utils.commons.getUserProps(this._userName,this._clanAbbrev,this._region,this._igrType,this._tags,this._badge,this._badgeImgStr);
this._userProps = App.utils.commons.getUserProps(this._userName,this._clanAbbrev,this._region,this._igrType,this._tags,this._badge,this._badgeImgStr,this._fakeName);
}
override protected function onDispose() : void
......@@ -61,48 +63,48 @@ package net.wg.data.VO
super.onDispose();
}
public function get accID() : Number
public function get dbID() : Number
{
return this._accID;
return this._dbID;
}
public function set accID(param1:Number) : void
public function set dbID(param1:Number) : void
{
this._accID = param1;
this._dbID = param1;
}
public function get isTeamKiller() : Boolean
public function get accID() : Number
{
return this._isTeamKiller;
return this._accID;
}
public function set isTeamKiller(param1:Boolean) : void
public function set accID(param1:Number) : void
{
this._isTeamKiller = param1;
if(this._userProps)
{
this._userProps.isTeamKiller = param1;
}
this._accID = param1;
}
public function get dbID() : Number
public function get uid() : Number
{
return this._dbID;
}
public function set dbID(param1:Number) : void
public function get kickId() : Number
{
this._dbID = param1;
return this._dbID;
}
public function get fullName() : String
public function get fakeName() : String
{
return this._fullName;
return this._fakeName;
}
public function set fullName(param1:String) : void
public function set fakeName(param1:String) : void
{
this._fullName = param1;
this._fakeName = param1;
if(this._userProps)
{
this._userProps.fakeName = param1;
}
}
public function get userName() : String
......@@ -133,6 +135,16 @@ package net.wg.data.VO
}
}
public function get fullName() : String
{
return this._fullName;
}
public function set fullName(param1:String) : void
{
this._fullName = param1;
}
public function get region() : String
{
return this._region;
......@@ -147,49 +159,39 @@ package net.wg.data.VO
}
}
public function get igrType() : int
public function get tags() : Array
{
return this._igrType;
return this._tags;
}
public function set igrType(param1:int) : void
public function set tags(param1:Array) : void
{
this._igrType = param1;
this._tags = param1;
if(this._userProps)
{
this._userProps.igrType = param1;
this._userProps.tags = param1;
}
}
public function get uid() : Number
{
return this._dbID;
}
public function get kickId() : Number
public function get userProps() : IUserProps
{
return this._dbID;
return this._userProps;
}
public function get tags() : Array
public function get igrType() : int
{
return this._tags;
return this._igrType;
}
public function set tags(param1:Array) : void
public function set igrType(param1:int) : void
{
this._tags = param1;
this._igrType = param1;
if(this._userProps)
{
this._userProps.tags = param1;
this._userProps.igrType = param1;
}
}
public function get userProps() : IUserProps
{
return this._userProps;
}
public function get badge() : int
{
return this._badge;
......@@ -217,5 +219,24 @@ package net.wg.data.VO
this._userProps.badgeImgStr = param1;
}
}
public function get isTeamKiller() : Boolean
{
return this._isTeamKiller;
}
public function set isTeamKiller(param1:Boolean) : void
{
this._isTeamKiller = param1;
if(this._userProps)
{
this._userProps.isTeamKiller = param1;
}
}
public function get isAnonymized() : Boolean
{
return this._userProps.isAnonymized || this._fakeName && this._fakeName != this._userName;
}
}
}
package net.wg.data.VO.daapi
{
import net.wg.data.daapi.base.DAAPIDataClass;
import net.wg.data.constants.Values;
import net.wg.data.constants.VehicleStatus;
import net.wg.data.constants.PlayerStatus;
import net.wg.data.constants.UserTags;
import net.wg.data.constants.generated.BATTLEATLAS;
public class DAAPIVehicleInfoVO extends DAAPIDataClass
{
public static const DEFAULT_SQUAD_IDX:int = 0;
public static const DEFAULT_SQUAD_IDX:int = Values.ZERO;
public var suffixBadgeType:String = "";
public var accountDBID:Number = 0;
public var prebattleID:Number = 0;
public var isSpeaking:Boolean = false;
public var prebattleID:Number = 0;
public var frags:int;
public var playerStatus:uint = 0;
public var sessionID:String = "";
public var accountDBID:Number = 0;
public var playerName:String = "";
public var playerFakeName:String = "";
public var playerFullName:String = "";
public var userTags:Array = null;
public var playerStatus:uint = 0;
public var vehicleID:Number = 0;
public var clanAbbrev:String = "";
public var vehicleAction:uint = 0;
public var region:String = "";
public var vehicleIcon:String = "";
public var userTags:Array = null;
public var vehicleIconName:String = "";
public var squadIndex:uint = 0;
public var vehicleName:String = "";
public var invitationStatus:uint = 0;
public var vehicleLevel:int = -1;
public var vehicleID:Number = 0;
public var vehicleName:String = "";
public var vehicleType:String = "";
public var vehicleStatus:uint = 0;
public var vehicleLevel:int = -1;
public var isVehiclePremiumIgr:Boolean = false;
public var vehicleIcon:String = "";
public var isObserver:Boolean = false;
public var vehicleIconName:String = "";
public var frags:int;
public var vehicleStatus:uint = 0;
public var region:String = "";
public var isObserver:Boolean = false;
public var squadIndex:uint = 0;
public var vehicleAction:uint = 0;
public var invitationStatus:uint = 0;
public var isVehiclePremiumIgr:Boolean = false;
public var teamColor:String = "";
public var clanAbbrev:String = "";
public var badgeType:String = "";
public var suffixBadgeType:String = "";
public var selfBgSource:String;
public var isCurrentSquad:Boolean = false;
......@@ -114,6 +120,16 @@ package net.wg.data.VO.daapi
return (this.playerStatus & PlayerStatus.IS_TEAM_KILLER) > 0;
}
public function get isAnonymized() : Boolean
{
return this.playerFakeName && this.playerFakeName != this.playerName;
}
public function get isCurrentPlayer() : Boolean
{
return this.userTags && UserTags.isCurrentPlayer(this.userTags);
}
public function get isIGR() : Boolean
{
return this.isVehiclePremiumIgr && this.vehicleType && this.vehicleType != BATTLEATLAS.UNKNOWN;
......
......@@ -795,6 +795,8 @@ package net.wg.data.constants.generated
public static const FRANCE_F38_BAT_CHATILLON155_58:String = "france-F38_Bat_Chatillon155_58";
public static const FRANCE_F42_AMR_35:String = "france-F42_AMR_35";
public static const FRANCE_F44_SOMUA_S35:String = "france-F44_Somua_S35";
public static const FRANCE_F49_RENAULT_R35:String = "france-F49_RenaultR35";
......
......@@ -121,6 +121,8 @@ package net.wg.data.constants.generated
public static const SHOP_20_BADGE:String = "shop20Badge";
public static const SHOP_20_CREW_BUNDLE:String = "shop20CrewBundle";
public static const TANKMAN_SKILL:String = "tankmanSkill";
public static const TANKMAN_NEW_SKILL:String = "tankmanNewSkill";
......@@ -529,6 +531,10 @@ package net.wg.data.constants.generated
public static const SETTINGS_KEY_SWITCH_MODE_UI:String = "ToolTipInblocksDefaultUI";
public static const SETTINGS_KEY_CHARGE_FIRE:String = "SettingsKeyChargeFire";
public static const SETTINGS_KEY_CHARGE_FIRE_UI:String = "ToolTipInblocksDefaultUI";
public static const VEH_CMP_SKILLS:String = "vehCmpSkills";
public static const VEH_CMP_SKILLS_UI:String = "ToolTipInblocksDefaultUI";
......@@ -591,7 +597,7 @@ package net.wg.data.constants.generated
public static const RANKED_SET:Array = [RANKED_BATTLES_POSITION,RANKED_BATTLES_EFFICIENCY,RANKED_BATTLES_LEAGUE,RANKED_BATTLES_BONUS,RANKED_BATTLES_RANK,RANKED_STEP,RANKED_CALENDAR_DAY_INFO,RANKED_CALENDAR_STEPS_INFO,RANKED_SELECTOR_INFO,RANKED_UNAVAILABLE_INFO,RANKED_DIVISION_INFO,RANKED_BATTLES_YEAR_REWARD,RANKED_SERVER_PRIMETIME];
public static const SETTINGS_SET:Array = [SETTINGS_CONTROL,SETTINGS_BUTTON,SETTINGS_MINIMAP_CIRCLES,SETTINGS_KEY_FOLLOW_ME,SETTINGS_KEY_TURN_BACK,SETTINGS_KEY_NEED_HELP,SETTINGS_KEY_RELOAD,SETTINGS_KEY_SWITCH_MODE];
public static const SETTINGS_SET:Array = [SETTINGS_CONTROL,SETTINGS_BUTTON,SETTINGS_MINIMAP_CIRCLES,SETTINGS_KEY_FOLLOW_ME,SETTINGS_KEY_TURN_BACK,SETTINGS_KEY_NEED_HELP,SETTINGS_KEY_RELOAD,SETTINGS_KEY_SWITCH_MODE,SETTINGS_KEY_CHARGE_FIRE];
public static const TUTORIAL_SET:Array = [HANGAR_TUTORIAL_CUSTOMIZATION_TYPES,HANGAR_TUTORIAL_PERSONAL_CASE_SKILLS,HANGAR_TUTORIAL_PERSONAL_CASE_PERKS,HANGAR_TUTORIAL_PERSONAL_CASE_ADDITIONAL,HANGAR_TUTORIAL_AMMUNITION,HANGAR_TUTORIAL_EQUPMENT];
......@@ -609,6 +615,8 @@ package net.wg.data.constants.generated
public static const CREW_BOOK_SET:Array = [CREW_BOOK,CREW_BOOK_RESTRICTED];
public static const CREW_BUNDLE_SET:Array = [SHOP_20_CREW_BUNDLE];
public static const FRONTLINE_SET:Array = [FRONTLINE_COUPON,FRONTLINE_RANK];
public static const SESSION_STATS_SET:Array = [SESSION_STATS_TANK_INFO,SESSION_STATS_EFFICIENCY_PARAM];
......
......@@ -101,7 +101,7 @@ package net.wg.gui.battle
{
}
public function as_setIsIntaractive(param1:Boolean) : void
public function as_setIsInteractive(param1:Boolean) : void
{
this._isInteractive = param1;
this.applyInteractivity();
......
......@@ -7,11 +7,11 @@ package net.wg.gui.battle.battleloading.renderers
import net.wg.gui.components.icons.PlayerActionMarker;
import flash.display.MovieClip;
import net.wg.infrastructure.managers.IColorSchemeManager;
import net.wg.data.constants.Values;
import net.wg.data.constants.generated.BATTLEATLAS;
import org.idmedia.as3commons.util.StringUtils;
import net.wg.gui.battle.battleloading.BattleLoadingHelper;
import net.wg.gui.battle.views.stats.constants.PlayerStatusSchemeName;
import net.wg.data.constants.UserTags;
import net.wg.infrastructure.interfaces.IColorScheme;
import net.wg.data.constants.Errors;
import flash.text.TextFieldAutoSize;
......@@ -150,7 +150,7 @@ package net.wg.gui.battle.battleloading.renderers
this.setSelfBG();
this.setBadge();
this._textField.visible = true;
App.utils.commons.formatPlayerName(this._textField,App.utils.commons.getUserProps(this.model.playerName,this.model.clanAbbrev,this.model.region,0,this.model.userTags));
App.utils.commons.formatPlayerName(this._textField,App.utils.commons.getUserProps(this.model.playerName,this.model.clanAbbrev,this.model.region,Values.ZERO,this.model.userTags,Values.ZERO,Values.EMPTY_STR,this.model.playerFakeName),!this.model.isCurrentPlayer,this.model.isCurrentPlayer);
this._vehicleField.visible = true;
this._vehicleField.text = this.model.vehicleName;
this._icoIGR.visible = this.model.isIGR;
......@@ -319,7 +319,7 @@ package net.wg.gui.battle.battleloading.renderers
var _loc4_:* = false;
var _loc5_:* = NaN;
var _loc1_:Boolean = this.model.isAlive();
var _loc2_:String = PlayerStatusSchemeName.getSchemeNameForVehicle(UserTags.isCurrentPlayer(this.model.userTags),this.model.isSquadPersonal(),this.model.isTeamKiller(),!_loc1_,!this.model.isReady());
var _loc2_:String = PlayerStatusSchemeName.getSchemeNameForVehicle(this.model.isCurrentPlayer,this.model.isSquadPersonal(),this.model.isTeamKiller(),!_loc1_,!this.model.isReady());
var _loc3_:IColorScheme = this._colorMgr.getScheme(_loc2_);
if(_loc3_)
{
......@@ -331,7 +331,7 @@ package net.wg.gui.battle.battleloading.renderers
{
this._vehicleLevelIcon.transform.colorTransform = _loc3_.colorTransform;
}
_loc2_ = PlayerStatusSchemeName.getSchemeNameForPlayer(UserTags.isCurrentPlayer(this.model.userTags),this.model.isSquadPersonal(),this.model.isTeamKiller(),!_loc1_,!this.model.isReady());
_loc2_ = PlayerStatusSchemeName.getSchemeNameForPlayer(this.model.isCurrentPlayer,this.model.isSquadPersonal(),this.model.isTeamKiller(),!_loc1_,!this.model.isReady());
_loc3_ = this._colorMgr.getScheme(_loc2_);
if(_loc3_)
{
......
......@@ -124,7 +124,7 @@ package net.wg.gui.battle.components
dispatchEvent(new Event(Event.CHANGE));
}
public function as_setIsIntaractive(param1:Boolean) : void
public function as_setIsInteractive(param1:Boolean) : void
{
this.panelSwitch.setIsInteractive(param1);
this.listLeft.setIsCursorVisible(param1);
......@@ -454,12 +454,12 @@ package net.wg.gui.battle.components
private function onDynamicSquadAcceptHandler(param1:DynamicSquadEvent) : void
{
acceptSquadS(param1.uid);
acceptSquadS(param1.sessionID);
}
private function onDynamicSquadAddHandler(param1:DynamicSquadEvent) : void
{
addToSquadS(param1.uid);
addToSquadS(param1.sessionID);
}
private function onMouseClickHandler(param1:MouseEvent) : void
......
......@@ -9,6 +9,8 @@ package net.wg.gui.battle.components.buttons
protected var _isAllowedToShowTooltipOnDisabled:Boolean = false;
protected var _hideToolTipOnClickActions:Boolean = true;
protected var _tooltipStr:String = "";
public function BattleToolTipButton()
......@@ -18,19 +20,19 @@ package net.wg.gui.battle.components.buttons
override protected function invokeReleaseOutsideActions() : void
{
this.hideTooltip();
this.tryToHideTooltip();
super.invokeReleaseOutsideActions();
}
override protected function invokeReleaseActions() : void
{
this.hideTooltip();
this.tryToHideTooltip();
super.invokeReleaseActions();
}
override protected function invokePressActions() : void
{
this.hideTooltip();
this.tryToHideTooltip();
super.invokePressActions();
}
......@@ -49,7 +51,15 @@ package net.wg.gui.battle.components.buttons
super.invokeRollOverActions();
}
public function hideTooltip() : void
private function tryToHideTooltip() : void
{
if(this.hideToolTipOnClickActions)
{
this.hideTooltip();
}
}
private function hideTooltip() : void
{