@novely/core 0.36.0-beta.0 → 0.36.0-beta.2

package/dist/index.global.js

@@ -1179,6 +1179,11 @@ var Novely = (() => {
       await Promise.allSettled(list);
       ASSETS_TO_PRELOAD.clear();
     };
+    const assetsToPreloadAdd = (asset) => {
+      if (!PRELOADED_ASSETS.has(asset)) {
+        ASSETS_TO_PRELOAD.add(asset);
+      }
+    };
     const scriptBase = async (part) => {
       Object.assign(story, flattenStory(part));
       let loadingIsShown = false;
@@ -1209,27 +1214,27 @@ var Novely = (() => {
     const checkAndAddToPreloadingList = (action2, props) => {
       if (action2 === "showBackground") {
         if (isImageAsset(props[0])) {
-          ASSETS_TO_PRELOAD.add(props[0]);
+          assetsToPreloadAdd(props[0]);
         }
         if (props[0] && typeof props[0] === "object") {
           for (const value of Object.values(props[0])) {
             if (!isImageAsset(value))
               continue;
-            ASSETS_TO_PRELOAD.add(value);
+            assetsToPreloadAdd(value);
           }
         }
       }
       if (isAudioAction(action2) && isString(props[0])) {
-        ASSETS_TO_PRELOAD.add(props[0]);
+        assetsToPreloadAdd(props[0]);
       }
       if (action2 === "showCharacter" && isString(props[0]) && isString(props[1])) {
         const images = characters[props[0]].emotions[props[1]];
         if (Array.isArray(images)) {
           for (const asset of images) {
-            ASSETS_TO_PRELOAD.add(asset);
+            assetsToPreloadAdd(asset);
           }
         } else {
-          ASSETS_TO_PRELOAD.add(images);
+          assetsToPreloadAdd(images);
         }
       }
     };
@@ -1611,17 +1616,21 @@ var Novely = (() => {
           for (const [action3, ...props2] of collection) {
             checkAndAddToPreloadingList(action3, props2);
           }
-          const { preloadAudioBlocking, preloadImage } = renderer.misc;
+          const { preloadAudioBlocking, preloadImageBlocking } = renderer.misc;
           ASSETS_TO_PRELOAD.forEach(async (asset) => {
             ASSETS_TO_PRELOAD.delete(asset);
             const type = await getResourseType(request, asset);
             switch (type) {
               case "audio": {
-                preloadAudioBlocking(asset);
+                preloadAudioBlocking(asset).then(() => {
+                  PRELOADED_ASSETS.add(asset);
+                });
                 break;
               }
               case "image": {
-                preloadImage(asset);
+                preloadImageBlocking(asset).then(() => {
+                  PRELOADED_ASSETS.add(asset);
+                });
                 break;
               }
             }