diff --git a/routers/game.py b/routers/game.py index e691976..ff12de6 100644 --- a/routers/game.py +++ b/routers/game.py @@ -127,14 +127,24 @@ async def get_level(request: Request, level_number: int): telegram_id, level["id"], ) - # 🆕 (10.10.2026): волна и позиция в волне для этого юзера. - # Источник — user_game_progress.global_level_number (тот же, - # что использует /game/next). Если строки нет — считаем 1. - global_level = await conn.fetchval( - "SELECT global_level_number FROM user_game_progress WHERE user_id = $1", + # 🔧 ФИКС (10.10.2026): wave_off_by_one — + # wave/pos хранятся в момент выдачи. Если NULL — fallback. + wave_pos = await conn.fetchrow( + "SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1", telegram_id, ) - global_level = int(global_level or 1) + if wave_pos and wave_pos["current_wave"] and wave_pos["current_position_in_wave"]: + current_wave = int(wave_pos["current_wave"]) + current_pos = int(wave_pos["current_position_in_wave"]) + else: + global_level = await conn.fetchval( + "SELECT global_level_number FROM user_game_progress WHERE user_id = $1", + telegram_id, + ) + global_level = int(global_level or 1) + from services.waves import wave_for_level, level_in_wave + current_wave = wave_for_level(global_level) + current_pos = level_in_wave(global_level) # 🔧 ОБНОВЛЕНО (09.10.2026): отдаём ВСЕ 4 перевода. # Flutter сам выбирает, какой показать по context.lang. @@ -176,10 +186,9 @@ async def get_level(request: Request, level_number: int): ) ) - # 🆕 (10.10.2026): волна и позиция в волне (как в /game/next). - from services.waves import wave_for_level, level_in_wave - wave = wave_for_level(global_level) - pos_in_wave = level_in_wave(global_level) + # 🔧 ФИКС (10.10.2026): wave/pos из зафиксированных значений. + wave = current_wave + pos_in_wave = current_pos return { "level": { @@ -707,10 +716,13 @@ async def get_next_level(request: Request): session_number = $3, session_level_number = $4, current_level_id = $5, + current_wave = $6, + current_position_in_wave = $7, updated_at = NOW() WHERE user_id = $1 """, telegram_id, next_global, next_session, next_session_level, level_id, + wave, pos_in_wave, ) return {