diff --git a/src/css/main.css b/src/css/main.css index c4523bf..1477bf3 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -44,3 +44,53 @@ html, body{ } +.stroke-main { + font-weight: 300; +} + +.result-title { + margin-top: 9px !important; + margin-left: 5px !important; + z-index: 1; +} + +.result-song { + position: absolute; + right: 0; + font-size: 5vmin; + margin: 30px 30px 0px 0px; + color: white; + float: right; + z-index: 1; +} + +.stroke-main:before { + content: attr(alt); + left: 0; + z-index: -1; + position: absolute; + -webkit-text-stroke: 0.3em #fb3c0c; +} + +.stroke-main:after { + content: attr(alt); + left: 0; + z-index: -2; + position: absolute; + -webkit-text-stroke: 0.5em #000; +} + +.stroke-sub:before { + content: attr(alt); + position: absolute; + -webkit-text-stroke: 0.25em #000; + left: 0; + z-index: -1; +} + +.songsel-title { + position: absolute; + z-index: 1; + font-size: 7vmin; + margin: 15px; +} \ No newline at end of file diff --git a/src/css/scoresheet.css b/src/css/scoresheet.css index 5f2b9e5..f720af8 100644 --- a/src/css/scoresheet.css +++ b/src/css/scoresheet.css @@ -15,8 +15,6 @@ font-size: 7vmin; margin:0; color: white; - -webkit-text-stroke-width: 1px; - -webkit-text-stroke-color: black; } diff --git a/src/css/songselect.css b/src/css/songselect.css index 96c12cc..d83a074 100644 --- a/src/css/songselect.css +++ b/src/css/songselect.css @@ -18,8 +18,9 @@ #song-container{ width:98%; - height:90%; - padding:1%; + height:80%; + padding: 5% 1% 1% 1%; + text-align: center; } ul li{ @@ -86,12 +87,13 @@ ul li{ margin: auto; margin-top:10px; font-size: 20pt; + margin-left: 6px; } .difficulty .stars{ position:absolute; color: #f12b69; - text-align: center; + margin-left: -17px; width:100%; bottom:10px; } diff --git a/src/js/assets.js b/src/js/assets.js index 10ff3ff..f1ced47 100644 --- a/src/js/assets.js +++ b/src/js/assets.js @@ -42,6 +42,7 @@ var assets = { 'pause.wav', 'cancel.wav', 'results.wav', + 'diffsel.wav', 'note_don.ogg', 'note_ka.ogg', diff --git a/src/js/game.js b/src/js/game.js index 9406664..844c2a2 100644 --- a/src/js/game.js +++ b/src/js/game.js @@ -11,7 +11,7 @@ function Game(controller, selectedSong, songData){ var _currentCircle=0; var _currentScore=0; var _combo=0; - var _globalScore={points:0, great:0, good:0, fail:0, maxCombo:0, hp:0}; + var _globalScore={points:0, great:0, good:0, fail:0, maxCombo:0, hp:0, song:selectedSong.title}; var _HPGain= 100/_songData.circles.length; var _paused=false; var _started=false; diff --git a/src/js/scoresheet.js b/src/js/scoresheet.js index c6712e6..98b594e 100644 --- a/src/js/scoresheet.js +++ b/src/js/scoresheet.js @@ -25,6 +25,8 @@ function Scoresheet(controller, score){ $("#nb-good").html(_score.good); $("#nb-fail").html(_score.fail); $("#max-combo").html(_score.maxCombo); + + $('.result-song').attr('alt', _score.song).html(_score.song); } diff --git a/src/js/songselect.js b/src/js/songselect.js index 9420656..f96741f 100644 --- a/src/js/songselect.js +++ b/src/js/songselect.js @@ -41,6 +41,17 @@ function SongSelect(){ $(".song:not(.opened)").click(function(e){ if (!$(e.target).parents('.difficulties').length) { assets.sounds["ka"].play(); + + if(!$('.opened').length) { + setTimeout(function(){ + assets.sounds["diffsel"].play(); + }, 300); + + $('.songsel-title').fadeOut(200, function(){ + $('.songsel-title').attr('alt', 'むずかしさをえらぶ').html('むずかしさをえらぶ').css('left', -300); + $('.songsel-title').animate({left:0, opacity:"show"}, 400); + }); + } }; $(".difficulty").hide(); diff --git a/src/views/scoresheet.html b/src/views/scoresheet.html index 50c6e6c..2b405c5 100644 --- a/src/views/scoresheet.html +++ b/src/views/scoresheet.html @@ -1,7 +1,8 @@
-

成績発表

+

成績発表

+

diff --git a/src/views/songselect.html b/src/views/songselect.html index aec63fb..7b5b80e 100644 --- a/src/views/songselect.html +++ b/src/views/songselect.html @@ -1,3 +1,4 @@
+

曲をえらぶ

\ No newline at end of file