合并主分支

解决合并冲突

src/components/creation-home/CreationLandingView.test.tsx

@@ -350,7 +350,7 @@ describe('CreationLandingView', () => {
     ['游戏角色', 'character-spec'],
     ['游戏UI', 'ui-design'],
     ['游戏音乐', 'background-music'],
-    ['游戏场景', 'image'],
+    ['游戏场景', 'scene'],
     ['游戏美宣', 'publication-cover'],
   ])(
     'creates a new project from %s with its canvas tool intent',
@@ -480,7 +480,11 @@ describe('CreationLandingView', () => {
 
   it('plays a character action on card focus and in the preview dialog', async () => {
     const user = userEvent.setup();
-    const setIntervalSpy = vi.spyOn(window, 'setInterval');
+    const setIntervalSpy = vi
+      .spyOn(window, 'setInterval')
+      .mockImplementation(
+        () => 1 as unknown as ReturnType<typeof window.setInterval>,
+      );
     listEditorProjectsMock.mockResolvedValueOnce(projectItems);
     listPublicEditorProjectResourcesMock.mockResolvedValueOnce([
       {
@@ -994,9 +998,11 @@ describe('CreationLandingView', () => {
       'creation-landing__asset-preview--campaign',
     );
     expect(campaignPreview?.style.aspectRatio).toBe('900 / 1200');
-    const campaignImage = await screen.findByRole('img', {
-      name: '活动精选',
-    });
+    const campaignImage = await screen.findByRole(
+      'img',
+      { name: '活动精选' },
+      { timeout: 5_000 },
+    );
     expect((campaignImage as HTMLImageElement).src).toBe(signedCampaignUrl);
     expect(fetchMock).toHaveBeenCalledWith(
       `/api/assets/read-url?objectKey=${encodeURIComponent(campaignObjectKey)}`,

src/components/creation-home/CreationLandingView.tsx

@@ -58,7 +58,8 @@ type CreationFeatureTool =
   | 'ui-design'
   | 'background-music'
   | 'image'
-  | 'publication-cover';
+  | 'publication-cover'
+  | 'scene';
 
 type CreationFeatureItem = {
   title: string;
@@ -134,7 +135,7 @@ const CREATION_FEATURES: CreationFeatureItem[] = [
     title: '游戏场景',
     description: '轻松生成各类游戏场景素材',
     iconSrc: '/creation-home/feature-scene.png',
-    action: { kind: 'tool', tool: 'image' },
+    action: { kind: 'tool', tool: 'scene' },
   },
   {
     title: '游戏美宣',