+
diff --git a/src/module/Application/pwa/js/site/LevelSite.js b/src/module/Application/pwa/js/site/LevelSite.js
index 7dfde9f..d4c4752 100755
--- a/src/module/Application/pwa/js/site/LevelSite.js
+++ b/src/module/Application/pwa/js/site/LevelSite.js
@@ -34,7 +34,7 @@ export class LevelSite extends WordRotatorBaseSite {
return super.onConstruct(args);
}
- onFirstStart() {
+ async onFirstStart() {
super.onFirstStart();
let leafSegmentTemplate = this.findBy("#segment-leaf-template");
@@ -61,14 +61,17 @@ export class LevelSite extends WordRotatorBaseSite {
let wonText = this.findBy("#won-text");
let scaleHelper = new ScaleHelper();
- this.continueButtonScaler = scaleHelper.scaleToFull(continueButton, continueButton.parentElement, false, true);
- this.wonTextScaler = scaleHelper.scaleToFull(wonText, wonText.parentElement);
+ this.continueButtonScaler = await scaleHelper.scaleToFull(continueButton, continueButton.parentElement, false, true);
+ this.wonTextScaler = await scaleHelper.scaleToFull(wonText, wonText.parentElement, false, false, 10, null, 5);
+ this.wonText = wonText;
+ this.wonText.style.fontSize = "0";
//Benutze Document, da Element außerhalb von Seite (eigentlich unschön!)
this.levelCounterActionContainer = document.getElementById("level-number-container");
this.levelCounterAction = document.getElementById("level-number");
this.levelCounterAction.innerText = this.levelCounter;
- this.levelNumberScaler = scaleHelper.scaleToFull(this.levelCounterAction, this.levelCounterActionContainer, false, false, 4);
+ this.levelNumberScaler = await scaleHelper.scaleToFull(this.levelCounterAction, this.levelCounterActionContainer, false, false, 4);
+ this.levelCounterActionContainer.classList.add("visible");
this.templateContainer = new TemplateContainer(leafSegmentTemplate, parentSegmentTemplate, rowSegmentTemplate, triangleTemplate);
this.coinTemplate = this.findBy("#coin-template");
@@ -114,7 +117,7 @@ export class LevelSite extends WordRotatorBaseSite {
let levelSegment = this.findBy("#level");
levelSegment.removeAllChildren().appendChild(level.getRootSegment().getElement());
let scaleHelper = new ScaleHelper();
- this.levelScaler = scaleHelper.scaleToFull(levelSegment, levelSegment.parentElement, false, false, 2, level.words[0].length * 2);
+ this.levelScaler = await scaleHelper.scaleToFull(levelSegment, levelSegment.parentElement, false, false, 2, level.words[0].length * 2, null, 0);
this.level = level;
return;
@@ -129,6 +132,7 @@ export class LevelSite extends WordRotatorBaseSite {
async nextLevel() {
try {
this._siteContent.classList.remove('won');
+ this.wonText.style.fontSize = "0";
const db = WordRotatorDb.getInstance();
const nextLevelJson = await db.loadNextLevel([20, 40, 60, 100, 120, 140, 160]);
@@ -151,7 +155,7 @@ export class LevelSite extends WordRotatorBaseSite {
let levelSegment = this.findBy("#level");
levelSegment.removeAllChildren().appendChild(level.getRootSegment().getElement());
let scaleHelper = new ScaleHelper();
- this.levelScaler = scaleHelper.scaleToFull(levelSegment, levelSegment.parentElement, false, false, 2, level.words[0].length * 2);
+ this.levelScaler = await scaleHelper.scaleToFull(levelSegment, levelSegment.parentElement, false, false, 2, level.words[0].length * 2, null, 0);
this.level = level;
this.levelCounterAction.innerText = this.levelCounter;
@@ -168,8 +172,11 @@ export class LevelSite extends WordRotatorBaseSite {
onStart(args) {
let res = super.onStart(args);
- this.levelCounterAction.innerText = this.levelCounter;
- this.levelCounterActionContainer.classList.add("visible");
+ if (this.levelCounterAction) {
+
+ this.levelCounterAction.innerText = this.levelCounter;
+ this.levelCounterActionContainer.classList.add("visible");
+ }
this.levelScaler();
return res;
}
@@ -190,17 +197,52 @@ export class LevelSite extends WordRotatorBaseSite {
this._siteContent.classList.add('won');
localStorage.removeItem("currentLevel");
+ let continueButton = this.findBy("#continue-button");
+ continueButton.style.transition = "none";
+ continueButton.style.opacity = 0;
+
this.coinContainer.removeAllChildren();
let coinsPerLevel = SystemSettings.get("coinsPerLevel", 5);
+ let coinsBefore = parseInt(Helper.nonNull(localStorage.getItem("coins"), "0"));
+ localStorage.setItem("coins", coinsBefore + parseInt(coinsPerLevel));
+
+ let audio = (new Audio(Helper.basePath("/sound/single_coin_fall_on_concrete_.mp3")));
+ let coinPromise = Promise.all([new Promise((r) => {
+ setTimeout(r, 500)
+ }),
+ new Promise(r => {
+ audio.addEventListener('loadeddata', r);
+ })
+ ]);
for (let i = 0; i < coinsPerLevel; i++) {
let coinElem = Helper.cloneNode(this.coinTemplate);
this.coinContainer.appendChild(coinElem);
+ coinPromise = coinPromise.then(() => {
+ return new Promise(r => {
+ let timeout = 350;
+ coinElem.fadeIn(timeout / 1000);
+ if (audio !== null) {
+ audio.pause();
+ audio.currentTime = 0;
+ audio.play();
+ }
+
+ setTimeout(() => {
+ this.coinAction.setTitle(coinsBefore++);
+ this.coinAction.redraw();
+ }, timeout / 2);
+ setTimeout(r, timeout);
+ })
+ });
}
- localStorage.setItem("coins", parseInt(Helper.nonNull(localStorage.getItem("coins"), "0")) + parseInt(coinsPerLevel));
this.wonTextScaler();
this.continueButtonScaler();
+ this.levelScaler();
+ coinPromise.then(() => {
+ continueButton.fadeIn();
+ });
await savePromise;
}
catch (e) {
@@ -219,8 +261,11 @@ export class LevelSite extends WordRotatorBaseSite {
this.coinAction.redraw();
let rotatables = this.level.getRotatableSegments();
+ rotatables = rotatables.filter((segment) => {
+ return (segment.rotation !== 0);
+ });
+
let index = Math.floor(Math.random() * rotatables.length);
- console.log(rotatables, index);
let segmentToHelp = rotatables[index];
while (segmentToHelp.rotation !== 0) {
@@ -229,7 +274,7 @@ export class LevelSite extends WordRotatorBaseSite {
segmentToHelp.setIsRotatable(false);
this.level.saveAsCurrentLevel();
}
- else{
+ else {
FlashMessenger.addMessage("not-enough-coins");
}
}
diff --git a/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js b/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js
index df06670..399eede 100755
--- a/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js
+++ b/src/module/Application/pwa/js/wordrotator/Segment/ParentSegment.js
@@ -100,7 +100,6 @@ export class ParentSegment extends Segment {
}
applyLocks(locks) {
- console.log(locks);
this.rotatable = locks[0];
locks.splice(0, 1);
for (let i = 0, n = this.children.length; i < n; i++) {
diff --git a/src/scss/_editStory.scss b/src/scss/_editStory.scss
deleted file mode 100755
index 4527812..0000000
--- a/src/scss/_editStory.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-#author-list {
- .author-entry {
- border-bottom: 1px solid $borderColor;
- .author-image-container {
- .author-image {
- position: relative;
- }
- }
- .user-flag{
- display: none;
- }
-
- &.isUser{
- .user-flag{
- display: inherit;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/scss/wordRotator.scss b/src/scss/wordRotator.scss
index 54e6e79..9e28e95 100755
--- a/src/scss/wordRotator.scss
+++ b/src/scss/wordRotator.scss
@@ -61,10 +61,15 @@ $coinTowerDimension: 28px;
}
}
-#coin-container .coin {
- margin: 3px;
- max-width: 30px;
- display: inline-block;
+#coin-container {
+ height: 30px;
+ .coin {
+ margin-left: 3px;
+ margin-right: 3px;
+ //height: 30px;
+ max-width:30px;
+ display: inline-block;
+ }
}
//Segments
@@ -247,18 +252,28 @@ $animationDuration: 0.25s;
}
//Won-screen
-.show-when-won {
- //visibility: hidden;
- display: none;
- transition: none;
- * {
- transition: none;
+#site-content > :not(.won) {
+ .show-when-won {
+ //visibility: hidden;
+ display: none;
+ //transition: none;
+ //* {
+ // transition: none;
+ //}
}
}
+.level-container {
+ height: 100%;
+ transition: none;
+}
+
.won {
+ .level-container {
+ height: 60%;
+ }
.show-when-won {
- display: flex;
+ //visibility: initial;
}
.show-while-playing {
display: none;
@@ -268,4 +283,3 @@ $animationDuration: 0.25s;
.text-right {
text-align: right;
}
-
