@ives_xxz/framework 2.0.0 → 2.0.2

package/FrameworkAutoInitialize.ts

@@ -45,6 +45,7 @@ export function autoInitialize() {
   FW.Framework = new (require('./Framework').Framework)();
   FW.FrameworkBase = require('./FrameworkBase').FrameworkBase;
   FW.Entry = new (require('./entry/FWEntry').FWEntry)();
+  FW.Scene = require('./scene/FWScene').FWScene;
   FW.Logic = require('./logic/FWLogic').FWLogic;
   FW.Data = require('./data/FWData').FWData;
   FW.Sender = require('./service/socket/FWSocketSender').FWSocketSender;

package/FrameworkBase.ts

@@ -1,14 +1,12 @@
 import { injectable } from 'inversify';
-import FWLogic from './logic/FWLogic';
-import FWData from './data/FWData';
 
 @injectable()
 export abstract class FrameworkBase {
   public logic?: FW.Logic;
   public data?: FW.Data;
-  public config?: FW.Config;
-  public sender?: FW.SocketSender;
-  public handle?: FW.SocketHandle;
+  public config?: FW.AssetConfig;
+  public sender?: FW.Sender;
+  public handle?: FW.Handle;
   private dependenciesInjected: boolean = false;
   private isInitialized: boolean = false;
   protected abstract initialize?(): void;
@@ -27,23 +25,23 @@ export abstract class FrameworkBase {
     return this.constructor.name;
   }
 
-  public getLogic<T extends FW.Logic = FWLogic>() {
+  public getLogic<T extends FW.Logic = FW.Logic>() {
     return this.logic as T;
   }
 
-  public getData<T extends FW.Data = FWData>() {
+  public getData<T extends FW.Data = FW.Data>() {
     return this.data as T;
   }
 
-  public getSender<T extends FW.SocketSender>() {
+  public getSender<T extends FW.Sender>() {
     return this.sender as T;
   }
 
-  public getHandle<T extends FW.SocketHandle>() {
+  public getHandle<T extends FW.Handle>() {
     return this.handle as T;
   }
 
-  public getConfig<T extends FW.Config>() {
+  public getConfig<T extends FW.AssetConfig>() {
     return this.config as T;
   }
 
@@ -71,19 +69,19 @@ export abstract class FrameworkBase {
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.CONFIG) {
-      this.config = FW.Framework.getComponent<FW.Config>(
+      this.config = FW.Framework.getComponent<FW.AssetConfig>(
         `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`,
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.SENDER) {
-      this.sender = FW.Framework.getComponent<FW.SocketSender>(
+      this.sender = FW.Framework.getComponent<FW.Sender>(
         `${bundleName}${FW.SystemDefine.FWBindTag.SENDER}`,
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.HANDLE) {
-      this.handle = FW.Framework.getComponent<FW.SocketHandle>(
+      this.handle = FW.Framework.getComponent<FW.Handle>(
         `${bundleName}${FW.SystemDefine.FWBindTag.HANDLE}`,
       );
     }

package/package.json

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

package/scene/FWScene.ts

@@ -3,7 +3,7 @@ import { FWSocketAutoProcessResume } from '../expand/FWDecorator';
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default abstract class FWScene extends cc.Component {
+export abstract class FWScene extends cc.Component {
   readonly entry: FW.Entry = FW.Entry;
 
   @FWSocketAutoProcessResume()

package/types/FW.d.ts

@@ -98,10 +98,6 @@ declare namespace FW {
     bindVirtualViewComponent(args: FW.VirtualViewComponentArgs);
   };
 
-  type Scene = {
-    node: cc.Node;
-  };
-
   type ObjectManager = {
     /** 创建一个对象池 */
     createObjectPool<T extends FWObject = FWObject>(
@@ -2258,6 +2254,13 @@ declare namespace FW {
 
 declare namespace FW {
   export const SystemConfig;
+
+  export class Scene extends cc.Component {
+    onLoad(): void;
+    update(dt: number);
+    onDestroy(): void;
+  }
+
   export class Logic extends FrameworkBase {
     public initialize?(): void;
     public onDestroy?(): void;
@@ -2278,8 +2281,8 @@ declare namespace FW {
     onDestroy?();
     sendHeart();
     onHeart?(msg: any): Promise<boolean>;
-    abstract onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
-    abstract getProtocolKey?(msg: any): string;
+    onBeforeSendingMessage?(msg: any): Promise<FW.SocketMessage>;
+    getProtocolKey?(msg: any): string;
     send(msg: any);
   }