Merge branch 'dev'

OpenWebGAL · Nov 6, 2023 · 63515c4 · 63515c4
2 parents 27c66a8 + bf85281
commit 63515c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts b/packages/webgal/src/Core/controller/stage/pixi/PixiController.ts
@@ -125,12 +125,18 @@ export default class PixiStage {
     this.backgroundContainer.zIndex = 0;
     app.stage.addChild(this.effectsContainer, this.figureContainer, this.backgroundContainer);
     this.currentApp = app;
-    // 每 5s 获取帧率
+    // 每 5s 获取帧率，并且防 loader 死
     const update = () => {
       this.updateFps();
       setTimeout(update, 10000);
     };
     update();
+    // loader 防死
+    const reload = () => {
+      setTimeout(reload, 500);
+      this.callLoader();
+    };
+    reload();
   }
 
   public getFigureObjects() {
@@ -703,7 +709,7 @@ export default class PixiStage {
     /**
      * Loader 复用疑似有问题，转而采用先前的单独方式
      */
-    this.loadQueue.push({ url, callback });
+    this.loadQueue.unshift({ url, callback });
     /**
      * 尝试启动加载
      */

diff --git a/packages/webgal/src/config/info.ts b/packages/webgal/src/config/info.ts
@@ -1,5 +1,5 @@
 export const __INFO = {
-  version: 'WebGAL 4.4.6.2',
+  version: 'WebGAL 4.4.6.3',
   contributors: [
     { username: 'Mahiru', link: 'https://github.com/MakinoharaShoko' },
     { username: 'Hoshinokinya', link: 'https://github.com/hshqwq' },