From afb5742e65a64f9d735f1a5ad2e3a3a008cd1514 Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Sat, 28 Sep 2024 03:15:41 +0200 Subject: [PATCH] Site - skin working - fix bug three js lobby page - add notification for join a invitation Game - fix bug fade --- .../djangoserver/file/server/server/Game.py | 4 +- .../nginx/static/javascript/Page.js | 7 ++- .../nginx/static/javascript/lobbyPage/3d.js | 52 ++++++++-------- .../nginx/static/javascript/lobbyPage/main.js | 10 +-- .../static/javascript/multiLocalGame/Map.js | 2 +- .../static/javascript/multiOnlineGame/Map.js | 14 +---- .../javascript/multiOnlineGame/Player.js | 61 ++++++++----------- .../multiOnlineGame/multiOnlineGamePage.js | 21 ++++--- .../static/javascript/notification/main.js | 7 +-- .../javascript/typeResponse/typeGame.js | 8 ++- .../javascript/typeResponse/typeInvitation.js | 23 +++++++ .../static/javascript/waitingGame/main.js | 8 +-- .../nginx/static/javascript/websocket.js | 7 ++- 13 files changed, 116 insertions(+), 108 deletions(-) create mode 100644 docker-compose/requirements/nginx/static/javascript/typeResponse/typeInvitation.js diff --git a/docker-compose/requirements/djangoserver/file/server/server/Game.py b/docker-compose/requirements/djangoserver/file/server/server/Game.py index 3d7b159..a5dbc4e 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Game.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Game.py @@ -6,7 +6,7 @@ # By: edbernar { - document.getElementsByTagName('canvas')[canvasIndex].style.animation = 'fadeOutGames 0.99s'; - document.getElementsByTagName('canvas')[canvasIndex].style.filter = 'brightness(1)'; - }, 200); - setTimeout(() => { if (name == "player") score.player++; diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js index c6e65ca..86074f5 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 { document.getElementsByTagName('canvas')[canvasIndex].style.animation = null; - document.getElementsByTagName('canvas')[canvasIndex].style.animation = 'fadeOut 0.199s'; + document.getElementsByTagName('canvas')[canvasIndex].style.animation = 'fadeOutGames 0.199s'; document.getElementsByTagName('canvas')[canvasIndex].style.filter = 'brightness(1)'; }, 300) @@ -212,7 +212,7 @@ class Player let hue = 0; document.getElementsByTagName('canvas')[canvasIndex].style.animation = null; - document.getElementsByTagName('canvas')[canvasIndex].style.animation = 'fadeIn 0.199s'; + document.getElementsByTagName('canvas')[canvasIndex].style.animation = 'fadeInGames 0.199s'; document.getElementsByTagName('canvas')[canvasIndex].style.filter = 'brightness(0)'; setTimeout(() => { @@ -220,7 +220,6 @@ class Player document.getElementsByTagName('canvas')[canvasIndex].style.animation = 'fadeOut 0.199s'; document.getElementsByTagName('canvas')[canvasIndex].style.filter = 'brightness(1)'; }, 300) - setTimeout(() => { tmpCamera.position.set(this.limits.left, this.limits.up / 2 + 0.5, map.centerPos.z); isOnPointAnim = true; @@ -390,9 +389,10 @@ function goFullscreen() function showGamePad() { - const gamePad = document.getElementsByClassName('gamePad')[0]; - const buttons = document.getElementsByClassName('buttonGamePad'); - const canvas = document.getElementById('canvasMultiGameOnline'); + const gamePad = document.getElementsByClassName('gamePad')[0]; + const canvas = document.getElementById('canvasMultiGameOnline'); + const keyList = ['padLeft', 'padRight', 'padTop', 'padBottom'] + const keyAction = ['a', 'd', 'w', 's'] canvas.addEventListener('touchstart', function(e) { e.preventDefault(); @@ -404,34 +404,25 @@ function showGamePad() goFullscreen(); }); gamePad.style.display = 'flex'; - for (let i = 0; i < buttons.length; i++) - { - buttons[i].addEventListener('touchstart', (event) => { - const key = event.target.getAttribute("id"); - - if (key == 'padLeft') - addKeyInArr({key: 'a'}); - else if (key == 'padRight') - addKeyInArr({key: 'd'}); - else if (key == 'padTop') - addKeyInArr({key: 'w'}); - else if (key == 'padBottom') - addKeyInArr({key: 's'}); + document.addEventListener('touchstart', (event) => { + const key = event.target.getAttribute("id"); + - }); - buttons[i].addEventListener('touchend', (event) => { - const key = event.target.getAttribute("id"); + for (let i = 0; i < keyList.length; i++) + { + if (keyList[i] == key) + addKeyInArr({key: keyAction[i]}) + } + }); + document.addEventListener('touchend', (event) => { + const key = event.target.getAttribute("id"); - if (key == 'padLeft') - remKeyInArr({key: 'a'}); - else if (key == 'padRight') - remKeyInArr({key: 'd'}); - else if (key == 'padTop') - remKeyInArr({key: 'w'}); - else if (key == 'padBottom') - remKeyInArr({key: 's'}); - }); - } + for (let i = 0; i < keyList.length; i++) + { + if (keyList[i] == key) + remKeyInArr({key: keyAction[i]}) + } + }); } -export { Player, playerExist, goalAnimation}; \ No newline at end of file +export { Player, playerExist, goalAnimation}; diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js index 4a1ef19..76bbc79 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js @@ -6,11 +6,12 @@ /* By: edbernar +#+ +:+ +#+ */ +/* By: edbernar { + pageRenderer.changePage('waitingGamePage', false, {username: "AAA", id: content.invitor}); + }, 'Join', 30000); +} + +export { typeInvitation } \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/javascript/waitingGame/main.js b/docker-compose/requirements/nginx/static/javascript/waitingGame/main.js index 0ed4bf5..608d33d 100644 --- a/docker-compose/requirements/nginx/static/javascript/waitingGame/main.js +++ b/docker-compose/requirements/nginx/static/javascript/waitingGame/main.js @@ -6,7 +6,7 @@ /* By: edbernar { - sentence.innerText = "Your opponent is " + username; + sentence.innerText = "Your opponent is " + content.username; sentence.style.animation = 'animShowMenuDiv 0.5s'; sentence.style.opacity = 1; setTimeout(() => { document.body.style.animation = 'anim3 0.5s'; document.body.style.opacity = 0; - pageRenderer.changePage("multiOnlineGamePage"); + pageRenderer.changePage("multiOnlineGamePage", false, {player: lastSelected.id, opponent: content.skin}); }, 1000); }, 500); document.body.removeChild(returnButton); diff --git a/docker-compose/requirements/nginx/static/javascript/websocket.js b/docker-compose/requirements/nginx/static/javascript/websocket.js index 2e6e473..b912665 100644 --- a/docker-compose/requirements/nginx/static/javascript/websocket.js +++ b/docker-compose/requirements/nginx/static/javascript/websocket.js @@ -6,7 +6,7 @@ /* By: edbernar