|
@@ -82,10 +82,21 @@ export const addAM = (data: AnimationModel): Promise<AnimationModel3D> => {
|
|
|
am.bus.on("loadDone", () => {
|
|
am.bus.on("loadDone", () => {
|
|
|
amMap[key].am = am;
|
|
amMap[key].am = am;
|
|
|
if (isTemploraryID(data.id)) {
|
|
if (isTemploraryID(data.id)) {
|
|
|
- console.error('putInFrontOfCam', data.id)
|
|
|
|
|
am.putInFrontOfCam();
|
|
am.putInFrontOfCam();
|
|
|
}
|
|
}
|
|
|
- console.log("0.0", am);
|
|
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
|
+ if (
|
|
|
|
|
+ !play.value &&
|
|
|
|
|
+ router.currentRoute.value.name !== RoutesName.animation &&
|
|
|
|
|
+ !(
|
|
|
|
|
+ router.currentRoute.value.name === RoutesName.guide &&
|
|
|
|
|
+ isEdit.value
|
|
|
|
|
+ )
|
|
|
|
|
+ ) {
|
|
|
|
|
+ console.log("====>show false");
|
|
|
|
|
+ am.changeShow(false);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -457,7 +468,7 @@ export const addSubtitle = (data: AnimationModelSubtitle) => {
|
|
|
() => amMap[getAMKey(am)]?.am,
|
|
() => amMap[getAMKey(am)]?.am,
|
|
|
(am, _, onCleanup) => {
|
|
(am, _, onCleanup) => {
|
|
|
am && am.bus.on("transformChanged", update);
|
|
am && am.bus.on("transformChanged", update);
|
|
|
- onCleanup(() => am && am.bus.off("transformChanged", update))
|
|
|
|
|
|
|
+ onCleanup(() => am && am.bus.off("transformChanged", update));
|
|
|
},
|
|
},
|
|
|
{ immediate: true }
|
|
{ immediate: true }
|
|
|
)
|
|
)
|