@ives_xxz/framework 2.1.6 → 2.1.7

package/manager/FWAssetManager.ts

@@ -1,5 +1,5 @@
-import { FWSystemConfig } from '../config/FWSystemConfig';
-import { FWManager } from './FWManager';
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWManager } from "./FWManager";
 
 /**
  * 资源数据
@@ -14,7 +14,6 @@ class FWAssetData implements FW.AssetData {
   dependentBundle: string;
   loaded: boolean;
   autoRelease: boolean;
-  refCount: number;
   assetProperty: FW.AssetProperty;
 }
 
@@ -47,7 +46,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           const img = data.img;
           const ske = data.ske;
           const atlas = data.atlas;
-          const type = bin ? '.bin' : '.txt';
+          const type = bin ? ".bin" : ".txt";
           cc.assetManager.loadAny(
             [
               { url: atlas, ext: type },
@@ -59,34 +58,38 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.skeletonJson = assets[1];
               asset.atlasText = assets[0];
               asset.textures.push(texture);
-              asset['textureNames'] = [`${img}.png`];
-              asset['_uuid'] = ske;
+              asset["textureNames"] = [`${img}.png`];
+              asset["_uuid"] = ske;
               resolve(asset);
-            },
+            }
           );
-        }, FWSystemConfig.PromiseConfig.loadAsset).promise,
+        }, FWSystemConfig.PromiseConfig.loadAsset).promise
       );
     } catch (e) {
-      FW.Log.error('从远程加载spine动画资源失败!');
+      FW.Log.error("从远程加载spine动画资源失败!");
     }
   }
 
   /** 加载远程资源 */
   async loadRemote<T extends cc.Asset = cc.Asset>(
     url?: string,
-    cb?: (asset: cc.Asset) => void,
+    cb?: (asset: cc.Asset) => void
   ): Promise<T> {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
-        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
-          if (err || !asset) {
-            reject(err);
+        cc.assetManager.loadRemote(
+          url,
+          { cacheEnabled: true, maxRetryCount: 3 },
+          (err, asset) => {
+            if (err || !asset) {
+              reject(err);
+            }
+            cb?.(asset as T);
+            resolve(asset as T);
           }
-          cb?.(asset as T);
-          resolve(asset as T);
-        });
+        );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`,
+      `loadAssets -> ${url}`
     );
   }
 
@@ -96,7 +99,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       return undefined;
     }
 
-    const propertys = Array.isArray(assetProperty) ? assetProperty : [assetProperty];
+    const propertys = Array.isArray(assetProperty)
+      ? assetProperty
+      : [assetProperty];
 
     await Promise.all(
       propertys.map(async (property) => {
@@ -105,17 +110,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === '') {
+        if (!bundleName || bundleName === "") {
           FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === '') {
+        if (!path || path === "") {
           FW.Log.error(`找不到资源路径${path},请检查!`);
           return undefined;
         }
 
-        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+          bundleName
+        );
 
         if (!bundle) {
           FW.Log.error(`加载bundle失败,请检查!`);
@@ -127,20 +134,24 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             bundle.preload(
               path,
               type,
-              (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+              (
+                finish: number,
+                total: number,
+                item: cc.AssetManager.RequestItem
+              ) => {
                 progress?.(finish, total, item);
               },
               (err: Error, item: cc.AssetManager.RequestItem[]) => {
                 if (err || !item || item?.length == 0) {
-                  reject(err || 'preload failed!');
+                  reject(err || "preload failed!");
                 }
                 resolve(item);
-              },
+              }
             );
           }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-          `preLoadAssets -> ${property.path}`,
+          `preLoadAssets -> ${property.path}`
         );
-      }),
+      })
     );
   }
 
@@ -161,17 +172,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+      bundleName
+    );
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -181,10 +194,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     if (this.assetsMap.has(key)) {
       const assetData = this.assetsMap.get(key);
-      if (!assetData.asset.loaded) {
+      if(!assetData.asset.loaded){
         this.assetsMap.delete(key);
-      } else {
-        assetData.refCount++;
+      }else{
         return assetData;
       }
     }
@@ -199,7 +211,11 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         bundle.load(
           path,
           type,
-          (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+          (
+            finish: number,
+            total: number,
+            item: cc.AssetManager.RequestItem
+          ) => {
             progress?.(finish, total, item);
           },
           (err: Error, asset: cc.Asset) => {
@@ -209,21 +225,20 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             }
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
+            assetData.uuid = asset["_uuid"];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.user = assetProperty.user;
-            assetData.refCount = 1;
             assetData.assetProperty = assetProperty;
 
             self.assetsMap.set(key, assetData);
 
             cb?.(assetData);
             resolve(assetData);
-          },
+          }
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`,
+      `loadAssets -> ${assetProperty.path}`
     );
   }
   /**
@@ -242,17 +257,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+      bundleName
+    );
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -262,7 +279,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     return new Promise(
       (
         resolve: (value: FW.AssetData[] | PromiseLike<FW.AssetData[]>) => void,
-        reject: (reason?: any) => void,
+        reject: (reason?: any) => void
       ) => {
         bundle.loadDir(path, type, (err: Error, assets: cc.Asset[]) => {
           if (err || assets.length === 0) {
@@ -276,7 +293,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const assetData = new FWAssetData();
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
+            assetData.uuid = asset["_uuid"];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.type = type;
@@ -285,7 +302,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const key = `${this.createAssetMapKey({
               bundle: bundleName,
               path: path,
-            })}/${asset.name}${type ? `_${type?.name}` : ''}`;
+            })}/${asset.name}${type ? `_${type?.name}` : ""}`;
 
             this.assetsMap.set(key, assetData);
 
@@ -295,7 +312,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      },
+      }
     );
   }
 
@@ -312,24 +329,23 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FW.Log.error('获取资源失败,请先加载!');
+      FW.Log.error("获取资源失败,请先加载!");
       return undefined;
     }
 
     const key = this.createAssetMapKey(assetProperty);
     const assetsData = this.assetsMap.get(key);
-    assetsData.refCount++;
     return assetsData;
   }
 
@@ -347,12 +363,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
@@ -360,11 +376,11 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     if (!this.has(assetProperty)) {
       return undefined;
     }
+
     const key = this.createAssetMapKey(assetProperty);
     const assetData = this.assetsMap.get(key);
-    assetData.refCount--;
 
-    if (assetData.refCount <= 0) {
+    if (assetData.asset?.refCount <= 0 && autoRelease) {
       this.resMgr.getBundle(bundleName)?.release(path);
       this.assetsMap.delete(key);
     }
@@ -377,7 +393,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
    */
   public getReferenceCount(assetProperty: FW.AssetProperty): number {
     const key = this.createAssetMapKey(assetProperty);
-    return this.assetsMap.get(key)?.refCount || 0;
+    return this.assetsMap.get(key)?.asset?.refCount || 0;
   }
 
   /**

package/manager/FWResManager.ts

@@ -218,7 +218,6 @@ export class FWResManager extends FWManager implements FW.ResManager {
       dependentBundle: res.dependentBundle,
       autoRelease: res.autoRelease,
       loaded: res.loaded,
-      refCount: res.refCount,
       assetProperty: res.assetProperty,
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/types/FW.d.ts

@@ -1001,10 +1001,6 @@ declare namespace FW {
      * 释放时是否从bundle内释放
      */
     autoRelease: boolean;
-    /**
-     * 资源引用计数
-     */
-    refCount: number;
     /**
      * 资源属性
      */