1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 23:46:45 +00:00

new preloader

-added preloader aniamtion
-modified export bat,
-added right stick controls
-switch preorders tagline
This commit is contained in:
Brandon 2020-11-07 02:29:20 -05:00
parent 99741f0a65
commit e84bb65b1d
3 changed files with 17 additions and 25 deletions

View file

@ -29,7 +29,7 @@ class Preloader extends FlxBasePreloader
this._width = Lib.current.stage.stageWidth;
this._height = Lib.current.stage.stageHeight;
var ratio:Float = this._width / 1920; //This allows us to scale assets depending on the size of the screen.
var ratio:Float = this._width / 2560; //This allows us to scale assets depending on the size of the screen.
logo = new Sprite();
logo.addChild(new Bitmap(new LogoImage(0,0))); //Sets the graphic of the sprite to a Bitmap object, which uses our embedded BitmapData class.
@ -43,27 +43,19 @@ class Preloader extends FlxBasePreloader
override function update(Percent:Float):Void
{
if (Percent < 0.1)
if(Percent < 75)
{
logo.alpha = 0;
logo.scaleX += Percent / 1280;
logo.scaleY += Percent / 1280;
logo.x -= Percent * 0.9;
logo.y -= Percent / 1.6;
}else{
logo.scaleX = this._width / 1280;
logo.scaleY = this._width / 1280;
logo.x = ((this._width) / 2) - ((logo.width) / 2);
logo.y = (this._height / 2) - ((logo.height) / 2);
}
else if (Percent < 0.25)
{
logo.alpha = 0;
}
else if (Percent < 0.5)
{
logo.alpha = 1;
}
else if ((Percent > 0.75) && (Percent < 0.9))
{
logo.alpha = 0;
}
else if (Percent > 0.9)
{
logo.alpha = 1;
}
super.update(Percent);
}
#end

View file

@ -637,10 +637,10 @@ class Controls extends FlxActionSet
//Swap A and B for switch
Control.ACCEPT => [B],
Control.BACK => [A],
Control.UP => [DPAD_UP, LEFT_STICK_DIGITAL_UP],
Control.DOWN => [DPAD_DOWN, LEFT_STICK_DIGITAL_DOWN],
Control.LEFT => [DPAD_LEFT, LEFT_STICK_DIGITAL_LEFT],
Control.RIGHT => [DPAD_RIGHT, LEFT_STICK_DIGITAL_RIGHT],
Control.UP => [DPAD_UP, LEFT_STICK_DIGITAL_UP, RIGHT_STICK_DIGITAL_UP],
Control.DOWN => [DPAD_DOWN, LEFT_STICK_DIGITAL_DOWN, RIGHT_STICK_DIGITAL_DOWN],
Control.LEFT => [DPAD_LEFT, LEFT_STICK_DIGITAL_LEFT, RIGHT_STICK_DIGITAL_LEFT],
Control.RIGHT => [DPAD_RIGHT, LEFT_STICK_DIGITAL_RIGHT, RIGHT_STICK_DIGITAL_RIGHT],
Control.PAUSE => [START],
//Swap Y and X for switch
Control.RESET => [Y],

View file

@ -37,7 +37,7 @@ class TitleState extends MusicBeatState
['you already know', 'we really out here'], ['rise and grind', 'love to luis'], ['like parappa', 'but cooler'],
['album of the year', 'chuckie finster'], ["free gitaroo man", "with love to wandaboy"], ['better than geometry dash', 'fight me robtop'],
['kiddbrute for president', 'vote now'], ['play dead estate', 'on newgrounds'], ['this is a god damn prototype', 'we workin on it okay'],
['WOMEN ARE real', 'this is official']];
['WOMEN ARE real', 'this is official'], ['Nintendo Switch', 'Pre-orders now available']];
var curWacky:Array<String> = [];