@ives_xxz/framework 2.0.7 → 2.0.8

package/manager/FWAssetManager.ts

@@ -421,9 +421,6 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
   }
 
   public onDestroy(): void {
-    this.assetsMap.forEach((v) => {
-      this.release(v.assetProperty);
-    });
     this.assetsMap.clear();
   }
 }

package/manager/FWBundleManager.ts

@@ -92,9 +92,6 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
   }
 
   public onDestroy(): void {
-    this.bundleMap.forEach((bundle) => {
-      cc.assetManager.removeBundle(bundle);
-    });
     this.bundleMap.clear();
   }
 }

package/manager/FWEngineManager.ts

@@ -1,7 +1,11 @@
-import { FWManager } from './FWManager';
+import { FWManager } from "./FWManager";
 
-export default class FWEngineManager extends FWManager implements FW.EngineManager {
+export default class FWEngineManager
+  extends FWManager
+  implements FW.EngineManager
+{
   debug: boolean = false;
+  launchScene: string = "";
 
   initialize() {
     this.registerCCCSystemEvent();
@@ -16,26 +20,26 @@ export default class FWEngineManager extends FWManager implements FW.EngineManag
     FW.Entry.evtMgr.dispatch(FW.EventDefine.SystemEvent.SYSTEM_RESTART);
     FW.Entry.initialize();
     FW.Framework.restart();
-    cc.game.restart();
+    FW.Entry.launchScene(this.launchScene);
   }
 
   getMemory() {
     if (!this.debug) return;
-    if (window.performance && window.performance['memory']) {
+    if (window.performance && window.performance["memory"]) {
       FW.Log.debug(
-        '浏览器允许的最大内存:',
-        this.formatBytes(window.performance['memory'].jsHeapSizeLimit),
+        "浏览器允许的最大内存:",
+        this.formatBytes(window.performance["memory"].jsHeapSizeLimit)
       );
       FW.Log.debug(
-        '浏览器已分配内存:',
-        this.formatBytes(window.performance['memory'].totalJSHeapSize),
+        "浏览器已分配内存:",
+        this.formatBytes(window.performance["memory"].totalJSHeapSize)
       );
       FW.Log.debug(
-        '浏览器已使用内存:',
-        this.formatBytes(window.performance['memory'].usedJSHeapSize),
+        "浏览器已使用内存:",
+        this.formatBytes(window.performance["memory"].usedJSHeapSize)
       );
     } else {
-      FW.Log.debug('当前浏览器不支持 performance.memory');
+      FW.Log.debug("当前浏览器不支持 performance.memory");
     }
   }
   /**
@@ -47,23 +51,23 @@ export default class FWEngineManager extends FWManager implements FW.EngineManag
   }
   /** 应用切换到前台 */
   private onAppShow() {
-    FW.Log.debug('game on show!');
+    FW.Log.debug("game on show!");
     FW.Entry.evtMgr?.dispatch(FW.EventDefine.CCEvent.ON_SHOW);
   }
 
   /** 应用切换到后台 */
   private onAppHide() {
-    FW.Log.debug('game on hide!');
+    FW.Log.debug("game on hide!");
     FW.Entry.evtMgr?.dispatch(FW.EventDefine.CCEvent.ON_HIDE);
   }
 
   private formatBytes(bytes: number) {
     if (bytes < 1024 * 1024) {
-      return (bytes / 1024).toFixed(2) + ' KB';
+      return (bytes / 1024).toFixed(2) + " KB";
     } else if (bytes < 1024 * 1024 * 1024) {
-      return (bytes / 1024 / 1024).toFixed(2) + ' MB';
+      return (bytes / 1024 / 1024).toFixed(2) + " MB";
     } else {
-      return (bytes / 1024 / 1024 / 1024).toFixed(2) + ' GB';
+      return (bytes / 1024 / 1024 / 1024).toFixed(2) + " GB";
     }
   }
 }

package/package.json

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

package/scene/FWScene.ts

@@ -7,6 +7,10 @@ export abstract class FWScene extends cc.Component {
   @FWSocketAutoProcessResume()
   onLoad(): void {
     this.entry.scene = this;
+    if (!this.entry.engineMgr.launchScene) {
+      this.entry.engineMgr.launchScene =
+        cc.director.getScene()?.name || undefined;
+    }
   }
 
   update(dt: number): void {

package/types/FW.d.ts

@@ -1019,6 +1019,7 @@ declare namespace FW {
   };
 
   type EngineManager = {
+    launchScene: string;
     debug: boolean;
     getMemory(): void;
     restart(): void;