still bugged version

server-rs/crates/module-puzzle-clear/src/application.rs

@@ -916,286 +916,41 @@ fn puzzle_clear_pattern_group_specs() -> Vec<PuzzleClearPatternGroupSpec> {
     use PuzzleClearShapeKind::{OneByThree, OneByTwo, TwoByThree, TwoByTwo};
 
     vec![
-        PuzzleClearPatternGroupSpec {
+        PuzzleClearPatternGroupSpec { group_id: "B02", shape: OneByThree, width: 1, height: 3, atlas_col: 0, atlas_row: 0 },
-            group_id: "D01",
+        PuzzleClearPatternGroupSpec { group_id: "B04", shape: OneByThree, width: 1, height: 3, atlas_col: 1, atlas_row: 0 },
-            shape: TwoByThree,
+        PuzzleClearPatternGroupSpec { group_id: "D01", shape: TwoByThree, width: 3, height: 2, atlas_col: 2, atlas_row: 0 },
-            width: 3,
+        PuzzleClearPatternGroupSpec { group_id: "D02", shape: TwoByThree, width: 3, height: 2, atlas_col: 5, atlas_row: 0 },
-            height: 2,
+        PuzzleClearPatternGroupSpec { group_id: "C01", shape: TwoByTwo, width: 2, height: 2, atlas_col: 8, atlas_row: 0 },
-            atlas_col: 0,
+        PuzzleClearPatternGroupSpec { group_id: "D03", shape: TwoByThree, width: 3, height: 2, atlas_col: 2, atlas_row: 2 },
-            atlas_row: 0,
+        PuzzleClearPatternGroupSpec { group_id: "C02", shape: TwoByTwo, width: 2, height: 2, atlas_col: 5, atlas_row: 2 },
-        },
+        PuzzleClearPatternGroupSpec { group_id: "C03", shape: TwoByTwo, width: 2, height: 2, atlas_col: 7, atlas_row: 2 },
-        PuzzleClearPatternGroupSpec {
+        PuzzleClearPatternGroupSpec { group_id: "A02", shape: OneByTwo, width: 1, height: 2, atlas_col: 9, atlas_row: 2 },
-            group_id: "D02",
+        PuzzleClearPatternGroupSpec { group_id: "C04", shape: TwoByTwo, width: 2, height: 2, atlas_col: 0, atlas_row: 3 },
-            shape: TwoByThree,
+        PuzzleClearPatternGroupSpec { group_id: "A04", shape: OneByTwo, width: 1, height: 2, atlas_col: 2, atlas_row: 4 },
-            width: 2,
+        PuzzleClearPatternGroupSpec { group_id: "A06", shape: OneByTwo, width: 1, height: 2, atlas_col: 3, atlas_row: 4 },
-            height: 3,
+        PuzzleClearPatternGroupSpec { group_id: "A08", shape: OneByTwo, width: 1, height: 2, atlas_col: 4, atlas_row: 4 },
-            atlas_col: 3,
+        PuzzleClearPatternGroupSpec { group_id: "A10", shape: OneByTwo, width: 1, height: 2, atlas_col: 5, atlas_row: 4 },
-            atlas_row: 0,
+        PuzzleClearPatternGroupSpec { group_id: "A12", shape: OneByTwo, width: 1, height: 2, atlas_col: 6, atlas_row: 4 },
-        },
+        PuzzleClearPatternGroupSpec { group_id: "A14", shape: OneByTwo, width: 1, height: 2, atlas_col: 7, atlas_row: 4 },
-        PuzzleClearPatternGroupSpec {
+        PuzzleClearPatternGroupSpec { group_id: "A16", shape: OneByTwo, width: 1, height: 2, atlas_col: 8, atlas_row: 4 },
-            group_id: "D03",
+        PuzzleClearPatternGroupSpec { group_id: "A18", shape: OneByTwo, width: 1, height: 2, atlas_col: 9, atlas_row: 4 },
-            shape: TwoByThree,
+        PuzzleClearPatternGroupSpec { group_id: "A20", shape: OneByTwo, width: 1, height: 2, atlas_col: 0, atlas_row: 5 },
-            width: 3,
+        PuzzleClearPatternGroupSpec { group_id: "A22", shape: OneByTwo, width: 1, height: 2, atlas_col: 1, atlas_row: 5 },
-            height: 2,
+        PuzzleClearPatternGroupSpec { group_id: "B01", shape: OneByThree, width: 3, height: 1, atlas_col: 2, atlas_row: 6 },
-            atlas_col: 5,
+        PuzzleClearPatternGroupSpec { group_id: "B03", shape: OneByThree, width: 3, height: 1, atlas_col: 5, atlas_row: 6 },
-            atlas_row: 0,
+        PuzzleClearPatternGroupSpec { group_id: "A01", shape: OneByTwo, width: 2, height: 1, atlas_col: 8, atlas_row: 6 },
-        },
+        PuzzleClearPatternGroupSpec { group_id: "B05", shape: OneByThree, width: 3, height: 1, atlas_col: 0, atlas_row: 7 },
-        PuzzleClearPatternGroupSpec {
+        PuzzleClearPatternGroupSpec { group_id: "A03", shape: OneByTwo, width: 2, height: 1, atlas_col: 3, atlas_row: 7 },
-            group_id: "C01",
+        PuzzleClearPatternGroupSpec { group_id: "A05", shape: OneByTwo, width: 2, height: 1, atlas_col: 5, atlas_row: 7 },
-            shape: TwoByTwo,
+        PuzzleClearPatternGroupSpec { group_id: "A07", shape: OneByTwo, width: 2, height: 1, atlas_col: 7, atlas_row: 7 },
-            width: 2,
+        PuzzleClearPatternGroupSpec { group_id: "A09", shape: OneByTwo, width: 2, height: 1, atlas_col: 0, atlas_row: 8 },
-            height: 2,
+        PuzzleClearPatternGroupSpec { group_id: "A11", shape: OneByTwo, width: 2, height: 1, atlas_col: 2, atlas_row: 8 },
-            atlas_col: 8,
+        PuzzleClearPatternGroupSpec { group_id: "A13", shape: OneByTwo, width: 2, height: 1, atlas_col: 4, atlas_row: 8 },
-            atlas_row: 0,
+        PuzzleClearPatternGroupSpec { group_id: "A15", shape: OneByTwo, width: 2, height: 1, atlas_col: 6, atlas_row: 8 },
-        },
+        PuzzleClearPatternGroupSpec { group_id: "A17", shape: OneByTwo, width: 2, height: 1, atlas_col: 8, atlas_row: 8 },
-        PuzzleClearPatternGroupSpec {
+        PuzzleClearPatternGroupSpec { group_id: "A19", shape: OneByTwo, width: 2, height: 1, atlas_col: 0, atlas_row: 9 },
-            group_id: "C02",
+        PuzzleClearPatternGroupSpec { group_id: "A21", shape: OneByTwo, width: 2, height: 1, atlas_col: 2, atlas_row: 9 },
-            shape: TwoByTwo,
+        PuzzleClearPatternGroupSpec { group_id: "A23", shape: OneByTwo, width: 2, height: 1, atlas_col: 4, atlas_row: 9 },
-            width: 2,
-            height: 2,
-            atlas_col: 0,
-            atlas_row: 2,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "B02",
-            shape: OneByThree,
-            width: 1,
-            height: 3,
-            atlas_col: 2,
-            atlas_row: 2,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "C03",
-            shape: TwoByTwo,
-            width: 2,
-            height: 2,
-            atlas_col: 5,
-            atlas_row: 2,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "C04",
-            shape: TwoByTwo,
-            width: 2,
-            height: 2,
-            atlas_col: 7,
-            atlas_row: 2,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "B04",
-            shape: OneByThree,
-            width: 1,
-            height: 3,
-            atlas_col: 9,
-            atlas_row: 2,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A02",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 3,
-            atlas_row: 3,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A04",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 4,
-            atlas_row: 3,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A01",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 0,
-            atlas_row: 4,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "B01",
-            shape: OneByThree,
-            width: 3,
-            height: 1,
-            atlas_col: 5,
-            atlas_row: 4,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A06",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 8,
-            atlas_row: 4,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "B03",
-            shape: OneByThree,
-            width: 3,
-            height: 1,
-            atlas_col: 0,
-            atlas_row: 5,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "B05",
-            shape: OneByThree,
-            width: 3,
-            height: 1,
-            atlas_col: 3,
-            atlas_row: 5,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A03",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 6,
-            atlas_row: 5,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A08",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 9,
-            atlas_row: 5,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A05",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 0,
-            atlas_row: 6,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A07",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 2,
-            atlas_row: 6,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A09",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 4,
-            atlas_row: 6,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A10",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 6,
-            atlas_row: 6,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A11",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 7,
-            atlas_row: 6,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A12",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 0,
-            atlas_row: 7,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A13",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 1,
-            atlas_row: 7,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A14",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 3,
-            atlas_row: 7,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A15",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 4,
-            atlas_row: 7,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A16",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 7,
-            atlas_row: 7,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A17",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 8,
-            atlas_row: 7,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A19",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 1,
-            atlas_row: 8,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A18",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 4,
-            atlas_row: 8,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A20",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 5,
-            atlas_row: 8,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A22",
-            shape: OneByTwo,
-            width: 1,
-            height: 2,
-            atlas_col: 6,
-            atlas_row: 8,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A21",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 8,
-            atlas_row: 8,
-        },
-        PuzzleClearPatternGroupSpec {
-            group_id: "A23",
-            shape: OneByTwo,
-            width: 2,
-            height: 1,
-            atlas_col: 0,
-            atlas_row: 9,
-        },
     ]
 }
 

