Skip to content
This repository has been archived by the owner on Dec 31, 2024. It is now read-only.

Commit

Permalink
NEW SPLASHES
Browse files Browse the repository at this point in the history
  • Loading branch information
@nebulazorua
nebulazorua committed Sep 10, 2024
1 parent 942a9f7 commit 4422d02
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 63 deletions.
Binary file modified art/flashFiles/AndroSplash.fla
View file
Binary file not shown.
Binary file added art/flashFiles/RECOVER_AndroSplash.fla
View file
Binary file not shown.
Binary file modified assets/preload/images/skins/default/base/AndroSplash.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 30 additions & 41 deletions assets/preload/images/skins/default/base/AndroSplash.xml
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="AndroSplash.png">
<!-- Created with Adobe Animate version 21.0.5.40714 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="splash down0000" x="425" y="2" width="420" height="420" pivotX="136.25" pivotY="134.85"/>
<SubTexture name="splash down0001" x="425" y="424" width="420" height="420"/>
<SubTexture name="splash down0002" x="425" y="846" width="420" height="420"/>
<SubTexture name="splash down0003" x="425" y="1268" width="420" height="420"/>
<SubTexture name="splash down0004" x="425" y="1690" width="420" height="420"/>
<SubTexture name="splash down0005" x="425" y="2112" width="420" height="420"/>
<SubTexture name="splash down0006" x="425" y="2534" width="420" height="420"/>
<SubTexture name="splash down0007" x="425" y="2956" width="420" height="420"/>
<SubTexture name="splash down0008" x="425" y="3378" width="420" height="420"/>
<SubTexture name="splash left0000" x="1267" y="2" width="417" height="417" pivotX="119.9" pivotY="133.55"/>
<SubTexture name="splash left0001" x="1267" y="421" width="417" height="417"/>
<SubTexture name="splash left0002" x="1267" y="840" width="417" height="417"/>
<SubTexture name="splash left0003" x="1267" y="1259" width="417" height="417"/>
<SubTexture name="splash left0004" x="1267" y="1678" width="417" height="417"/>
<SubTexture name="splash left0005" x="1267" y="2097" width="417" height="417"/>
<SubTexture name="splash left0006" x="1267" y="2516" width="417" height="417"/>
<SubTexture name="splash left0007" x="1267" y="2935" width="417" height="417"/>
<SubTexture name="splash left0008" x="1267" y="3354" width="417" height="417"/>
<SubTexture name="splash right0000" x="2" y="2" width="421" height="420" pivotX="136.25" pivotY="134.85"/>
<SubTexture name="splash right0001" x="2" y="424" width="421" height="420"/>
<SubTexture name="splash right0002" x="2" y="846" width="421" height="420"/>
<SubTexture name="splash right0003" x="2" y="1268" width="421" height="420"/>
<SubTexture name="splash right0004" x="2" y="1690" width="421" height="420"/>
<SubTexture name="splash right0005" x="2" y="2112" width="421" height="420"/>
<SubTexture name="splash right0006" x="2" y="2534" width="421" height="420"/>
<SubTexture name="splash right0007" x="2" y="2956" width="421" height="420"/>
<SubTexture name="splash right0008" x="2" y="3378" width="421" height="420"/>
<SubTexture name="splash up0000" x="847" y="2" width="418" height="417" pivotX="135.05" pivotY="133.55"/>
<SubTexture name="splash up0001" x="847" y="421" width="418" height="417"/>
<SubTexture name="splash up0002" x="847" y="840" width="418" height="417"/>
<SubTexture name="splash up0003" x="847" y="1259" width="418" height="417"/>
<SubTexture name="splash up0004" x="847" y="1678" width="418" height="417"/>
<SubTexture name="splash up0005" x="847" y="2097" width="418" height="417"/>
<SubTexture name="splash up0006" x="847" y="2516" width="418" height="417"/>
<SubTexture name="splash up0007" x="847" y="2935" width="418" height="417"/>
<SubTexture name="splash up0008" x="847" y="3354" width="418" height="417"/>
</TextureAtlas>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Created with Funkin Packer v0.1.3 https://neeeoo.github.io/funkin-packer/
-->
<TextureAtlas imagePath="texture.png" width="1320" height="1271">
<SubTexture name="splash down0000" x="2" y="2" width="393" height="370" frameX="-0" frameY="-0" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash down0001" x="2" y="746" width="300" height="282" frameX="-61" frameY="-56" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash down0002" x="792" y="527" width="97" height="97" frameX="-167" frameY="-150" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash down0003" x="1094" y="2" width="204" height="212" frameX="-110" frameY="-88" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash down0004" x="528" y="1030" width="230" height="231" frameX="-98" frameY="-78" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash down0005" x="792" y="286" width="261" height="239" frameX="-76" frameY="-76" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash left0000" x="2" y="374" width="393" height="370" frameX="-0" frameY="-0" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash left0001" x="304" y="746" width="300" height="282" frameX="-61" frameY="-56" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash left0002" x="792" y="626" width="97" height="97" frameX="-167" frameY="-150" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash left0003" x="908" y="760" width="204" height="212" frameX="-110" frameY="-88" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash left0004" x="760" y="1030" width="230" height="231" frameX="-98" frameY="-78" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash left0005" x="2" y="1030" width="261" height="239" frameX="-76" frameY="-76" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash right0000" x="397" y="2" width="393" height="370" frameX="-0" frameY="-0" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash right0001" x="606" y="746" width="300" height="282" frameX="-61" frameY="-56" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash right0002" x="1198" y="974" width="97" height="97" frameX="-167" frameY="-150" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash right0003" x="992" y="974" width="204" height="212" frameX="-110" frameY="-88" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash right0004" x="908" y="527" width="230" height="231" frameX="-98" frameY="-78" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash right0005" x="265" y="1030" width="261" height="239" frameX="-76" frameY="-76" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash up0000" x="397" y="374" width="393" height="370" frameX="-0" frameY="-0" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash up0001" x="792" y="2" width="300" height="282" frameX="-61" frameY="-56" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash up0002" x="1198" y="1073" width="97" height="97" frameX="-167" frameY="-150" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash up0003" x="1114" y="760" width="204" height="212" frameX="-110" frameY="-88" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash up0004" x="1055" y="286" width="230" height="231" frameX="-98" frameY="-78" frameWidth="396" frameHeight="373"/>
<SubTexture name="splash up0005" x="792" y="286" width="261" height="239" frameX="-76" frameY="-76" frameWidth="396" frameHeight="373"/>
</TextureAtlas>
24 changes: 12 additions & 12 deletions assets/preload/images/skins/default/base/behaviorData.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@
"sheet": "AndroSplash",
"scale":1,
"left":{
"framerate": 30,
"offsetX": -35,
"offsetY": 0,
"framerate": 24,
"offsetX": -15,
"offsetY": -30,
"prefix": "splash left0"
},
"up":{
"framerate": 30,
"offsetX": -5,
"offsetY": 0,
"framerate": 24,
"offsetX": -15,
"offsetY": -30,
"prefix": "splash up0"
},
"down":{
"framerate": 30,
"offsetX": -5,
"offsetY": -2,
"framerate": 24,
"offsetX": -15,
"offsetY": -30,
"prefix": "splash down0"
},
"right":{
"framerate": 30,
"offsetX": -3,
"offsetY": 2,
"framerate": 24,
"offsetX": -15,
"offsetY": -30,
"prefix": "splash right0"
}
},
Expand Down
14 changes: 7 additions & 7 deletions source/flixel/text/FlxText.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,17 +817,17 @@ class FlxText extends FlxSprite

