tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Game

Browse Source 
- remove video when user is on mobile
Site
    - add skin in tournament request
    - fix bug with goal/bar selector
This commit is contained in:
Kum1ta
2024-10-14 22:16:00 +02:00
parent 7c0d0eb9b7
commit 93da99d559
8 changed files with 82 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
View File

@ -3,14 +3,15 @@
# ::: :::::::: #
# TournamentGame.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: tomoron <marvin@42.fr> +#+ +:+ +#+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/12 22:49:00 by tomoron #+# #+# #
# Updated: 2024/10/14 20:29:06 by tomoron ### ########.fr #
# Updated: 2024/10/14 21:57:14 by edbernar ### ########.fr #
# #
# **************************************************************************** #
import asyncio
from .Game import Game
import asyncio
class TournamentGame:
def __init__(self, left, right):
@ -38,7 +39,8 @@ class TournamentGame:
"pfp": r.socket.pfp,
"username":r.socket.username,
"skin" : r.skin,
"goal": r.goal
"goal": r.goal,
"selfPfp": l.socket.pfp,
})
r.socket.sync_send("tournament", {
"action":4,
@ -46,7 +48,8 @@ class TournamentGame:
"pfp": l.socket.pfp,
"username": l.socket.username,
"skin" : l.skin,
"goal": l.goal
"goal": l.goal,
"selfPfp": r.socket.pfp,
})
async def loop(self):

4
docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/01 13:16:39 by edbernar #+# #+# #
# Updated: 2024/10/14 19:57:12 by tomoron ### ########.fr #
# Updated: 2024/10/14 21:41:33 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -51,6 +51,8 @@ from .tournamentActions.fetchAllData import fetchAllData
# 0 : start : start a tournament. if code == "", create a new tournament, else join the tournament with the code
# - code : code of the tournament
# - nbBot : number of bot in the tournament
# - skin : skin id of the player
# - goal : goal id of the player
#
# 1 : leave : leave the tournament
#