gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

more optimized sheets

Browse Source
This commit is contained in:
Yoshman29
2023-01-07 01:54:24 +01:00
parent f6582b73c3
commit b0a66d4ea7
16 changed files with 46908 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/characters/gf-car.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<!DOCTYPE codename-engine-character>
<character isPlayer="false" flipX="false" isGF="true">
<character isPlayer="false" flipX="false" isGF="true" x="75" y="335">
<anim name="danceLeft" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
</character>
assets/data/characters/gf-christmas.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<!DOCTYPE codename-engine-character>
<character isPlayer="false" flipX="false" isGF="true">
<character isPlayer="false" flipX="false" isGF="true" x="115" y="325">
<anim name="cheer" anim="GF Cheer" fps="24" loop="false" />
<anim name="singUP" anim="GF Up Note" fps="24" loop="false" x="0" y="4" />
<anim name="singLEFT" anim="GF left note" fps="24" loop="false" x="0" y="-19" />
assets/images/characters/gf-car.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 MiB

assets/images/characters/gf-car.xml
-35
View File
@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="gfCar.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="GF Dancing Beat Hair blowing CAR0000" x="0" y="0" width="699" height="634" frameX="-2" frameY="-15" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0001" x="709" y="0" width="703" height="634" frameX="0" frameY="-15" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0002" x="1422" y="0" width="728" height="626" frameX="0" frameY="-23" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0003" x="2160" y="0" width="699" height="625" frameX="-2" frameY="-24" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0004" x="2869" y="0" width="699" height="638" frameX="-2" frameY="-11" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0005" x="0" y="648" width="699" height="638" frameX="-2" frameY="-11" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0006" x="709" y="648" width="727" height="636" frameX="-2" frameY="-13" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0007" x="1446" y="648" width="702" height="647" frameX="-2" frameY="-2" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0008" x="2158" y="648" width="749" height="639" frameX="-2" frameY="-10" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0009" x="2917" y="648" width="699" height="638" frameX="-2" frameY="-11" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0010" x="0" y="1305" width="712" height="649" frameX="-2" frameY="0" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0011" x="0" y="1305" width="712" height="649" frameX="-2" frameY="0" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0012" x="722" y="1305" width="757" height="641" frameX="-2" frameY="-8" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0013" x="1489" y="1305" width="711" height="648" frameX="-2" frameY="-1" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0014" x="2210" y="1305" width="755" height="640" frameX="-2" frameY="-9" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0015" x="2975" y="1305" width="712" height="625" frameX="-2" frameY="-24" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0016" x="0" y="1964" width="729" height="634" frameX="0" frameY="-15" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0017" x="739" y="1964" width="722" height="631" frameX="0" frameY="-18" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0018" x="1471" y="1964" width="766" height="623" frameX="-2" frameY="-26" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0019" x="2247" y="1964" width="721" height="634" frameX="-2" frameY="-15" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0020" x="2978" y="1964" width="766" height="626" frameX="-2" frameY="-23" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0021" x="0" y="2608" width="707" height="630" frameX="-2" frameY="-19" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0022" x="717" y="2608" width="716" height="646" frameX="-2" frameY="-3" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0023" x="717" y="2608" width="716" height="646" frameX="-2" frameY="-3" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0024" x="1443" y="2608" width="759" height="638" frameX="-2" frameY="-11" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0025" x="2212" y="2608" width="714" height="647" frameX="-2" frameY="-2" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0026" x="2936" y="2608" width="756" height="639" frameX="-2" frameY="-10" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0027" x="0" y="3265" width="699" height="638" frameX="-2" frameY="-11" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0028" x="709" y="3265" width="712" height="646" frameX="-2" frameY="-3" frameWidth="774" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing CAR0029" x="709" y="3265" width="712" height="646" frameX="-2" frameY="-3" frameWidth="774" frameHeight="649"/>
</TextureAtlas>
assets/images/characters/gf-car/Animation.json
+14218
View File
File diff suppressed because it is too large Load Diff
assets/images/characters/gf-car/spritemap1.json
+29
View File
@@ -0,0 +1,29 @@
{"ATLAS": {"SPRITES":[
{"SPRITE" : {"name": "0000","x":0,"y":359,"w":191,"h":120,"rotated": false}},
{"SPRITE" : {"name": "0001","x":191,"y":359,"w":90,"h":151,"rotated": false}},
{"SPRITE" : {"name": "0002","x":420,"y":358,"w":256,"h":123,"rotated": false}},
{"SPRITE" : {"name": "0003","x":1394,"y":432,"w":122,"h":67,"rotated": false}},
{"SPRITE" : {"name": "0004","x":676,"y":358,"w":108,"h":126,"rotated": false}},
{"SPRITE" : {"name": "0005","x":1640,"y":267,"w":102,"h":147,"rotated": false}},
{"SPRITE" : {"name": "0006","x":281,"y":359,"w":95,"h":130,"rotated": false}},
{"SPRITE" : {"name": "0007","x":2035,"y":0,"w":1,"h":4,"rotated": false}},
{"SPRITE" : {"name": "0008","x":0,"y":0,"w":420,"h":359,"rotated": false}},
{"SPRITE" : {"name": "0009","x":420,"y":0,"w":406,"h":358,"rotated": false}},
{"SPRITE" : {"name": "0010","x":1304,"y":267,"w":336,"h":165,"rotated": false}},
{"SPRITE" : {"name": "0011","x":1304,"y":432,"w":90,"h":103,"rotated": false}},
{"SPRITE" : {"name": "0012","x":1820,"y":0,"w":215,"h":242,"rotated": false}},
{"SPRITE" : {"name": "0013","x":1820,"y":242,"w":213,"h":240,"rotated": false}},
{"SPRITE" : {"name": "0014","x":826,"y":250,"w":478,"h":262,"rotated": false}},
{"SPRITE" : {"name": "0015","x":826,"y":0,"w":521,"h":250,"rotated": false}},
{"SPRITE" : {"name": "0016","x":1347,"y":0,"w":473,"h":267,"rotated": false}},
{"SPRITE" : {"name": "0017","x":1640,"y":414,"w":98,"h":118,"rotated": false}}
]},
"meta": {
"app": "Adobe Animate",
"version": "21.0.1.37179",
"image": "spritemap1.png",
"format": "RGBA8888",
"size": {"w":2036,"h":535},
"resolution": "1"
}
}
assets/images/characters/gf-car/spritemap1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 123 KiB

