From f69b0fe38abbd600fa3c27e77135459fcf1bdcb1 Mon Sep 17 00:00:00 2001
From: Bui <bui@bui.pm>
Date: Mon, 6 Aug 2018 15:12:08 +0100
Subject: [PATCH] more

---
 src/js/songselect.js  | 30 +++++++++++++++++++++++++++---
 src/js/titlescreen.js |  3 +++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/js/songselect.js b/src/js/songselect.js
index f96741f..e8c350d 100644
--- a/src/js/songselect.js
+++ b/src/js/songselect.js
@@ -24,7 +24,9 @@ function SongSelect(){
 			var songID = parseInt(parentID.substr(5, parentID.length-1));
 			_selectedSong.title = $(this).parent().closest('.song').find('.song-title').html();
 			_selectedSong.folder = songID+" "+_selectedSong.title;
-                   
+            
+            assets.sounds["diffsel"].pause();
+            assets.sounds["diffsel"].currentTime = 0;
 			new loadSong(_selectedSong);
 
 		});
@@ -38,11 +40,31 @@ function SongSelect(){
 				$(this).css("background", "rgba(255, 220, 47, 0.90)");
 		});
 		
-		$(".song:not(.opened)").click(function(e){
+		$(".song").click(function(e){
 			if (!$(e.target).parents('.difficulties').length) {
+				if ($(".opened").length && $(".opened").attr('id') == $(this).attr('id')) {
+					assets.sounds["cancel"].play();
+					$(".difficulty").hide();
+					$(".opened").removeClass("opened", 300);
+
+					assets.sounds["diffsel"].pause();
+					assets.sounds["diffsel"].currentTime = 0;
+					setTimeout(function(){
+						assets.sounds["song-select"].play();
+					}, 300);
+
+					$('.songsel-title').fadeOut(200, function(){
+						$('.songsel-title').attr('alt', '曲をえらぶ').html('曲をえらぶ').css('left', -300);
+						$('.songsel-title').animate({left:0, opacity:"show"}, 400);
+					});
+
+					return;
+				}
 				assets.sounds["ka"].play();
 				
 				if(!$('.opened').length) {
+					assets.sounds["song-select"].pause();
+					assets.sounds["song-select"].currentTime = 0;
 					setTimeout(function(){
 						assets.sounds["diffsel"].play();
 					}, 300);
@@ -67,7 +89,9 @@ function SongSelect(){
 	this.createCode = function(){
 
 		assets.sounds["bgm_songsel"].play();		
-		assets.sounds["song-select"].play();
+		setTimeout(function(){
+			assets.sounds["song-select"].play();
+		}, 200);
 		for(var i=0; i<assets.songs.length; i++){
 			
 			var songDir = assets.songs[i].songDir;
diff --git a/src/js/titlescreen.js b/src/js/titlescreen.js
index 4e4519d..aecc9b1 100644
--- a/src/js/titlescreen.js
+++ b/src/js/titlescreen.js
@@ -37,6 +37,9 @@ function Titlescreen(){
     }
     
     this.goNext = function(){
+    	assets.sounds["title"].pause();
+    	assets.sounds["title"].currentTime = 0;
+
 		assets.sounds["don"].play();
         new SongSelect();
     }