@ives_xxz/framework 2.1.0 → 2.1.1

package/controller/FWLayerController.ts

@@ -35,9 +35,8 @@ export abstract class FWLayerController extends FW.FrameworkBase implements FW.L
   async destroy() {
     FW.Entry.timeMgr?.unSchedule(this);
     FW.Entry.evtMgr?.targetOff(this);
-    cc.Tween.stopAllByTarget(this.layer?.node);
-    this.layer?.node?.stopAllActions();
     this.layer?.unscheduleAllCallbacks();
+    this.layer?.node?.stopAllActions();
     this.layer?.node?.destroy();
   }
 

package/entry/FWEntry.ts

@@ -1,21 +1,21 @@
-import FWUiManager from "../manager/FWUiManager";
-import FWAnimationManager from "../manager/FWAnimationManager";
-import FWAudioManager from "../manager/FWAudioManager";
-import FWComponentManager from "../manager/FWComponentManager";
-import FWEventManager from "../manager/FWEventManager";
-import FWLanguageManager from "../manager/FWLanguageManager";
-import { FWLayerManager } from "../manager/FWLayerManager";
-import FWObjectManager from "../manager/FWObjectManager";
-import { FWResManager } from "../manager/FWResManager";
-import FWSocketManager from "../manager/FWSocketManager";
-import { FWStateManager } from "../manager/FWStateManager";
-import { FWTimeManager } from "../manager/FWTimeManager";
-import { FWSocketAutoProcessPause } from "../expand/FWDecorator";
-import FWTaskManager from "../manager/FWTaskManager";
-import FWEngineManager from "../manager/FWEngineManager";
-import FWHotUpdateManager from "../manager/FWHotUpdateManager";
-import FWPromiseManager from "../manager/FWPromiseManager";
-import { FWPerformanceManager } from "../manager/FWPerformanceManager";
+import FWUiManager from '../manager/FWUiManager';
+import FWAnimationManager from '../manager/FWAnimationManager';
+import FWAudioManager from '../manager/FWAudioManager';
+import FWComponentManager from '../manager/FWComponentManager';
+import FWEventManager from '../manager/FWEventManager';
+import FWLanguageManager from '../manager/FWLanguageManager';
+import { FWLayerManager } from '../manager/FWLayerManager';
+import FWObjectManager from '../manager/FWObjectManager';
+import { FWResManager } from '../manager/FWResManager';
+import FWSocketManager from '../manager/FWSocketManager';
+import { FWStateManager } from '../manager/FWStateManager';
+import { FWTimeManager } from '../manager/FWTimeManager';
+import { FWSocketAutoProcessPause } from '../expand/FWDecorator';
+import FWTaskManager from '../manager/FWTaskManager';
+import FWEngineManager from '../manager/FWEngineManager';
+import FWHotUpdateManager from '../manager/FWHotUpdateManager';
+import FWPromiseManager from '../manager/FWPromiseManager';
+import { FWPerformanceManager } from '../manager/FWPerformanceManager';
 
 /**
  * 入口脚本
@@ -98,18 +98,17 @@ export class FWEntry implements FW.Entry {
    * bundle名字
    */
   bundleName: string;
-
   /**
    * 初始化
    * */
   initialize() {
     this.map = new Map<string, FW.RegisterBundle>();
     this.evtMgr = new FWEventManager();
+    this.timeMgr = new FWTimeManager();
     this.engineMgr = new FWEngineManager();
     this.taskMgr = new FWTaskManager();
     this.resMgr = new FWResManager();
     this.layerMgr = new FWLayerManager();
-    this.timeMgr = new FWTimeManager();
     this.uiMgr = new FWUiManager();
     this.animationMgr = new FWAnimationManager();
     this.stateMgr = new FWStateManager();
@@ -139,10 +138,10 @@ export class FWEntry implements FW.Entry {
     if (!this.hasSceneName(name)) {
       try {
         cc.director.loadScene(name);
-        this.bundleName = "";
+        this.bundleName = '';
         return;
       } catch (e) {
-        FW.Log.error("launchScene failed:", name);
+        FW.Log.error('launchScene failed:', name);
       }
     }
 
@@ -201,13 +200,11 @@ export class FWEntry implements FW.Entry {
     return this.map.get(this.bundleName)?.sceneName || undefined;
   }
 
-  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (
-    serviceIdentifier
-  ) => FW.Framework.getComponent(serviceIdentifier);
+  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (serviceIdentifier) =>
+    FW.Framework.getComponent(serviceIdentifier);
 
-  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (
-    serviceIdentifier
-  ) => FW.Framework.getComponents(serviceIdentifier);
+  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (serviceIdentifier) =>
+    FW.Framework.getComponents(serviceIdentifier);
 
   update(dt: number) {
     this.timeMgr?.onUpdate(dt);

package/manager/FWEngineManager.ts

@@ -1,11 +1,8 @@
-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 = "";
+  launchScene: string = '';
 
   initialize() {
     this.registerCCCSystemEvent();
@@ -14,6 +11,7 @@ export default class FWEngineManager
   onDestroy(): void {
     cc.game.off(cc.game.EVENT_SHOW, this.onAppShow, this);
     cc.game.off(cc.game.EVENT_HIDE, this.onAppHide, this);
+    cc.game.off(cc.game.EVENT_GAME_INITED, this.onCreatorInited, this);
   }
 
   restart() {
@@ -25,21 +23,21 @@ export default class FWEngineManager
 
   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');
     }
   }
   /**
@@ -48,26 +46,34 @@ export default class FWEngineManager
   private registerCCCSystemEvent() {
     cc.game.on(cc.game.EVENT_SHOW, this.onAppShow, this);
     cc.game.on(cc.game.EVENT_HIDE, this.onAppHide, this);
+    cc.game.on(cc.game.EVENT_GAME_INITED, this.onCreatorInited, this);
   }
+
+  private onCreatorInited() {
+    FW.Entry.timeMgr.scheduleOnce(() => {
+      this.launchScene = cc.director.getScene()?.name || 'launchScene';
+    });
+  }
+
   /** 应用切换到前台 */
   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.1.0",
+  "version": "2.1.1",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/scene/FWScene.ts

@@ -7,10 +7,6 @@ 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

@@ -469,19 +469,19 @@ declare namespace FW {
    */
   type SocketConfig = {
     /** 心跳间隔 */
-    heartInternal: number;
+    heartInternal?: number;
     /** 心跳超时时间 */
-    heartTimeout: number;
+    heartTimeout?: number;
     /** 心跳弱网时间 */
-    heartWeakTime: number;
+    heartWeakTime?: number;
     /** 最大重连次数 */
-    maxReconnectTimes: number;
+    maxReconnectTimes?: number;
     /** 重连间隔 */
-    reconnectInternal: number;
+    reconnectInternal?: number;
     /** 协议符号 */
-    protocolSymbol: Symbol;
+    protocolSymbol?: Symbol;
     /** 协议轮询时间 */
-    protocolPollingTime: number;
+    protocolPollingTime?: number;
     /** 证书（可选） */
     certificate?: cc.Asset;
   };