bill 4 miesięcy temu
rodzic
commit
7b911645ac

+ 12 - 11
src/components/path/list.vue

@@ -1,15 +1,16 @@
 <template>
-  <template v-for="(path, index) in paths" :key="path.id">
-    <Sign
-      v-if="getPathIsShow(path)"
-      @delete="deletePath(path)"
-      @updatePoints="(data) => updatePosition(index, data)"
-      @updateLinePosition="(data) => updateLinePosition(index, data)"
-      :ref="(node: any) => nodeHandler(index, node)"
-      :path="path"
-      :key="path.id"
-    />
-  </template>
+  <!-- <template v-for="(path, index) in paths" :key="path.id">
+    v-if="getPathIsShow(path)" -->
+  <Sign
+    v-for="(path, index) in paths"
+    @delete="deletePath(path)"
+    @updatePoints="(data) => updatePosition(index, data)"
+    @updateLinePosition="(data) => updateLinePosition(index, data)"
+    :ref="(node: any) => nodeHandler(index, node)"
+    :path="path"
+    :key="path.id"
+  />
+  <!-- </template> -->
 </template>
 
 <script lang="ts" setup>

+ 8 - 2
src/sdk/association/animation.ts

@@ -23,6 +23,7 @@ import { Pos } from "@/utils/event";
 import Subtitle from "@/components/subtitle/index.vue";
 import { Size } from "@/components/drawing/dec";
 import router, { RoutesName } from "@/router";
+import { paths } from "@/store";
 
 export let animationGroup: AnimationGroup;
 export const getAMKey = (am: AnimationModel) => am.key || am.id;
@@ -238,6 +239,9 @@ export const addPath = (
   const path = computed(() =>
     data.pathId ? getPathNode(data.pathId) : undefined
   );
+  const pathData = computed(() =>
+    paths.value.find(item => item.id === data.pathId)
+  );
   const key = getAMKey(am);
   const stopLoad = watch(
     () => {
@@ -248,7 +252,6 @@ export const addPath = (
     ([map, exists, path]) => {
       if (!map?.am || !path) return;
       if (exists && !map.paths[data.id]) {
-        console.error('addPath', am.title, data)
         map.paths[data.id] = map.am.addPath({ ...data, path });
       } else if (!exists && map.paths[data.id]) {
         map.paths[data.id].destroy();
@@ -262,7 +265,10 @@ export const addPath = (
     watchEffect(() => amMap[key]?.paths[data.id]?.changeTime(data.time)),
     watchEffect(() => amMap[key]?.paths[data.id]?.changeReverse(data.reverse)),
     watchEffect(() => amMap[key]?.paths[data.id]?.changeDuration(data.duration)),
-    watchEffect(() => amMap[key]?.paths[data.id]?.changePath(path.value))
+    watchEffect(() => {
+      console.error(path.value, pathData.value)
+      path.value &&amMap[key]?.paths[data.id]?.changePath(path.value)
+    })
   );
 
   const stopWatch = watch(

+ 1 - 1
src/sdk/association/guide.ts

@@ -97,8 +97,8 @@ export const playSceneGuide = (
           paths.map((path) => ({ ...path, ...analysisPoseInfo(path) }))
         );
         sceneGuide.bus.on("changePoint", (index) => {
-          console.log(index)
           if (paths[index - 1].playAnimation) {
+            console.error(currentTime.value)
             play.value = true
           }
           changeIndexCallback && changeIndexCallback(index);

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

@@ -33,6 +33,7 @@ export const pathsGroup = groupProxy(() => {
       nodes.push(node);
     }
   }
+  console.error(nodes)
   return nodes;
 });