Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: 대진표에서 닷지 #450 #465

Merged
merged 4 commits into from
Mar 11, 2024
Merged

Feat: 대진표에서 닷지 #450 #465

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf0a6fb
feat: 대진표에서 p2 가 나갔을 때 #450
LWJ0513 Mar 11, 2024
0832322
fix: 접근 버그 수정
LWJ0513 Mar 11, 2024
d4896b8
fix: 코루틴 버그
LWJ0513 Mar 11, 2024
f2b94f4
feat: 대진표에서 p1 닷지 처리 #450
LWJ0513 Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 42 additions & 19 deletions backend/games/consumers/GameConsumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ async def _process_valid_user_connect(self):
await self._assignment_match()

if self.manager:
await self._waiting_join(self.game_group_name, "game")
if await self._waiting_join(self.game_group_name, "game"):
return
await self._send_match_table()
await self._print_start_log(self.game.mode)

Expand All @@ -108,14 +109,28 @@ async def _process_valid_user_connect(self):
async def _process_valid_user_disconnect(self):
await self._save_game_object_by_id()
if await self._is_finished(self.game.mode) is False:
match = self._get_my_match_PingPongGame_object(self.my_match)
match = await self._get_my_match_PingPongGame_object(self.my_match)
group_name = await self._get_my_match_group_name(self.my_match)
await self._dodge(self.my_match, match, self.player1, group_name)

async def _dodge(self, my_match, result: PingPongGame, player1: bool, match_group_name):
if player1:
self._save_match_data(my_match, result, False)
await self.channel_layer.group_discard(match_group_name, self.channel_name)
if result is None:
await self.channel_layer.group_send(
match_group_name,
{
'type': 'close.connection'
})
else:
if result.started_at is None:
await self.channel_layer.group_send(
match_group_name,
{
'type': 'close.connection'
})
else:
self._save_match_data(my_match, result, False)
await self.channel_layer.group_discard(match_group_name, self.channel_name)
else:
await self.channel_layer.group_send(
match_group_name,
Expand All @@ -135,14 +150,22 @@ def _is_finished(self, mode):
async def _waiting_join(self, group_name, _type):
start_time = time.time()
while True:
if time.time() - start_time >= 30:
raise TimeoutError()
if time.time() - start_time >= 10:
await self.channel_layer.group_send(
self.game_group_name,
{
'type': 'close.connection'
}
)
await self._save_game_status(4)
return True
num = self.channel_layer.groups[group_name].__len__()
if _type == "game" and ((self.game.mode == 0 and num == 2) or (self.game.mode != 0 and num == 4)):
break
elif _type == "match" and num == 2:
break
await asyncio.sleep(0.3)
return False

@database_sync_to_async
def _validate_user(self, user):
Expand Down Expand Up @@ -221,7 +244,8 @@ async def _process_game_start(self, message_data):
if self.player1:
if self.my_match == 1:
await self._init_game(message_data, self.my_match)
await self._waiting_join(self.match1_group_name, 'match')
if await self._waiting_join(self.match1_group_name, 'match'):
return
await self._send_start_message(self.match1, self.match1_group_name)
await asyncio.sleep(2)
self.match1.started_at = datetime.now()
Expand All @@ -242,7 +266,8 @@ async def _process_game_start(self, message_data):
await self._send_end_message(self.game.match1)
elif self.my_match == 2:
await self._init_game(message_data, self.my_match)
await self._waiting_join(self.match2_group_name, 'match')
if await self._waiting_join(self.match2_group_name, 'match'):
return
await self._send_start_message(self.match2, self.match2_group_name)
await asyncio.sleep(2)
self.match2.started_at = datetime.now()
Expand All @@ -262,14 +287,8 @@ async def _process_match3_game_start(self, message_data):
self.is_final = True
if self.player1:
await self._init_game(message_data, self.my_match)
start_time = time.time()
while True:
if time.time() - start_time >= 30:
raise TimeoutError()
num = self.channel_layer.groups[self.match3_group_name].__len__()
if num == 2:
break
await asyncio.sleep(0.3)
if await self._waiting_join(self.match3_group_name, 'match'):
return
await self._send_start_message(self.match3, self.match3_group_name)
await asyncio.sleep(2)
self.match3.started_at = datetime.now()
Expand Down Expand Up @@ -443,6 +462,10 @@ async def _send_in_game_message(self, match, group_name):
# 'data': data
# })

async def close_connection(self, event):
await self.send(text_data=json.dumps(event))
await self.close()

async def game_info(self, event):
try:
await self.send(text_data=json.dumps(event))
Expand Down Expand Up @@ -480,15 +503,15 @@ async def down(self, event):

async def player2_disconnect(self, event):
if self.player1:
# todo 겜 객체 만들어지기 전에 나갔을 때 예외처리 self.match1.finished 를 못 불러옴
match_attributes = {
1: self.match1,
2: self.match2,
3: self.match3
}
match = match_attributes.get(self.my_match)
await self._save_winner(self.my_match)
match.finished = True
if match is not None:
await self._save_winner(self.my_match)
match.finished = True

async def _get_my_match_PingPongGame_object(self, my_match):
match = None
Expand Down
Loading