🐛 fix: play error

rdmclin2 · rdmclin2 · commit a7646c2ef1f5 · 2024-08-05T01:36:07.000+08:00
diff --git a/src/features/DanceList/Item/index.tsx b/src/features/DanceList/Item/index.tsx
@@ -49,6 +49,7 @@ const DanceItem = (props: DanceItemProps) => {
     viewer.model?.disposeAll();
     if (isPlaying && isCurrentPlay) {
       setIsPlaying(false);
+      viewer.model?.loadIdleAnimation();
     } else {
       setCurrentPlayId(danceItem.danceId);
       setIsPlaying(true);
diff --git a/src/features/audioPlayer/audioPlayer.ts b/src/features/audioPlayer/audioPlayer.ts
@@ -7,11 +7,7 @@ export class AudioPlayer {
     this.bufferSource = undefined;
   }
 
-  public async playFromArrayBuffer(
-    buffer: ArrayBuffer,
-    onEnded?: () => void,
-    onProgress?: () => void,
-  ) {
+  public async playFromArrayBuffer(buffer: ArrayBuffer, onEnded?: () => void) {
     const audioBuffer = await this.audio.decodeAudioData(buffer);
 
     this.bufferSource = this.audio.createBufferSource();
@@ -22,9 +18,6 @@ export class AudioPlayer {
     if (onEnded) {
       this.bufferSource.addEventListener('ended', onEnded);
     }
-    if (onProgress) {
-      this.bufferSource.addEventListener('time', onProgress);
-    }
   }
 
   public stopPlay() {
diff --git a/src/libs/vrmViewer/model.ts b/src/libs/vrmViewer/model.ts
@@ -163,12 +163,10 @@ export class Model {
       const clip = await loadVMDAnimation(danceUrl, vrm);
       const action = mixer.clipAction(clip);
       action.setLoop(LoopOnce, 1).play(); // play animation
-      if (audioUrl) {
-        this._audioPlayer?.playFromURL(audioUrl, () => {
-          onEnd?.();
-        });
-        this._audio = audioUrl;
-      }
+      this._audioPlayer?.playFromURL(audioUrl, () => {
+        onEnd?.();
+      });
+      this._audio = audioUrl;
 
       this._action = action;
       this._clip = clip;

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,7 @@ export class AudioPlayer {`
`7`	`7`	`this.bufferSource = undefined;`
`8`	`8`	`}`
`9`	`9`
`10`		`- public async playFromArrayBuffer(`
`11`		`- buffer: ArrayBuffer,`
`12`		`- onEnded?: () => void,`
`13`		`- onProgress?: () => void,`
`14`		`- ) {`
	`10`	`+ public async playFromArrayBuffer(buffer: ArrayBuffer, onEnded?: () => void) {`
`15`	`11`	`const audioBuffer = await this.audio.decodeAudioData(buffer);`
`16`	`12`
`17`	`13`	`this.bufferSource = this.audio.createBufferSource();`
`@@ -22,9 +18,6 @@ export class AudioPlayer {`
`22`	`18`	`if (onEnded) {`
`23`	`19`	`this.bufferSource.addEventListener('ended', onEnded);`
`24`	`20`	`}`
`25`		`- if (onProgress) {`
`26`		`- this.bufferSource.addEventListener('time', onProgress);`
`27`		`- }`
`28`	`21`	`}`
`29`	`22`
`30`	`23`	`public stopPlay() {`