fix: 当包纹理集数量超过10，出现纹理加载错误

wingcd · Jun 21, 2023 · 308763e · 308763e
1 parent 3333735
commit 308763e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/source/bin/fairygui.js b/source/bin/fairygui.js
@@ -14737,8 +14737,8 @@ window.__extends = (this && this.__extends) || (function () {
                         itms.push({ url: file, type: ItemTypeToAssetType[pi.type] });
                         return;
                     }
-                    var index = parseInt(file.substring(file.length - 1));
-                    if (atlases.indexOf(index) >= 0) {
+                    var clip = file.match(/(\w+_atlas)(\d+)/);
+                    if (clip && atlases.indexOf(parseInt(clip[2])) >= 0) {
                         itms.push({ url: file, type: ItemTypeToAssetType[pi.type] });
                     }
                 }

diff --git a/source/src/fairygui/UIPackage.ts b/source/src/fairygui/UIPackage.ts
@@ -251,8 +251,8 @@ namespace fgui {
                         itms.push({ url: file, type: ItemTypeToAssetType[pi.type] });
                         return;
                     }
-                    const index = parseInt(file.substring(file.length - 1));
-                    if (atlases.indexOf(index) >= 0) {
+                    const clip = file.match(/(\w+_atlas)(\d+)/);
+                    if (clip && atlases.indexOf(parseInt(clip[2])) >= 0) {
                         itms.push({ url: file, type: ItemTypeToAssetType[pi.type] });
                     }
                 }