Browse Source

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

xzw 4 months ago
parent
commit
4b272acb09

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

@@ -364,6 +364,7 @@ export const addSubtitle = (data: AnimationModelSubtitle) => {
             )},${round(rgb.g * 255, 2)},${round(rgb.b * 255, 2)},0.5)`;
           }),
           watchEffect(() => {
+            console.log(pixel.value, show.value, modelShow.value, textShow.value)
             layer.style.visibility =
               pixel.value && show.value && modelShow.value && textShow.value ? "visible" : "hidden";
           }),
@@ -389,6 +390,7 @@ export const addSubtitle = (data: AnimationModelSubtitle) => {
     // isRun = true
     // setTimeout(() => {
     pixel.value = amMap[getAMKey(am)]?.am?.getCurrentSubtitlePixel(size.value);
+    console.log(amMap[getAMKey(am)]?.am, size.value)
     //   isRun = false
     // }, 16);
   };
@@ -405,7 +407,6 @@ export const addSubtitle = (data: AnimationModelSubtitle) => {
         () => amMap[key]?.am,
       ],
       (_a, _b, onCleanup) => {
-        console.error('currentTime', currentTime.value)
         if (
           !play.value &&
           router.currentRoute.value.name !== RoutesName.animation &&

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

@@ -51,6 +51,7 @@ export const playScenePath = async (
   forceFull = false,
 ) => {
   const node = getPathNode(path)
+  console.log(path, node)
   if (!node) {
     console.error('un', path.id)
     return Message.error('路径所在模型被隐藏活删除,无法播放');

+ 2 - 0
src/views/guide/guide/attach-animation-sam.vue

@@ -3,6 +3,7 @@
     class="anima fun-ctrl"
     :class="{ disabled: disableAttach, active: isPlayIng }"
     @click="attachAnimation"
+    v-if="ams.length"
   >
     <ui-icon type="a-animation_s" />
     <span>{{ isPlayIng ? "关闭" : "激活" }}动画</span>
@@ -14,6 +15,7 @@ import { currentTime } from "@/sdk/association/animation";
 import { computed, ref, watchEffect } from "vue";
 import { GuidePath } from "@/store";
 import { Message } from "bill/index";
+import { ams } from "@/store/animation";
 
 const props = defineProps<{ current: GuidePath; paths: GuidePath[] }>();