合并主分支

解决合并冲突

src/components/image-editor/ImageCanvasExportModel.test.ts

@@ -171,6 +171,15 @@ describe('ImageCanvasExportModel', () => {
     });
   });
 
+  it('preserves game scene semantics in exported layer metadata', () => {
+    const metadata = buildLayerExportMetadata(
+      buildLayer({ assetKind: 'scene' }),
+      'images/001-scene.png',
+    );
+
+    expect(metadata.visible.type).toBe('游戏场景');
+  });
+
   it('uses the reference fallback label when export metadata is blank', () => {
     const metadata = buildLayerExportMetadata(
       buildLayer({