dzkcc-mflow 0.0.18 → 0.0.19

package/dist/core/ICocosResManager.d.ts

@@ -6,6 +6,6 @@ export interface ICocosResManager extends IResManager {
     loadPrefab(path: string, nameOrUrl?: string): Promise<Prefab>;
     loadSpriteFrame(ref: Sprite, path: string, nameOrUrl?: string): Promise<SpriteFrame>;
     loadSpine(ref: sp.Skeleton, path: string, nameOrUrl?: string): Promise<sp.SkeletonData>;
-    release(asset: Asset): void;
-    release(path: string, type?: AssetType<Asset>, nameOrUrl?: string): void;
+    release(asset: Asset, force?: boolean): void;
+    release(path: string, type?: AssetType<Asset>, nameOrUrl?: string, force?: boolean): void;
 }

package/dist/libs/BaseView.js

@@ -65,8 +65,7 @@ class BaseView extends Component {
     onDestroy() {
         // 自动清理加载的资源
         this._loaderHandlers.forEach(({ path, asset }) => {
-            mf.res.release(path, asset.constructor);
-            // mf.res.release(asset);
+            mf.res.release(asset);
         });
         this._loaderHandlers = [];
     }

package/dist/libs/ResLoader.d.ts

@@ -5,6 +5,6 @@ export declare class ResLoader implements ICocosResManager {
     loadPrefab(path: string, nameOrUrl?: string): Promise<Prefab>;
     loadSpriteFrame(ref: Sprite, path: string, nameOrUrl?: string): Promise<SpriteFrame>;
     loadSpine(ref: sp.Skeleton, path: string, nameOrUrl?: string): Promise<sp.SkeletonData>;
-    release(asset: Asset): void;
-    release(path: string, type?: AssetType<Asset>, nameOrUrl?: string): void;
+    release(asset: Asset, force?: boolean): void;
+    release(path: string, type?: AssetType<Asset>, nameOrUrl?: string, force?: boolean): void;
 }

package/dist/libs/ResLoader.js

@@ -4,8 +4,6 @@ import { assetManager, Prefab, Asset, SpriteFrame, sp } from 'cc';
 const DefaultBundle = "resources";
 class ResLoader {
     loadAsset(path, type, nameOrUrl = DefaultBundle) {
-        //TODO: bundle.release和assetManager.releaseAsset的区别?
-        //TODO: prefab是否需要addRef，prefab被克隆出来的节点被销毁时，对应的prefab如何处理?
         if (assetManager.assets.has(path)) {
             const asset = assetManager.assets.get(path);
             asset.addRef();
@@ -31,6 +29,7 @@ class ResLoader {
         });
     }
     loadPrefab(path, nameOrUrl = DefaultBundle) {
+        //refCount 记录的是持有者数量，不是资源份数，所以prefab也需要addRef
         return this.loadAsset(path, Prefab, nameOrUrl);
     }
     loadSpriteFrame(ref, path, nameOrUrl = DefaultBundle) {
@@ -41,7 +40,7 @@ class ResLoader {
                 return Promise.resolve(sf);
             }
             else {
-                // 没有引用到的资源，释放掉
+                // 没有引用对象，释放掉资源
                 this.release(path, SpriteFrame, nameOrUrl);
                 return Promise.reject(new Error("Sprite is not valid"));
             }
@@ -55,26 +54,37 @@ class ResLoader {
                 return Promise.resolve(spine);
             }
             else {
-                // 没有引用到的资源，释放掉
+                // 没有引用对象，释放掉资源
                 this.release(path, sp.SkeletonData, nameOrUrl);
                 return Promise.reject(new Error("Spine is not valid"));
             }
         });
     }
-    release(pathOrAsset, type, nameOrUrl = DefaultBundle) {
+    release(pathOrAsset, typeOrForce, nameOrUrl = DefaultBundle, forceParam = false) {
+        var _a;
+        let asset;
+        let force = false;
         if (typeof pathOrAsset === "string") {
-            const bundle = assetManager.getBundle(nameOrUrl);
-            const asset = bundle === null || bundle === void 0 ? void 0 : bundle.get(pathOrAsset, type);
-            asset === null || asset === void 0 ? void 0 : asset.decRef();
-            if ((asset === null || asset === void 0 ? void 0 : asset.refCount) === 0) {
-                bundle === null || bundle === void 0 ? void 0 : bundle.release(pathOrAsset, type);
+            if (!typeOrForce || typeof typeOrForce === "boolean") {
+                throw new Error('typeOrForce is undefined, or typeOrForce is boolean! typeOrForce must be AssetType<Asset>!');
             }
+            force = forceParam;
+            asset = (_a = assetManager.getBundle(nameOrUrl)) === null || _a === void 0 ? void 0 : _a.get(pathOrAsset, typeOrForce);
         }
         else if (pathOrAsset instanceof Asset) {
-            pathOrAsset.decRef();
-            if (pathOrAsset.refCount === 0) {
-                assetManager.releaseAsset(pathOrAsset);
-            }
+            asset = pathOrAsset;
+            force = typeof typeOrForce === 'boolean' ? typeOrForce : forceParam;
+        }
+        if (!asset) {
+            console.warn(`${pathOrAsset} Release asset failed, asset is null or undefined`);
+            return;
+        }
+        if (force) {
+            assetManager.releaseAsset(asset);
+        }
+        else {
+            // decRef原型：decRef (autoRelease = true)，所以引用数量为 0，则将自动释放该资源。
+            asset.decRef();
         }
     }
 }

package/dist/libs/UIManager.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../_virtual/_tslib.js';
-import { director, Node, Sprite, Widget, Input, input, instantiate } from 'cc';
+import { director, Node, Sprite, Widget, Input, input, Prefab, instantiate } from 'cc';
 import { ServiceLocator } from '../core/ServiceLocator.js';
 import 'reflect-metadata';
 
@@ -144,6 +144,7 @@ class UIManager extends CcocosUIManager {
                 target = instantiate(prefab);
                 this._cache.set(viewType.name, target);
             }
+            target.active = true;
             return target.getComponent(viewType);
         });
     }
@@ -163,10 +164,21 @@ class UIManager extends CcocosUIManager {
         }
         viewortype.onExit();
         viewortype.node.removeFromParent();
+        viewortype.node.active = false;
         if (destroy) {
             let cacheKey = viewortype.constructor.name;
             (_a = this._cache.get(cacheKey)) === null || _a === void 0 ? void 0 : _a.destroy();
             this._cache.delete(cacheKey);
+            // 销毁被克隆出的UI后Node后，尝试释放 Prefab 资源
+            try {
+                const viewType = viewortype.constructor;
+                const prefabPath = this._getPrefabPath(viewType);
+                const ResMgr = ServiceLocator.getService('ResLoader');
+                ResMgr.release(prefabPath, Prefab);
+            }
+            catch (error) {
+                console.error(`Failed to release prefab for ${cacheKey}:`, error);
+            }
         }
     }
     internalGetTopView() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dzkcc-mflow",
-    "version": "0.0.18",
+    "version": "0.0.19",
     "description": "A modular design and process management framework developed for the cocos engine, suitable for decoupling and dependency injection.",
     "author": "duanzhk",
     "license": "MIT",