if (oldWidth != newWidth || oldHeight != newHeight)
{
if(lastKey!=null){
FlxG.bitmap.removeByKey(lastKey);
graphic.destroy();
}
if(lastKey!=null){
FlxG.bitmap.removeByKey(lastKey);
graphic.destroy();
}

height = newHeight;
// Need to generate a new buffer to store the text graphic
// Need to generate a new buffer to store the text graphic
var key:String = FlxG.bitmap.getUniqueKey(textField.text.trim()==''?'text':textField.text);
lastKey = key;
lastKey = key;
makeGraphic(Std.int(newWidth), Std.int(newHeight), FlxColor.TRANSPARENT, false, key);
graphic.persist=false;
graphic.persist=false;
if (_hasBorderAlpha)
_borderPixels = graphic.bitmap.clone();
frameHeight = Std.int(height);
Expand Down
2 changes: 2 additions & 0 deletions source/states/CharacterEditorState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ class CharacterEditorState extends MusicBeatState {
healthBar.scrollFactor.set();
healthBar.screenCenter(X);


stage.defaultCamZoom = 1;
camGame.zoom = stage.defaultCamZoom;
zoom=camGame.zoom;
camFollow = new FlxObject(stage.centerX,stage.centerY);
Expand Down
3 changes: 0 additions & 3 deletions source/states/PlayState.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,6 @@ class PlayState extends MusicBeatState
});
}
for(e in pushingEvents)eventSchedule.push(e);
//if(shouldSchedule)eventSchedule.push(event);
}
}else{
var shouldSchedule = eventInit(event);
Expand Down Expand Up @@ -3837,8 +3836,6 @@ class PlayState extends MusicBeatState
anim = 'hold${dir}End';
}
}
//if(daNote.noteType=='alt')suffix+='-alt';
//Just in case, I will annotate this code for the future. -Human

if(who.animation.getByName(anim+suffix)!=null)
anim += suffix;
Expand Down

0 comments on commit 4422d02

Please sign in to comment.