Ainias/wordRotator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ordentliche GameEnded-Seite

Browse Source
This commit is contained in:
silas 2018-09-22 01:02:55 +02:00
parent aa3e6e8629
commit a6f7fa8c3e
14 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
log/error.log
View File

@ -3,3 +3,8 @@
2018-09-21T17:18:04+02:00 ERR (3):
2018-09-21T17:33:11+02:00 ERR (3):
2018-09-21T17:34:08+02:00 ERR (3):
2018-09-22T00:43:23+02:00 ERR (3):
2018-09-22T00:58:27+02:00 ERR (3): syntax error, unexpected '$request' (T_VARIABLE) - ErrorCode: 0 File: /var/www/pwa/wordRotator/src/module/Application/src/Controller/SyncController.php Line: 108
2018-09-22T00:58:53+02:00 ERR (3): syntax error, unexpected '$request' (T_VARIABLE) - ErrorCode: 0 File: /var/www/pwa/wordRotator/src/module/Application/src/Controller/SyncController.php Line: 108
2018-09-22T01:00:24+02:00 ERR (3): syntax error, unexpected '$request' (T_VARIABLE) - ErrorCode: 0 File: /var/www/pwa/wordRotator/src/module/Application/src/Controller/SyncController.php Line: 108
2018-09-22T01:01:25+02:00 ERR (3):

5
log/log.log
View File

@ -3,3 +3,8 @@
2018-09-21T17:18:04+02:00 ERR (3):
2018-09-21T17:33:11+02:00 ERR (3):
2018-09-21T17:34:08+02:00 ERR (3):
2018-09-22T00:43:23+02:00 ERR (3):
2018-09-22T00:58:27+02:00 ERR (3): syntax error, unexpected '$request' (T_VARIABLE) - ErrorCode: 0 File: /var/www/pwa/wordRotator/src/module/Application/src/Controller/SyncController.php Line: 108
2018-09-22T00:58:53+02:00 ERR (3): syntax error, unexpected '$request' (T_VARIABLE) - ErrorCode: 0 File: /var/www/pwa/wordRotator/src/module/Application/src/Controller/SyncController.php Line: 108
2018-09-22T01:00:24+02:00 ERR (3): syntax error, unexpected '$request' (T_VARIABLE) - ErrorCode: 0 File: /var/www/pwa/wordRotator/src/module/Application/src/Controller/SyncController.php Line: 108
2018-09-22T01:01:25+02:00 ERR (3):

2
public/css/wordRotator.css
View File

File diff suppressed because one or more lines are too long

2
public/html/application/end.html
View File

@ -1 +1 @@
<div><div data-translation=game-ended></div></div>
<div class="max-height flex-center"><div data-translation=game-ended class=center></div></div>

2
public/html/application/level.html
View File

@ -1 +1 @@
<div class="max-height overflow-hidden"><div id=segment-leaf-template class="segment segment-leaf"><div class=leaf-element></div></div><div id=segment-parent-template class="segment segment-parent"><div class=child-container></div></div><div id=segment-row-template class="segment segment-row"><div class=child-container></div></div><div id=segment-triangle-template class="segment segment-triangle"><div class=child-container></div></div><div class=max-height><div class="text-right max-width"><button class="button right show-while-playing" id=help-button data-translation=help></button></div><div class="height-20 show-when-won center flex-center fill-me"><div class="grow max-width"><b data-translation=won id=won-text></b></div><div id=coin-container><div id=coin-template class=coin style="opacity: 0"><img src=img/coin.png></div></div></div><div class="flex-center level-container"><div id=level></div></div><div class="show-when-won flex-center height-20"><button class="button max-width" id=continue-button data-translation=continue></button></div></div></div>
<div class="max-height overflow-hidden"><div id=segment-leaf-template class="segment segment-leaf"><div class=leaf-element></div></div><div id=segment-parent-template class="segment segment-parent"><div class=child-container></div></div><div id=segment-row-template class="segment segment-row"><div class=child-container></div></div><div id=segment-triangle-template class="segment segment-triangle"><div class=child-container></div></div><div class="max-height fill-me"><div class="text-right max-width"><button class="button show-while-playing" id=help-button data-translation=help></button></div><div class="height-20 show-when-won center flex-center fill-me"><div class="grow max-width"><b data-translation=won id=won-text></b></div><div id=coin-container><div id=coin-template class=coin style="opacity: 0"><img src=img/coin.png></div></div></div><div class="flex-center level-container grow"><div id=level></div></div><div class="show-when-won flex-center height-20"><button class="button max-width" id=continue-button data-translation=continue></button></div></div></div>

7
public/js/app.js
View File

