fix: 调整模型事件注册时机

oh-my-live2d · Mar 22, 2024 · 17f63cd · 17f63cd
1 parent 53c8d3a
commit 17f63cd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/packages/oh-my-live2d/src/modules/oml2d.ts b/packages/oh-my-live2d/src/modules/oml2d.ts
@@ -91,6 +91,10 @@ export class OhMyLive2D {
    * 加载模型
    */
   private async loadModel(isLoading = true): Promise<void> {
+    if (!this.options.models || !this.options.models.length) {
+      return;
+    }
+
     if (this.mobileHidden) {
       this.statusBar.rest();
 
@@ -108,8 +112,14 @@ export class OhMyLive2D {
     this.application?.mount(this.stage.canvasElement!, this.stage.element!, this.models.model);
     this.models.settingModel();
     this.stage.reloadStyle(this.models.modelSize);
+
     this.application?.resize();
+
     this.statusBar.hideLoading();
+
+    // 注册模型事件
+    this.registerModelEvent();
+
     await this.stage.slideIn();
   }
 
@@ -158,10 +168,6 @@ export class OhMyLive2D {
       printProjectInfo();
     }
 
-    if (!this.options.models || !this.options.models.length) {
-      return;
-    }
-
     //  创建
     this.create();
 
@@ -176,9 +182,6 @@ export class OhMyLive2D {
 
     // 加载模型
     await this.loadModel();
-
-    // 注册模型事件
-    this.registerModelEvent();
   }
 
   /**

diff --git a/packages/oh-my-live2d/src/modules/stage.ts b/packages/oh-my-live2d/src/modules/stage.ts
@@ -52,11 +52,11 @@ export class Stage {
   reloadStyle(modelSize: CommonStyleType = {}): void {
     switch (getWindowSizeType()) {
       case WindowSizeType.mobile:
-        modelSize = mergeDeep(modelSize, this.options.models[this.modelIndex].mobileStageStyle || {});
+        modelSize = mergeDeep(modelSize, this.options.models?.[this.modelIndex]?.mobileStageStyle || {});
         this.setStyle(handleCommonStyle(modelSize));
         break;
       case WindowSizeType.pc:
-        modelSize = mergeDeep(modelSize, this.options.models[this.modelIndex].stageStyle || {});
+        modelSize = mergeDeep(modelSize, this.options.models?.[this.modelIndex]?.stageStyle || {});
         this.setStyle(handleCommonStyle(modelSize));
         break;
     }

diff --git a/tests/vite-app/src/main.ts b/tests/vite-app/src/main.ts
@@ -49,16 +49,16 @@ const foo = async () => {
       }
     },
     menus: {
-      items: [
-        {
-          id: 'github',
-          icon: 'github-fill',
-          title: '我的github',
-          onClick() {
-            window.open('https://github.com/hacxy');
-          }
-        }
-      ]
+      // items: [
+      //   {
+      //     id: 'github',
+      //     icon: 'github-fill',
+      //     title: '我的github',
+      //     onClick() {
+      //       window.open('https://github.com/hacxy');
+      //     }
+      //   }
+      // ]
     }
   });