浏览代码

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

xzw 3 月之前
父节点
当前提交
ccb1f07d69
共有 3 个文件被更改,包括 1266 次插入952 次删除
  1. 1263 950
      pnpm-lock.yaml
  2. 1 1
      src/api/animation.ts
  3. 2 1
      src/sdk/association/path.ts

文件差异内容过多而无法显示
+ 1263 - 950
pnpm-lock.yaml


+ 1 - 1
src/api/animation.ts

@@ -92,7 +92,7 @@ const serviceToLocal = (serviceAM: ServiceAnimationModel): AnimationModel => ({
   actions: JSON.parse(serviceAM.actions),
   subtitles: JSON.parse(serviceAM.subtitles),
   paths: JSON.parse(serviceAM.paths),
-  mat: serviceAM.mat && JSON.parse(serviceAM.mat) 
+  mat: serviceAM.mat && JSON.parse(serviceAM.mat)
 });
 
 const localToService = (am: AnimationModel): ServiceAnimationModel => ({

+ 2 - 1
src/sdk/association/path.ts

@@ -54,7 +54,8 @@ export const playScenePath = async (
 ) => {
   const node = getPathNode(path)
   // console.error('un', path.points, fuseModels.value)
-  if (!node || path.points.some(point => !fuseModels.value.some(am => am.id === point.modelId))) {
+  console.error(path)
+  if (!node || path.points.some(point => point.modelId !== '-100' && !fuseModels.value.some(am => am.id === point.modelId))) {
     return Message.error('路径所在模型被删除,无法播放');
   }