Raataar/kinderspiele1
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Controller bereinig, Animation verbessert

Browse Source
This commit is contained in:
Carsten Hilmer
2016-11-01 02:49:40 +01:00
parent 52d822c7ee
commit c4f9b3671b
5 changed files with 155 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
www/js/suchspiel_controller.js
View File

@@ -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();
}