fix(game): store wave/pos at issue time (fix off-by-one)
This commit is contained in:
+19
-7
@@ -127,14 +127,24 @@ async def get_level(request: Request, level_number: int):
|
|||||||
telegram_id, level["id"],
|
telegram_id, level["id"],
|
||||||
)
|
)
|
||||||
|
|
||||||
# 🆕 (10.10.2026): волна и позиция в волне для этого юзера.
|
# 🔧 ФИКС (10.10.2026): wave_off_by_one —
|
||||||
# Источник — user_game_progress.global_level_number (тот же,
|
# wave/pos хранятся в момент выдачи. Если NULL — fallback.
|
||||||
# что использует /game/next). Если строки нет — считаем 1.
|
wave_pos = await conn.fetchrow(
|
||||||
|
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1",
|
||||||
|
telegram_id,
|
||||||
|
)
|
||||||
|
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(
|
global_level = await conn.fetchval(
|
||||||
"SELECT global_level_number FROM user_game_progress WHERE user_id = $1",
|
"SELECT global_level_number FROM user_game_progress WHERE user_id = $1",
|
||||||
telegram_id,
|
telegram_id,
|
||||||
)
|
)
|
||||||
global_level = int(global_level or 1)
|
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 перевода.
|
# 🔧 ОБНОВЛЕНО (09.10.2026): отдаём ВСЕ 4 перевода.
|
||||||
# Flutter сам выбирает, какой показать по context.lang.
|
# Flutter сам выбирает, какой показать по context.lang.
|
||||||
@@ -176,10 +186,9 @@ async def get_level(request: Request, level_number: int):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
# 🆕 (10.10.2026): волна и позиция в волне (как в /game/next).
|
# 🔧 ФИКС (10.10.2026): wave/pos из зафиксированных значений.
|
||||||
from services.waves import wave_for_level, level_in_wave
|
wave = current_wave
|
||||||
wave = wave_for_level(global_level)
|
pos_in_wave = current_pos
|
||||||
pos_in_wave = level_in_wave(global_level)
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"level": {
|
"level": {
|
||||||
@@ -707,10 +716,13 @@ async def get_next_level(request: Request):
|
|||||||
session_number = $3,
|
session_number = $3,
|
||||||
session_level_number = $4,
|
session_level_number = $4,
|
||||||
current_level_id = $5,
|
current_level_id = $5,
|
||||||
|
current_wave = $6,
|
||||||
|
current_position_in_wave = $7,
|
||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
WHERE user_id = $1
|
WHERE user_id = $1
|
||||||
""",
|
""",
|
||||||
telegram_id, next_global, next_session, next_session_level, level_id,
|
telegram_id, next_global, next_session, next_session_level, level_id,
|
||||||
|
wave, pos_in_wave,
|
||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user