mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2026-04-22 10:41:38 +00:00
fix music
This commit is contained in:
parent
b3705ae193
commit
89e95786a1
2 changed files with 7 additions and 6 deletions
|
|
@ -60,7 +60,7 @@ class AudioManager {
|
|||
|
||||
public static function playShell() {
|
||||
AudioManager.manager.stopByName("music");
|
||||
var sndres = ResourceLoader.getAudio("data/sound/music/Pianoforte.ogg");
|
||||
var sndres = ResourceLoader.getAudio("data/sound/shell.ogg");
|
||||
if (sndres == null)
|
||||
return;
|
||||
sndres.acquire();
|
||||
|
|
|
|||
|
|
@ -366,11 +366,12 @@ class MarbleWorld extends Scheduler {
|
|||
this.scene.addChild(this.sky);
|
||||
|
||||
this._ready = true;
|
||||
var musicFileName = 'data/sound/music/' + this.mission.missionInfo.music;
|
||||
if (ResourceLoader.exists(musicFileName))
|
||||
AudioManager.playMusic(ResourceLoader.getResource(musicFileName, ResourceLoader.getAudio, this.soundResources), this.mission.missionInfo.music);
|
||||
else
|
||||
AudioManager.playShell();
|
||||
var musicFileName = [
|
||||
'data/sound/groovepolice.ogg',
|
||||
'data/sound/classic vibe.ogg',
|
||||
'data/sound/beach party.ogg'
|
||||
][(mission.index + 1) % 3];
|
||||
AudioManager.playMusic(ResourceLoader.getResource(musicFileName, ResourceLoader.getAudio, this.soundResources), musicFileName);
|
||||
MarbleGame.canvas.clearContent();
|
||||
if (this.endPad != null)
|
||||
this.endPad.generateCollider();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue