refactor

apps/client/assets/Scripts/Scene/BattleManager.ts

@@ -1,37 +1,52 @@
-import { _decorator, Component, Node, Prefab, instantiate, SpriteFrame } from 'cc';
+import { _decorator, Component, Node, Prefab, instantiate, SpriteFrame, director } from 'cc';
 import { ActorManager } from '../Entity/Actor/ActorManager';
 import DataManager from '../Global/DataManager';
 import { JoyStickManager } from '../UI/JoyStickManager';
 import { ResourceManager } from '../Global/ResourceManager';
-import { PrefabPathEnum, TexturePathEnum } from '../Enum';
+import { EventEnum, PrefabPathEnum, SceneEnum, TexturePathEnum } from '../Enum';
 import NetworkManager from '../Global/NetworkManager';
 import ObjectPoolManager from '../Global/ObjectPoolManager';
 import { BulletManager } from '../Entity/Bullet/BulletManager';
 import { ApiMsgEnum, EntityTypeEnum, IMsgServerSync, InputTypeEnum } from '../Common';
+import EventManager from '../Global/EventManager';
 
 const { ccclass } = _decorator;
 
 @ccclass('BattleManager')
 export class BattleManager extends Component {
-    stage: Node
-    ui: Node
-    isInited = false
-    onLoad() {
-        this.stage = DataManager.Instance.stage = this.node.getChildByName("Stage")
-        this.ui = this.node.getChildByName("UI")
-    }
+    private stage: Node
+    private ui: Node
+    private shouldUpdate = false
 
     async start() {
+        //清空
         this.clearGame()
-        await this.loadRes()
-        this.initScene()
-        await this.connectServer()
+
+        //资源加载和网络连接同步执行
+        await Promise.all([this.loadRes(), this.connectServer()])
+
+        this.initGame()
+
         // 在场景初始化完毕之前，卡主别的玩家，准备好以后再告知服务器，等所有玩家都准备好以后才开始，这里就不做了
-        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgServerSync, this.handleSync);
-        this.isInited = true
+        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgServerSync, this.handleSync, this);
+        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgGameEnd, this.leaveGame, this);
+        EventManager.Instance.on(EventEnum.GameEnd, this.handleGameEnd, this)
     }
 
     clearGame() {
+        //监听
+        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgServerSync, this.handleSync, this);
+        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgGameEnd, this.leaveGame, this);
+        EventManager.Instance.off(EventEnum.GameEnd, this.handleGameEnd, this)
+
+        //数据
+        this.shouldUpdate = false
+        ObjectPoolManager.Instance.reset()
+        DataManager.Instance.reset()
+
+        //节点
+        this.stage = DataManager.Instance.stage = this.node.getChildByName("Stage")
+        this.ui = this.node.getChildByName("UI")
         this.stage.destroyAllChildren()
         this.ui.destroyAllChildren()
     }
@@ -53,12 +68,6 @@ export class BattleManager extends Component {
         await Promise.all(list)
     }
 
-    async initScene() {
-        this.initJoyStick()
-        this.initShoot()
-        this.initMap()
-    }
-
     async connectServer() {
         if (!await NetworkManager.Instance.connect().catch(() => false)) {
             await new Promise((resolve) => setTimeout(resolve, 1000))
@@ -66,6 +75,26 @@ export class BattleManager extends Component {
         }
     }
 
+    leaveGame() {
+        this.clearGame()
+        director.loadScene(SceneEnum.Hall);
+    }
+
+    async handleGameEnd() {
+        const { success, res, error } = await NetworkManager.Instance.callApi(ApiMsgEnum.ApiGameEnd, { rid: DataManager.Instance.roomInfo.id })
+        if (!success) {
+            console.log(error)
+            return;
+        }
+    }
+
+    async initGame() {
+        this.initJoyStick()
+        this.initShoot()
+        this.initMap()
+        this.shouldUpdate = true
+    }
+
     initJoyStick() {
         const prefab = DataManager.Instance.prefabMap.get(EntityTypeEnum.JoyStick)
         const joySitck = instantiate(prefab)
@@ -86,14 +115,8 @@ export class BattleManager extends Component {
         map.setParent(this.stage)
     }
 
-    handleSync(inputs: IMsgServerSync) {
-        for (const input of inputs) {
-            DataManager.Instance.applyInput(input)
-        }
-    }
-
     update(dt: number) {
-        if (!this.isInited) {
+        if (!this.shouldUpdate) {
             return
         }
         this.render()
@@ -158,5 +181,12 @@ export class BattleManager extends Component {
             }
         }
     }
+
+    handleSync(inputs: IMsgServerSync) {
+        for (const input of inputs) {
+            DataManager.Instance.applyInput(input)
+        }
+    }
+
 }
 

apps/client/assets/Scripts/Scene/HallManager.ts

@@ -25,14 +25,14 @@ export class HallManager extends Component {
     onLoad() {
         director.preloadScene(SceneEnum.Room);
         EventManager.Instance.on(EventEnum.RoomJoin, this.joinRoom, this)
-        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayers);
-        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoomList, this.renderRooms);
+        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayers, this);
+        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoomList, this.renderRooms, this);
     }
 
     onDestroy() {
         EventManager.Instance.off(EventEnum.RoomJoin, this.joinRoom, this)
-        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayers);
-        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoomList, this.renderRooms);
+        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayers, this);
+        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoomList, this.renderRooms, this);
     }
 
     start() {

apps/client/assets/Scripts/Scene/RoomManager.ts

@@ -1,8 +1,7 @@
 import { _decorator, Component, Node, Prefab, director, instantiate } from 'cc';
 import { ApiMsgEnum, IMsgGameStart, IMsgRoom } from '../Common';
-import { EventEnum, SceneEnum } from '../Enum';
+import { SceneEnum } from '../Enum';
 import DataManager from '../Global/DataManager';
-import EventManager from '../Global/EventManager';
 import NetworkManager from '../Global/NetworkManager';
 import { PlayerManager } from '../UI/PlayerManager';
 const { ccclass, property } = _decorator;
@@ -17,13 +16,13 @@ export class RoomManager extends Component {
 
     onLoad() {
         director.preloadScene(SceneEnum.Battle);
-        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoom, this.renderPlayers);
-        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgGameStart, this.startGame);
+        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoom, this.renderPlayers, this);
+        NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgGameStart, this.handleGameStart, this);
     }
 
     onDestroy() {
-        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoom, this.renderPlayers);
-        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgGameStart, this.startGame);
+        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoom, this.renderPlayers, this);
+        NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgGameStart, this.handleGameStart, this);
     }
 
     async start() {
@@ -32,7 +31,7 @@ export class RoomManager extends Component {
         })
     }
 
-    renderPlayers = ({ room: { players: list } }: IMsgRoom) => {
+    renderPlayers({ room: { players: list } }: IMsgRoom) {
         for (const item of this.playerContainer.children) {
             item.active = false
         }
@@ -67,13 +66,10 @@ export class RoomManager extends Component {
             console.log(error)
             return;
         }
-
-        // director.loadScene(SceneEnum.Battle);
     }
 
-    startGame = ({ state }: IMsgGameStart) => {
+    handleGameStart({ state }: IMsgGameStart) {
         DataManager.Instance.state = state
-
         director.loadScene(SceneEnum.Battle);
     }
 }