assets/images/characters/gf-christmas.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.5 MiB

assets/images/characters/gf-christmas.xml
-227
View File
@@ -1,227 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="gfChristmas.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="GF Cheer0000" x="0" y="0" width="817" height="724"/>
<SubTexture name="GF Cheer0001" x="827" y="0" width="817" height="724"/>
<SubTexture name="GF Cheer0002" x="1654" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0003" x="2481" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0004" x="3308" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0005" x="4135" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0006" x="4962" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0007" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0008" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0009" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0010" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0011" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0012" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0013" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0014" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0015" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0016" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0017" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0018" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0019" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0020" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Dancing Beat0000" x="6616" y="0" width="817" height="701" frameX="0" frameY="-14" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0001" x="0" y="734" width="817" height="701" frameX="0" frameY="-14" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0002" x="827" y="734" width="817" height="699" frameX="0" frameY="-16" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0003" x="1654" y="734" width="817" height="699" frameX="0" frameY="-16" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0004" x="2481" y="734" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0005" x="3308" y="734" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0006" x="4135" y="734" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0007" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0008" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0009" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0010" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0011" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0012" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0013" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0014" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0015" x="0" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0016" x="827" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0017" x="1654" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0018" x="2481" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0019" x="3308" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0020" x="4135" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0021" x="4962" y="1459" width="817" height="705" frameX="0" frameY="-10" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0022" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0023" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0024" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0025" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0026" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0027" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0028" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0029" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0000" x="827" y="2179" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0001" x="1654" y="2179" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0002" x="2481" y="2179" width="817" height="686" frameX="0" frameY="-29" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0003" x="3308" y="2179" width="817" height="686" frameX="0" frameY="-29" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0004" x="4135" y="2179" width="817" height="674" frameX="0" frameY="-41" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0005" x="4962" y="2179" width="817" height="674" frameX="0" frameY="-41" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0006" x="5789" y="2179" width="817" height="693" frameX="0" frameY="-22" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0007" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0008" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0009" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0010" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0011" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0012" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0013" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0014" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0015" x="0" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0016" x="827" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0017" x="1654" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0018" x="2481" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0019" x="3308" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0020" x="4135" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0021" x="4962" y="1459" width="817" height="705" frameX="0" frameY="-10" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0022" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0023" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0024" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0025" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0026" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0027" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0028" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0029" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Down Note0000" x="6616" y="2179" width="817" height="698" frameX="0" frameY="-6" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0001" x="0" y="2898" width="817" height="698" frameX="0" frameY="-6" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0002" x="827" y="2898" width="817" height="703" frameX="0" frameY="-1" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0003" x="1654" y="2898" width="817" height="703" frameX="0" frameY="-1" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0004" x="2481" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0005" x="3308" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0006" x="4135" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0007" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0008" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0009" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0010" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0011" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0012" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0013" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0014" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0015" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0016" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0017" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0018" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0019" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF FEAR 0000" x="5789" y="2898" width="817" height="707"/>
<SubTexture name="GF FEAR 0001" x="6616" y="2898" width="817" height="707"/>
<SubTexture name="GF FEAR 0002" x="0" y="3615" width="817" height="705" frameX="0" frameY="-2" frameWidth="817" frameHeight="707"/>
<SubTexture name="GF FEAR 0003" x="827" y="3615" width="817" height="707"/>
<SubTexture name="GF Right Note0000" x="1654" y="3615" width="817" height="699" frameX="0" frameY="-5" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Right Note0001" x="2481" y="3615" width="817" height="699" frameX="0" frameY="-5" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Right Note0002" x="3308" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0003" x="4135" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0004" x="4962" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0005" x="5789" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0006" x="6616" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0007" x="0" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0008" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0009" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0010" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0011" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0012" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0013" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0014" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Up Note0000" x="1654" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0001" x="2481" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0002" x="3308" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0003" x="4135" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0004" x="4962" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0005" x="5789" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0006" x="6616" y="4332" width="817" height="728"/>
<SubTexture name="GF left note0000" x="0" y="5070" width="817" height="700" frameX="0" frameY="-5" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0001" x="827" y="5070" width="817" height="698" frameX="0" frameY="-7" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0002" x="1654" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0003" x="2481" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0004" x="3308" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0005" x="4135" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0006" x="4962" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0007" x="5789" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0008" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0009" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0010" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0011" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0012" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0013" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0014" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="gf sad0000" x="0" y="5785" width="817" height="701" frameX="0" frameY="-3" frameWidth="817" frameHeight="704"/>
<SubTexture name="gf sad0001" x="0" y="5785" width="817" height="701" frameX="0" frameY="-3" frameWidth="817" frameHeight="704"/>
<SubTexture name="gf sad0002" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0003" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0004" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0005" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0006" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0007" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0008" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0009" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0010" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0011" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0012" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0013" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0014" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0015" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0016" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0017" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0018" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0019" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0020" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0021" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0022" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0023" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0024" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0025" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0026" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0027" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0028" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0029" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0030" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0031" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0032" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0033" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0034" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0035" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0036" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0037" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0038" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0039" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0040" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0041" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0042" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0043" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0044" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0045" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0046" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0047" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0048" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0049" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0050" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0051" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0052" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0053" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0054" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0055" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0056" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0057" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0058" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0059" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0060" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0061" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0062" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0063" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0064" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0065" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0066" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0067" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0068" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0069" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0070" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0071" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0072" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0073" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0074" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0075" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0076" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0077" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0078" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0079" x="2481" y="5785" width="817" height="704"/>
</TextureAtlas>
assets/images/characters/gf-christmas/Animation.json
+32568
View File
File diff suppressed because it is too large Load Diff
assets/images/characters/gf-christmas/spritemap1.json
+45
View File
@@ -0,0 +1,45 @@
{"ATLAS": {"SPRITES":[
{"SPRITE" : {"name": "0000","x":0,"y":1012,"w":187,"h":118,"rotated": false}},
{"SPRITE" : {"name": "0001","x":1950,"y":130,"w":84,"h":140,"rotated": false}},
{"SPRITE" : {"name": "0002","x":463,"y":422,"w":258,"h":137,"rotated": false}},
{"SPRITE" : {"name": "0003","x":1288,"y":629,"w":122,"h":66,"rotated": false}},
{"SPRITE" : {"name": "0004","x":1937,"y":501,"w":108,"h":126,"rotated": false}},
{"SPRITE" : {"name": "0005","x":1937,"y":352,"w":103,"h":149,"rotated": false}},
{"SPRITE" : {"name": "0006","x":1950,"y":0,"w":95,"h":130,"rotated": false}},
{"SPRITE" : {"name": "0007","x":2045,"y":0,"w":1,"h":4,"rotated": false}},
{"SPRITE" : {"name": "0008","x":931,"y":638,"w":309,"h":375,"rotated": false}},
{"SPRITE" : {"name": "0009","x":0,"y":0,"w":778,"h":422,"rotated": false}},
{"SPRITE" : {"name": "0010","x":778,"y":0,"w":761,"h":393,"rotated": false}},
{"SPRITE" : {"name": "0011","x":1539,"y":0,"w":411,"h":352,"rotated": false}},
{"SPRITE" : {"name": "0012","x":1539,"y":352,"w":398,"h":350,"rotated": false}},
{"SPRITE" : {"name": "0013","x":1634,"y":973,"w":329,"h":162,"rotated": false}},
{"SPRITE" : {"name": "0014","x":352,"y":683,"w":90,"h":103,"rotated": false}},
{"SPRITE" : {"name": "0015","x":1288,"y":393,"w":211,"h":236,"rotated": false}},
{"SPRITE" : {"name": "0016","x":1240,"y":992,"w":208,"h":235,"rotated": false}},
{"SPRITE" : {"name": "0017","x":463,"y":638,"w":468,"h":256,"rotated": false}},
{"SPRITE" : {"name": "0018","x":778,"y":393,"w":510,"h":245,"rotated": false}},
{"SPRITE" : {"name": "0019","x":0,"y":422,"w":463,"h":261,"rotated": false}},
{"SPRITE" : {"name": "0020","x":352,"y":894,"w":418,"h":268,"rotated": false}},
{"SPRITE" : {"name": "0021","x":1634,"y":702,"w":387,"h":271,"rotated": false}},
{"SPRITE" : {"name": "0022","x":1240,"y":702,"w":394,"h":290,"rotated": false}},
{"SPRITE" : {"name": "0023","x":0,"y":683,"w":352,"h":329,"rotated": false}},
{"SPRITE" : {"name": "0024","x":1950,"y":270,"w":67,"h":70,"rotated": false}},
{"SPRITE" : {"name": "0025","x":770,"y":894,"w":122,"h":62,"rotated": false}},
{"SPRITE" : {"name": "0026","x":352,"y":786,"w":64,"h":106,"rotated": false}},
{"SPRITE" : {"name": "0027","x":721,"y":422,"w":55,"h":112,"rotated": false}},
{"SPRITE" : {"name": "0028","x":463,"y":559,"w":179,"h":67,"rotated": false}},
{"SPRITE" : {"name": "0029","x":642,"y":559,"w":118,"h":75,"rotated": false}},
{"SPRITE" : {"name": "0030","x":1410,"y":629,"w":128,"h":61,"rotated": false}},
{"SPRITE" : {"name": "0031","x":770,"y":956,"w":124,"h":58,"rotated": false}},
{"SPRITE" : {"name": "0032","x":1448,"y":992,"w":174,"h":97,"rotated": false}},
{"SPRITE" : {"name": "0033","x":1937,"y":627,"w":82,"h":14,"rotated": false}}
]},
"meta": {
"app": "Adobe Animate",
"version": "21.0.1.37179",
"image": "spritemap1.png",
"format": "RGBA8888",
"size": {"w":2046,"h":1227},
"resolution": "1"
}
}
assets/images/characters/gf-christmas/spritemap1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 KiB

buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
1918
1921
source/funkin/game/PlayState.hx
+28 -17
View File
@@ -1406,22 +1406,33 @@ class PlayState extends MusicBeatState
}
}
@:gcOptimize
var __funcsToExec:Array<Note->Void> = [];
var __pressed:Array<Bool> = [];
var __justPressed:Array<Bool> = [];
var __justReleased:Array<Bool> = [];
private function keyShit():Void
{
var pressed = [controls.NOTE_LEFT, controls.NOTE_DOWN, controls.NOTE_UP, controls.NOTE_RIGHT];
var justPressed = [controls.NOTE_LEFT_P, controls.NOTE_DOWN_P, controls.NOTE_UP_P, controls.NOTE_RIGHT_P];
var justReleased = [controls.NOTE_LEFT_R, controls.NOTE_DOWN_R, controls.NOTE_UP_R, controls.NOTE_RIGHT_R];
__funcsToExec.clear();
__pressed.clear();
__justPressed.clear();
__justReleased.clear();
var event = scripts.event("onKeyShit", new InputSystemEvent(pressed, justPressed, justReleased));
__pressed.pushGroup(controls.NOTE_LEFT, controls.NOTE_DOWN, controls.NOTE_UP, controls.NOTE_RIGHT);
__justPressed.pushGroup(controls.NOTE_LEFT_P, controls.NOTE_DOWN_P, controls.NOTE_UP_P, controls.NOTE_RIGHT_P);
__justReleased.pushGroup(controls.NOTE_LEFT_R, controls.NOTE_DOWN_R, controls.NOTE_UP_R, controls.NOTE_RIGHT_R);
var event = scripts.event("onKeyShit", new InputSystemEvent(__pressed, __justPressed, __justReleased));
if (event.cancelled) return;
pressed = CoolUtil.getDefault(event.pressed, []);
justPressed = CoolUtil.getDefault(event.justPressed, []);
justReleased = CoolUtil.getDefault(event.justReleased, []);
var funcsToExec:Array<Note->Void> = [];
if (pressed.contains(true)) {
funcsToExec.push(function(note:Note) {
if (pressed[note.strumID] && note.isSustainNote && note.canBeHit && note.mustPress && !note.wasGoodHit) {
__pressed = CoolUtil.getDefault(event.pressed, []);
__justPressed = CoolUtil.getDefault(event.justPressed, []);
__justReleased = CoolUtil.getDefault(event.justReleased, []);
if (__pressed.contains(true)) {
__funcsToExec.push(function(note:Note) {
if (__pressed[note.strumID] && note.isSustainNote && note.canBeHit && note.mustPress && !note.wasGoodHit) {
goodNoteHit(note);
}
});
@@ -1429,9 +1440,9 @@ class PlayState extends MusicBeatState
var notePerStrum = [for(i in 0...4) null];
var additionalNotes:Array<Note> = [];
if (justPressed.contains(true)) {
funcsToExec.push(function(note:Note) {
if (justPressed[note.strumID] && !note.isSustainNote && note.mustPress && !note.wasGoodHit && note.canBeHit) {
if (__justPressed.contains(true)) {
__funcsToExec.push(function(note:Note) {
if (__justPressed[note.strumID] && !note.isSustainNote && note.mustPress && !note.wasGoodHit && note.canBeHit) {
if (notePerStrum[note.strumID] == null) notePerStrum[note.strumID] = note;
else if (Math.abs(notePerStrum[note.strumID].strumTime - note.strumTime) <= 10) additionalNotes.push(note);
else if (note.strumTime < notePerStrum[note.strumID].strumTime) notePerStrum[note.strumID] = note;
@@ -1439,9 +1450,9 @@ class PlayState extends MusicBeatState
});
}
if (funcsToExec.length > 0) {
if (__funcsToExec.length > 0) {
notes.forEachAlive(function(note:Note) {
for(e in funcsToExec) e(note);
for(e in __funcsToExec) e(note);
});
}
@@ -1449,7 +1460,7 @@ class PlayState extends MusicBeatState
for(e in additionalNotes) goodNoteHit(e);
playerStrums.forEach(function(str:Strum) {
str.updatePlayerInput(pressed[str.ID], justPressed[str.ID], justReleased[str.ID]);
str.updatePlayerInput(__pressed[str.ID], __justPressed[str.ID], __justReleased[str.ID]);
});
scripts.call("onPostKeyShit");
}
source/funkin/menus/TitleState.hx
+2
View File
@@ -72,9 +72,11 @@ class TitleState extends MusicBeatState
var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
add(bg);
#if TITLESCREEN_XML
titleScreenSprites = new MusicBeatGroup();
add(titleScreenSprites);
loadXML();
#end
titleText = new FlxSprite(100, FlxG.height * 0.8);
titleText.frames = Paths.getFrames('menus/titlescreen/titleEnter');
source/funkin/system/CoolUtil.hx
+15
View File
@@ -366,4 +366,19 @@ class CoolUtil
public static function getMacroAbstractClass(className:String) {
return Type.resolveClass('${className}_HSC');
}
/**
* Clears the content of an array
*/
public static function clear<T>(array:Array<T>):Array<T> {
while(array.length > 0)
array.shift();
return array;
}
public static function pushGroup<T>(array:Array<T>, ...args:T):Array<T> {
for(a in args)
array.push(a);
return array;
}
}