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

update

Browse Source
This commit is contained in:
sli97
2022-12-03 20:06:57 +08:00
parent bdead4a6d1
commit f3dc3ef7ba
110 changed files with 1347 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/assets/Scripts/Entity/Player.meta → apps/client/assets/Scripts/Common.meta
View File

@@ -2,7 +2,7 @@
"ver": "1.1.0",
"importer": "directory",
"imported": true,
"uuid": "5802fd2f-7823-4294-91c8-d71adca41319",
"uuid": "b5fb8ade-69bf-469c-9685-0d14804b00ac",
"files": [],
"subMetas": {},
"userData": {

12
apps/client/assets/Scripts/Entity/Actor.meta Normal file
View File

@@ -0,0 +1,12 @@
{
"ver": "1.1.0",
"importer": "directory",
"imported": true,
"uuid": "b207a15b-0f84-4e83-93de-cb6186e22772",
"files": [],
"subMetas": {},
"userData": {
"compressionType": {},
"isRemoteBundle": {}
}
}

26
apps/client/assets/Scripts/Entity/Player/PlayerManager.ts → apps/client/assets/Scripts/Entity/Actor/ActorManager.ts
View File

@@ -1,14 +1,16 @@
import { _decorator, instantiate, ProgressBar, Label } from 'cc';
import { EntityManager } from '../../Base/EntityManager';
import { EntityTypeEnum, EntityStateEnum, InputType } from '../../Enum';
import DataManager, { IPlayer, IVec2 } from '../../Global/DataManager';
import { ApiMsgEnum, EntityTypeEnum, IActor, InputTypeEnum, IVec2 } from '../../Common';
import { EntityStateEnum } from '../../Enum';
import DataManager from '../../Global/DataManager';
import NetworkManager from '../../Global/NetworkManager';
import { rad2Angle } from '../../Utils';
import { WeaponManager } from '../Weapon/WeaponManager';
import { PlayerStateMachine } from './PlayerStateMachine';
import { PlayerStateMachine } from './ActorStateMachine';
const { ccclass } = _decorator;
@ccclass('PlayerManager')
export class PlayerManager extends EntityManager {
@ccclass('ActorManager')
export class ActorManager extends EntityManager implements IActor {
//静态数据
id: number
nickname: string
@@ -29,7 +31,7 @@ export class PlayerManager extends EntityManager {
return DataManager.Instance.myPlayerId === this.id
}
init(data: IPlayer) {
init(data: IActor) {
const { id, nickname, type, weaponType, bulletType } = data
this.id = id
this.nickname = nickname
@@ -58,8 +60,8 @@ export class PlayerManager extends EntityManager {
}
const { x, y } = DataManager.Instance.jm.input
DataManager.Instance.applyInput({
type: InputType.PlayerMove,
NetworkManager.Instance.sendMsg(ApiMsgEnum.MsgClientSync, {
type: InputTypeEnum.ActorMove,
id: this.id,
direction: {
x,
@@ -69,21 +71,21 @@ export class PlayerManager extends EntityManager {
})
}
render(data: IPlayer) {
render(data: IActor) {
this.renderHP(data)
this.renderPosition(data)
this.renderDirection(data)
}
renderHP(data: IPlayer) {
renderHP(data: IActor) {
this.hpBar.progress = data.hp / this.hpBar.totalLength
}
renderPosition(data: IPlayer) {
renderPosition(data: IActor) {
this.node.setPosition(data.position.x, data.position.y)
}
renderDirection(data: IPlayer) {
renderDirection(data: IActor) {
if (data.direction.x === 0 && data.direction.y === 0) {
this.state = EntityStateEnum.Idle
return

2
apps/client/assets/Scripts/UI/PlayerItemManager.ts.meta → apps/client/assets/Scripts/Entity/Actor/ActorManager.ts.meta
View File

@@ -2,7 +2,7 @@
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "0b36580d-5fc7-40c1-9ac0-0fb78a685fd1",
"uuid": "aaa694fa-4476-44b2-9213-4b4978a57d66",
"files": [],
"subMetas": {},
"userData": {}

3
apps/client/assets/Scripts/Entity/Player/PlayerStateMachine.ts → apps/client/assets/Scripts/Entity/Actor/ActorStateMachine.ts
View File

@@ -1,7 +1,8 @@
import { _decorator, Animation, AnimationClip } from 'cc'
import State from '../../Base/State'
import StateMachine, { getInitParamsTrigger } from '../../Base/StateMachine'
import { EntityTypeEnum, EntityStateEnum, ParamsNameEnum } from '../../Enum'
import { EntityTypeEnum } from '../../Common'
import { EntityStateEnum, ParamsNameEnum } from '../../Enum'
const { ccclass } = _decorator
@ccclass('PlayerStateMachine')

2
apps/client/assets/Scripts/UI/RoomItemManager.ts.meta → apps/client/assets/Scripts/Entity/Actor/ActorStateMachine.ts.meta
View File

@@ -2,7 +2,7 @@
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "26da1a71-eb0d-463d-b2d6-fbc64bf0ab89",
"uuid": "67239e69-9cbb-42c8-ae8f-27f8bae24103",
"files": [],
"subMetas": {},
"userData": {}

0
apps/client/assets/Scripts/Entity/Player/PlayerManager.ts.meta → apps/client/assets/Scripts/Entity/Actor/PlayerManager.ts.meta
View File

0
apps/client/assets/Scripts/Entity/Player/PlayerStateMachine.ts.meta → apps/client/assets/Scripts/Entity/Actor/PlayerStateMachine.ts.meta
View File

7
apps/client/assets/Scripts/Entity/Bullet/BulletManager.ts
View File

@@ -1,7 +1,8 @@
import { _decorator } from 'cc'
import { EntityManager } from '../../Base/EntityManager'
import { EntityTypeEnum, EntityStateEnum, EventEnum } from '../../Enum'
import DataManager, { IBullet, IVec2 } from '../../Global/DataManager'
import { EntityTypeEnum, IBullet, IVec2 } from '../../Common'
import { EntityStateEnum, EventEnum } from '../../Enum'
import DataManager from '../../Global/DataManager'
import EventManager from '../../Global/EventManager'
import ObjectPoolManager from '../../Global/ObjectPoolManager'
import { rad2Angle } from '../../Utils'
@@ -10,7 +11,7 @@ import { BulletStateMachine } from './BulletStateMachine'
const { ccclass } = _decorator
@ccclass('BulletManager')
export class BulletManager extends EntityManager {
export class BulletManager extends EntityManager implements IBullet {
//静态数据
id: number
owner: number

3
apps/client/assets/Scripts/Entity/Bullet/BulletStateMachine.ts
View File

@@ -1,7 +1,8 @@
import { _decorator, Animation } from 'cc'
import State from '../../Base/State'
import StateMachine, { getInitParamsTrigger } from '../../Base/StateMachine'
import { EntityTypeEnum, EntityStateEnum, ParamsNameEnum } from '../../Enum'
import { EntityTypeEnum } from '../../Common'
import { EntityStateEnum, ParamsNameEnum } from '../../Enum'
const { ccclass } = _decorator
@ccclass('BulletStateMachine')

4
apps/client/assets/Scripts/Entity/Explosion/ExplosionManager.ts
View File

@@ -1,7 +1,7 @@
import { _decorator } from 'cc'
import { EntityManager } from '../../Base/EntityManager'
import { EntityTypeEnum, EntityStateEnum } from '../../Enum'
import { IVec2 } from '../../Global/DataManager'
import { EntityTypeEnum, IVec2 } from '../../Common'
import { EntityStateEnum } from '../../Enum'
import { ExplosionStateMachine } from './ExplosionStateMachine'
const { ccclass, property } = _decorator

3
apps/client/assets/Scripts/Entity/Explosion/ExplosionStateMachine.ts
View File

@@ -1,7 +1,8 @@
import { _decorator, Animation } from 'cc'
import State from '../../Base/State'
import StateMachine, { getInitParamsTrigger } from '../../Base/StateMachine'
import { EntityTypeEnum, EntityStateEnum, ParamsNameEnum } from '../../Enum'
import { EntityTypeEnum } from '../../Common'
import { EntityStateEnum, ParamsNameEnum } from '../../Enum'
import ObjectPoolManager from '../../Global/ObjectPoolManager'
const { ccclass, property } = _decorator

12
apps/client/assets/Scripts/Entity/Weapon/WeaponManager.ts
View File

@@ -1,8 +1,10 @@
import { _decorator, Node, Vec2, UITransform } from 'cc'
import { EntityManager } from '../../Base/EntityManager'
import { EntityTypeEnum, EntityStateEnum, EventEnum, InputType } from '../../Enum'
import DataManager, { IPlayer } from '../../Global/DataManager'
import { ApiMsgEnum, EntityTypeEnum, InputTypeEnum } from '../../Common'
import { EntityStateEnum, EventEnum } from '../../Enum'
import DataManager from '../../Global/DataManager'
import EventManager from '../../Global/EventManager'
import NetworkManager from '../../Global/NetworkManager'
import { WeaponStateMachine } from './WeaponStateMachine'
const { ccclass } = _decorator
@@ -19,7 +21,7 @@ export class WeaponManager extends EntityManager {
return DataManager.Instance.myPlayerId === this.owner
}
init({ id, weaponType }: IPlayer) {
init({ id, weaponType }: { id: number, weaponType: EntityTypeEnum }) {
this.owner = id
this.type = weaponType
@@ -58,8 +60,8 @@ export class WeaponManager extends EntityManager {
const anchorWorldPos = this.anchor.getWorldPosition()
const directionVec2 = new Vec2(pointWorldPos.x - anchorWorldPos.x, pointWorldPos.y - anchorWorldPos.y).normalize()
DataManager.Instance.applyInput({
type: InputType.WeaponShoot,
NetworkManager.Instance.sendMsg(ApiMsgEnum.MsgClientSync, {
type: InputTypeEnum.WeaponShoot,
owner: this.owner,
position: {
x: pointStagePos.x,

3
apps/client/assets/Scripts/Entity/Weapon/WeaponStateMachine.ts
View File

@@ -1,7 +1,8 @@
import { _decorator, Animation, AnimationClip } from 'cc'
import State from '../../Base/State'
import StateMachine, { getInitParamsTrigger } from '../../Base/StateMachine'
import { EntityStateEnum, EntityTypeEnum, ParamsNameEnum } from '../../Enum'
import { EntityTypeEnum } from '../../Common'
import { EntityStateEnum, ParamsNameEnum } from '../../Enum'
import { WeaponManager } from './WeaponManager'
const { ccclass } = _decorator

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

@@ -23,23 +23,10 @@ export enum EventEnum {
GameStart = 'GameStart',
}
export enum EntityTypeEnum {
Map1 = 'Map1',
Player1 = 'Player1',
Player2 = 'Player2',
Weapon1 = 'Weapon1',
Weapon2 = 'Weapon2',
Bullet1 = 'Bullet1',
Bullet2 = 'Bullet2',
Explosion = 'Explosion',
JoyStick = 'JoyStick',
Shoot = 'Shoot',
}
export enum PrefabPathEnum {
Map1 = 'prefab/Map1',
Player1 = 'prefab/Player',
Player2 = 'prefab/Player',
Actor1 = 'prefab/Actor',
Actor2 = 'prefab/Actor',
Weapon1 = 'prefab/Weapon1',
Weapon2 = 'prefab/Weapon2',
Bullet1 = 'prefab/Bullet',
@@ -50,10 +37,10 @@ export enum PrefabPathEnum {
}
export enum TexturePathEnum {
Player1Idle = 'texture/player/player1/idle',
Player1Run = 'texture/player/player1/run',
Player2Idle = 'texture/player/player2/idle',
Player2Run = 'texture/player/player2/run',
Actor1Idle = 'texture/actor/actor1/idle',
Actor1Run = 'texture/actor/actor1/run',
Actor2Idle = 'texture/actor/actor2/idle',
Actor2Run = 'texture/actor/actor2/run',
Weapon1Idle = 'texture/weapon/weapon1/idle',
Weapon1Attack = 'texture/weapon/weapon1/attack',
Weapon2Idle = 'texture/weapon/weapon2/idle',
@@ -63,12 +50,6 @@ export enum TexturePathEnum {
ExplosionIdle = 'texture/explosion',
}
export enum InputType {
PlayerMove = 'PlayerMove',
WeaponShoot = 'WeaponShoot',
TimePast = 'TimePast',
}
export enum SceneEnum {
Login = 'Login',
Hall = 'Hall',

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

@@ -1,14 +1,12 @@
import { Node, Prefab, SpriteFrame } from 'cc'
import Singleton from '../Base/Singleton'
import { EntityTypeEnum, IBullet, IClientInput, InputTypeEnum, IRoom, IState } from '../Common'
import { ActorManager } from '../Entity/Actor/ActorManager'
import { BulletManager } from '../Entity/Bullet/BulletManager'
import { PlayerManager } from '../Entity/Player/PlayerManager'
import { EntityTypeEnum, EventEnum, InputType } from '../Enum'
import { EventEnum } from '../Enum'
import { JoyStickManager } from '../UI/JoyStickManager'
import EventManager from './EventManager'
import { IData } from './NetworkManager'
export type IPlayer = Pick<PlayerManager, 'id' | 'nickname' | 'hp' | 'position' | 'direction' | 'type' | 'weaponType' | 'bulletType'>
export type IBullet = Pick<BulletManager, 'id' | 'owner' | 'position' | 'direction' | 'type'>
const PLAYER_SPEED = 100
const BULLET_SPEED = 600
@@ -18,36 +16,6 @@ const WEAPON_DAMAGE = 5
const PLAYER_RADIUS = 50
const BULLET_RADIUS = 10
export interface IVec2 {
x: number;
y: number
}
interface IState {
players: IPlayer[],
bullets: IBullet[],
nextBulletId: number
}
interface IPlayerMove {
type: InputType.PlayerMove
id: number;
direction: IVec2;
dt: number;
}
interface IWeaponShoot {
type: InputType.WeaponShoot
owner: number;
position: IVec2;
direction: IVec2;
}
interface ITimePast {
type: InputType.TimePast;
dt: number
}
export default class DataManager extends Singleton {
static get Instance() {
return super.GetInstance<DataManager>()
@@ -59,11 +27,11 @@ export default class DataManager extends Singleton {
prefabMap: Map<string, Prefab> = new Map()
textureMap: Map<string, SpriteFrame[]> = new Map()
playerMap: Map<number, PlayerManager> = new Map()
actorMap: Map<number, ActorManager> = new Map()
bulletMap: Map<number, BulletManager> = new Map()
myPlayerId = 1
roomInfo: IData
roomInfo: IRoom
mapSize = {
x: 960,
y: 640,
@@ -82,7 +50,7 @@ export default class DataManager extends Singleton {
y: 0
},
hp: 100,
type: EntityTypeEnum.Player1,
type: EntityTypeEnum.Actor1,
weaponType: EntityTypeEnum.Weapon1,
bulletType: EntityTypeEnum.Bullet1,
}, {
@@ -97,7 +65,7 @@ export default class DataManager extends Singleton {
y: -1
},
hp: 100,
type: EntityTypeEnum.Player2,
type: EntityTypeEnum.Actor2,
weaponType: EntityTypeEnum.Weapon2,
bulletType: EntityTypeEnum.Bullet2,
}],
@@ -105,9 +73,9 @@ export default class DataManager extends Singleton {
nextBulletId: 1
}
applyInput(input: IPlayerMove | IWeaponShoot | ITimePast) {
applyInput(input: IClientInput) {
switch (input.type) {
case InputType.PlayerMove: {
case InputTypeEnum.ActorMove: {
const { direction: { x, y }, dt, id } = input
const player = this.state.players.find(e => e.id === id)
if (!player) {
@@ -120,21 +88,21 @@ export default class DataManager extends Singleton {
break
}
case InputType.WeaponShoot: {
case InputTypeEnum.WeaponShoot: {
const { owner, position, direction } = input
const bullet: IBullet = {
id: this.state.nextBulletId++,
owner,
position,
direction,
type: this.playerMap.get(owner).bulletType
type: this.actorMap.get(owner).bulletType
}
this.state.bullets.push(bullet)
EventManager.Instance.emit(EventEnum.BulletBorn, owner)
break
}
case InputType.TimePast: {
case InputTypeEnum.TimePast: {
const { dt } = input
const { bullets, players } = this.state

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

@@ -1,27 +1,15 @@
import Singleton from '../Base/Singleton'
import { IModel } from '../Common';
const TIMEOUT = 5000
export type IData = Record<string, any>
export interface ICallApiRet {
export interface ICallApiRet<T> {
success: boolean;
error?: Error;
res?: IData
}
export enum ApiMsgEnum {
ApiPlayerList = 'ApiPlayerList',
ApiPlayerJoin = 'ApiPlayerJoin',
ApiRoomList = 'ApiRoomList',
ApiRoomCreate = 'ApiRoomCreate',
ApiRoomJoin = 'ApiRoomJoin',
ApiRoomLeave = 'ApiRoomLeave',
MsgPlayerList = 'MsgPlayerList',
MsgRoomList = 'MsgRoomList',
MsgRoom = 'MsgRoom',
res?: T
}
type aaa = keyof IModel
export default class NetworkManager extends Singleton {
static get Instance() {
return super.GetInstance<NetworkManager>()
@@ -71,11 +59,36 @@ export default class NetworkManager extends Singleton {
})
}
sendMsg(name: string, data: IData) {
callApi<T extends keyof IModel['api']>(name: T, data: IModel['api'][T]['req']): Promise<ICallApiRet<IModel['api'][T]['res']>> {
return new Promise((resolve) => {
try {
// 超时处理
const timer = setTimeout(() => {
resolve({ success: false, error: new Error('timeout') })
this.unlistenMsg(name, cb)
}, TIMEOUT)
// 回调处理
const cb = (res) => {
resolve(res)
clearTimeout(timer)
this.unlistenMsg(name, cb)
}
this.listenMsg(name as any, cb)
this.ws.send(JSON.stringify({ name, data }))
} catch (error) {
console.log(error)
resolve({ success: false, error: error as Error })
}
})
}
sendMsg<T extends keyof IModel['msg']>(name: T, data: IModel['msg'][T]) {
this.ws.send(JSON.stringify({ name, data }))
}
listenMsg(name: string, cb: Function) {
listenMsg<T extends keyof IModel['msg']>(name: T, cb: (args: IModel['msg'][T]) => void) {
if (this.cbs.has(name)) {
this.cbs.get(name).push(cb)
} else {
@@ -89,29 +102,4 @@ export default class NetworkManager extends Singleton {
index > -1 && this.cbs.get(name).splice(index, 1)
}
}
callApi(name: string, data: IData) {
return new Promise<ICallApiRet>((resolve) => {
try {
// 超时处理
const timer = setTimeout(() => {
resolve({ success: false, error: new Error('timeout') })
this.unlistenMsg(name, cb)
}, TIMEOUT)
// 回调处理
const cb = (res: ICallApiRet) => {
resolve(res)
clearTimeout(timer)
this.unlistenMsg(name, cb)
}
this.listenMsg(name, cb)
this.ws.send(JSON.stringify({ name, data }))
} catch (error) {
console.log(error)
resolve({ success: false, error: error as Error })
}
})
}
}

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

@@ -1,7 +1,7 @@
import Singleton from '../Base/Singleton'
import { instantiate, Node } from 'cc'
import { EntityTypeEnum } from '../Enum'
import DataManager from './DataManager'
import { EntityTypeEnum } from '../Common'
export default class ObjectPoolManager extends Singleton {
static get Instance() {

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

@@ -1,12 +1,13 @@
import { _decorator, Component, Node, Prefab, instantiate, SpriteFrame } from 'cc';
import { PlayerManager } from '../Entity/Player/PlayerManager';
import { ActorManager } from '../Entity/Actor/ActorManager';
import DataManager from '../Global/DataManager';
import { JoyStickManager } from '../UI/JoyStickManager';
import { ResourceManager } from '../Global/ResourceManager';
import { EntityTypeEnum, InputType, PrefabPathEnum, TexturePathEnum } from '../Enum';
import { PrefabPathEnum, TexturePathEnum } from '../Enum';
import NetworkManager from '../Global/NetworkManager';
import ObjectPoolManager from '../Global/ObjectPoolManager';
import { BulletManager } from '../Entity/Bullet/BulletManager';
import { EntityTypeEnum, InputTypeEnum } from '../Common';
const { ccclass } = _decorator;
@@ -98,7 +99,7 @@ export class BattleManager extends Component {
tickPlayer(dt: number) {
for (const p of DataManager.Instance.state.players) {
const playerManager = DataManager.Instance.playerMap.get(p.id)
const playerManager = DataManager.Instance.actorMap.get(p.id)
if (!playerManager) {
return
}
@@ -108,7 +109,7 @@ export class BattleManager extends Component {
tickGlobal(dt: number) {
DataManager.Instance.applyInput({
type: InputType.TimePast,
type: InputTypeEnum.TimePast,
dt
})
}
@@ -120,13 +121,13 @@ export class BattleManager extends Component {
renderPlayer() {
for (const p of DataManager.Instance.state.players) {
let playerManager = DataManager.Instance.playerMap.get(p.id)
let playerManager = DataManager.Instance.actorMap.get(p.id)
if (!playerManager) {
const playerPrefab = DataManager.Instance.prefabMap.get(p.type)
const player = instantiate(playerPrefab)
player.setParent(this.stage)
playerManager = player.addComponent(PlayerManager)
DataManager.Instance.playerMap.set(p.id, playerManager)
playerManager = player.addComponent(ActorManager)
DataManager.Instance.actorMap.set(p.id, playerManager)
playerManager.init(p)
} else {
playerManager.render(p)

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

@@ -1,10 +1,11 @@
import { _decorator, Component, Node, Prefab, director, instantiate } from 'cc';
import { ApiMsgEnum, IApiPlayerListRes, IApiRoomListRes, IMsgPlayerList, IMsgRoomList } from '../Common';
import { EventEnum, SceneEnum } from '../Enum';
import DataManager from '../Global/DataManager';
import EventManager from '../Global/EventManager';
import NetworkManager, { ApiMsgEnum, IData } from '../Global/NetworkManager';
import { PlayerItemManager } from '../UI/PlayerItemManager';
import { RoomItemManager } from '../UI/RoomItemManager';
import NetworkManager from '../Global/NetworkManager';
import { PlayerManager } from '../UI/PlayerManager';
import { RoomManager } from '../UI/RoomManager';
const { ccclass, property } = _decorator;
@ccclass('HallManager')
@@ -13,24 +14,24 @@ export class HallManager extends Component {
playerContainer: Node = null;
@property(Prefab)
playerItem: Prefab = null;
playerPrefab: Prefab = null;
@property(Node)
roomContainer: Node = null;
@property(Prefab)
roomItem: Prefab = null;
roomPrefab: Prefab = null;
onLoad() {
director.preloadScene(SceneEnum.Room);
EventManager.Instance.on(EventEnum.RoomJoin, this.joinRoom, this)
NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayer);
NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayers);
NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoomList, this.renderRooms);
}
onDestroy() {
EventManager.Instance.off(EventEnum.RoomJoin, this.joinRoom, this)
NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayer);
NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgPlayerList, this.renderPlayers);
NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoomList, this.renderRooms);
}
@@ -46,15 +47,15 @@ export class HallManager extends Component {
return;
}
this.renderPlayer(res)
this.renderPlayers(res)
}
renderPlayer = ({ list }: IData) => {
renderPlayers = ({ list }: IApiPlayerListRes | IMsgPlayerList) => {
for (const item of this.playerContainer.children) {
item.active = false
}
while (this.playerContainer.children.length < list.length) {
const playerItem = instantiate(this.playerItem);
const playerItem = instantiate(this.playerPrefab);
playerItem.active = false
playerItem.setParent(this.playerContainer)
}
@@ -62,7 +63,7 @@ export class HallManager extends Component {
for (let i = 0; i < list.length; i++) {
const data = list[i];
const node = this.playerContainer.children[i]
const playerItemManager = node.getComponent(PlayerItemManager)
const playerItemManager = node.getComponent(PlayerManager)
playerItemManager.init(data)
}
}
@@ -77,12 +78,12 @@ export class HallManager extends Component {
this.renderRooms(res)
}
renderRooms = ({ list }: IData) => {
renderRooms = ({ list }: IApiRoomListRes | IMsgRoomList) => {
for (const item of this.roomContainer.children) {
item.active = false
}
while (this.roomContainer.children.length < list.length) {
const roomItem = instantiate(this.roomItem);
const roomItem = instantiate(this.roomPrefab);
roomItem.active = false
roomItem.setParent(this.roomContainer)
}
@@ -90,7 +91,7 @@ export class HallManager extends Component {
for (let i = 0; i < list.length; i++) {
const data = list[i];
const node = this.roomContainer.children[i]
const roomItemManager = node.getComponent(RoomItemManager)
const roomItemManager = node.getComponent(RoomManager)
roomItemManager.init(data)
}
}
@@ -102,8 +103,7 @@ export class HallManager extends Component {
return;
}
DataManager.Instance.roomInfo = { ...res }
DataManager.Instance.roomInfo = res.room
director.loadScene(SceneEnum.Room);
}
@@ -114,8 +114,7 @@ export class HallManager extends Component {
return;
}
DataManager.Instance.roomInfo = { ...res }
DataManager.Instance.roomInfo = res.room
director.loadScene(SceneEnum.Room);
}
}

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

@@ -1,7 +1,8 @@
import { _decorator, Component, Node, EditBox, Button, director } from 'cc';
import { _decorator, Component, EditBox, director } from 'cc';
import { ApiMsgEnum } from '../Common';
import { SceneEnum } from '../Enum';
import DataManager from '../Global/DataManager';
import NetworkManager, { ApiMsgEnum } from '../Global/NetworkManager';
import NetworkManager from '../Global/NetworkManager';
const { ccclass, property } = _decorator;
@ccclass('LoginManager')
@@ -16,7 +17,6 @@ export class LoginManager extends Component {
async start() {
await NetworkManager.Instance.connect();
console.log("服务连接成功！");
}
async handleClick() {
@@ -38,7 +38,7 @@ export class LoginManager extends Component {
return;
}
DataManager.Instance.myPlayerId = res.id;
DataManager.Instance.myPlayerId = res.player.id;
director.loadScene(SceneEnum.Hall);
}
}

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

@@ -1,9 +1,10 @@
import { _decorator, Component, Node, Prefab, director, instantiate } from 'cc';
import { ApiMsgEnum, IMsgGameStart, IMsgRoom } from '../Common';
import { EventEnum, SceneEnum } from '../Enum';
import DataManager from '../Global/DataManager';
import EventManager from '../Global/EventManager';
import NetworkManager, { ApiMsgEnum, IData } from '../Global/NetworkManager';
import { PlayerItemManager } from '../UI/PlayerItemManager';
import NetworkManager from '../Global/NetworkManager';
import { PlayerManager } from '../UI/PlayerManager';
const { ccclass, property } = _decorator;
@ccclass('RoomManager')
@@ -12,27 +13,31 @@ export class RoomManager extends Component {
playerContainer: Node = null;
@property(Prefab)
playerItem: Prefab = null;
playerPrefab: Prefab = null;
onLoad() {
director.preloadScene(SceneEnum.Battle);
NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoom, this.renderPlayer);
NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgRoom, this.renderPlayers);
NetworkManager.Instance.listenMsg(ApiMsgEnum.MsgGameStart, this.startGame);
}
onDestroy() {
NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoom, this.renderPlayer);
NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgRoom, this.renderPlayers);
NetworkManager.Instance.unlistenMsg(ApiMsgEnum.MsgGameStart, this.startGame);
}
async start() {
this.renderPlayer(DataManager.Instance.roomInfo)
this.renderPlayers({
room: DataManager.Instance.roomInfo
})
}
renderPlayer = ({ players: list }: any) => {
renderPlayers = ({ room: { players: list } }: IMsgRoom) => {
for (const item of this.playerContainer.children) {
item.active = false
}
while (this.playerContainer.children.length < list.length) {
const playerItem = instantiate(this.playerItem);
const playerItem = instantiate(this.playerPrefab);
playerItem.active = false
playerItem.setParent(this.playerContainer)
}
@@ -40,7 +45,7 @@ export class RoomManager extends Component {
for (let i = 0; i < list.length; i++) {
const data = list[i];
const node = this.playerContainer.children[i]
const playerItemManager = node.getComponent(PlayerItemManager)
const playerItemManager = node.getComponent(PlayerManager)
playerItemManager.init(data)
}
}
@@ -56,9 +61,20 @@ export class RoomManager extends Component {
director.loadScene(SceneEnum.Hall);
}
handleGameStart() {
console.log("handleGameStart");
async handleStart() {
const { success, res, error } = await NetworkManager.Instance.callApi(ApiMsgEnum.ApiGameStart, { rid: DataManager.Instance.roomInfo.id });
if (!success) {
console.log(error)
return;
}
// director.loadScene(SceneEnum.Battle);
}
startGame = ({ state }: IMsgGameStart) => {
DataManager.Instance.state = state
director.loadScene(SceneEnum.Battle);
}
}

4
apps/client/assets/Scripts/UI/PlayerItemManager.ts → apps/client/assets/Scripts/UI/PlayerManager.ts
View File

@@ -4,8 +4,8 @@ import DataManager from '../Global/DataManager';
import EventManager from '../Global/EventManager';
const { ccclass, property } = _decorator;
@ccclass('PlayerItemManager')
export class PlayerItemManager extends Component {
@ccclass('PlayerManager')
export class PlayerManager extends Component {
init({ id, nickname, rid }: { id: number, nickname: string, rid: number }) {
const label = this.getComponent(Label)
let str = nickname

9
apps/client/assets/Scripts/UI/PlayerManager.ts.meta Normal file
View File

@@ -0,0 +1,9 @@
{
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "741a7f88-76ef-4669-95a8-ce39c63a1c41",
"files": [],
"subMetas": {},
"userData": {}
}

4
apps/client/assets/Scripts/UI/RoomItemManager.ts → apps/client/assets/Scripts/UI/RoomManager.ts
View File

@@ -3,8 +3,8 @@ import { EventEnum } from '../Enum';
import EventManager from '../Global/EventManager';
const { ccclass, property } = _decorator;
@ccclass('RoomItemManager')
export class RoomItemManager extends Component {
@ccclass('RoomManager')
export class RoomManager extends Component {
id: number
init({ id, players }: { id: number, players: Array<{ id: number, nickname: string }> }) {
this.id = id

9
apps/client/assets/Scripts/UI/RoomManager.ts.meta Normal file
View File

@@ -0,0 +1,9 @@
{
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "23e17e0e-7637-4c8c-9af7-91dc0f41301b",
"files": [],
"subMetas": {},
"userData": {}
}