Unify animation event interfaces (cocos#9101)

* Unify animation event interfaces * update event edit (#27) # Conflicts: # editor/inspector/assets/fbx/event-editor/editor.js Co-authored-by: 媛媛 <yuanyuan1497@foxmail.com>
shrinktofit · Aug 5, 2021 · a40115e · a40115e
1 parent 2f8c25c
commit a40115e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/editor/inspector/assets/fbx/event-editor/editor.js b/editor/inspector/assets/fbx/event-editor/editor.js
@@ -114,15 +114,7 @@ exports.methods = {
 
     async saveData() {
         const that = this;
-        const result = that.value.map((item) => {
-            // TODO Animation events recorded in meta need to be unified https://github.com/cocos-creator/3d-tasks/issues/7416
-            return {
-                functionName: item.func,
-                parameters: item.params,
-                frame: that.frame,
-            };
-        });
-        that.$emit('update', that.frame, result);
+        that.$emit('update', that.frame, that.value);
         that.dirty = false;
     },
 
@@ -135,14 +127,7 @@ exports.methods = {
             that.value = [];
             return;
         }
-        that.value = data.map((item) => {
-            // TODO Animation events recorded in meta need to be unified
-            return {
-                frame: that.frame,
-                func: item.functionName,
-                params: item.parameters,
-            };
-        });
+        that.value = JSON.parse(JSON.stringify(data));
         that.newFuncName = '';
     },
 };

diff --git a/editor/inspector/assets/fbx/events/events.js b/editor/inspector/assets/fbx/events/events.js
@@ -35,8 +35,8 @@ exports.data = {
     eventEditorInfo: {
         frame: 0,
         events: [{
-            functionName: '',
-            parameters: [],
+            func: '',
+            params: [],
             frame: 0,
         }],
     },

diff --git a/editor/inspector/assets/fbx/events/index.js b/editor/inspector/assets/fbx/events/index.js
@@ -54,8 +54,8 @@ exports.apply = async function() {
 exports.addNewEvent = function(time) {
     const newInfo = {
         frame: time,
-        functionName: '',
-        parameters: [],
+        func: '',
+        params: [],
     };
     const userData = this.curEditClipInfo.userData;
     if (!userData.events) {