use scenemgr replace SceneRefCom

Alistairot · Apr 9, 2024 · b4ce017 · b4ce017
1 parent 16048ff
commit b4ce017
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 73 deletions.
diff --git a/dist/moye.d.ts b/dist/moye.d.ts
@@ -563,12 +563,6 @@ export declare class SceneFactory {
 	static createClientScene(): Scene;
 	static createCurrentScene(id: bigint, name: string): Scene;
 }
-/**
- * manage client scene
- */
-export declare class SceneRefCom extends Entity {
-	scene: Scene;
-}
 /**
  * key对应value数组的map
  */
@@ -583,6 +577,11 @@ export declare class MultiMap<T, K> {
 	getOne(t: T): K | undefined;
 	contains(t: T, k: K): boolean;
 }
+export declare class SceneMgr extends Singleton {
+	process: Scene;
+	client: Scene;
+	current: Scene;
+}
 export interface Entity {
 	currentScene(): Scene;
 	clientScene(): Scene;

diff --git a/dist/moye.min.mjs b/dist/moye.min.mjs
diff --git a/dist/moye.mjs b/dist/moye.mjs
@@ -1676,43 +1676,43 @@ class CoroutineLock extends Singleton {
     }
 }
 
-/**
- * manage client scene
- */
-class SceneRefCom extends Entity {
+class SceneMgr extends Singleton {
 }
 
+// import { SceneRefCom } from "./SceneRefCom";
 class SceneFactory {
     static createClientScene() {
-        const parent = Root.get().scene.getCom(SceneRefCom);
-        parent.scene?.dispose();
+        // const parent = Root.get().scene.getCom(SceneRefCom);
+        // parent.scene?.dispose();
         const scene = new Scene();
         scene.init({
             id: 1n,
             sceneType: SceneType.CLIENT,
             name: "Game",
             instanceId: IdGenerator.get().generateInstanceId(),
-            parent: parent
+            parent: SceneMgr.get().process
         });
-        scene.addCom(SceneRefCom);
-        parent.scene = scene;
+        // scene.addCom(SceneRefCom);
+        SceneMgr.get().client = scene;
+        // parent.scene = scene;
         EventSystem.get().publish(scene, AfterCreateClientScene.create());
         return scene;
     }
     static createCurrentScene(id, name) {
-        const clientSceneRef = Root.get().scene.getCom(SceneRefCom);
-        const clientScene = clientSceneRef.scene;
-        const parent = clientScene.getCom(SceneRefCom);
-        parent.scene?.dispose();
+        // const clientSceneRef = Root.get().scene.getCom(SceneRefCom);
+        // const clientScene = clientSceneRef.scene;
+        // const parent = clientScene.getCom(SceneRefCom);
+        SceneMgr.get().current?.dispose();
         const scene = new Scene();
         scene.init({
             id: id,
             sceneType: SceneType.CURRENT,
             name: name,
             instanceId: IdGenerator.get().generateInstanceId(),
-            parent: parent
+            parent: SceneMgr.get().client
         });
-        parent.scene = scene;
+        // parent.scene = scene;
+        SceneMgr.get().current = scene;
         EventSystem.get().publish(scene, AfterCreateCurrentScene.create());
         return scene;
     }
@@ -1731,6 +1731,7 @@ class Program {
         Game.addSingleton(EntityCenter);
         Game.addSingleton(EntityLifiCycleMgr);
         Game.addSingleton(Root);
+        Game.addSingleton(SceneMgr).process = Root.get().scene;
         // add client runtime
         rootNode.addComponent(MoyeRuntime);
         MoyeEventCenter.inst.publish(new AfterProgramInit());
@@ -1744,7 +1745,7 @@ class Program {
         MoyeEventCenter.inst.publish(new BeforeProgramStart());
         MoyeEventCenter.inst.publish(new AfterProgramStart());
         // create client scene
-        Root.get().scene.addCom(SceneRefCom);
+        // Root.get().scene.addCom(SceneRefCom);
         SceneFactory.createClientScene();
     }
 }
@@ -1898,23 +1899,19 @@ class MultiMap {
 
 Entity.prototype.clientScene = function () {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const self = this;
-    const domainScene = self.domainScene();
-    if (domainScene.sceneType == SceneType.CLIENT) {
-        return domainScene;
-    }
-    else if (domainScene.sceneType == SceneType.CURRENT) {
-        return domainScene.parent.parent;
-    }
-    else if (domainScene.sceneType == SceneType.PROCESS) {
-        return domainScene.getCom(SceneRefCom).scene;
-    }
+    // const self: Entity = this;
+    // const domainScene = self.domainScene();
+    // if(domainScene.sceneType == SceneType.CLIENT) {
+    //     return domainScene;
+    // }else if(domainScene.sceneType == SceneType.CURRENT) {
+    //     return domainScene.parent.parent as Scene;
+    // }else if(domainScene.sceneType == SceneType.PROCESS) {
+    //     return domainScene.getCom(SceneRefCom).scene;
+    // }
+    return SceneMgr.get().client;
 };
 Entity.prototype.currentScene = function () {
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const self = this;
-    const clientScene = self.clientScene();
-    return clientScene.getCom(SceneRefCom).scene;
+    return SceneMgr.get().current;
 };
 
 /**
@@ -6819,4 +6816,4 @@ class YYJJoystickListener extends Entity {
     }
 }
 
-export { AEvent, AEventHandler, AMHandler, AMoyeView, AWait, AfterAddLoginCom, AfterCreateClientScene, AfterCreateCurrentScene, AfterProgramInit, AfterProgramStart, AfterSingletonAdd, AssetOperationHandle, AsyncButtonListener, BeforeProgramInit, BeforeProgramStart, BeforeSingletonAdd, BgAdapter, BundleAsset, CTWidget, CancellationToken, CancellationTokenTag, CenterLayout, CoroutineLock, CoroutineLockItem, CoroutineLockTag, DecoratorCollector, Entity, EntityCenter, EventCom, EventDecorator, EventDecoratorType, EventHandlerTag, EventSystem, Game, IPEndPoint, IdGenerator, IdStruct, InstanceIdStruct, JsHelper, LocalStorageHelper, Logger, LoginCom, MoyeAssets, MoyeLabel, MoyeViewMgr, MsgHandlerDecorator, MsgHandlerDecoratorType, MsgMgr, MsgSerializeMgr, MultiMap, NetCom, NetServices, NetworkErrorCode, NodeNotBuild, ObjectPool, ObjectWait, Program, RecycleObj, RichTextListener, Root, RoundBoxSprite, Scene, SceneFactory, SceneRefCom, SceneType, Session, SessionCom, Singleton, SizeFollow, SpeedType, Task, TimeHelper, TimeInfo, TimerMgr, UIController, UIControllerAttr, UIControllerIndex, UIControllerListener, ViewDecorator, ViewDecoratorType, ViewLayer, WChannel, WService, WaitError, YYJJoystick, YYJJoystickCom, YYJJoystickListener, YYJJoystickMoveEvent, YYJJoystickSpeedChangeEvent, debug, debugF, error, errorF, log, logF, safeCall, warn, warnF };
+export { AEvent, AEventHandler, AMHandler, AMoyeView, AWait, AfterAddLoginCom, AfterCreateClientScene, AfterCreateCurrentScene, AfterProgramInit, AfterProgramStart, AfterSingletonAdd, AssetOperationHandle, AsyncButtonListener, BeforeProgramInit, BeforeProgramStart, BeforeSingletonAdd, BgAdapter, BundleAsset, CTWidget, CancellationToken, CancellationTokenTag, CenterLayout, CoroutineLock, CoroutineLockItem, CoroutineLockTag, DecoratorCollector, Entity, EntityCenter, EventCom, EventDecorator, EventDecoratorType, EventHandlerTag, EventSystem, Game, IPEndPoint, IdGenerator, IdStruct, InstanceIdStruct, JsHelper, LocalStorageHelper, Logger, LoginCom, MoyeAssets, MoyeLabel, MoyeViewMgr, MsgHandlerDecorator, MsgHandlerDecoratorType, MsgMgr, MsgSerializeMgr, MultiMap, NetCom, NetServices, NetworkErrorCode, NodeNotBuild, ObjectPool, ObjectWait, Program, RecycleObj, RichTextListener, Root, RoundBoxSprite, Scene, SceneFactory, SceneMgr, SceneType, Session, SessionCom, Singleton, SizeFollow, SpeedType, Task, TimeHelper, TimeInfo, TimerMgr, UIController, UIControllerAttr, UIControllerIndex, UIControllerListener, ViewDecorator, ViewDecoratorType, ViewLayer, WChannel, WService, WaitError, YYJJoystick, YYJJoystickCom, YYJJoystickListener, YYJJoystickMoveEvent, YYJJoystickSpeedChangeEvent, debug, debugF, error, errorF, log, logF, safeCall, warn, warnF };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moye-cocos",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "ecs game framework of cocos creator",
   "main": "dist/moye.mjs",
   "types": "dist/moye.d.ts",

diff --git a/src/Core/Core.ts b/src/Core/Core.ts
@@ -31,4 +31,5 @@ export * from "./Scene/SceneRefCom";
 export * from "./Task/Task";
 export * from "./Type/Action";
 export * from "./Type/Type";
-export * from "./DataStructure/MultiMap";
+export * from "./DataStructure/MultiMap";
+export * from "./Scene/SceneMgr";
diff --git a/src/Core/Program/Program.ts b/src/Core/Program/Program.ts
@@ -13,8 +13,9 @@ import { EntityLifiCycleMgr } from "../Entity/EntityLifiCycleMgr";
 import { Root } from "../Entity/Root";
 import { TimerMgr } from "../Timer/TimerMgr";
 import { CoroutineLock } from "../CoroutineLock/CoroutineLock";
-import { SceneRefCom } from "../Scene/SceneRefCom";
+// import { SceneRefCom } from "../Scene/SceneRefCom";
 import { SceneFactory } from "../Scene/SceneFactory";
+import { SceneMgr } from "../Scene/SceneMgr";
 
 export class Program {
     static init(rootNode: Node) {
@@ -31,6 +32,8 @@ export class Program {
         Game.addSingleton(EntityLifiCycleMgr);
         Game.addSingleton(Root);
 
+        Game.addSingleton(SceneMgr).process = Root.get().scene;
+
         // add client runtime
         rootNode.addComponent(MoyeRuntime);
 
@@ -47,7 +50,7 @@ export class Program {
         MoyeEventCenter.inst.publish(new AfterProgramStart());
 
         // create client scene
-        Root.get().scene.addCom(SceneRefCom);
+        // Root.get().scene.addCom(SceneRefCom);
         SceneFactory.createClientScene();
     }
 }
diff --git a/src/Core/Scene/SceneFactory.ts b/src/Core/Scene/SceneFactory.ts
@@ -4,49 +4,54 @@ import { SceneType } from "../Entity/SceneType";
 import { AfterCreateClientScene, AfterCreateCurrentScene } from "../EventSystem/EventCore";
 import { EventSystem } from "../EventSystem/EventSystem";
 import { IdGenerator } from "../IdGenerator/IdGenerator";
-import { SceneRefCom } from "./SceneRefCom";
+import { SceneMgr } from "./SceneMgr";
+// import { SceneRefCom } from "./SceneRefCom";
 
 export class SceneFactory {
     static createClientScene(): Scene {
-        const parent = Root.get().scene.getCom(SceneRefCom);
+        // const parent = Root.get().scene.getCom(SceneRefCom);
 
-        parent.scene?.dispose();
+        // parent.scene?.dispose();
 
         const scene = new Scene();
         scene.init({
             id: 1n,
             sceneType: SceneType.CLIENT,
             name: "Game",
             instanceId: IdGenerator.get().generateInstanceId(),
-            parent: parent
+            parent:  SceneMgr.get().process
         });
 
-        scene.addCom(SceneRefCom);
+        // scene.addCom(SceneRefCom);
 
-        parent.scene = scene;
+        SceneMgr.get().client = scene;
+
+        // parent.scene = scene;
 
         EventSystem.get().publish(scene, AfterCreateClientScene.create());
 
         return scene;
     }
 
     static createCurrentScene(id: bigint, name: string): Scene {
-        const clientSceneRef = Root.get().scene.getCom(SceneRefCom);
-        const clientScene = clientSceneRef.scene;
-        const parent = clientScene.getCom(SceneRefCom);
+        // const clientSceneRef = Root.get().scene.getCom(SceneRefCom);
+        // const clientScene = clientSceneRef.scene;
+        // const parent = clientScene.getCom(SceneRefCom);
 
-        parent.scene?.dispose();
+        SceneMgr.get().current?.dispose();
 
         const scene = new Scene();
         scene.init({
             id: id,
             sceneType: SceneType.CURRENT,
             name: name,
             instanceId: IdGenerator.get().generateInstanceId(),
-            parent: parent
+            parent: SceneMgr.get().client
         });
 
-        parent.scene = scene;
+        // parent.scene = scene;
+
+        SceneMgr.get().current = scene;
 
         EventSystem.get().publish(scene, AfterCreateCurrentScene.create());
 

diff --git a/src/Core/Scene/SceneMgr.ts b/src/Core/Scene/SceneMgr.ts
@@ -0,0 +1,8 @@
+import { Scene } from "../Entity/Scene";
+import { Singleton } from "../Singleton/Singleton";
+
+export class SceneMgr extends Singleton {
+    process: Scene;
+    client: Scene;
+    current: Scene;
+}
diff --git a/src/Core/Scene/SceneRefCom.ts b/src/Core/Scene/SceneRefCom.ts
@@ -5,6 +5,6 @@ import { Scene } from "../Entity/Scene";
 /**
  * manage client scene
  */
-export class SceneRefCom extends Entity {
-    scene: Scene;
-}
+// export class SceneRefCom extends Entity {
+//     scene: Scene;
+// }
diff --git a/src/EntityExt/EntityExtension.ts b/src/EntityExt/EntityExtension.ts
@@ -1,4 +1,5 @@
-import { Entity, Scene, SceneRefCom, SceneType } from "../Core/Core";
+import { Entity, Scene, SceneType } from "../Core/Core";
+import { SceneMgr } from "../Core/Scene/SceneMgr";
 
 
 declare module "../Core/Core" {
@@ -11,22 +12,20 @@ declare module "../Core/Core" {
 
 Entity.prototype.clientScene = function () {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const self: Entity = this;
-    const domainScene = self.domainScene();
+    // const self: Entity = this;
+    // const domainScene = self.domainScene();
 
-    if(domainScene.sceneType == SceneType.CLIENT) {
-        return domainScene;
-    }else if(domainScene.sceneType == SceneType.CURRENT) {
-        return domainScene.parent.parent as Scene;
-    }else if(domainScene.sceneType == SceneType.PROCESS) {
-        return domainScene.getCom(SceneRefCom).scene;
-    }
+    // if(domainScene.sceneType == SceneType.CLIENT) {
+    //     return domainScene;
+    // }else if(domainScene.sceneType == SceneType.CURRENT) {
+    //     return domainScene.parent.parent as Scene;
+    // }else if(domainScene.sceneType == SceneType.PROCESS) {
+    //     return domainScene.getCom(SceneRefCom).scene;
+    // }
+
+    return SceneMgr.get().client;
 };
 
 Entity.prototype.currentScene = function () {
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const self: Entity = this;
-    const clientScene = self.clientScene();
-
-    return clientScene.getCom(SceneRefCom).scene;
+    return SceneMgr.get().current;
 };