合并主分支

解决合并冲突

src/components/image-editor/ImageCanvasEditorModel.ts

@@ -1,3 +1,4 @@
+import { isEditorSceneStylePreset } from '../../../packages/shared/src/contracts/editorScene';
 import type {
   EditorAssetGenerationInputs,
   EditorAssetLibrarySnapshot,
@@ -1241,6 +1242,10 @@ export function hydrateCanvasGenerationDialog(
       resourcesById,
       currentUserId,
     ),
+    sceneStylePreset: isEditorSceneStylePreset(snapshot.sceneStylePreset)
+      ? snapshot.sceneStylePreset
+      : undefined,
+    sceneCustomStyle: stringOrUndefined(snapshot.sceneCustomStyle),
     imageModel: stringOrUndefined(snapshot.imageModel),
     style,
     videoModel:
@@ -2133,7 +2138,8 @@ export function canvasAssetKindOrNull(value: unknown): CanvasAssetKind | null {
     value === 'ui-design' ||
     value === 'video' ||
     value === 'sound-effect' ||
-    value === 'background-music'
+    value === 'background-music' ||
+    value === 'scene'
     ? value
     : null;
 }
@@ -2162,6 +2168,7 @@ function isCanvasGenerationDialogMode(
     value === 'icon' ||
     value === 'publication' ||
     value === 'ui-design' ||
+    value === 'scene' ||
     value === 'quick-edit' ||
     value === 'character-animation' ||
     value === 'video' ||