diff --git a/public/assets/assets-manifest.json b/public/assets/assets-manifest.json index 0edeff65..8c546013 100644 --- a/public/assets/assets-manifest.json +++ b/public/assets/assets-manifest.json @@ -13,7 +13,7 @@ "bgm-game1.mp3" ], "src": [ - "common/bgm-game1-YOyzyQ.ogg", + "common/bgm-game1-RRAdfA.ogg", "common/bgm-game1-paGWsA.mp3" ], "data": { @@ -28,8 +28,8 @@ "bgm-game2.mp3" ], "src": [ - "common/bgm-game2-9iQP9A.mp3", - "common/bgm-game2-5jakMA.ogg" + "common/bgm-game2-cScWmQ.ogg", + "common/bgm-game2-9iQP9A.mp3" ], "data": { "tags": { @@ -44,7 +44,7 @@ ], "src": [ "common/bgm-game3-VRUx5w.mp3", - "common/bgm-game3-VfgxhQ.ogg" + "common/bgm-game3-FR7oNQ.ogg" ], "data": { "tags": { @@ -58,7 +58,7 @@ "bgm-game4.mp3" ], "src": [ - "common/bgm-game4-PNpF9w.ogg", + "common/bgm-game4-YYS_mQ.ogg", "common/bgm-game4-cor7YQ.mp3" ], "data": { @@ -73,8 +73,8 @@ "bgm-lobby.mp3" ], "src": [ - "common/bgm-lobby-EmMnSA.ogg", - "common/bgm-lobby-7O1h.mp3" + "common/bgm-lobby-7O1h.mp3", + "common/bgm-lobby-53Ty.ogg" ], "data": { "tags": { @@ -88,8 +88,8 @@ "common-sprite" ], "src": [ - "common/common-sprite-YWquQA@0.5x.png.json", - "common/common-sprite-gQOICg.png.json" + "common/common-sprite-UOWvAw@0.5x.png.json", + "common/common-sprite-GQ4Ecg.png.json" ], "data": { "tags": { @@ -105,7 +105,7 @@ ], "src": [ "common/sfx-buble-uUSK4w.mp3", - "common/sfx-buble-fvTIGg.ogg" + "common/sfx-buble-89NBFQ.ogg" ], "data": { "tags": { @@ -120,7 +120,7 @@ ], "src": [ "common/sfx-match-UApIOg.mp3", - "common/sfx-match-3I4C7Q.ogg" + "common/sfx-match-fAs73w.ogg" ], "data": { "tags": { @@ -134,8 +134,8 @@ "sfx-select.mp3" ], "src": [ - "common/sfx-select-IwK74A.mp3", - "common/sfx-select-ee6sEw.ogg" + "common/sfx-select-Z6EbuA.ogg", + "common/sfx-select-IwK74A.mp3" ], "data": { "tags": { @@ -149,7 +149,7 @@ "sfx-start.mp3" ], "src": [ - "common/sfx-start-MOAt5Q.ogg", + "common/sfx-start-tJqvsQ.ogg", "common/sfx-start-Gl6aBQ.mp3" ], "data": { @@ -165,7 +165,7 @@ ], "src": [ "common/sfx-tap-sKDtIw.mp3", - "common/sfx-tap-2CJN2A.ogg" + "common/sfx-tap-IPhA1Q.ogg" ], "data": { "tags": { diff --git a/public/assets/common/bgm-game1-YOyzyQ.ogg b/public/assets/common/bgm-game1-RRAdfA.ogg similarity index 98% rename from public/assets/common/bgm-game1-YOyzyQ.ogg rename to public/assets/common/bgm-game1-RRAdfA.ogg index 90e5dc9f..96baed5f 100644 Binary files a/public/assets/common/bgm-game1-YOyzyQ.ogg and b/public/assets/common/bgm-game1-RRAdfA.ogg differ diff --git a/public/assets/common/bgm-game2-5jakMA.ogg b/public/assets/common/bgm-game2-cScWmQ.ogg similarity index 98% rename from public/assets/common/bgm-game2-5jakMA.ogg rename to public/assets/common/bgm-game2-cScWmQ.ogg index ad733731..e8042c97 100644 Binary files a/public/assets/common/bgm-game2-5jakMA.ogg and b/public/assets/common/bgm-game2-cScWmQ.ogg differ diff --git a/public/assets/common/bgm-game3-VfgxhQ.ogg b/public/assets/common/bgm-game3-FR7oNQ.ogg similarity index 98% rename from public/assets/common/bgm-game3-VfgxhQ.ogg rename to public/assets/common/bgm-game3-FR7oNQ.ogg index dce4efab..760b295c 100644 Binary files a/public/assets/common/bgm-game3-VfgxhQ.ogg and b/public/assets/common/bgm-game3-FR7oNQ.ogg differ diff --git a/public/assets/common/bgm-game4-PNpF9w.ogg b/public/assets/common/bgm-game4-YYS_mQ.ogg similarity index 98% rename from public/assets/common/bgm-game4-PNpF9w.ogg rename to public/assets/common/bgm-game4-YYS_mQ.ogg index ab3df9ac..c02529e7 100644 Binary files a/public/assets/common/bgm-game4-PNpF9w.ogg and b/public/assets/common/bgm-game4-YYS_mQ.ogg differ diff --git a/public/assets/common/bgm-lobby-EmMnSA.ogg b/public/assets/common/bgm-lobby-53Ty.ogg similarity index 97% rename from public/assets/common/bgm-lobby-EmMnSA.ogg rename to public/assets/common/bgm-lobby-53Ty.ogg index 32822d73..725fec02 100644 Binary files a/public/assets/common/bgm-lobby-EmMnSA.ogg and b/public/assets/common/bgm-lobby-53Ty.ogg differ diff --git a/public/assets/common/common-sprite-5Dx3Ag@0.5x.png b/public/assets/common/common-sprite-5Dx3Ag@0.5x.png new file mode 100644 index 00000000..9c57529c Binary files /dev/null and b/public/assets/common/common-sprite-5Dx3Ag@0.5x.png differ diff --git a/public/assets/common/common-sprite-gQOICg.png.json b/public/assets/common/common-sprite-GQ4Ecg.png.json similarity index 73% rename from public/assets/common/common-sprite-gQOICg.png.json rename to public/assets/common/common-sprite-GQ4Ecg.png.json index ef1f76a3..77f00c3e 100644 --- a/public/assets/common/common-sprite-gQOICg.png.json +++ b/public/assets/common/common-sprite-GQ4Ecg.png.json @@ -1 +1 @@ -{"frames":{"switch_on":{"frame":{"x":2,"y":2,"w":80,"h":40},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":80,"h":40},"sourceSize":{"w":80,"h":40}},"switch_off":{"frame":{"x":2,"y":44,"w":80,"h":40},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":80,"h":40},"sourceSize":{"w":80,"h":40}},"settings":{"frame":{"x":84,"y":2,"w":26,"h":26},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":3,"y":3,"w":26,"h":26},"sourceSize":{"w":32,"h":32}},"rounded-rectangle":{"frame":{"x":2,"y":86,"w":366,"h":189},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":366,"h":189},"sourceSize":{"w":366,"h":189}},"ripple":{"frame":{"x":193,"y":2,"w":80,"h":80},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":80,"h":80},"sourceSize":{"w":80,"h":80}},"question":{"frame":{"x":84,"y":30,"w":26,"h":26},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":26,"h":26},"sourceSize":{"w":26,"h":26}},"match":{"frame":{"x":275,"y":2,"w":145,"h":96},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":145,"h":96},"sourceSize":{"w":145,"h":96}},"large-button":{"frame":{"x":373,"y":2,"w":305,"h":115},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":305,"h":115},"sourceSize":{"w":305,"h":115}},"large-button-press":{"frame":{"x":2,"y":454,"w":305,"h":95},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":10,"w":305,"h":95},"sourceSize":{"w":305,"h":105}},"circle":{"frame":{"x":193,"y":309,"w":117,"h":117},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":117,"h":117},"sourceSize":{"w":117,"h":117}}},"meta":{"app":"http://github.com/pixijs/assetpack","version":"1.0","image":"common-sprite-hMu0QQ.png","format":"RGBA8888","size":{"w":490,"h":551},"scale":1,"related_multi_packs":[]}} \ No newline at end of file +{"frames":{"switch_on":{"frame":{"x":2,"y":2,"w":80,"h":40},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":80,"h":40},"sourceSize":{"w":80,"h":40}},"switch_off":{"frame":{"x":2,"y":44,"w":80,"h":40},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":80,"h":40},"sourceSize":{"w":80,"h":40}},"settings":{"frame":{"x":84,"y":2,"w":26,"h":26},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":3,"y":3,"w":26,"h":26},"sourceSize":{"w":32,"h":32}},"rounded-rectangle":{"frame":{"x":2,"y":86,"w":366,"h":189},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":366,"h":189},"sourceSize":{"w":366,"h":189}},"ripple":{"frame":{"x":193,"y":2,"w":80,"h":80},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":80,"h":80},"sourceSize":{"w":80,"h":80}},"question":{"frame":{"x":84,"y":30,"w":26,"h":26},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":26,"h":26},"sourceSize":{"w":26,"h":26}},"match":{"frame":{"x":275,"y":2,"w":145,"h":96},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":145,"h":96},"sourceSize":{"w":145,"h":96}},"large-button":{"frame":{"x":373,"y":2,"w":305,"h":115},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":305,"h":115},"sourceSize":{"w":305,"h":115}},"large-button-press":{"frame":{"x":2,"y":454,"w":305,"h":95},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":10,"w":305,"h":95},"sourceSize":{"w":305,"h":105}},"large-button-disabled":{"frame":{"x":490,"y":2,"w":305,"h":115},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":305,"h":115},"sourceSize":{"w":305,"h":115}},"circle":{"frame":{"x":193,"y":309,"w":117,"h":117},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":117,"h":117},"sourceSize":{"w":117,"h":117}}},"meta":{"app":"http://github.com/pixijs/assetpack","version":"1.0","image":"common-sprite-lE8ycQ.png","format":"RGBA8888","size":{"w":607,"h":551},"scale":1,"related_multi_packs":[]}} \ No newline at end of file diff --git a/public/assets/common/common-sprite-YWquQA@0.5x.png.json b/public/assets/common/common-sprite-UOWvAw@0.5x.png.json similarity index 70% rename from public/assets/common/common-sprite-YWquQA@0.5x.png.json rename to public/assets/common/common-sprite-UOWvAw@0.5x.png.json index bb91d50c..c197631a 100644 --- a/public/assets/common/common-sprite-YWquQA@0.5x.png.json +++ b/public/assets/common/common-sprite-UOWvAw@0.5x.png.json @@ -1 +1 @@ -{"frames":{"switch_on":{"frame":{"x":2,"y":2,"w":40,"h":20},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":40,"h":20},"sourceSize":{"w":40,"h":20}},"switch_off":{"frame":{"x":2,"y":24,"w":40,"h":20},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":40,"h":20},"sourceSize":{"w":40,"h":20}},"settings":{"frame":{"x":44,"y":2,"w":16,"h":16},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":16,"h":16},"sourceSize":{"w":16,"h":16}},"rounded-rectangle":{"frame":{"x":2,"y":46,"w":183,"h":95},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":183,"h":95},"sourceSize":{"w":183,"h":95}},"ripple":{"frame":{"x":99,"y":2,"w":40,"h":40},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":40,"h":40},"sourceSize":{"w":40,"h":40}},"question":{"frame":{"x":44,"y":20,"w":13,"h":13},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":13,"h":13},"sourceSize":{"w":13,"h":13}},"match":{"frame":{"x":141,"y":2,"w":73,"h":48},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":73,"h":48},"sourceSize":{"w":73,"h":48}},"large-button":{"frame":{"x":191,"y":2,"w":153,"h":58},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":153,"h":58},"sourceSize":{"w":153,"h":58}},"large-button-press":{"frame":{"x":2,"y":231,"w":153,"h":50},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":3,"w":153,"h":50},"sourceSize":{"w":153,"h":53}},"circle":{"frame":{"x":99,"y":157,"w":59,"h":59},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":59,"h":59},"sourceSize":{"w":59,"h":59}}},"meta":{"app":"http://github.com/pixijs/assetpack","version":"1.0","image":"common-sprite-dR7tmg@0.5x.png","format":"RGBA8888","size":{"w":251,"h":283},"scale":0.5,"related_multi_packs":[]}} \ No newline at end of file +{"frames":{"switch_on":{"frame":{"x":2,"y":2,"w":40,"h":20},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":40,"h":20},"sourceSize":{"w":40,"h":20}},"switch_off":{"frame":{"x":2,"y":24,"w":40,"h":20},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":40,"h":20},"sourceSize":{"w":40,"h":20}},"settings":{"frame":{"x":44,"y":2,"w":16,"h":16},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":16,"h":16},"sourceSize":{"w":16,"h":16}},"rounded-rectangle":{"frame":{"x":2,"y":46,"w":183,"h":95},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":183,"h":95},"sourceSize":{"w":183,"h":95}},"ripple":{"frame":{"x":99,"y":2,"w":40,"h":40},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":40,"h":40},"sourceSize":{"w":40,"h":40}},"question":{"frame":{"x":44,"y":20,"w":13,"h":13},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":13,"h":13},"sourceSize":{"w":13,"h":13}},"match":{"frame":{"x":141,"y":2,"w":73,"h":48},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":73,"h":48},"sourceSize":{"w":73,"h":48}},"large-button":{"frame":{"x":191,"y":2,"w":153,"h":58},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":153,"h":58},"sourceSize":{"w":153,"h":58}},"large-button-press":{"frame":{"x":2,"y":231,"w":153,"h":50},"rotated":false,"trimmed":true,"spriteSourceSize":{"x":0,"y":3,"w":153,"h":50},"sourceSize":{"w":153,"h":53}},"large-button-disabled":{"frame":{"x":251,"y":2,"w":153,"h":58},"rotated":true,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":153,"h":58},"sourceSize":{"w":153,"h":58}},"circle":{"frame":{"x":99,"y":157,"w":59,"h":59},"rotated":false,"trimmed":false,"spriteSourceSize":{"x":0,"y":0,"w":59,"h":59},"sourceSize":{"w":59,"h":59}}},"meta":{"app":"http://github.com/pixijs/assetpack","version":"1.0","image":"common-sprite-5Dx3Ag@0.5x.png","format":"RGBA8888","size":{"w":311,"h":283},"scale":0.5,"related_multi_packs":[]}} \ No newline at end of file diff --git a/public/assets/common/common-sprite-dR7tmg@0.5x.png b/public/assets/common/common-sprite-dR7tmg@0.5x.png deleted file mode 100644 index 34865dde..00000000 Binary files a/public/assets/common/common-sprite-dR7tmg@0.5x.png and /dev/null differ diff --git a/public/assets/common/common-sprite-hMu0QQ.png b/public/assets/common/common-sprite-hMu0QQ.png deleted file mode 100644 index faf61ac3..00000000 Binary files a/public/assets/common/common-sprite-hMu0QQ.png and /dev/null differ diff --git a/public/assets/common/common-sprite-lE8ycQ.png b/public/assets/common/common-sprite-lE8ycQ.png new file mode 100644 index 00000000..ce5bb17f Binary files /dev/null and b/public/assets/common/common-sprite-lE8ycQ.png differ diff --git a/public/assets/common/sfx-buble-fvTIGg.ogg b/public/assets/common/sfx-buble-89NBFQ.ogg similarity index 95% rename from public/assets/common/sfx-buble-fvTIGg.ogg rename to public/assets/common/sfx-buble-89NBFQ.ogg index 59328b94..1d299fd2 100644 Binary files a/public/assets/common/sfx-buble-fvTIGg.ogg and b/public/assets/common/sfx-buble-89NBFQ.ogg differ diff --git a/public/assets/common/sfx-match-3I4C7Q.ogg b/public/assets/common/sfx-match-fAs73w.ogg similarity index 96% rename from public/assets/common/sfx-match-3I4C7Q.ogg rename to public/assets/common/sfx-match-fAs73w.ogg index d435b12a..0ee675df 100644 Binary files a/public/assets/common/sfx-match-3I4C7Q.ogg and b/public/assets/common/sfx-match-fAs73w.ogg differ diff --git a/public/assets/common/sfx-select-ee6sEw.ogg b/public/assets/common/sfx-select-Z6EbuA.ogg similarity index 95% rename from public/assets/common/sfx-select-ee6sEw.ogg rename to public/assets/common/sfx-select-Z6EbuA.ogg index bca9c4d9..8a319e68 100644 Binary files a/public/assets/common/sfx-select-ee6sEw.ogg and b/public/assets/common/sfx-select-Z6EbuA.ogg differ diff --git a/public/assets/common/sfx-start-MOAt5Q.ogg b/public/assets/common/sfx-start-tJqvsQ.ogg similarity index 92% rename from public/assets/common/sfx-start-MOAt5Q.ogg rename to public/assets/common/sfx-start-tJqvsQ.ogg index 78fbca52..5ffab49d 100644 Binary files a/public/assets/common/sfx-start-MOAt5Q.ogg and b/public/assets/common/sfx-start-tJqvsQ.ogg differ diff --git a/public/assets/common/sfx-tap-2CJN2A.ogg b/public/assets/common/sfx-tap-IPhA1Q.ogg similarity index 96% rename from public/assets/common/sfx-tap-2CJN2A.ogg rename to public/assets/common/sfx-tap-IPhA1Q.ogg index fe59414f..3f58bfab 100644 Binary files a/public/assets/common/sfx-tap-2CJN2A.ogg and b/public/assets/common/sfx-tap-IPhA1Q.ogg differ diff --git a/raw-assets/common{m}/common-sprite{tps}/large-button-disabled.png b/raw-assets/common{m}/common-sprite{tps}/large-button-disabled.png new file mode 100644 index 00000000..ce4b0994 Binary files /dev/null and b/raw-assets/common{m}/common-sprite{tps}/large-button-disabled.png differ diff --git a/src/pages/games/SnackGame/game/popup/PausePopup.ts b/src/pages/games/SnackGame/game/popup/PausePopup.ts index 5fe2a776..f1d3fb53 100644 --- a/src/pages/games/SnackGame/game/popup/PausePopup.ts +++ b/src/pages/games/SnackGame/game/popup/PausePopup.ts @@ -32,8 +32,14 @@ export class PausePopup extends BasePopup { this.panel.addChild(this.resumeButton); } + private setButtonsEnabled(isEnabled: boolean) { + this.endButton.enabled = isEnabled; + this.resumeButton.enabled = isEnabled; + } + public async handleEndButton() { try { + this.setButtonsEnabled(false); await this.handleGameEnd(); } catch (error) { this.app.setError(error); @@ -42,6 +48,7 @@ export class PausePopup extends BasePopup { public async handleResumeButton() { try { + this.setButtonsEnabled(false); await this.handleGameResume(); this.app.dismissPopup(); } catch (error) { diff --git a/src/pages/games/SnackGame/game/ui/LargeButton.ts b/src/pages/games/SnackGame/game/ui/LargeButton.ts index 8e898b94..b178b9f1 100644 --- a/src/pages/games/SnackGame/game/ui/LargeButton.ts +++ b/src/pages/games/SnackGame/game/ui/LargeButton.ts @@ -43,9 +43,20 @@ export class LargeButton extends FancyButton { height: opts.height, }); + const disabledView = new NineSliceSprite({ + texture: Texture.from('large-button-disabled'), + leftWidth: 36, + topHeight: 42, + rightWidth: 36, + bottomHeight: 52, + width: opts.width, + height: opts.height, + }); + super({ defaultView, pressedView, + disabledView, anchor: 0.5, });