@ives_xxz/framework 2.1.16 → 2.1.18

package/manager/FWResManager.ts

@@ -86,12 +86,16 @@ export class FWResManager extends FWManager implements FW.ResManager {
     return await this.assetMgr.loadSpineDataFromRemote(data);
   }
 
-  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb: (asset: any) => T): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, texture?: boolean): Promise<T> {
     const asset = await this.assetMgr.loadRemote(url);
-    if (asset instanceof cc.Texture2D) {
-      return new cc.SpriteFrame(asset) as unknown as T;
-    } else {
+    if (texture) {
       return asset as T;
+    } else {
+      if (asset instanceof cc.Texture2D) {
+        return new cc.SpriteFrame(asset) as unknown as T;
+      } else {
+        return asset as T;
+      }
     }
   }
 
@@ -133,8 +137,14 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
+  async loadAsset<T extends cc.Asset>(
+    assetProperty: FW.AssetProperty,
+    texture?: boolean,
+  ): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
+    if (texture) {
+      return res.asset as T;
+    }
     return this.process<T>(res).asset as T;
   }
 
@@ -156,16 +166,24 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param bundleName
    * @returns
    */
-  getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty) {
-    return this.process<T>(this.assetMgr.get(assetProperty));
+  getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean) {
+    const res = this.assetMgr.get(assetProperty);
+    if (texture) {
+      return res;
+    }
+    return this.process<T>(res);
   }
   /**
    * 获取资源
    * @param assetProperty
    * @returns
    */
-  getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): T {
-    return this.process<T>(this.assetMgr.get(assetProperty)).asset as T;
+  getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean): T {
+    const res = this.assetMgr.get(assetProperty);
+    if (texture) {
+      return res.asset as T;
+    }
+    return this.process<T>(res).asset as T;
   }
 
   /**

package/package.json

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

package/types/FW.d.ts

@@ -1063,7 +1063,7 @@ declare namespace FW {
      * @param cb - 回调函数
      * @returns Promise返回加载的资源
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(url: string, texutre?: boolean): Promise<T>;
 
     /**
      * 从远程加载spine动画数据
@@ -1092,7 +1092,7 @@ declare namespace FW {
      * @param cb - 回调函数
      * @returns Promise返回加载的资源
      */
-    loadAsset<T extends cc.Asset>(assetProperty: AssetProperty, cb?: () => void): Promise<T>;
+    loadAsset<T extends cc.Asset>(assetProperty: AssetProperty, texture?: boolean): Promise<T>;
 
     /**
      * 获取资源数据
@@ -1100,7 +1100,7 @@ declare namespace FW {
      * @param assetProperty - 资源属性
      * @returns 资源数据
      */
-    getAssetData<T extends cc.Asset>(assetProperty: AssetProperty): AssetData;
+    getAssetData<T extends cc.Asset>(assetProperty: AssetProperty, texture?: boolean): AssetData;
 
     /**
      * 获取资源
@@ -1108,7 +1108,7 @@ declare namespace FW {
      * @param assetProperty - 资源属性
      * @returns 资源对象
      */
-    getAsset<T extends cc.Asset = cc.Asset>(assetProperty: AssetProperty): T;
+    getAsset<T extends cc.Asset = cc.Asset>(assetProperty: AssetProperty, texture?: boolean): T;
 
     /**
      * 释放资源

package/utils/FWObjectPool.ts

@@ -1,8 +1,6 @@
-import FWObject from './FWObject';
-
 const POOL_DISABLE_POSITION: cc.Vec3 = cc.v3(50000, 50000);
 
-export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPool {
+export class FWObjectPool<T extends FW.Object = FW.Object> implements FW.ObjectPool {
   private uniqueId: number;
   private type: FW.SystemDefine.FWObjectType;
   private enablePoolMap: Map<number, FW.ObjectProperty>;
@@ -51,7 +49,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
         if (property.node.uuid == uuid) {
           return property;
         }
-      } else if (arguments[0] instanceof FWObject) {
+      } else if (arguments[0] instanceof FW.Object) {
         if (uniqueId == arguments[0]?.uniqueId) {
           return property;
         }
@@ -77,7 +75,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
     };
     if (this.isEmpty()) {
       node = cc.instantiate(this.node);
-      element = (node.getComponent(FWObject) as T) || undefined;
+      element = (node.getComponent(FW.Object) as T) || undefined;
       ObjectProperty.uniqueId = ++this.uniqueId;
       ObjectProperty.node = node;
       ObjectProperty.component = element;
@@ -142,7 +140,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
     let property: FW.ObjectProperty = this.findObjectProperty(arguments[0]);
 
     const node: cc.Node = property.node;
-    const element = (node.getComponent(FWObject) as T) || undefined;
+    const element = (node.getComponent(FW.Object) as T) || undefined;
 
     if (!cc.isValid(node)) {
       return;