Bring patch from for_pr

9a9d20f 638053e
RaSan147 · Apr 10, 2024 · 0409b60 · 0409b60
1 parent b00b64b
commit 0409b60
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Live2DModel.ts b/src/Live2DModel.ts
@@ -167,8 +167,8 @@ export class Live2DModel<IM extends InternalModel = InternalModel> extends Conta
      */
     motion(
         group: string,
-        index: number,
-        priority: MotionPriority,
+        index?: number,
+        priority?: MotionPriority,
         {
             sound = undefined,
             volume = VOLUME,

diff --git a/src/cubism4/Cubism4MotionManager.ts b/src/cubism4/Cubism4MotionManager.ts
@@ -25,15 +25,19 @@ export class Cubism4MotionManager extends MotionManager<CubismMotion, CubismSpec
     expressionManager?: Cubism4ExpressionManager;
 
     eyeBlinkIds: string[];
-    lipSyncIds: string[];
+    lipSyncIds = ["ParamMouthOpenY"];
 
     constructor(settings: Cubism4ModelSettings, options?: MotionManagerOptions) {
         super(settings, options);
 
         this.definitions = settings.motions ?? {};
         this.eyeBlinkIds = settings.getEyeBlinkParameters() || [];
-        this.lipSyncIds = settings.getLipSyncParameters() || [];
 
+        const lipSyncIds = settings.getLipSyncParameters();
+
+        if (lipSyncIds?.length) {
+            this.lipSyncIds = lipSyncIds;
+        }
         this.init(options);
     }