diff --git a/www/css/style.css b/www/css/style.css index 67a68ff..aceebc5 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -289,6 +289,54 @@ to {background-position: -2000px 0;} } +.teddy { + position: fixed; + top: 50%; + left: 50%; + width: 256px; + height: 256px; + margin-left: -128px; + margin-top: -128px; + overflow: hidden; +} + +.teddybackground { + background: url('../img/Teddybear/Teddy_klein/Teddybackgound.png'); +} + + +.teddyani1 { + width: 256px; + height: 1024px; + background: url('../img/Teddybear/Teddy_klein/Teddybear_ani1.png') left center; + -webkit-animation: teddyspriteani 1.4s steps(4) infinite; +} + +.teddyani2 { + width: 256px; + height: 1024px; + background: url('../img/Teddybear/Teddy_klein/Teddybear_ani2.png') left center; + -webkit-animation: teddyspriteani 1.4s steps(4) infinite; +} + +.teddyani3 { + width: 256px; + height: 1024px; + background: url('../img/Teddybear/Teddy_klein/Teddybear_ani3.png') left center; + -webkit-animation: teddyspriteani 1.4s steps(4) infinite; +} + +.teddyani4 { + width: 256px; + height: 1024px; + background: url('../img/Teddybear/Teddy_klein/Teddybear_ani4.png') left center; + -webkit-animation: teddyspriteani 1.4s steps(4) infinite; +} + +@-webkit-keyframes teddyspriteani { + 100% { background-position: 0 -1024px; } +} + #background-wrap { bottom: 0; @@ -350,7 +398,6 @@ to {background-position: -2000px 0;} -moz-transform: scale(0.3); transform: scale(0.3); } -/* .x3 { -webkit-animation: animateCloud 30s linear infinite; -moz-animation: animateCloud 30s linear infinite; @@ -361,6 +408,7 @@ to {background-position: -2000px 0;} transform: scale(0.5); } +/* .x4 { -webkit-animation: animateCloud 18s linear infinite; -moz-animation: animateCloud 18s linear infinite; @@ -383,6 +431,15 @@ to {background-position: -2000px 0;} */ /* OBJECTS */ +.ufo { + background: url('../img/ufo.png'); + position: relative; + height: 64px; + position: relative; + width: 64px; +} + + .cloud { background: #fff; background: -moz-linear-gradient(top, #fff 5%, #f1f1f1 100%); diff --git a/www/img/Teddybear/Teddy1.svg b/www/img/Teddybear/Teddy1.svg new file mode 100644 index 0000000..540822b --- /dev/null +++ b/www/img/Teddybear/Teddy1.svg @@ -0,0 +1,1412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy2.png b/www/img/Teddybear/Teddy2.png new file mode 100644 index 0000000..f5e0855 Binary files /dev/null and b/www/img/Teddybear/Teddy2.png differ diff --git a/www/img/Teddybear/Teddy2.svg b/www/img/Teddybear/Teddy2.svg new file mode 100644 index 0000000..cc566b9 --- /dev/null +++ b/www/img/Teddybear/Teddy2.svg @@ -0,0 +1,1424 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy2_1.png b/www/img/Teddybear/Teddy2_1.png new file mode 100644 index 0000000..527864d Binary files /dev/null and b/www/img/Teddybear/Teddy2_1.png differ diff --git a/www/img/Teddybear/Teddy3.png b/www/img/Teddybear/Teddy3.png new file mode 100644 index 0000000..a98f751 Binary files /dev/null and b/www/img/Teddybear/Teddy3.png differ diff --git a/www/img/Teddybear/Teddy3.svg b/www/img/Teddybear/Teddy3.svg new file mode 100644 index 0000000..5285c65 --- /dev/null +++ b/www/img/Teddybear/Teddy3.svg @@ -0,0 +1,1426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy3_1.png b/www/img/Teddybear/Teddy3_1.png new file mode 100644 index 0000000..09a892f Binary files /dev/null and b/www/img/Teddybear/Teddy3_1.png differ diff --git a/www/img/Teddybear/Teddy4.png b/www/img/Teddybear/Teddy4.png new file mode 100644 index 0000000..1c0aacf Binary files /dev/null and b/www/img/Teddybear/Teddy4.png differ diff --git a/www/img/Teddybear/Teddy4.svg b/www/img/Teddybear/Teddy4.svg new file mode 100644 index 0000000..5f926ac --- /dev/null +++ b/www/img/Teddybear/Teddy4.svg @@ -0,0 +1,1425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy4_1.png b/www/img/Teddybear/Teddy4_1.png new file mode 100644 index 0000000..639dc4a Binary files /dev/null and b/www/img/Teddybear/Teddy4_1.png differ diff --git a/www/img/Teddybear/Teddy5.png b/www/img/Teddybear/Teddy5.png new file mode 100644 index 0000000..ea5be63 Binary files /dev/null and b/www/img/Teddybear/Teddy5.png differ diff --git a/www/img/Teddybear/Teddy5.svg b/www/img/Teddybear/Teddy5.svg new file mode 100644 index 0000000..1efff60 --- /dev/null +++ b/www/img/Teddybear/Teddy5.svg @@ -0,0 +1,1426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy5_1.png b/www/img/Teddybear/Teddy5_1.png new file mode 100644 index 0000000..2264318 Binary files /dev/null and b/www/img/Teddybear/Teddy5_1.png differ diff --git a/www/img/Teddybear/Teddy6.png b/www/img/Teddybear/Teddy6.png new file mode 100644 index 0000000..597bcfd Binary files /dev/null and b/www/img/Teddybear/Teddy6.png differ diff --git a/www/img/Teddybear/Teddy6.svg b/www/img/Teddybear/Teddy6.svg new file mode 100644 index 0000000..24de2fd --- /dev/null +++ b/www/img/Teddybear/Teddy6.svg @@ -0,0 +1,1426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy6_1.png b/www/img/Teddybear/Teddy6_1.png new file mode 100644 index 0000000..141ff63 Binary files /dev/null and b/www/img/Teddybear/Teddy6_1.png differ diff --git a/www/img/Teddybear/Teddy7.png b/www/img/Teddybear/Teddy7.png new file mode 100644 index 0000000..6cfbde4 Binary files /dev/null and b/www/img/Teddybear/Teddy7.png differ diff --git a/www/img/Teddybear/Teddy7.svg b/www/img/Teddybear/Teddy7.svg new file mode 100644 index 0000000..21ab8dd --- /dev/null +++ b/www/img/Teddybear/Teddy7.svg @@ -0,0 +1,1428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy7_1.png b/www/img/Teddybear/Teddy7_1.png new file mode 100644 index 0000000..e804573 Binary files /dev/null and b/www/img/Teddybear/Teddy7_1.png differ diff --git a/www/img/Teddybear/Teddy8.png b/www/img/Teddybear/Teddy8.png new file mode 100644 index 0000000..e193a51 Binary files /dev/null and b/www/img/Teddybear/Teddy8.png differ diff --git a/www/img/Teddybear/Teddy8.svg b/www/img/Teddybear/Teddy8.svg new file mode 100644 index 0000000..4b23ac8 --- /dev/null +++ b/www/img/Teddybear/Teddy8.svg @@ -0,0 +1,1428 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/img/Teddybear/Teddy8_1.png b/www/img/Teddybear/Teddy8_1.png new file mode 100644 index 0000000..d6cf592 Binary files /dev/null and b/www/img/Teddybear/Teddy8_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy2.png b/www/img/Teddybear/Teddy_klein/Teddy2.png new file mode 100644 index 0000000..5272954 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy2.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy2_1.png b/www/img/Teddybear/Teddy_klein/Teddy2_1.png new file mode 100644 index 0000000..1f8cdef Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy2_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy3.png b/www/img/Teddybear/Teddy_klein/Teddy3.png new file mode 100644 index 0000000..5744f25 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy3.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy3_1.png b/www/img/Teddybear/Teddy_klein/Teddy3_1.png new file mode 100644 index 0000000..0f116dd Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy3_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy4.png b/www/img/Teddybear/Teddy_klein/Teddy4.png new file mode 100644 index 0000000..2943b2e Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy4.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy4_1.png b/www/img/Teddybear/Teddy_klein/Teddy4_1.png new file mode 100644 index 0000000..aa98495 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy4_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy5.png b/www/img/Teddybear/Teddy_klein/Teddy5.png new file mode 100644 index 0000000..1b7296b Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy5.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy5_1.png b/www/img/Teddybear/Teddy_klein/Teddy5_1.png new file mode 100644 index 0000000..bda4184 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy5_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy6.png b/www/img/Teddybear/Teddy_klein/Teddy6.png new file mode 100644 index 0000000..7ab09f1 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy6.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy6_1.png b/www/img/Teddybear/Teddy_klein/Teddy6_1.png new file mode 100644 index 0000000..cd06592 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy6_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy7.png b/www/img/Teddybear/Teddy_klein/Teddy7.png new file mode 100644 index 0000000..9640d3d Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy7.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy7_1.png b/www/img/Teddybear/Teddy_klein/Teddy7_1.png new file mode 100644 index 0000000..defd410 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy7_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy8.png b/www/img/Teddybear/Teddy_klein/Teddy8.png new file mode 100644 index 0000000..cdd744d Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy8.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddy8_1.png b/www/img/Teddybear/Teddy_klein/Teddy8_1.png new file mode 100644 index 0000000..f146d8f Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddy8_1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddybackgound.png b/www/img/Teddybear/Teddy_klein/Teddybackgound.png new file mode 100644 index 0000000..e3c2fb6 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddybackgound.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddybear.psd b/www/img/Teddybear/Teddy_klein/Teddybear.psd new file mode 100644 index 0000000..4c47f8a Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddybear.psd differ diff --git a/www/img/Teddybear/Teddy_klein/Teddybear_ani1.png b/www/img/Teddybear/Teddy_klein/Teddybear_ani1.png new file mode 100644 index 0000000..847c0ea Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddybear_ani1.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddybear_ani2.png b/www/img/Teddybear/Teddy_klein/Teddybear_ani2.png new file mode 100644 index 0000000..e72a1da Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddybear_ani2.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddybear_ani3.png b/www/img/Teddybear/Teddy_klein/Teddybear_ani3.png new file mode 100644 index 0000000..c0a938f Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddybear_ani3.png differ diff --git a/www/img/Teddybear/Teddy_klein/Teddybear_ani4.png b/www/img/Teddybear/Teddy_klein/Teddybear_ani4.png new file mode 100644 index 0000000..c241639 Binary files /dev/null and b/www/img/Teddybear/Teddy_klein/Teddybear_ani4.png differ diff --git a/www/img/ufo.png b/www/img/ufo.png new file mode 100644 index 0000000..f77ee5c Binary files /dev/null and b/www/img/ufo.png differ diff --git a/www/js/suchspiel_controller.js b/www/js/suchspiel_controller.js index 0937118..4496ca7 100644 --- a/www/js/suchspiel_controller.js +++ b/www/js/suchspiel_controller.js @@ -30,7 +30,7 @@ $scope.CSSFalscheAntwort = false; $scope.CCSInittimer = false; //SpieleTimer -$scope.Spielzeit = 180; +$scope.Spielzeit = 90; $scope.showgametimer = false; //Spielzeit vorbei @@ -48,6 +48,10 @@ $scope.punktebonus=0; $scope.rundenstart = ''; $scope.rundenende = ''; +//Minispiel +$scope.showteddybear=false; +$scope.teddyback=false; + $ionicPlatform.ready(function() { @@ -94,6 +98,14 @@ $ionicPlatform.ready(function() { var kartegebensound = new Media('/android_asset/www/sounds/karte.mp3', kartegeben,null); var aufloesungsound = new Media('/android_asset/www/sounds/soundsneu/aufloesung.mp3', aufloesung,null); + /* + * Spielende - Minispiel + */ + var spielendesound = new Media('/android_asset/www/sounds/minispiel/geschafft.mp3', minispielintro,null); + var minispielsound = new Media('/android_asset/www/sounds/minispiel/kitzeldenbaeren.mp3', minispielstart,null); + var minispielsound1 = new Media('/android_asset/www/sounds/minispiel/lachen1.mp3', null,null); + var minispielsound2 = new Media('/android_asset/www/sounds/minispiel/lachen2.mp3', null,null); + /* * Sounds in $Scope referenzieren @@ -101,6 +113,11 @@ $ionicPlatform.ready(function() { $scope.kartegebensound=kartegebensound; $scope.aufloesung=aufloesungsound; + $scope.spielendesound=spielendesound; + $scope.minispielsound=minispielsound; + $scope.minispielsound1=minispielsound1; + $scope.minispielsound2=minispielsound2; + $scope.bravosounds.push(bravosound1); $scope.bravosounds.push(bravosound2); $scope.bravosounds.push(bravosound3); @@ -502,13 +519,48 @@ function karteausblenden(){ } else{ - //Belohnung hier rein - $state.go('home'); + spielende(); } } +/* +* Spielende +*/ +function spielende(){ + + //Belohnung hier rein + //$state.go('home'); + + $timeout(function () { + $scope.showmentorbravo=true; + $scope.spielendesound.play(); + }, 10); + + //$scope.showteddybear=true + +} + +function minispielintro(){ + $scope.minispielsound.play(); +} + + +function minispielstart(){ + $timeout(function () { + $scope.showmentorbravo=false; + $scope.showteddybear=true; + $scope.teddyback=true; + }, 10); + $timeout(function () { + $scope.showteddybear=false; + $state.go('home'); + }, 30000); + +} + + /* * SpieleTimer Funktion */ @@ -524,8 +576,6 @@ function SpieleTimer(){ else{ $scope.spielvorbei=true; } - - } function aufloesung(){ @@ -653,4 +703,36 @@ function inittimer(){ } +/* +* MiniSpiel kitzel den Teddy +*/ +$scope.teddyaction = function() { + $scope.teddyanimation=getRandomInt(1,4); + $scope.teddyback=false; + $scope.teddyani1=false; + $scope.teddyani2=false; + $scope.teddyani3=false; + $scope.teddyani4=false; + + if ($scope.teddyanimation==1){ + $scope.teddyani1=true; + $scope.minispielsound1.play(); + } + if ($scope.teddyanimation==2){ + $scope.teddyani2=true; + $scope.minispielsound2.play(); + } + if ($scope.teddyanimation==3){ + $scope.teddyani3=true; + $scope.minispielsound1.play(); + } + if ($scope.teddyanimation==4){ + $scope.teddyani4=true; + $scope.minispielsound2.play(); + } + + +} + + }); \ No newline at end of file diff --git a/www/sounds/minispiel/geschafft.mp3 b/www/sounds/minispiel/geschafft.mp3 new file mode 100644 index 0000000..5303a62 Binary files /dev/null and b/www/sounds/minispiel/geschafft.mp3 differ diff --git a/www/sounds/minispiel/geschafft.wav b/www/sounds/minispiel/geschafft.wav new file mode 100644 index 0000000..bd63b0d Binary files /dev/null and b/www/sounds/minispiel/geschafft.wav differ diff --git a/www/sounds/minispiel/kitzeldenbaeren.mp3 b/www/sounds/minispiel/kitzeldenbaeren.mp3 new file mode 100644 index 0000000..67e7b4f Binary files /dev/null and b/www/sounds/minispiel/kitzeldenbaeren.mp3 differ diff --git a/www/sounds/minispiel/kitzeldenbaeren.wav b/www/sounds/minispiel/kitzeldenbaeren.wav new file mode 100644 index 0000000..d6e56e1 Binary files /dev/null and b/www/sounds/minispiel/kitzeldenbaeren.wav differ diff --git a/www/sounds/minispiel/lachen1.mp3 b/www/sounds/minispiel/lachen1.mp3 new file mode 100644 index 0000000..c53b53b Binary files /dev/null and b/www/sounds/minispiel/lachen1.mp3 differ diff --git a/www/sounds/minispiel/lachen1.wav b/www/sounds/minispiel/lachen1.wav new file mode 100644 index 0000000..30712f5 Binary files /dev/null and b/www/sounds/minispiel/lachen1.wav differ diff --git a/www/sounds/minispiel/lachen2.mp3 b/www/sounds/minispiel/lachen2.mp3 new file mode 100644 index 0000000..b970701 Binary files /dev/null and b/www/sounds/minispiel/lachen2.mp3 differ diff --git a/www/sounds/minispiel/lachen2.wav b/www/sounds/minispiel/lachen2.wav new file mode 100644 index 0000000..42a6c3a Binary files /dev/null and b/www/sounds/minispiel/lachen2.wav differ diff --git a/www/templates/home.html b/www/templates/home.html index 8133316..87e29bf 100644 --- a/www/templates/home.html +++ b/www/templates/home.html @@ -30,6 +30,7 @@
+ diff --git a/www/templates/suchspiel.html b/www/templates/suchspiel.html index 918fd23..e896318 100644 --- a/www/templates/suchspiel.html +++ b/www/templates/suchspiel.html @@ -36,5 +36,10 @@
+ +
+
+
+