@gedit/editor-2d 0.3.4 → 0.3.6

package/lib/browser/utils/snapshot.js

@@ -1,10 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SnapshotCreator = exports.createSnapshots = exports.SnapshotOptsDefault = void 0;
-const canvas_draw_1 = require("../playground/canvas-draw");
-const utils_1 = require("@gedit/utils");
-const model_1 = require("../model");
-exports.SnapshotOptsDefault = {
+import { CanvasDraw } from '../playground/canvas-draw';
+import { 
+// debounce,
+deepClone, Disposable, DisposableCollection, DisposableImpl, Emitter, PromiseDeferred, SizeSchema, URI } from '@gedit/utils';
+import { Editor2dNode } from '../model';
+export const SnapshotOptsDefault = {
     quility: 0.8,
     imageType: 'image/webp',
 };
@@ -12,27 +11,26 @@ function fixDrawerScale(drawer, limitSize) {
     // const appConfig = drawer.getData()?.appConfig;
     // if (!appConfig) return;
     const currentSize = drawer.getSceneSize();
-    const scale = utils_1.SizeSchema.fixSize(currentSize, {
+    const scale = SizeSchema.fixSize(currentSize, {
         width: limitSize.width,
         height: limitSize.height,
     });
     drawer.refreshScale(false, scale);
 }
-async function createSnapshots(opts, sceneDatas) {
+export async function createSnapshots(opts, sceneDatas) {
     const creator = new SnapshotCreator(opts);
     const result = await creator.draw(sceneDatas);
     creator.dispose();
     return result;
 }
-exports.createSnapshots = createSnapshots;
 let host;
-class SnapshotCreator extends utils_1.DisposableImpl {
+export class SnapshotCreator extends DisposableImpl {
     constructor(opts) {
         super();
         this.opts = opts;
         this.result = {};
         this.processingData = [];
-        this.onUpdateEmitter = new utils_1.Emitter();
+        this.onUpdateEmitter = new Emitter();
         this.onUpdate = this.onUpdateEmitter.event;
         if (!host) {
             host = document.createElement('div');
@@ -40,7 +38,7 @@ class SnapshotCreator extends utils_1.DisposableImpl {
             // host.style.display = 'none';
             document.body.appendChild(host);
         }
-        this.drawer = new canvas_draw_1.CanvasDraw(Object.assign({ host, isSnapshot: true }, opts));
+        this.drawer = new CanvasDraw(Object.assign({ host, isSnapshot: true }, opts));
         this.toDispose.pushAll([
             this.drawer,
             this.onUpdateEmitter,
@@ -81,10 +79,10 @@ class SnapshotCreator extends utils_1.DisposableImpl {
         if (this.processing) {
             return this.processing.promise;
         }
-        const deferred = this.processing = new utils_1.PromiseDeferred();
+        const deferred = this.processing = new PromiseDeferred();
         const { drawer } = this;
-        const dispose = new utils_1.DisposableCollection();
-        dispose.push(utils_1.Disposable.create(() => {
+        const dispose = new DisposableCollection();
+        dispose.push(Disposable.create(() => {
             deferred.resolve();
             this.current = undefined;
             this.processing = undefined;
@@ -115,7 +113,7 @@ class SnapshotCreator extends utils_1.DisposableImpl {
                     }
                     this.next(() => dispose.dispose());
                 };
-                widget.createSnapShot(this.opts.imageType || exports.SnapshotOptsDefault.imageType, this.opts.quility || exports.SnapshotOptsDefault.quility, this.opts.fontBool || false, callback).then(callback);
+                widget.createSnapShot(this.opts.imageType || SnapshotOptsDefault.imageType, this.opts.quility || SnapshotOptsDefault.quility, this.opts.fontBool || false, callback).then(callback);
             }
         }));
         this.next(() => dispose.dispose());
@@ -140,12 +138,12 @@ class SnapshotCreator extends utils_1.DisposableImpl {
             let content = next.content;
             // Empty
             if (!content || !content.children || Object.keys(content).length === 0) {
-                content = model_1.Editor2dNode.createRootNode(new utils_1.URI(next.uri));
+                content = Editor2dNode.createRootNode(new URI(next.uri));
                 const attrs = this.opts.renderEngine.getDisplayDefaultData(this.opts.engineName, content.displayType);
                 Object.assign(content, Object.assign({}, attrs));
             }
             // 设置 parent, 保持 id 一致； mask 里用的是 path id;
-            content = this.setParent((0, utils_1.deepClone)(content));
+            content = this.setParent(deepClone(content));
             this.drawer.update({
                 visible: true,
                 uri: next.uri,
@@ -181,5 +179,4 @@ class SnapshotCreator extends utils_1.DisposableImpl {
         });
     }
 }
-exports.SnapshotCreator = SnapshotCreator;
 //# sourceMappingURL=snapshot.js.map

package/lib/browser/utils/snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/browser/utils/snapshot.ts"],"names":[],"mappings":"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"}

package/lib/i18n/zh-CN.js

@@ -1,7 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable max-len */
-exports.default = {
+export default {
     languageId: 'zh-CN',
     languageName: 'Chinese',
     localizedLanguageName: '中文(中国)',

package/lib/i18n/zh-CN.js.map

@@ -1 +1 @@
-{"version":3,"file":"zh-CN.js","sourceRoot":"","sources":["../../src/i18n/zh-CN.ts"],"names":[],"mappings":";;AAAA,4BAA4B;AAC5B,kBAAe;IACb,UAAU,EAAE,OAAO;IACnB,YAAY,EAAE,SAAS;IACvB,qBAAqB,EAAE,QAAQ;IAC/B,QAAQ,EAAE,EACT;CACF,CAAC"}
+{"version":3,"file":"zh-CN.js","sourceRoot":"","sources":["../../src/i18n/zh-CN.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,eAAe;IACb,UAAU,EAAE,OAAO;IACnB,YAAY,EAAE,SAAS;IACvB,qBAAqB,EAAE,QAAQ;IAC/B,QAAQ,EAAE,EACT;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gedit/editor-2d",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "license": "MIT",
   "main": "lib/browser/index",
   "typings": "lib/browser/index.d.ts",
@@ -9,18 +9,19 @@
     "src"
   ],
   "dependencies": {
-    "@gedit/app-config": "^0.3.6",
-    "@gedit/canvas-draw": "^0.3.4",
-    "@gedit/editor": "^0.3.2",
-    "@gedit/playground": "^0.3.4",
-    "@gedit/render-engine-ide": "^0.3.4",
-    "@gedit/theme": "^0.2.13",
-    "@gedit/workspace-2d": "^0.3.4",
+    "@gedit/app-config": "^0.3.7",
+    "@gedit/canvas-draw": "^0.3.5",
+    "@gedit/editor": "^0.3.3",
+    "@gedit/playground": "^0.3.5",
+    "@gedit/render-engine-ide": "^0.3.5",
+    "@gedit/theme": "^0.2.14",
+    "@gedit/workspace-2d": "^0.3.5",
     "@types/bezier-js": "^4.1.3",
     "bezier-js": "^6.1.4",
     "clsx": "^1.1.1",
     "json-stringify-pretty-compact": "^2.0.0",
-    "nanoid": "^3.3.2"
+    "nanoid": "^3.3.2",
+    "tween-one": "^1.2.0"
   },
   "geditExtensions": [
     {
@@ -40,5 +41,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "2878f4d9609cfd63bd6746e5d703749a16b6af6a"
+  "gitHead": "811242741b9942050f7e5aa872b57911de937e11"
 }

package/src/browser/editor2d-anim-path-selection-service.ts

@@ -0,0 +1,48 @@
+import { injectable } from 'inversify';
+import { Emitter, Event } from '@gedit/utils';
+import { PathPointSelection } from '@gedit/playground';
+
+interface AnimPathEvent {
+  changBool: boolean;
+  selection: PathPointSelection<number>[];
+}
+/**
+ * 独立动画路程选择服务
+ * 用于处理动画路程的选择
+ * 通过设置selection属性来设置选择对象
+ * anim-path-edit-layer 与 timeline 互通使用；
+ * 注入到 PlaygroundContext;
+ */
+@injectable()
+export class Editor2dAnimPathSelectionService {
+  protected readonly onSelectionChangedEmitter = new Emitter<AnimPathEvent>();
+  readonly onSelectionChanged: Event<AnimPathEvent> = this
+    .onSelectionChangedEmitter.event;
+  private currentSelection: PathPointSelection<number>[] = [];
+
+  get selection(): PathPointSelection<number>[] {
+    return this.currentSelection;
+  }
+
+  set selection(selection: PathPointSelection<number>[]) {
+    if (this.currentSelection !== selection) {
+      this.currentSelection = selection;
+      this.onSelectionChangedEmitter.fire({
+        changBool: true,
+        selection,
+      });
+    }
+  }
+  setSelection(selection: PathPointSelection<number>[], change: boolean = true): void {
+    if (this.currentSelection !== selection) {
+      this.currentSelection = selection;
+      this.onSelectionChangedEmitter.fire({
+        changBool: change,
+        selection,
+      });
+    }
+  }
+  clearSelection(): void {
+    this.currentSelection = [];
+  }
+}

package/src/browser/editor2d-frontend-module.ts

@@ -15,9 +15,11 @@ import { Editor2dContextKeyService } from './editor2d-context-key-service';
 import { EditorProviderContribution } from '@gedit/editor/lib/browser/editor-provider';
 import { Editor2dRefProviderContribution } from './editor2d-ref-provider-contribution';
 import { ResourceRefProviderContribution } from '@gedit/resource';
+import { Editor2dAnimPathSelectionService } from './editor2d-anim-path-selection-service';
 
 export default new ContainerModule(bind => {
   bindInSingletonScope(bind, [
+    Editor2dAnimPathSelectionService,
     Editor2dService,
     Editor2dModelProvider,
     Editor2dLabelProvider,

package/src/browser/editor2d-service.ts

@@ -10,6 +10,7 @@ import { Editor2dNode } from './model/editor2d';
 import { Editor2dDocument } from './model/editor2d-document';
 import { SelectableTreeNode, TreeSelection } from '@gedit/tree';
 import SelectionType = TreeSelection.SelectionType;
+import { Editor2dAnimPathSelectionService } from './';
 
 export interface Editor2dSelectedNodesChangedEvent {
   selectedNodes: Editor2dNode[];
@@ -26,6 +27,7 @@ export class Editor2dService {
   @inject(SelectionService) protected readonly selectionService: SelectionService;
   @inject(EditorAccess) @named(EditorAccess.CURRENT) protected readonly editorAccess: EditorAccess;
   @inject(EditorManager) protected readonly editorManager: EditorManager;
+  @inject(Editor2dAnimPathSelectionService) public readonly animPathSelection: Editor2dAnimPathSelectionService;
 
   getCurrentModel(): Editor2dModel | undefined {
     const model = this.editorAccess.editor as Editor2dModel;

package/src/browser/index.ts

@@ -2,4 +2,5 @@ export * from './model';
 export * from './editor2d-service';
 export * from './playground';
 export * from './utils/snapshot';
-
+export * from './editor2d-anim-path-selection-service';
+export * from './utils/bezier.path.utils';

package/src/browser/model/editor2d-document.ts

@@ -12,6 +12,9 @@ import {
   PromiseDeferred,
   URI,
   FileStat,
+  getByKey,
+  coverData,
+  setByKey,
 } from '@gedit/utils';
 import {
   checkDuplicateNodes,
@@ -21,7 +24,18 @@ import {
   Editor2dNode,
   // Editor2dNodeCache,
 } from './editor2d';
-import { ComponentGameObjectData, GameConfig, GameObject, GameObjectBaseType, GameObjectData, GameObjectType } from '@gedit/render-engine';
+import {
+  ComponentGameObjectData,
+  FrameChild,
+  GameConfig,
+  GameObject,
+  GameObjectBaseType,
+  GameObjectData,
+  GameObjectType,
+  LayerData,
+  TimelineData,
+  TimelineFrame,
+} from '@gedit/render-engine';
 import { GameObjectDecoration, RenderEngineIDEService } from '@gedit/render-engine-ide';
 import { CompositeTreeNode, ExpandableTreeNode, Tree, TreeImpl, TreeNode } from '@gedit/tree';
 import { ResourceAutoSaveService } from '@gedit/resource/lib/browser';
@@ -34,9 +48,9 @@ import { Editor2dIterator } from './editor2d-iterator';
 import { ThemeService } from '@gedit/theme';
 import { followKeyType, getFollowValue } from '@gedit/render-engine-pixi';
 import { ConfirmDialog } from '@gedit/layout';
-import { AssetsMetaData } from '@gedit/assets-2d';
 import { toFixedValue } from '@gedit/canvas-draw';
 import { getPIXILocalBoundsByNode } from '../utils/bounds';
+import { sortFrame } from './utils';
 // import { getAnimationKeys, getChangeAnimationData } from './utils';
 
 export const maskShowArray: GameObjectType[] = [
@@ -70,6 +84,30 @@ export const Editor2dComponentProvider = Symbol('Editor2dComponentProvider');
 
 const replaceReg = (s: string) => s.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
 
+export interface TimelineService  {
+  getAnimationIds: () => string[]
+  changeTimelineData: (e: Editor2dNode) => void;
+  saveTimelineData: (
+    data: LayerData,
+    timeObj: {
+      totalTime: number;
+      regionStartTime: number;
+      regionEndTime: number;
+    },
+    forceUpdate?: boolean,
+    noSave?: boolean
+  ) => void;
+  getNodeCurrentFrame: (
+    frame: TimelineFrame
+  ) => {
+    [key: string]: number;
+  };
+  currentTimelineData?: TimelineData;
+  animationNode?: GameObject;
+  currentTime?: number;
+  playTime?: number;
+}
+
 /**
  * 组件内容修改后触发
  */
@@ -107,7 +145,8 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
   readonly onContentChanged = this.onContentChangedEmitter.event;
   readonly onSaved = this.onSavedEmitter.event;
   public animationStarted: boolean = false;
-  protected animationIds: string[] = []; // 当前正在录制的动画节点
+  public animationIds: string[] = []; // 当前正在录制的动画节点
+  public timelineService?: TimelineService;
   private _localVersion: number = 0;
   private _saveVersion: number = 0;
   protected errors: ResourceRefError[] = [];
@@ -517,6 +556,116 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     }
   }
 
+  updateAnimationNode(node: Editor2dNode, data: Partial<Editor2dNode>): void {
+    if (!this.timelineService) {
+      return;
+    }
+    const frames: TimelineFrame[] = deepClone(this.timelineService.currentTimelineData?.frames) || [];
+    // 获取当前图层在动画中的数据;
+    const animItem = frames.find(c => c.id === node.id);
+    if (!animItem) {
+      return;
+    }
+
+    // 取出全部帧里的 key
+    const keys = Array.from(
+      new Set(animItem.frame.value.map((item: FrameChild) => item.key)),
+    );
+
+    Object.keys(animItem.frame.current).forEach(key => {
+      if (!keys.includes(key)) {
+        const currentValue = getByKey(data, key);
+        // 更新当前帧的数据
+        animItem.frame.current[key] = currentValue ??  animItem.frame.current[key];
+      }
+    });
+
+    /**
+     * 如果是动画节点，更新数据到动画节点上
+     * 不是动画节点，更新到当前节点上
+     */
+    keys.forEach(key => {
+      const currentValue = getByKey(data, key);
+      if (typeof currentValue === 'undefined') {
+        return;
+      }
+      if (toFixedValue(currentValue, 2) !== toFixedValue(animItem.frame.current[key], 2)) {
+        animItem.frame.current[key] = currentValue ??  animItem.frame.current[key];
+        // 判断是否有帧
+        const frame = animItem.frame.value.find(
+          (item: FrameChild) =>
+            item.key === key && item.time === this.timelineService!.currentTime
+        );
+        if (frame) {
+          frame.value = currentValue;
+        } else {
+          animItem.frame.value.push({
+            key,
+            time: this.timelineService!.currentTime!,
+            value: currentValue,
+          });
+          animItem.frame.value = sortFrame(animItem.frame.value);
+        }
+      }
+
+      // 删除data里的当前帧的数据
+      const keyArr = key.split('.');
+      keyArr.reduce((v: any, k: string, i) => {
+        if (typeof v !== 'object') {
+          return undefined;
+        }
+        if (i >= keyArr.length - 1) {
+          delete v[k];
+        }
+        return v[k];
+      }, data);
+    });
+
+    // 属性栏更新数据会传回来 Editor2dNode; 清除不需要的数据
+    const newData = omit(data, ['nextSibling', 'previousSibling', 'parent']);
+    const nodeData = coverData(node, newData);
+    const gameObject = this.getGameObjectById(node.id);
+    if (gameObject) {
+      gameObject.data = {
+        ...gameObject.data,
+        ...nodeData,
+        id: gameObject.data.id
+      };
+    }
+
+    Object.assign(node, nodeData);
+    // 通过 animation 保存；
+    // node.version = (node.version || 0) + 1;
+    // this.fireContentChanged([node], 'update', false, true);
+    const animNode = this.getNodeById(this.timelineService.currentTimelineData!.id) as Editor2dNode & {animation: any};
+    if (!animNode) {
+      console.error('动画节点不存在');
+      return;
+    }
+
+    // 告知 node 变更，时间轴里数据更新；
+    // 使用 changeTimelineData 变更数据；
+    // const nodes = frames
+    //   .map(c => this.getNodeById(c.id))
+    //   .filter(c => c) as Editor2dNode[];
+    // const contents = nodes.map(n => ({ text: 'treeNode' }));
+    // this.onContentChangedEmitter.fire({
+    //   document: this,
+    //   contentChanges: contents,
+    //   nodes,
+    //   type: 'update',
+    // });
+    // 更新保存 animation 数据
+    this.updateNode(animNode, {
+      animation: {
+        ...animNode.animation,
+        frames,
+      }
+    }, true);
+    // 更新时间轴数据；
+    this.timelineService?.changeTimelineData(animNode);
+  }
+
   updateNode(node: Editor2dNode | string, data: Partial<Editor2dNode> = {}, forceUpdate: boolean = false, noSave?: boolean, noFiredChanged?: boolean): void {
     const treeNode = typeof node === 'string' ? this.nodes[node] : this.nodes[node.id];
     if (!treeNode) return;
@@ -526,6 +675,16 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     //     data = { ...data, name: treeNode.name };
     //   }
     // }
+    // 动画面板更新属性，直接更新到动画节点上, 不保存；
+    if (
+      treeNode.useAnimationId &&
+      this.timelineService?.currentTimelineData &&
+      this.timelineService.currentTimelineData.id === treeNode.useAnimationId
+    ) {
+      this.updateAnimationNode(treeNode, data);
+      return;
+    }
+
     // 这里采用深度比较, 因为数据层次定义不会太多
     if (data && data.id && data.id !== treeNode.id) {
       alert('节点更新出错，不同节点无法互相覆盖');
@@ -600,6 +759,12 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     this.refresh();
     // this.loadRefInfos();
     this.fireContentChanged([], 'add', true);
+    if (this.timelineService?.currentTimelineData) {
+      const animNode = this.getNodeById(this.timelineService.currentTimelineData.id);
+      if (animNode) {
+        this.timelineService?.changeTimelineData(animNode);
+      }
+    }
   }
 
   reloadEnd(): void {
@@ -1068,8 +1233,31 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     return nodes;
   }
 
-  getNodeById(nodeId: string): Editor2dNode | Editor2dContainerNode | undefined {
-    return this.nodes[nodeId];
+  getNodeById(nodeId: string, noMerge?: boolean): Editor2dNode | Editor2dContainerNode | undefined {
+    const node = this.nodes[nodeId];
+    // 动画编辑，这里的 node 数据不会改变，还是没打开的数据；需要合并数据；
+    // 动画数据在 animation 里变更附值；不会改前 document 的 node 数据；
+    if (
+      !noMerge && node?.useAnimationId &&
+      this.timelineService?.currentTimelineData?.id === node.useAnimationId
+    ) {
+      const animNode = this.nodes[
+        this.timelineService.currentTimelineData.id
+      ] as Editor2dNode & { animation: any };
+      if (animNode) {
+        const current = animNode.animation.frames.find(
+          (c: any) => c.id === node.id
+        );
+        if (current) {
+          const newNode = this.cloneNodeData(node);
+          Object.keys(current.frame.current || {}).forEach(key => {
+            setByKey(newNode, key, current.frame.current[key]);
+          });
+          return newNode;
+        }
+      }
+    }
+    return node;
   }
 
   getNodeIcon(node: Editor2dNode | Editor2dContainerNode): string {
@@ -1195,21 +1383,22 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
   }
 
   startRecordAnimation(
-    animationIds: () => string[],
-    onNodeChange: (nodes: Editor2dNode[], type: EditorDocumentChangeEvent['type']) => void
+    timelineService: TimelineService,
+    onNodeChange: (nodes: Editor2dNode[], type: EditorDocumentChangeEvent['type']) => void,
   ): Disposable {
     // this.animationStarted = true;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const getNodesToChildrenById: any = (n: Editor2dContainerNode, id: string) =>
       n.children && n.children.some((c: Editor2dContainerNode) => c.id === id || getNodesToChildrenById(c, id));
 
-    this.animationIds = animationIds();
+    this.timelineService = timelineService;
+    this.animationIds = timelineService.getAnimationIds();
     // 缓存移到 timeline 里处理
     /* const cache: Editor2dNode[] = this.animationIds
       .map(id => this.getNodeById(id)).filter(n => !!n)
       .map(node => this.cloneNodeData(node as Editor2dNode)); */
     const toDispose = this.onContentChanged(e => {
-      this.animationIds = animationIds();
+      this.animationIds = timelineService.getAnimationIds();
       // TODO 删除动画元件后，动画面板清空数据
       if (e.nodes) {
         const nodes = e.nodes.filter((n: any) =>
@@ -1497,15 +1686,4 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
     });
 
   }
-  /**
-   * 资源重新加载
-   */
-  async reloadAssets(assets: AssetsMetaData[]): Promise<void> {
-    if (!assets.length) {
-      return;
-    }
-    const game = this.engineService.getGameWidgetByUri(this.uri);
-    const scene = game?.getCurrentScene();
-    await scene?.refresh(assets);
-  }
 }

package/src/browser/model/editor2d.ts

@@ -56,13 +56,24 @@ export namespace Editor2dContent {
       node.selected = false;
       // console.log('>>>>>>>>>>>>>>cache', node.cache);
       // 不保存动画数据，，如果有 cache 直接用 cache 的，cache 为 timeline 专属
-      const { cache, ...n } = node;
+      // 不保存 useAnimationId, useAnimationId 打开 timeline 输入；
+      const { cache, useAnimationId, animationTime, ...n } = node;
+      // 清除 animation 里的 current;
+      if (n.animation) {
+        // @ts-ignore
+        n.animation.frames = n.animation.frames.map(a => {
+          const frame = a.frame;
+          if (frame) {
+            const { current, ...f } = frame;
+            return { ...a, frame: f };
+          }
+        });
+      }
       if (cache) {
         return { ...n, ...cache };
       }
       return n;
     });
-    // console.log(content);
     return {
       version: contentData.version,
       content,

package/src/browser/model/utils/anim.utils.ts

@@ -1,4 +1,4 @@
-import { GameObjectData } from '@gedit/render-engine';
+import { GameObjectData, FrameValue } from '@gedit/render-engine';
 import { GameObjectIDERegister } from '@gedit/render-engine-ide';
 import { RenderEngineIDEService as RenderEngineService } from '@gedit/render-engine-ide';
 import { SchemaDecoration, SchemaType } from '@gedit/playground';
@@ -12,14 +12,14 @@ interface KeysValue {
 // 添加进时间轴动画的条件；
 const supportKeys: SchemaType[] = ['integer', 'float', 'color'];
 // 三个数组 key 写死
-export const animArrayKeys: {[key: string]: string} = {
+export const animArrayKeys: { [key: string]: string } = {
   'style.color': 'FillArray',
   'style.line': 'LineArray',
   'style.lineDash': 'LineDashArray',
 };
 function readAnimationKeys(
   deco: SchemaDecoration,
-  keyList: { key: string; name: string; }[],
+  keyList: { key: string; name: string }[],
   engineName: string,
   currentKey?: string,
   parentName?: string,
@@ -48,9 +48,8 @@ function readAnimationKeys(
   } else if (
     currentLabel &&
     currentKey &&
-    (supportKeys.includes(deco.type) &&
-    !currentKey.match(/^(origin)/) // 干掉原点
-    || animArrayKeys[currentKey])
+    ((supportKeys.includes(deco.type) && !currentKey.match(/^(origin)/)) || // 干掉原点
+      animArrayKeys[currentKey])
   ) {
     keyList.push({
       key: currentKey,
@@ -93,3 +92,8 @@ export const getChangeAnimationData = (
   });
   return data;
 };
+
+export const sortFrame = (v: FrameValue) => {
+  v.sort((a, b) => a.time - b.time);
+  return v;
+};