@ives_xxz/framework 1.4.6 → 1.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -131,37 +131,43 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
131
131
 
132
132
  assetData.loaded = false;
133
133
 
134
- const proxy = FW.Entry.promiseMgr.execute((resolve, reject) => {
135
- const self = this;
136
- bundle.load(
137
- path,
138
- type,
139
- (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
140
- progress?.(finish, total, item);
141
- },
142
- (err: Error, asset: cc.Asset) => {
143
- if (err || !asset) {
144
- reject(err);
145
- return;
146
- }
134
+ return FW.Entry.promiseMgr.execute(
135
+ (resolve, reject, signal) => {
136
+ const self = this;
137
+ bundle.load(
138
+ path,
139
+ type,
140
+ (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
141
+ progress?.(finish, total, item);
142
+ },
143
+ (err: Error, asset: cc.Asset) => {
144
+ if (err || !asset) {
145
+ reject(err);
146
+ return;
147
+ }
147
148
 
148
- assetData.loaded = true;
149
- assetData.dependentBundle = bundleName;
150
- assetData.uuid = asset['_uuid'];
151
- assetData.autoRelease = autoRelease;
152
- assetData.asset = asset;
153
- assetData.user = assetProperty.user;
154
- assetData.refCount = 1;
155
- assetData.assetProperty = assetProperty;
156
-
157
- self.assetsMap.set(key, assetData);
158
-
159
- cb?.(assetData);
160
- resolve(assetData);
161
- },
162
- );
163
- });
164
- return proxy.promise;
149
+ assetData.loaded = true;
150
+ assetData.dependentBundle = bundleName;
151
+ assetData.uuid = asset['_uuid'];
152
+ assetData.autoRelease = autoRelease;
153
+ assetData.asset = asset;
154
+ assetData.user = assetProperty.user;
155
+ assetData.refCount = 1;
156
+ assetData.assetProperty = assetProperty;
157
+
158
+ self.assetsMap.set(key, assetData);
159
+
160
+ cb?.(assetData);
161
+ resolve(assetData);
162
+ },
163
+ );
164
+ },
165
+ {
166
+ retryCount: 3,
167
+ retryInterval: 1,
168
+ timeout: 10,
169
+ },
170
+ ).promise;
165
171
  }
166
172
  /**
167
173
  * 加载文件夹
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ives_xxz/framework",
3
- "version": "1.4.6",
3
+ "version": "1.4.7",
4
4
  "description": "cocoscreator 2.x mvc framework",
5
5
  "main": "index.js",
6
6
  "keywords": ["123456"],