@ives_xxz/framework 1.2.3 → 1.2.5

package/FW.d.ts

@@ -1092,7 +1092,7 @@ declare namespace FW {
      * tasksFrameCount?: number; 每帧最多执行的任务个数
      */
 
-    createTask(options: Partial<FW.TaskOptions>): FW.Task;
+    createTask(options?: Partial<FW.TaskOptions>): FW.Task;
     /**
      * 获取任务
      * @param taskId

package/manager/FWLayerManager.ts

@@ -34,6 +34,10 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * 当前已经打开的layer缓存容器
    */
   private layerMap: Map<string, FWLayerData>;
+  /**
+   * 当前所有打开Layer注册表
+   */
+  private layerRegistry: Set<new () => FW.LayerController>;
   /**
    * layer栈队列
    */
@@ -42,6 +46,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   public initialize(): void {
     this.layerQueue = new FWQueue<FWLayerData>();
     this.layerMap = new Map<string, FWLayerData>();
+    this.layerRegistry = new Set<new () => FW.LayerController>();
     this.layerStack = [];
   }
 
@@ -118,19 +123,22 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
 
     let ctr = new data.type();
 
-    if (!ctr.isRepeatOpen) {
-      for (const [key, value] of this.layerMap) {
-        if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-          return this.layerMap.get(value.uuid).controller as Ctr;
-        }
-      }
-    }
-
     if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
       this.layerQueue.add(ctr.layerData);
       return;
     }
 
+    /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
+    if (
+      this.layerRegistry.has(data.type) &&
+      !ctr.isRepeatOpen &&
+      ctr.layerType != FWSystemDefine.FWLayerType.POPUP_QUEUE
+    ) {
+      return;
+    }
+
+    this.layerRegistry.add(data.type);
+
     ctr.initialize();
 
     const layerData = this.createLayerData(ctr);
@@ -165,6 +173,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.layerStack.push(layerData);
     }
 
+    this.layerRegistry.delete(data.type);
+
     const proxy = new Proxy(ctr, {
       get: (target, prop) => {
         if (prop === ADD_EXTERNAL_REFERENCE) {
@@ -190,19 +200,20 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
     let ctr = new data.type();
 
-    if (!ctr.isRepeatOpen) {
-      for (const [key, value] of this.layerMap) {
-        if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-          return this.layerMap.get(value.uuid).controller as Ctr;
-        }
-      }
-    }
-
     if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
       this.layerQueue.add(ctr.layerData);
       return;
     }
 
+    /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
+    if (
+      this.layerRegistry.has(data.type) &&
+      !ctr.isRepeatOpen &&
+      ctr.layerType != FWSystemDefine.FWLayerType.POPUP_QUEUE
+    ) {
+      return;
+    }
+
     ctr.initialize();
 
     const layerData = this.createLayerData(ctr);

package/package.json

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

package/service/socket/FWSocket.ts

@@ -170,7 +170,7 @@ export default class FWSocket implements FW.Socket {
       return;
     }
 
-    this.socket.close();
+    this.socket?.close();
     this.socket = null;
 
     this.createSocket(this.address, this.tag, this.sender, this.handle, {

package/utils/FWTask.ts

@@ -20,13 +20,13 @@ export default class FWTask implements FW.Task {
 
   readonly id: number;
 
-  constructor(options?: Partial<FW.TaskOptions>) {
-    this.id = options?.taskId || 0;
+  constructor(options: FW.TaskOptions) {
+    this.id = options.taskId || Date.now();
     this.taskCounter = 0;
     this.totalTaskDuration = 0;
-    this.log = options?.log ?? true;
-    this.frameBudget = options?.frameBudget ?? 16;
-    this.tasksFrameCount = options?.tasksFrameCount ?? 3;
+    this.log = options.log ?? true;
+    this.frameBudget = options.frameBudget ?? 16;
+    this.tasksFrameCount = options.tasksFrameCount ?? 3;
     this.performanceData = {
       frameTimes: [],
       detailedFrames: [],
@@ -138,13 +138,11 @@ export default class FWTask implements FW.Task {
         });
       }
 
-      if ((result?.value as any)?.message) {
-        frameTasks.push({
-          taskId: taskId,
-          result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
-          message: (result?.value as any)?.message,
-        });
-      }
+      frameTasks.push({
+        taskId: taskId,
+        result: result.done ? FWEventDefine.TaskEvent.COMPLETE : FWEventDefine.TaskEvent.YIELDED,
+        message: (result?.value as any)?.message,
+      });
 
       processed++;
     }