yuuki/taiko-web
1
0
Fork 0
mirror of https://github.com/yuukiwww/taiko-web.git synced 2024-10-03 06:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sound gestion improved

Browse Source
This commit is contained in:
Clement Gournay 2015-07-18 14:07:34 +09:00
parent b868c2598c
commit 524ba0f9a8
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/controller.js
View File

@ -39,7 +39,7 @@ function Controller(selectedSong, songData){
_game.updateTime();
_view.refresh();
}
else if(ms>=0 && !started){ //when music starts
else if(ms>=0 && !started){ //when music shall starts
assets.sounds["main-music"].play();
started=true;
}
@ -93,9 +93,9 @@ function Controller(selectedSong, songData){
}
this.restartSong = function(){
_game.pauseSound("main-music", true);
assets.sounds["main-music"].pause();
assets.sounds["main-music"].currentTime=0;
clearInterval(_mainLoop);
//songData.circles.forEach(function(circle){
$("#screen").load("/src/views/game.html", function(){
var taikoGame = new Controller(selectedSong, songData);
taikoGame.run();

4
src/js/game.js
View File

@ -222,11 +222,11 @@ function Game(controller, selectedSong, songData){
this.toggleMainMusic = function(){
if(_mainMusicPlaying){
_soundSystem.pauseSound("main-music", false);
assets.sounds["main-music"].pause();
_mainMusicPlaying=false;
}
else{
_soundSystem.playSound("main-music");
assets.sounds["main-music"].play();
_mainMusicPlaying=true;
}
}

5
src/js/soundsystem.js
View File

@ -29,11 +29,6 @@ function soundSystem(controller){
}
}
this.pauseSound = function(soundID, stop){
_sounds[soundID].pause();
if(stop) _sounds[soundID].currentTime=0;
}
this.fadeOutMusic = function(){