[Eva] Fix off-by-one в reuse-ветке /game/next #24
+8
-3
@@ -574,7 +574,7 @@ async def get_next_level(request: Request):
|
|||||||
row = await conn.fetchrow(
|
row = await conn.fetchrow(
|
||||||
"""
|
"""
|
||||||
SELECT global_level_number, session_number, session_level_number,
|
SELECT global_level_number, session_number, session_level_number,
|
||||||
current_level_id
|
current_level_id, current_wave, current_position_in_wave
|
||||||
FROM user_game_progress WHERE user_id = $1
|
FROM user_game_progress WHERE user_id = $1
|
||||||
""",
|
""",
|
||||||
telegram_id,
|
telegram_id,
|
||||||
@@ -623,12 +623,17 @@ async def get_next_level(request: Request):
|
|||||||
telegram_id, active["id"],
|
telegram_id, active["id"],
|
||||||
)
|
)
|
||||||
if not done:
|
if not done:
|
||||||
|
# 🔧 ФИКС (10.10.2026): off-by-one в reuse-ветке —
|
||||||
|
# global_level уже инкрементнут при первой выдаче,
|
||||||
|
# поэтому wave/pos считаем от зафиксированных значений
|
||||||
|
# current_wave / current_position_in_wave. Fallback —
|
||||||
|
# старый расчёт для записей без этих полей.
|
||||||
return {
|
return {
|
||||||
"level_id": active["id"],
|
"level_id": active["id"],
|
||||||
"level_number": active["level_number"],
|
"level_number": active["level_number"],
|
||||||
"grid_size": active["grid_size"],
|
"grid_size": active["grid_size"],
|
||||||
"wave": wave_for_level(global_level),
|
"wave": int(row["current_wave"]) if row["current_wave"] else wave_for_level(global_level),
|
||||||
"position_in_wave": level_in_wave(global_level),
|
"position_in_wave": int(row["current_position_in_wave"]) if row["current_position_in_wave"] else level_in_wave(global_level),
|
||||||
"session_number": session_number,
|
"session_number": session_number,
|
||||||
"session_level": session_level,
|
"session_level": session_level,
|
||||||
"global_level": global_level,
|
"global_level": global_level,
|
||||||
|
|||||||
Reference in New Issue
Block a user