server-rs/crates/spacetime-client/src/puzzle_clear.rs

@@ -16,7 +16,7 @@ use shared_kernel::build_prefixed_uuid_id;
 
 const PUZZLE_CLEAR_TEMPLATE_ID: &str = "puzzle-clear";
 const PUZZLE_CLEAR_TEMPLATE_NAME: &str = "拼消消";
-const PUZZLE_CLEAR_ATLAS_CELL_SIZE: u32 = 128;
+const PUZZLE_CLEAR_ATLAS_CELL_SIZE: u32 = 256;
 const PUZZLE_CLEAR_ASSET_OBJECT_ID_PREFIX: &str = "assetobj_";
 
 impl SpacetimeClient {

src/components/platform-entry/PlatformEntryFlowShellImpl.tsx

@@ -3130,6 +3130,7 @@ export function PlatformEntryFlowShellImpl({
         'big-fish': bigFishGenerationState,
         'square-hole': squareHoleGenerationState,
         'jump-hop': jumpHopGenerationState,
+        'puzzle-clear': puzzleClearGenerationState,
         'wooden-fish': woodenFishGenerationState,
         'baby-object-match': babyObjectMatchGenerationState,
       },
@@ -6202,6 +6203,9 @@ export function PlatformEntryFlowShellImpl({
         puzzle: () => {
           void openPuzzleWorkspace();
         },
+        'puzzle-clear': () => {
+          void openPuzzleClearWorkspace();
+        },
         'bark-battle': () => {
           void openBarkBattleWorkspace();
         },

src/components/platform-entry/platformCreationLaunchModel.ts

@@ -9,6 +9,7 @@ export type PlatformCreationLaunchTarget =
   | 'jump-hop'
   | 'wooden-fish'
   | 'puzzle'
+  | 'puzzle-clear'
   | 'bark-battle'
   | 'visual-novel'
   | 'baby-object-match';
@@ -43,6 +44,7 @@ const PLATFORM_CREATION_LAUNCH_TARGETS = new Set<PlatformCreationTypeId>([
   'jump-hop',
   'wooden-fish',
   'puzzle',
+  'puzzle-clear',
   'bark-battle',
   'visual-novel',
   'baby-object-match',

src/components/platform-entry/platformGenerationProgressTickModel.ts

@@ -38,6 +38,7 @@ const MINI_GAME_GENERATION_STAGE_TO_KIND: Partial<
   'square-hole-generating': 'square-hole',
   'jump-hop-generating': 'jump-hop',
   'wooden-fish-generating': 'wooden-fish',
+  'puzzle-clear-generating': 'puzzle-clear',
   'baby-object-match-generating': 'baby-object-match',
 };