Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Musikbuttons hinzugefügt

Browse Source
This commit is contained in:
silas
2018-09-26 14:01:33 +02:00
parent be130a99e8
commit c13dfc378f
16 changed files with 1229 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
public/js/app.js
View File

@@ -4703,12 +4703,16 @@ class SoundManager {
audioObject.volume = Helper.nonNull(options.volume, audioObject.volume, 1);
audioObject.loop = Helper.nonNull(options.loop, audioObject.loop, false);
audioObject.timeOffset = Helper.nonNull(options.timeOffset, audioObject.timeOffset, 0);
this.channels[channel] = audioObject;
console.log(options);
if (audioObject.muted){
this.stop(channel);
}
this.channels[channel] = audioObject;
else if (Helper.isNotNull(options.muted) && options.muted === false){
// this.play(channel);
}
return this.channels[channel];
}
@@ -4727,13 +4731,12 @@ class SoundManager {
this.stop(channel);
this.set(audioOrOptions, channel);
console.log(this.channels[channel]);
if (!this.channels[channel].muted) {
let buffer = await this.channels[channel].loadedPromise;
let source = this.context.createBufferSource();
source.buffer = buffer;
source.connect(this.context.destination);
// source.loopStart = 5;
// source.loopEnd = 5;
source.loop = this.channels[channel].loop;
source.start(0);
this.channels[channel].source = source;
@@ -5763,8 +5766,10 @@ class LevelSite extends WordRotatorBaseSite {
coinCounterTimer: null,
};
let settingsManager = SettingsManager.getInstance();
let soundManager = SoundManager.getInstance();
soundManager.set("sound/single_coin_fall_on_concrete_.mp3", SoundManager.CHANNELS.SOUND);
soundManager.set({audio: "sound/single_coin_fall_on_concrete_.mp3", muted: !settingsManager.getSetting("play-sound")}, SoundManager.CHANNELS.SOUND);
return super.onConstruct(args);
}
@@ -6143,6 +6148,29 @@ class MenuSite extends WordRotatorBaseSite {
}
});
}
let settingsManager = SettingsManager.getInstance();
let soundManager = SoundManager.getInstance();
let playMusicButton = this.findBy("#play-music");
playMusicButton.checked = settingsManager.getSetting("play-music", true);
playMusicButton.addEventListener("change", () => {
settingsManager.setSetting("play-music", playMusicButton.checked);
soundManager.set({muted: !playMusicButton.checked}, SoundManager.CHANNELS.MUSIC);
if (playMusicButton.checked){
soundManager.play(SoundManager.CHANNELS.MUSIC);
}
});
let playSoundButton = this.findBy("#play-sound");
playSoundButton.checked = settingsManager.getSetting("play-sound", true);
playSoundButton.addEventListener("change", () => {
settingsManager.setSetting("play-sound", playSoundButton.checked);
soundManager.set({muted: !playSoundButton.checked}, SoundManager.CHANNELS.SOUND);
// if (playSoundButton.checked){
// soundManager.play(SoundManager.CHANNELS.MUSIC);
// }
});
}
onPause(args) {
@@ -6304,8 +6332,10 @@ LoginSite.addLoginAction = false;
InitPromise.resolve(app).then(function(){
SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS;
let settingsManager = SettingsManager.getInstance();
let soundManager = SoundManager.getInstance();
soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.3});
soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.wav", loop: true, volume: 0.3, muted: !settingsManager.getSetting("play-music", true)});
app.start(SynchronizeSite);
Translator.setLanguage("de");