Test_Project_Cocos/cocos-nodejs-io-game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
sli97
2022-12-07 22:24:46 +08:00
parent b7c95c5ca9
commit c5acb09642
24 changed files with 280 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/client/assets/Scripts/Base/EntityManager.ts
View File

@@ -8,7 +8,6 @@ export abstract class EntityManager extends Component {
fsm: StateMachine
private _state: EntityStateEnum
get state() {
return this._state
}

3
apps/client/assets/Scripts/Base/StateMachine.ts
View File

@@ -1,5 +1,6 @@
import { _decorator, Animation, Component } from 'cc'
import { EntityTypeEnum, FsmParamTypeEnum } from '../Enum'
import { EntityTypeEnum } from '../Common'
import { FsmParamTypeEnum } from '../Enum'
const { ccclass } = _decorator
import State from './State'
import SubStateMachine from './SubStateMachine'

16
apps/client/assets/Scripts/Entity/Actor/ActorManager.ts
View File

@@ -1,8 +1,9 @@
import { _decorator, instantiate, ProgressBar, Label, Vec3, Tween, tween } from 'cc';
import { _decorator, instantiate, ProgressBar, Label, Vec3, Tween, tween, director } from 'cc';
import { EntityManager } from '../../Base/EntityManager';
import { ApiMsgEnum, EntityTypeEnum, IActor, InputTypeEnum, IVec2, toFixed } from '../../Common';
import { EntityStateEnum } from '../../Enum';
import { EntityStateEnum, EventEnum, SceneEnum } from '../../Enum';
import DataManager from '../../Global/DataManager';
import EventManager from '../../Global/EventManager';
import NetworkManager from '../../Global/NetworkManager';
import { rad2Angle } from '../../Utils';
import { WeaponManager } from '../Weapon/WeaponManager';
@@ -30,6 +31,8 @@ export class ActorManager extends EntityManager implements IActor {
private tw: Tween<any>
private targetPos: Vec3
private isDead = false
get isSelf() {
return DataManager.Instance.myPlayerId === this.id
}
@@ -60,11 +63,17 @@ export class ActorManager extends EntityManager implements IActor {
this.node.active = false
}
tick(dt: number) {
async tick(dt: number) {
if (!this.isSelf) {
return
}
if (this.hp <= 0 && !this.isDead) {
EventManager.Instance.emit(EventEnum.GameEnd)
this.isDead = true
return
}
if (DataManager.Instance.jm.input.length()) {
const { x, y } = DataManager.Instance.jm.input
NetworkManager.Instance.sendMsg(ApiMsgEnum.MsgClientSync, {
@@ -87,6 +96,7 @@ export class ActorManager extends EntityManager implements IActor {
}
renderHP(data: IActor) {
this.hp = data.hp
this.hpBar.progress = data.hp / this.hpBar.totalLength
}

1
apps/client/assets/Scripts/Enum/index.ts
View File

@@ -21,6 +21,7 @@ export enum EventEnum {
ExplosionBorn = 'ExplosionBorn',
RoomJoin = 'RoomJoin',
GameStart = 'GameStart',
GameEnd = 'GameEnd',
}
export enum PrefabPathEnum {

29
apps/client/assets/Scripts/Global/DataManager.ts
View File

@@ -16,25 +16,36 @@ const WEAPON_DAMAGE = 5
const PLAYER_RADIUS = 50
const BULLET_RADIUS = 10
const mapW = 960
const mapH = 640
export default class DataManager extends Singleton {
static get Instance() {
return super.GetInstance<DataManager>()
}
//登陆数据
myPlayerId = 1
//大厅数据
roomInfo: IRoom
//游戏数据
stage: Node
jm: JoyStickManager
prefabMap: Map<string, Prefab> = new Map()
textureMap: Map<string, SpriteFrame[]> = new Map()
actorMap: Map<number, ActorManager> = new Map()
bulletMap: Map<number, BulletManager> = new Map()
myPlayerId = 1
roomInfo: IRoom
mapSize = {
x: 960,
y: 640,
reset() {
this.stage = null
this.jm = null
this.actorMap.clear()
this.bulletMap.clear()
this.prefabMap.clear()
this.textureMap.clear()
}
state: IState = {
@@ -85,8 +96,8 @@ export default class DataManager extends Singleton {
player.position.x += toFixed(x * PLAYER_SPEED * dt)
player.position.y += toFixed(y * PLAYER_SPEED * dt)
player.position.x = clamp(player.position.x, -this.mapSize.x / 2, this.mapSize.x / 2)
player.position.y = clamp(player.position.y, -this.mapSize.y / 2, this.mapSize.y / 2)
player.position.x = clamp(player.position.x, -mapW / 2, mapW / 2)
player.position.y = clamp(player.position.y, -mapH / 2, mapH / 2)
player.direction = { x, y }
break
@@ -124,7 +135,7 @@ export default class DataManager extends Singleton {
break
}
}
if (Math.abs(bullet.position.x) > this.mapSize.x / 2 || Math.abs(bullet.position.y) > this.mapSize.y / 2) {
if (Math.abs(bullet.position.x) > mapW / 2 || Math.abs(bullet.position.y) > mapH / 2) {
EventManager.Instance.emit(EventEnum.ExplosionBorn, bullet.id, {
x: bullet.position.x,
y: bullet.position.y,

16
apps/client/assets/Scripts/Global/EventManager.ts
View File

@@ -2,7 +2,7 @@ import Singleton from '../Base/Singleton'
import { EventEnum } from '../Enum';
interface IItem {
func: Function;
cb: Function;
ctx: unknown;
}
@@ -13,25 +13,25 @@ export default class EventManager extends Singleton {
private map: Map<EventEnum, Array<IItem>> = new Map();
on(event: EventEnum, func: Function, ctx?: unknown) {
on(event: EventEnum, cb: Function, ctx: unknown) {
if (this.map.has(event)) {
this.map.get(event).push({ func, ctx });
this.map.get(event).push({ cb, ctx });
} else {
this.map.set(event, [{ func, ctx }]);
this.map.set(event, [{ cb, ctx }]);
}
}
off(event: EventEnum, func: Function, ctx?: unknown) {
off(event: EventEnum, cb: Function, ctx: unknown) {
if (this.map.has(event)) {
const index = this.map.get(event).findIndex(i => func === i.func && i.ctx === ctx);
const index = this.map.get(event).findIndex(i => cb === i.cb && i.ctx === ctx);
index > -1 && this.map.get(event).splice(index, 1);
}
}
emit(event: EventEnum, ...params: unknown[]) {
if (this.map.has(event)) {
this.map.get(event).forEach(({ func, ctx }) => {
ctx ? func.apply(ctx, params) : func(...params);
this.map.get(event).forEach(({ cb, ctx }) => {
cb.apply(ctx, params)
});
}
}

41
apps/client/assets/Scripts/Global/NetworkManager.ts
View File

@@ -1,9 +1,14 @@
import Singleton from '../Base/Singleton'
import { ApiMsgEnum, IModel, strdecode, strencode } from '../Common';
import { ApiMsgEnum, IModel } from '../Common';
import { binaryEncode, binaryDecode } from '../Common/Binary';
const TIMEOUT = 5000
interface IItem {
cb: Function;
ctx: unknown;
}
export interface ICallApiRet<T> {
success: boolean;
error?: Error;
@@ -18,7 +23,7 @@ export default class NetworkManager extends Singleton {
ws: WebSocket
port = 8888
maps: Map<ApiMsgEnum, Function[]> = new Map()
maps: Map<ApiMsgEnum, Array<IItem>> = new Map()
isConnected = false
connect() {
@@ -28,16 +33,17 @@ export default class NetworkManager extends Singleton {
return
}
this.ws = new WebSocket(`ws://localhost:${this.port}`)
//onmessage接受的数据类型，只有在后端返回字节数组的时候才有效果
this.ws.binaryType = 'arraybuffer';
this.ws.onopen = () => {
console.log("ws onopen")
this.isConnected = true
resolve(true)
}
this.ws.onerror = () => {
this.ws.onerror = (e) => {
this.isConnected = false
console.log(e)
reject("ws onerror")
}
@@ -53,12 +59,11 @@ export default class NetworkManager extends Singleton {
try {
if (this.maps.has(name) && this.maps.get(name).length) {
console.log(json);
this.maps.get(name).forEach(cb => cb(data))
this.maps.get(name).forEach(({ cb, ctx }) => cb.call(ctx, data))
}
} catch (error) {
console.log("this.maps.get(name).forEach(cb => cb(restData))", error)
console.log("onmessage:", error)
}
} catch (error) {
console.log('解析失败，不是合法的JSON格式', error)
}
@@ -72,20 +77,19 @@ export default class NetworkManager extends Singleton {
// 超时处理
const timer = setTimeout(() => {
resolve({ success: false, error: new Error('timeout') })
this.unlistenMsg(name, cb)
this.unlistenMsg(name as any, cb, null)
}, TIMEOUT)
// 回调处理
const cb = (res) => {
resolve(res)
clearTimeout(timer)
this.unlistenMsg(name, cb)
this.unlistenMsg(name as any, cb, null)
}
this.listenMsg(name as any, cb)
this.listenMsg(name as any, cb, null)
this.sendMsg(name as any, data)
} catch (error) {
console.log(error)
resolve({ success: false, error: error as Error })
}
})
@@ -98,18 +102,19 @@ export default class NetworkManager extends Singleton {
this.ws.send(view.buffer)
}
listenMsg<T extends keyof IModel['msg']>(name: T, cb: (args: IModel['msg'][T]) => void) {
listenMsg<T extends keyof IModel['msg']>(name: T, cb: (args: IModel['msg'][T]) => void, ctx: unknown) {
if (this.maps.has(name)) {
this.maps.get(name).push(cb)
this.maps.get(name).push({ ctx, cb })
} else {
this.maps.set(name, [cb])
this.maps.set(name, [{ ctx, cb }])
}
}
unlistenMsg(name: ApiMsgEnum, cb: Function) {
unlistenMsg<T extends keyof IModel['msg']>(name: T, cb: (args: IModel['msg'][T]) => void, ctx: unknown) {
if (this.maps.has(name)) {
const index = this.maps.get(name).indexOf(cb)
index > -1 && this.maps.get(name).splice(index, 1)
const items = this.maps.get(name)
const index = items.findIndex(i => cb === i.cb && i.ctx === ctx);
index > -1 && items.splice(index, 1)
}
}
}

5
apps/client/assets/Scripts/Global/ObjectPoolManager.ts
View File

@@ -15,6 +15,11 @@ export default class ObjectPoolManager extends Singleton {
return objectName + 'Pool'
}
reset() {
this.objectPool = null
this.map.clear()
}
get(objectName: EntityTypeEnum) {
if (this.objectPool === null) {
this.objectPool = new Node("ObjectPool")

84
apps/client/assets/Scripts/Scene/BattleManager.ts
View File

@@ -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)
}
}
}

8
apps/client/assets/Scripts/Scene/HallManager.ts
View File

@@ -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() {

18
apps/client/assets/Scripts/Scene/RoomManager.ts
View File

@@ -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);
}
}

2
apps/client/assets/Scripts/UI/RoomManager.ts
View File

@@ -9,7 +9,7 @@ export class RoomManager extends Component {
init({ id, players }: { id: number, players: Array<{ id: number, nickname: string }> }) {
this.id = id
const label = this.getComponent(Label)
label.string = `房间id:${id}，当前人数:${players.length}`
label.string = `房间id:${id},当前人数:${players.length}`
this.node.active = true
}