mirror of
https://github.com/jiojciojsioe3/a3cjroijsiojiorj.git
synced 2024-11-15 07:21:50 +08:00
even more audio fixes
This commit is contained in:
parent
90e461b587
commit
44c18c1ebc
@ -43,6 +43,8 @@ var assets = {
|
||||
'cancel.wav',
|
||||
'results.wav',
|
||||
|
||||
'note_don.ogg',
|
||||
'note_ka.ogg',
|
||||
|
||||
'bgm_songsel.mp3',
|
||||
'bgm_results.ogg'
|
||||
|
@ -22,11 +22,16 @@ function Controller(selectedSong, songData){
|
||||
|
||||
this.loadUIEvents = function(){
|
||||
$("#song-selection-butt").click(function(){
|
||||
assets.sounds["don"].play();
|
||||
_this.songSelection();
|
||||
});
|
||||
$("#restart-butt").click(function(){
|
||||
assets.sounds["don"].play();
|
||||
_this.restartSong();
|
||||
});
|
||||
$("#continue-butt").click(function(){
|
||||
_this.togglePauseMenu();
|
||||
});
|
||||
}
|
||||
|
||||
this.startMainLoop = function(){
|
||||
@ -40,6 +45,7 @@ function Controller(selectedSong, songData){
|
||||
_view.refresh();
|
||||
}
|
||||
else if(ms>=0 && !started){ //when music shall starts
|
||||
assets.sounds["main-music"].volume = 0.7;
|
||||
assets.sounds["main-music"].play();
|
||||
started=true;
|
||||
}
|
||||
|
@ -24,20 +24,20 @@ function Keyboard(controller){
|
||||
this.checkGameKeys = function(){
|
||||
|
||||
if(_keys[86] && !_this.isWaitingForKeyup(86, "sound")){//if press v, play 'don' sound
|
||||
controller.playSound('don');
|
||||
controller.playSound('note_don');
|
||||
_this.waitForKeyup(86, "sound");
|
||||
}
|
||||
if(_keys[66] && !_this.isWaitingForKeyup(66, "sound")){//if press b, play 'don' sound
|
||||
controller.playSound('don');
|
||||
controller.playSound('note_don');
|
||||
_this.waitForKeyup(66, "sound");
|
||||
}
|
||||
|
||||
if(_keys[67] && !_this.isWaitingForKeyup(67, "sound")){//if press c, play 'ka' sound
|
||||
controller.playSound('ka');
|
||||
controller.playSound('note_ka');
|
||||
_this.waitForKeyup(67, "sound");
|
||||
}
|
||||
if(_keys[78] && !_this.isWaitingForKeyup(78, "sound")){//if press n, play 'ka' sound
|
||||
controller.playSound('ka');
|
||||
controller.playSound('note_ka');
|
||||
_this.waitForKeyup(78, "sound");
|
||||
}
|
||||
|
||||
@ -50,8 +50,8 @@ function Keyboard(controller){
|
||||
controller.pauseSound("main-music", true);
|
||||
controller.songSelection();
|
||||
}
|
||||
if(_keys[27] && !_this.isWaitingForKeyup(27, "menu")){//if press escape key, pause the game
|
||||
_this.waitForKeyup(27, "menu");
|
||||
if(_keys[81] && !_this.isWaitingForKeyup(81, "menu")){//if press p key, pause the game
|
||||
_this.waitForKeyup(81, "menu");
|
||||
controller.togglePauseMenu();
|
||||
}
|
||||
|
||||
|
@ -71,6 +71,7 @@ function Scoresheet(controller, score){
|
||||
}
|
||||
|
||||
this.run = function(){
|
||||
assets.sounds["results"].volume = 0.6;
|
||||
assets.sounds["results"].play();
|
||||
|
||||
assets.sounds["bgm_results"].volume = 1;
|
||||
@ -80,12 +81,14 @@ function Scoresheet(controller, score){
|
||||
_this.setResults();
|
||||
|
||||
$("#song-select").click(function(){
|
||||
assets.sounds["don"].play();
|
||||
assets.sounds["bgm_results"].pause();
|
||||
assets.sounds["bgm_songsel"].currentTime = 0;
|
||||
controller.songSelection();
|
||||
});
|
||||
|
||||
$("#replay").click(function(){
|
||||
assets.sounds["don"].play();
|
||||
assets.sounds["bgm_results"].pause();
|
||||
assets.sounds["bgm_songsel"].currentTime = 0;
|
||||
controller.restartSong();
|
||||
|
@ -15,6 +15,7 @@ function SongSelect(){
|
||||
$("#song-container").show();
|
||||
|
||||
$(".difficulty").click(function(e){
|
||||
assets.sounds["don"].play();
|
||||
|
||||
clearInterval(menuLoop);
|
||||
var difficultyElement = (e.target.className=="stars" || e.target.className=="diffname") ? e.target.parentElement : e.target;
|
||||
@ -37,8 +38,11 @@ function SongSelect(){
|
||||
$(this).css("background", "rgba(255, 220, 47, 0.90)");
|
||||
});
|
||||
|
||||
$(".song:not(.opened)").click(function(){
|
||||
assets.sounds["ka"].play();
|
||||
$(".song:not(.opened)").click(function(e){
|
||||
if (!$(e.target).parents('.difficulties').length) {
|
||||
assets.sounds["ka"].play();
|
||||
};
|
||||
|
||||
$(".difficulty").hide();
|
||||
$(".opened").removeClass("opened", 300);
|
||||
$(this).addClass("opened", 300, "linear", function(){
|
||||
|
@ -4,6 +4,7 @@
|
||||
|
||||
<div id='pause-menu'>
|
||||
<div class='window'>
|
||||
<button type='button' id='continue-butt'>Continue</button>
|
||||
<button type='button' id='restart-butt'>Restart</button>
|
||||
<button type='button' id='song-selection-butt'>Song selection</button>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user