@ -5738,7 +5738,7 @@ class LevelSite extends WordRotatorBaseSite {
const db = WordRotatorDb.getInstance();
const nextLevelJson = await db.loadNextLevel([20, 40, 60, 100, 120, 140, 160]);
// const nextLevelJson = await db.loadNextLevel([120]);
if (nextLevelJson === null) {
this.startSite(EndSite);
return;
@ -5816,8 +5816,7 @@ class LevelSite extends WordRotatorBaseSite {
audio.addEventListener('loadeddata', r);
})
]);
console.log(Helper.basePath("/sound/single_coin_fall_on_concrete_.mp3"));
audio.src = Helper.basePath("/sound/single_coin_fall_on_concrete_.mp3");
audio.src = Helper.basePath("sound/single_coin_fall_on_concrete_.mp3");
for (let i = 0; i < coinsPerLevel; i++) {
let coinElem = Helper.cloneNode(this.coinTemplate);
@ -5915,6 +5914,8 @@ class SynchronizeSite extends WordRotatorBaseSite {
"dateLastSync": dateLastSync
}));
if (!res["success"]) {
FlashMessenger.addMessage("sync-error", null, 6000);
newLastSync = null;
break;
}
res = res["result"];

2
public/js/lang/de.json
View File

File diff suppressed because one or more lines are too long

4
src/module/Application/pwa/html/application/end.html
View File

@ -1,3 +1,3 @@
<div>
<div data-translation="game-ended"></div>
<div class = 'max-height flex-center'>
<div data-translation="game-ended" class = 'center'></div>
</div>

7
src/module/Application/pwa/html/application/level.html
View File

@ -13,9 +13,10 @@
<div class='child-container'></div>
</div>
<!-- Site Content -->
<div class='max-height'>
<div class='max-height fill-me'>
<!--<div class = 'max-width'>-->
<div class="text-right max-width">
<button class="button right show-while-playing" id='help-button' data-translation="help"></button>
<button class="button show-while-playing" id='help-button' data-translation="help"></button>
</div>
<div class='height-20 show-when-won center flex-center fill-me'>
<div class = 'grow max-width'>
@ -27,7 +28,7 @@
</div>
</div>
</div>
<div class="flex-center level-container">
<div class="flex-center level-container grow">
<div id='level'>
</div>
</div>

3
src/module/Application/pwa/js/site/LevelSite.js
View File

@ -136,7 +136,7 @@ export class LevelSite extends WordRotatorBaseSite {
const db = WordRotatorDb.getInstance();
const nextLevelJson = await db.loadNextLevel([20, 40, 60, 100, 120, 140, 160]);
// const nextLevelJson = await db.loadNextLevel([120]);
if (nextLevelJson === null) {
this.startSite(EndSite);
return;
@ -214,7 +214,6 @@ export class LevelSite extends WordRotatorBaseSite {
audio.addEventListener('loadeddata', r);
})
]);
console.log(Helper.basePath("sound/single_coin_fall_on_concrete_.mp3"));
audio.src = Helper.basePath("sound/single_coin_fall_on_concrete_.mp3");
for (let i = 0; i < coinsPerLevel; i++) {

4
src/module/Application/pwa/js/site/SynchronizeSite.js
View File

@ -1,4 +1,4 @@
import {Helper} from "../../../../../js/lib/pwa-lib";
import {FlashMessenger, Helper} from "../../../../../js/lib/pwa-lib";
import {DataManager} from "../../../../../js/lib/pwa-core";
import {WordRotatorDb} from "../WordRotatorDb";
import {LevelSite} from "./LevelSite";
@ -34,6 +34,8 @@ export class SynchronizeSite extends WordRotatorBaseSite {
"dateLastSync": dateLastSync
}));
if (!res["success"]) {
FlashMessenger.addMessage("sync-error", null, 6000);
newLastSync = null;
break;
}
res = res["result"];

5
src/module/Application/pwa/translations/de.json
View File

@ -3,5 +3,8 @@
"continue":"Weiter",
"help": "?",
"not-enough-coins":"Du hast zu wenig Münzen!"
"not-enough-coins":"Du hast zu wenig Münzen!",
"sync-error":"Es gab einen Fehler beim Aktualisieren der Level. Bitte stelle sicher, dass du eine aktive Internetverbindung hast und versuche es später erneut.",
"game-ended":"<b>Oh nein!</b> <br/>Es sieht so aus, als ob du schon alle Level gespielt hast... <br/>Schau später noch einmal rein, evtl gibt es dann neue Level."
}

1
src/module/Application/src/Controller/SyncController.php
View File

@ -104,6 +104,7 @@ class SyncController extends JsonController
public function getLevelsAction()
{
// fdhsdh
$request = $this->getRequest();
$currentRun = (int)$request->getQuery("currentRun", null);

7
src/scss/wordRotator.scss
View File

@ -264,13 +264,13 @@ $animationDuration: 0.25s;
}
.level-container {
height: 100%;
//flex: 1;
transition: none;
}
.won {
.level-container {
height: 60%;
//height: 60%;
}
.show-when-won {
//visibility: initial;
@ -283,3 +283,6 @@ $animationDuration: 0.25s;
.text-right {
text-align: right;
}
#continue-button{
margin-bottom: 2px;
}