diff --git a/site/v1/img/sym/nand.png b/site/v1/img/sym/nand.png index 89153d9..5808543 100644 Binary files a/site/v1/img/sym/nand.png and b/site/v1/img/sym/nand.png differ diff --git a/site/v1/img/sym/nor.png b/site/v1/img/sym/nor.png index 8c969d6..b996197 100644 Binary files a/site/v1/img/sym/nor.png and b/site/v1/img/sym/nor.png differ diff --git a/site/v1/index.html b/site/v1/index.html index 7c6d062..7611811 100644 --- a/site/v1/index.html +++ b/site/v1/index.html @@ -461,7 +461,7 @@ -
@@ -730,7 +726,6 @@ diff --git a/site/v1/js/func.js b/site/v1/js/func.js index 3850f89..dbdb6b7 100644 --- a/site/v1/js/func.js +++ b/site/v1/js/func.js @@ -664,6 +664,7 @@ function checkEnd(mode) { } function success(mode) { + document.querySelector("#play_menu_game").style.display = "none"; modeG = mode; timeTot = timeTot + timer.getTimeValues().seconds; timer.stop(); @@ -767,22 +768,47 @@ function resize() { function activeSwitchInput(event) { changeAllSwitchColorActive(event.target.value); + localStorage.setItem("colorLineInnactive", colorLineInnactive); + localStorage.setItem("colorLineActive", colorLineActive); + localStorage.setItem("colorEnd", colorEnd); + localStorage.setItem("colorSwitchInnactiveBackground", colorSwitchInnactiveBackground); + localStorage.setItem("colorSwitchActiveBackground", colorSwitchActiveBackground); } function inactiveSwitchInput(event) { changeAllSwitchColorInActive(event.target.value); + localStorage.setItem("colorLineInnactive", colorLineInnactive); + localStorage.setItem("colorLineActive", colorLineActive); + localStorage.setItem("colorEnd", colorEnd); + localStorage.setItem("colorSwitchInnactiveBackground", colorSwitchInnactiveBackground); + localStorage.setItem("colorSwitchActiveBackground", colorSwitchActiveBackground); } function activeLineInput(event) { changeAllLineColorActive(event.target.value); + localStorage.setItem("colorLineInnactive", colorLineInnactive); + localStorage.setItem("colorLineActive", colorLineActive); + localStorage.setItem("colorEnd", colorEnd); + localStorage.setItem("colorSwitchInnactiveBackground", colorSwitchInnactiveBackground); + localStorage.setItem("colorSwitchActiveBackground", colorSwitchActiveBackground); } function inactiveLineInput(event) { changeAllLineColorInActive(event.target.value); + localStorage.setItem("colorLineInnactive", colorLineInnactive); + localStorage.setItem("colorLineActive", colorLineActive); + localStorage.setItem("colorEnd", colorEnd); + localStorage.setItem("colorSwitchInnactiveBackground", colorSwitchInnactiveBackground); + localStorage.setItem("colorSwitchActiveBackground", colorSwitchActiveBackground); } function inactiveEndInput(event) { changeEndColorInActive(event.target.value); + localStorage.setItem("colorLineInnactive", colorLineInnactive); + localStorage.setItem("colorLineActive", colorLineActive); + localStorage.setItem("colorEnd", colorEnd); + localStorage.setItem("colorSwitchInnactiveBackground", colorSwitchInnactiveBackground); + localStorage.setItem("colorSwitchActiveBackground", colorSwitchActiveBackground); } document.querySelector("#active_switch_picker").addEventListener("input", activeSwitchInput, false); @@ -1218,7 +1244,7 @@ function launchGameOne(mode) { } function launchFacileGameOne(mode) { - document.querySelector(".niveau").innerHTML = niveauActuel + " / 25"; + document.querySelector(".niveau").innerHTML = niveauActuel + " / 15"; document.querySelector("#win_pannel").style.display = "none"; timer.stop(); timer.reset(); @@ -1263,21 +1289,11 @@ function launchFacileGameOne(mode) { case 12: case 13: case 14: - case 15: - case 16: - case 17: - case 18: - case 19: - case 20: - case 21: - case 22: - case 23: - case 24: col = [5, 4, 3]; matchs = [[1, 3], [2, 2]]; porteLogique = [[true, "et"], [true, "ou"], [true, "inv"]]; break; - case 25: + case 15: col = [5, 4, 3]; matchs = [[1, 3], [2, 2]]; porteLogique = [[true, "et"], [true, "ou"], [true, "inv"]]; @@ -1320,7 +1336,7 @@ function launchFacileGameOne(mode) { } function launchMoyenGameOne(mode) { - document.querySelector(".niveau").innerHTML = niveauActuel + " / 25"; + document.querySelector(".niveau").innerHTML = niveauActuel + " / 15"; document.querySelector("#win_pannel").style.display = "none"; timer.stop(); timer.reset(); @@ -1360,17 +1376,11 @@ function launchMoyenGameOne(mode) { case 12: case 13: case 14: + col = [7, 6, 5]; + matchs = [[1, 3], [1, 2], [2, 2]]; + porteLogique = [[true, "et"], [true, "ou"], [true, "inv"], [true, "etnon"], [true, "nonou"]]; + break; case 15: - case 16: - case 17: - case 18: - case 19: - case 20: - case 21: - case 22: - case 23: - case 24: - case 25: isFinish = true; col = [7, 6, 5]; matchs = [[1, 3], [1, 2], [2, 2]]; @@ -1411,7 +1421,7 @@ function launchMoyenGameOne(mode) { } function launchImpossibleGameOne(mode) { - document.querySelector(".niveau").innerHTML = niveauActuel + " / 25"; + document.querySelector(".niveau").innerHTML = niveauActuel + " / 15"; document.querySelector("#win_pannel").style.display = "none"; timer.stop(); timer.reset(); @@ -1461,11 +1471,16 @@ function launchImpossibleGameOne(mode) { case 22: case 23: case 24: + col = [7, 6, 5]; + matchs = [[1, 3], [1, 2], [2, 2]]; + porteLogique = [[true, "et"], [true, "ou"], [true, "inv"], [true, "etnon"], [true, "nonou"]]; + break; case 25: - isFinish = true; col = [7, 6, 5]; matchs = [[1, 3], [1, 2], [2, 2]]; porteLogique = [[true, "et"], [true, "ou"], [true, "inv"], [true, "etnon"], [true, "nonou"]]; + + isFinish = true; break; } for (let i = 0; i < 200; i++) { diff --git a/site/v1/js/generateGame.js b/site/v1/js/generateGame.js index eac6e6d..a45dbd0 100644 --- a/site/v1/js/generateGame.js +++ b/site/v1/js/generateGame.js @@ -1066,11 +1066,11 @@ function generator(matchs, col, listePorteLogique, mode, time) { } }); checkAllSortieLogique(); + document.querySelector("#play_menu_game").style.display = "block"; } return regen; - } @@ -1353,6 +1353,7 @@ function setLineTrue(line) { } } + document.querySelector("#play_menu_game").style.display = "block"; checkAllSortieLogique(); //setLineTrue(getLogiqueFromLine(line).id1); diff --git a/site/v1/js/main.js b/site/v1/js/main.js index f7d8ed8..253fb10 100644 --- a/site/v1/js/main.js +++ b/site/v1/js/main.js @@ -2,18 +2,34 @@ function initAll() { loadData(); darkMode(); setLang("fr"); + tutoCreateLayer(); dysFont(); - } function loadData() { pseudo = localStorage.getItem("pseudo"); + colorLineInnactive = localStorage.getItem("colorLineInnactive"); if (pseudo === null || pseudo === undefined) { pseudo = generateName(); + } + if (colorLineInnactive === null || colorLineInnactive === undefined) { localStorage.setItem("pseudo", pseudo); - + localStorage.setItem("colorLineInnactive", "black"); + localStorage.setItem("colorLineActive", "#2ec22e"); + localStorage.setItem("colorEnd", "#fe8a71"); + localStorage.setItem("colorSwitchInnactiveBackground", "#fe8a71"); + localStorage.setItem("colorSwitchActiveBackground", "#2ec22e"); } - console.log(pseudo) + colorLineInnactive = localStorage.getItem("colorLineInnactive"); + colorLineActive = localStorage.getItem("colorLineActive"); + colorEnd = localStorage.getItem("colorEnd"); + colorSwitchInnactiveBackground = localStorage.getItem("colorSwitchInnactiveBackground"); + colorSwitchActiveBackground = localStorage.getItem("colorSwitchActiveBackground"); + document.querySelector("#active_switch_picker").value = colorSwitchActiveBackground; + document.querySelector("#inactive_switch_picker").value = colorSwitchInnactiveBackground; + document.querySelector("#active_line_picker").value = colorLineActive; + document.querySelector("#inactive_line_picker").value = colorLineInnactive; + document.querySelector("#inactive_end_picker").value = colorEnd; insertName(pseudo); document.querySelector("#pseudo_show").innerHTML = pseudo; document.querySelector("#active_switch_picker").value = colorSwitchActiveBackground; @@ -38,7 +54,6 @@ var stage = new Konva.Stage({ height: height, }); var layer = new Konva.Layer(); -tutoCreateLayer(); function tutoCreateLayer() { endHeight = 50; @@ -73,13 +88,15 @@ width = (window.innerWidth - window.innerWidth / 100 * 10); height = window.innerHeight / 1.5; function resetAllTabs(save) { + logiques.forEach(function (logique) { + layer.findOne("#" + logique.name).destroy(); + }); if (!save) { timeEnd = 5; } logiques = []; clickTot = clickTot + click; - console.log(click + " : " + clickTot) click = 0; numberPerColonne = []; @@ -91,7 +108,6 @@ function resetAllTabs(save) { colonneTot = 0; switchs = [], lineCount = [], lines = [], endLines = [], end, switchsInfo = [], lineRemove = [], switchsInfoCopy = []; - layer.destroyChildren(); stage.draw(); } @@ -140,7 +156,8 @@ function initEndGame(mode) { function resetCache() { openModal("reset_cache"); - window.localStorage.removeItem('pseudo'); + window.localStorage.clear(); + setTimeout(() => { location.reload();