diff --git a/res/ui/main_menu/bg.noinline.jpg b/res/ui/main_menu/bg.noinline.jpg deleted file mode 100644 index 3c939bff..00000000 Binary files a/res/ui/main_menu/bg.noinline.jpg and /dev/null differ diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json index da01fe95..5dcf222f 100644 --- a/res_built/atlas/atlas0_10.json +++ b/res_built/atlas/atlas0_10.json @@ -575,6 +575,6 @@ "format": "RGBA8888", "size": {"w":123,"h":380}, "scale": "0.1", - "smartupdate": "$TexturePacker:SmartUpdate:8070ac06277f5131500335ffd9170197:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:74461fa20e58ea6d62ee3dd3add52778:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_100.json b/res_built/atlas/atlas0_100.json index 103d83f7..2c642803 100644 --- a/res_built/atlas/atlas0_100.json +++ b/res_built/atlas/atlas0_100.json @@ -575,6 +575,6 @@ "format": "RGBA8888", "size": {"w":2028,"h":1634}, "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:8070ac06277f5131500335ffd9170197:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:74461fa20e58ea6d62ee3dd3add52778:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_25.json b/res_built/atlas/atlas0_25.json index 14382478..5a64f9bf 100644 --- a/res_built/atlas/atlas0_25.json +++ b/res_built/atlas/atlas0_25.json @@ -575,6 +575,6 @@ "format": "RGBA8888", "size": {"w":956,"h":244}, "scale": "0.25", - "smartupdate": "$TexturePacker:SmartUpdate:8070ac06277f5131500335ffd9170197:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:74461fa20e58ea6d62ee3dd3add52778:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_50.json b/res_built/atlas/atlas0_50.json index de2f26dd..21a1240d 100644 --- a/res_built/atlas/atlas0_50.json +++ b/res_built/atlas/atlas0_50.json @@ -575,6 +575,6 @@ "format": "RGBA8888", "size": {"w":493,"h":1783}, "scale": "0.5", - "smartupdate": "$TexturePacker:SmartUpdate:8070ac06277f5131500335ffd9170197:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:74461fa20e58ea6d62ee3dd3add52778:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_built/atlas/atlas0_75.json b/res_built/atlas/atlas0_75.json index eaaca17b..7f339aac 100644 --- a/res_built/atlas/atlas0_75.json +++ b/res_built/atlas/atlas0_75.json @@ -575,6 +575,6 @@ "format": "RGBA8888", "size": {"w":1858,"h":1015}, "scale": "0.75", - "smartupdate": "$TexturePacker:SmartUpdate:8070ac06277f5131500335ffd9170197:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" + "smartupdate": "$TexturePacker:SmartUpdate:74461fa20e58ea6d62ee3dd3add52778:b1a366c7a8668dcf22b90fcff95a3dba:f159918d23e5952766c6d23ab52278c6$" } } diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps index 92e00944..4d42a03a 100644 --- a/res_raw/atlas.tps +++ b/res_raw/atlas.tps @@ -15,13 +15,13 @@ spriteFilter acceptFractionalValues - + maxTextureSize width - -1 + 2048 height - -1 + 2048 @@ -32,13 +32,13 @@ spriteFilter acceptFractionalValues - + maxTextureSize width - -1 + 2048 height - -1 + 2048 @@ -49,7 +49,7 @@ spriteFilter acceptFractionalValues - + maxTextureSize width @@ -66,7 +66,7 @@ spriteFilter acceptFractionalValues - + maxTextureSize width @@ -83,7 +83,7 @@ spriteFilter acceptFractionalValues - + maxTextureSize width diff --git a/src/js/platform/browser/sound.js b/src/js/platform/browser/sound.js index cc365f64..7e58543b 100644 --- a/src/js/platform/browser/sound.js +++ b/src/js/platform/browser/sound.js @@ -185,7 +185,6 @@ export class SoundImplBrowser extends SoundInterface { keys.forEach(key => { this.sounds[key] = new WrappedSoundInstance(this.sfxHandle, key); }); - console.log(this.sounds); for (const musicKey in MUSIC) { const musicPath = MUSIC[musicKey]; const music = new this.musicClass(musicKey, musicPath); diff --git a/src/js/states/preload.js b/src/js/states/preload.js index b5857707..ebf6b272 100644 --- a/src/js/states/preload.js +++ b/src/js/states/preload.js @@ -157,7 +157,8 @@ export class PreloadState extends GameState { if (G_IS_DEV) { return Promise.resolve(); } - return waitNextFrame(); + return Promise.resolve(); + // return waitNextFrame(); } showFailMessage(text) {