@ives_xxz/framework 1.4.7 → 1.4.9

package/FW.d.ts

@@ -50,7 +50,7 @@ declare namespace FW {
   };
 
   type PromiseManager = {
-    public execute<T = any>(
+    execute<T = any>(
       executor: (
         resolve: (value: T | PromiseLike<T>) => void,
         reject: (reason?: any) => void,
@@ -58,6 +58,10 @@ declare namespace FW {
       ) => void = PromiseExcutor,
       options: PromiseExecuteOptions = {},
     ): PromiseProxy<T>;
+    all<T = any>(
+      promises: FW.PromiseProxy<T>[],
+      options: FW.PromiseExecuteOptions = {},
+    ): FW.PromiseProxy<FW.PromiseResult<T>>;
   };
 
   type Registry = {
@@ -656,6 +660,11 @@ declare namespace FW {
      * @param name
      */
     closeFromLayerName(name: string | string[]);
+    /**
+     * 移除所有子Layer
+     * @param layer
+     */
+    removeAllChildren(layer: Layer);
 
     getLayerMap(): Map<new () => LayerController, LayerData>;
   };
@@ -964,6 +973,8 @@ declare namespace FW {
 
   type Layer = {
     readonly entry: FW.Entry;
+    node: cc.Node;
+    ctr: LayerController;
     onLoad(): void;
     start(): void;
     onEnable(): void;
@@ -1215,33 +1226,6 @@ declare namespace FW {
      * @returns
      */
     createSkeleton(skeleton: sp.Skeleton): FW.Skeleton;
-    /**
-     * 获取一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    getSkeleton(animationName: string): FW.Skeleton;
-
-    /**
-     * 暂停一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    pauseSkeleton(animationName: string): void;
-
-    /**
-     * 恢复一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    resumeSkeleton(animationName: string): void;
-
-    /**
-     * 移除一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    removeSkeleton(animationName: string): void;
 
     /**
      * 暂停所有动画
@@ -1251,19 +1235,6 @@ declare namespace FW {
      * 恢复所有动画
      * */
     resumeAll(): void;
-    /**
-     * 创建动画机
-     * @param animationMachineName
-     * @returns
-     */
-    createAnimationMachine(animationMachineName: string): void;
-
-    /**
-     * 移除动画机
-     * @param animationMachineName
-     * @returns
-     */
-    removeAnimationMachine(animationMachineName: string): void;
   };
 
   type Tween = {
@@ -1950,7 +1921,7 @@ declare namespace FW {
   type Promise = (resolve: (value: any) => void, reject: (reason?: any) => void) => void;
 
   type PromiseResult<T = any> = {
-    success: T[];
+    success: PromiseProxy<T>[];
     failed: { id: number; reason: any }[];
     cancelled: number[];
   };

package/Framework.ts

@@ -1,7 +1,6 @@
 import 'reflect-metadata';
 import { Container, interfaces } from 'inversify';
 import { FWSystemDefine } from './define/FWSystemDefine';
-import FWLog from './log/FWLog';
 
 class Framework {
   private container: Container;
@@ -140,15 +139,12 @@ class Framework {
    */
   register(data: FW.RegisterFramework) {
     const classes = [data.logic, data.data, data.config, data.sender, data.handle];
-    FWLog.debug('framework注册->', classes);
     classes.forEach((cls, index) => {
       if (cls && !this.container.isBound(cls)) {
-        FWLog.debug('framework容器绑定成功->', cls);
         this.container.bind(cls).toSelf().inSingletonScope();
         this.container.bind(this.getKey(data.bundleName, index)).toService(cls);
       }
     });
-    FWLog.debug('framework注册完成->', this.container);
   }
   /**
    * 注销数据
@@ -157,21 +153,17 @@ class Framework {
    */
   unRegister(data: FW.RegisterFramework) {
     const classes = [data.logic, data.data, data.config, data.sender, data.handle];
-    FWLog.debug('framework注销->', classes);
     classes.forEach((cls, index) => {
       const key = this.getKey(data.bundleName, index);
       if (cls && this.container.isBound(cls)) {
         this.container.get(key)['onDestroy']?.();
         this.container.unbind(cls);
-        FWLog.debug('framework容器解开绑定->', cls);
       }
       if (this.container.isBound(key)) {
         this.container.get(key)['onDestroy']?.();
         this.container.unbind(this.getKey(data.bundleName, index));
-        FWLog.debug('framework容器解开绑定->', this.getKey(data.bundleName, index));
       }
     });
-    FWLog.debug('framework注销完成->', this.container);
   }
 
   private getKey(bundleName: string, tag: FWSystemDefine.FWBindTag) {

package/animation/FWSkeleton.ts

@@ -28,7 +28,6 @@ export class FWSkeleton extends FWAnimation implements FW.Skeleton {
     return new Promise((resolve) => {
       this.animation.setCompleteListener(() => {
         this.animation.setCompleteListener(null);
-        FW.Entry.animationMgr.removeSkeleton(this.animationName);
         args?.cb?.();
         resolve();
       });

package/define/FWSystemDefine.ts

@@ -137,4 +137,11 @@ export namespace FWSystemDefine {
     REJECTED = 'rejected',
     CANCELLED = 'cancelled',
   }
+
+  export enum FWLayerState {
+    CLOSED = 'closed',
+    OPENING = 'opening',
+    OPENED = 'opened',
+    CLOSING = 'closing',
+  }
 }

package/layer/FWLayer.ts

@@ -3,6 +3,7 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class FWLayer extends cc.Component implements FW.Layer {
   public readonly entry: FW.Entry = FW.Entry;
+  public ctr: FW.LayerController;
   public onLoad(): void {}
   public start(): void {}
   public onEnable(): void {}

package/manager/FWAnimationManager.ts

@@ -44,47 +44,6 @@ export default class FWAnimationManager extends FWManager {
     return s;
   }
 
-  /**
-   * 获取一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  getSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    return this.animationMachineMap
-      .get(FWSystemDefine.FWAnimationMachineType.SKELETON)
-      .getAnimation(animationName) as FWSkeleton;
-  }
-
-  /**
-   * 暂停一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  pauseSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    this.animationMachineMap.get(animationName).pause();
-  }
-
-  /**
-   * 恢复一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  resumeSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    this.animationMachineMap.get(animationName).resume();
-  }
-  /**
-   * 移除一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  removeSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    this.animationMachineMap.delete(animationName);
-  }
-
   /**
    * 暂停所有动画
    */
@@ -102,7 +61,7 @@ export default class FWAnimationManager extends FWManager {
    * @param animationMachineName
    * @returns
    */
-  createAnimationMachine(animationMachineName: string) {
+  private createAnimationMachine(animationMachineName: string) {
     if (this.animationMachineMap.has(animationMachineName)) {
       FWLog.warn(`已创建动画机:${animationMachineName},请勿重复注册!`);
       return;
@@ -117,12 +76,16 @@ export default class FWAnimationManager extends FWManager {
    * @param animationMachineName
    * @returns
    */
-  removeAnimationMachine(animationMachineName: string) {
+  private removeAnimationMachine(animationMachineName: string) {
     if (!this.animationMachineMap.has(animationMachineName)) {
       return;
     }
     this.animationMachineMap.delete(animationMachineName);
   }
 
-  onDestroy(): void {}
+  onDestroy(): void {
+    this.animationMachineMap.forEach((v, k) => {
+      this.removeAnimationMachine(k);
+    });
+  }
 }

package/manager/FWAssetManager.ts

@@ -179,7 +179,6 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
       return undefined;
     }
-
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const type = assetProperty.type;
     const path = assetProperty.path;