diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html index e5eae5c..2972441 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html @@ -124,6 +124,14 @@
US
FR
+ +
+

Against bot

+ +
@@ -194,9 +202,9 @@

Tournament code

+ -
diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js index db24a49..c9aa939 100644 --- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js +++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js @@ -6,7 +6,7 @@ /* By: edbernar usernameP.innerHTML = userMeInfo.username); @@ -92,6 +95,7 @@ class LobbyPage startButton.addEventListener('click', startMode); methButton.addEventListener('click', goBackHome); document.getElementsByClassName('menuSelected')[gameMode].style.display = 'flex'; + checkBoxBot.addEventListener('click', () => withBot = !withBot); } static dispose() @@ -188,12 +192,13 @@ function startMatchmaking(ranked) function startTournmament() { const code = document.getElementById('tournamentCode').value; - const nbBot = document.getElementById('nbBot').value; + let nbBot = document.getElementById('nbBot').value; if (code != '') sendRequest("tournament", {action: 0, code: code}); - else if (nbBot != '') + else { + nbBot = nbBot == '' ? 0 : nbBot; if (parseInt(nbBot) >= 0 && parseInt(nbBot) <= 7) sendRequest("tournament", {action: 0, code: '', nbBot: parseInt(nbBot)}); else @@ -435,4 +440,4 @@ function changeDisplayedLayout(isUS) } } -export { LobbyPage, layoutSelected }; +export { LobbyPage, layoutSelected, withBot }; diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js index 830eec5..c8ac837 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js @@ -6,7 +6,7 @@ /* By: edbernar = this.limits.up) { clearInterval(this.interval); + this.object.position.y = this.limits.up; + this.camera.position.y = 2.34; this.interval = null; } }, 5); @@ -356,6 +358,7 @@ class Player clearInterval(this.interval); this.interval = null; this.object.position.y = this.limits.down; + this.camera.position.y = 1; } }, 5); } diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js index cff9b67..a8d5dc2 100644 --- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js +++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js @@ -6,7 +6,7 @@ /* By: edbernar { launchSocket(); - }, 500); + }, 5000); } }; } diff --git a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css index 9ad8a3d..1a4d8b6 100644 --- a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css +++ b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css @@ -64,7 +64,6 @@ body { .main{ padding-block: 45px; - padding-inline: 150px; display: flex; flex-direction: row; gap: 9vw; @@ -410,6 +409,12 @@ body { min-width: 200px; } +#nbBot { + margin-top: 15px; + width: 94%; + font-size: 0.8rem; +} + .search-input:focus { border-color: white; } @@ -543,6 +548,65 @@ body { font-size: 0.8rem; } +.switch { + position: relative; + display: inline-block; + width: 60px; + height: 34px; +} + +.switch input { + opacity: 0; + width: 0; + height: 0; +} + +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + -webkit-transition: .4s; + transition: .4s; +} + +.slider:before { + position: absolute; + content: ""; + height: 26px; + width: 26px; + left: 4px; + bottom: 4px; + background-color: white; + -webkit-transition: .4s; + transition: .4s; +} + +input:checked + .slider { + background-color: #21f356; +} + +input:focus + .slider { + box-shadow: 0 0 1px #21f356; +} + +input:checked + .slider:before { + -webkit-transform: translateX(26px); + -ms-transform: translateX(26px); + transform: translateX(26px); +} + +.slider.round { + border-radius: 34px; +} + +.slider.round:before { + border-radius: 50%; +} + @media (max-aspect-ratio: 1/1){ .main { flex-direction: column;