Merge branch 'v1.2.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v1.2.0-ga

src/sdk/cover/index.js

@@ -1464,16 +1464,19 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                         addAction(frame){// 添加模型动作
                             console.log('addAction',frame)
                             let key = Object.assign({},frame) 
-                                key.weight = key.amplitude
+                                key.weight = key.amplitude || 1 //幅度
+                                key.speed = key.speed || 1
                                 key.actionIndex = model.actions.findIndex(e=>e.name == key.key)
                                 if(key.actionIndex == -1){
-                                    return console.error('cannot find action', key.key)
+                                    //return console.error('cannot find action', key.key)
+                                    console.log('没找到动作，暂时先用第一个')
+                                    key.actionIndex = 0
                                 }   
                                 delete key.amplitude
                                 delete key.key
                                 delete key.duration
                                 
-                            AnimationEditor.addKey(model, 'pose', key)
+                            AnimationEditor.addKey(model, 'clip', key)
                             
                             return {
                                 destroy(){ 
@@ -1490,7 +1493,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                                 changeAmplitude(weight){//修改动作幅度
                                     key.weight = weight
                                 },
-                                changeSpeed(s){
+                                changeSpeed(speed){
                                     key.speed = speed
                                 }
                             }