diff --git a/www/css/style.css b/www/css/style.css index afdf387..c88f980 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -45,6 +45,16 @@ to {background-position: -2000px 0;} overflow: hidden; } +.statusbar{ + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 64px; + overflow: hidden; + text-align: center; +} + .myborder{ display: inline-block; border-radius: 6px; @@ -60,15 +70,38 @@ to {background-position: -2000px 0;} transform: translateY(4px); } -.mentorborder { + + +.mentorhilfe { position: absolute; - top: 122px; - left: 120px; - width: 32px; - height: 32px; + bottom: 0; + left: 0; + width: 64px; + height: 64px; overflow: hidden; + background: url('../img/mentorhelp_64px.png'); } +.mentorborder { + position: absolute; + bottom: 0; + left: 0; + width: 64px; + height: 64px; + overflow: hidden; + background: url('../img/mentorhelp_64px.png'); +} + +.mentor { + width: 64px; + height: 640px; + background: url('../img/mentor_64px.png') left center; + -webkit-animation: mentorsprite 4s steps(10) infinite; +} + +@-webkit-keyframes mentorsprite { + 100% { background-position: 0 -640px; } +} .mentorborderbaumhaus { position: absolute; diff --git a/www/img/mentorhelp_64px.png b/www/img/mentorhelp_64px.png new file mode 100644 index 0000000..f44281f Binary files /dev/null and b/www/img/mentorhelp_64px.png differ diff --git a/www/img/statusbar.svg b/www/img/statusbar.svg new file mode 100644 index 0000000..7e28f7e --- /dev/null +++ b/www/img/statusbar.svg @@ -0,0 +1,85 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/www/js/suchspiel_controller.js b/www/js/suchspiel_controller.js index 630c017..119bb82 100644 --- a/www/js/suchspiel_controller.js +++ b/www/js/suchspiel_controller.js @@ -18,14 +18,14 @@ $ionicPlatform.ready(function() { $scope.sounds=[]; $scope.sounds.push(''); - var tiersound1 = new Media('/android_asset/www/sounds/finde_elefant.mp3', null,null); - var tiersound2 = new Media('/android_asset/www/sounds/finde_esel.mp3', null,null); - var tiersound3 = new Media('/android_asset/www/sounds/finde_hahn.mp3', null,null); - var tiersound4 = new Media('/android_asset/www/sounds/finde_hund.mp3', null,null); - var tiersound5 = new Media('/android_asset/www/sounds/finde_katze.mp3', null,null); - var tiersound6 = new Media('/android_asset/www/sounds/finde_kuh.mp3', null,null); - var tiersound7 = new Media('/android_asset/www/sounds/finde_maus.mp3', null,null); - var tiersound8 = new Media('/android_asset/www/sounds/finde_schaf.mp3', null,null); + var tiersound1 = new Media('/android_asset/www/sounds/finde_elefant.mp3', mentorausblenden,null); + var tiersound2 = new Media('/android_asset/www/sounds/finde_esel.mp3', mentorausblenden,null); + var tiersound3 = new Media('/android_asset/www/sounds/finde_hahn.mp3', mentorausblenden,null); + var tiersound4 = new Media('/android_asset/www/sounds/finde_hund.mp3', mentorausblenden,null); + var tiersound5 = new Media('/android_asset/www/sounds/finde_katze.mp3', mentorausblenden,null); + var tiersound6 = new Media('/android_asset/www/sounds/finde_kuh.mp3', mentorausblenden,null); + var tiersound7 = new Media('/android_asset/www/sounds/finde_maus.mp3', mentorausblenden,null); + var tiersound8 = new Media('/android_asset/www/sounds/finde_schaf.mp3', mentorausblenden,null); var bravosound = new Media('/android_asset/www/sounds/bravo.mp3', goto_newspiel,null); var falschsound = new Media('/android_asset/www/sounds/falsch.mp3', null,null); @@ -124,13 +124,18 @@ $scope.spiele.push(tier7); */ $scope.hilfe = function() { $scope.showmentor=true; - $timeout(function () { - $scope.showmentor=false; - }, 3500); $scope.sounds[$scope.randomid].play(); } +/* +* Mentor ausblenden +*/ +function mentorausblenden(){ + $timeout(function () { $scope.showmentor=false; }, 10); +} + + /* * Antwort prüfen */ @@ -150,11 +155,7 @@ $scope.answer = function(src) { }, 500); }, 500); }, 500); - $scope.showmentorbravo=true; - $timeout(function () { - $scope.showmentorbravo=false; - $timeout(function () {$scope.showmentor=true;}, 1200); - }, 2400); + $timeout(function () { $scope.showmentorbravo=true; }, 0); $scope.bravosound.play(); } else{ @@ -173,15 +174,13 @@ $scope.answer = function(src) { /* * Neues Spiel */ -function goto_newspiel() { - - $scope.showmentor=true; - - $scope.randomid = getRandomInt(1, 8); - //$scope.play('/android_asset/www/sounds/' + $scope.sounds[$scope.randomid]); +function goto_newspiel(){ + $timeout(function () { - $scope.showmentor=false; - }, 3500); + $scope.showmentor=true; + $scope.showmentorbravo=false; + },0); + $scope.randomid = getRandomInt(1, 8); $scope.sounds[$scope.randomid].play(); } diff --git a/www/templates/spiel1.html b/www/templates/spiel1.html index 1703a4d..d9d0729 100644 --- a/www/templates/spiel1.html +++ b/www/templates/spiel1.html @@ -8,14 +8,16 @@
-
-
- + +
+
+
+
-
-
-
-
+
+
+ +