1

src/services/miniGameDraftGenerationProgress.ts

@@ -1,12 +1,12 @@
 import type { BigFishSessionSnapshotResponse } from '../../packages/shared/src/contracts/bigFish';
-import type {
-  CreatePuzzleAgentSessionRequest,
-  PuzzleAgentSessionSnapshot,
-} from '../../packages/shared/src/contracts/puzzleAgentSession';
 import type {
   CreateMatch3DSessionRequest,
   Match3DAgentSessionSnapshot,
 } from '../../packages/shared/src/contracts/match3dAgent';
+import type {
+  CreatePuzzleAgentSessionRequest,
+  PuzzleAgentSessionSnapshot,
+} from '../../packages/shared/src/contracts/puzzleAgentSession';
 import type {
   CustomWorldGenerationProgress,
   CustomWorldGenerationStep,
@@ -180,6 +180,17 @@ const MATCH3D_STEPS = [
   },
 ] as const satisfies ReadonlyArray<MiniGameStepDefinition>;
 
+const MATCH3D_PHASE_ORDER: Partial<
+  Record<MiniGameDraftGenerationPhase, number>
+> = {
+  'match3d-work-title': 0,
+  'match3d-item-names': 1,
+  'match3d-material-sheet': 2,
+  'match3d-slice-images': 3,
+  'match3d-upload-images': 4,
+  'match3d-generate-models': 5,
+};
+
 function clampProgress(value: number) {
   return Math.max(0, Math.min(100, Math.round(value)));
 }
@@ -283,23 +294,23 @@ function resolveSquareHolePhaseByElapsedMs(
 
 function resolveMatch3DPhaseByElapsedMs(
   elapsedMs: number,
+  currentPhase: MiniGameDraftGenerationPhase,
 ): MiniGameDraftGenerationPhase {
-  if (elapsedMs >= 92_000) {
-    return 'match3d-generate-models';
-  }
-  if (elapsedMs >= 72_000) {
-    return 'match3d-upload-images';
-  }
-  if (elapsedMs >= 58_000) {
-    return 'match3d-slice-images';
-  }
-  if (elapsedMs >= 16_000) {
-    return 'match3d-material-sheet';
-  }
-  if (elapsedMs >= 4_000) {
-    return 'match3d-item-names';
-  }
-  return 'match3d-work-title';
+  const elapsedPhase =
+    elapsedMs >= 92_000
+      ? 'match3d-generate-models'
+      : elapsedMs >= 72_000
+        ? 'match3d-upload-images'
+        : elapsedMs >= 58_000
+          ? 'match3d-slice-images'
+          : elapsedMs >= 16_000
+            ? 'match3d-material-sheet'
+            : elapsedMs >= 4_000
+              ? 'match3d-item-names'
+              : 'match3d-work-title';
+  const elapsedOrder = MATCH3D_PHASE_ORDER[elapsedPhase] ?? 0;
+  const currentOrder = MATCH3D_PHASE_ORDER[currentPhase] ?? -1;
+  return currentOrder > elapsedOrder ? currentPhase : elapsedPhase;
 }
 
 function resolvePuzzleTimelineByElapsedMs(elapsedMs: number) {
@@ -367,7 +378,7 @@ export function buildMiniGameDraftGenerationProgress(
             state.phase !== 'ready'
           ? {
               ...state,
-              phase: resolveMatch3DPhaseByElapsedMs(elapsedMs),
+              phase: resolveMatch3DPhaseByElapsedMs(elapsedMs, state.phase),
             }
         : state;