Permit to dissociate data by room
- Update share room id. - Join room when a scene is loaded. - Add a room in constant variable.
This commit is contained in:
parent
27c6034661
commit
5f11b065e1
7 changed files with 46 additions and 27 deletions
|
@ -147,7 +147,7 @@ export interface ConnexionInterface {
|
|||
|
||||
joinARoom(roomId: string, character: string): void;
|
||||
|
||||
sharePosition(x: number, y: number, direction: string, character: string): void;
|
||||
sharePosition(x: number, y: number, direction: string, roomId: string, character: string): void;
|
||||
|
||||
positionOfAllUser(): void;
|
||||
|
||||
|
@ -182,7 +182,7 @@ export class Connexion implements ConnexionInterface {
|
|||
return Axios.post(`${API_URL}/login`, {email: this.email})
|
||||
.then((res) => {
|
||||
this.token = res.data.token;
|
||||
this.startedRoom = res.data.roomId;
|
||||
this.startedRoom = res.data.startedRoom.key;
|
||||
this.userId = res.data.userId;
|
||||
|
||||
this.socket = SocketIo(`${API_URL}`, {
|
||||
|
@ -195,7 +195,7 @@ export class Connexion implements ConnexionInterface {
|
|||
this.joinARoom(this.startedRoom, characterSelected);
|
||||
|
||||
//share your first position
|
||||
this.sharePosition(0, 0, characterSelected);
|
||||
this.sharePosition(0, 0, characterSelected, this.startedRoom);
|
||||
|
||||
this.positionOfAllUser();
|
||||
|
||||
|
@ -229,7 +229,7 @@ export class Connexion implements ConnexionInterface {
|
|||
joinARoom(roomId: string, character: string): void {
|
||||
let messageUserPosition = new MessageUserPosition(
|
||||
this.userId,
|
||||
this.startedRoom,
|
||||
roomId,
|
||||
new Point(0, 0),
|
||||
this.email,
|
||||
character
|
||||
|
@ -242,15 +242,16 @@ export class Connexion implements ConnexionInterface {
|
|||
* @param x
|
||||
* @param y
|
||||
* @param character
|
||||
* @param roomId
|
||||
* @param direction
|
||||
*/
|
||||
sharePosition(x : number, y : number, character : string, direction : string = "none") : void{
|
||||
sharePosition(x : number, y : number, character : string, roomId : string, direction : string = "none") : void{
|
||||
if(!this.socket){
|
||||
return;
|
||||
}
|
||||
let messageUserPosition = new MessageUserPosition(
|
||||
this.userId,
|
||||
ROOM[0],
|
||||
roomId,
|
||||
new Point(x, y, direction),
|
||||
this.email,
|
||||
character
|
||||
|
@ -276,10 +277,9 @@ export class Connexion implements ConnexionInterface {
|
|||
positionOfAllUser(): void {
|
||||
this.socket.on(EventMessage.USER_POSITION, (message: string) => {
|
||||
let dataList = JSON.parse(message);
|
||||
dataList.forEach((UserPositions: any) => {
|
||||
let listMessageUserPosition = new ListMessageUserPosition(UserPositions[0], UserPositions[1]);
|
||||
this.GameManager.shareUserPosition(listMessageUserPosition);
|
||||
});
|
||||
let UserPositions : Array<any> = Object.values(dataList);
|
||||
let listMessageUserPosition = new ListMessageUserPosition(UserPositions[0], UserPositions[1]);
|
||||
this.GameManager.shareUserPosition(listMessageUserPosition);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -71,6 +71,10 @@ export class GameManager {
|
|||
this.status = StatusGameManagerEnum.CURRENT_USER_CREATED;
|
||||
}
|
||||
|
||||
joinRoom(sceneKey : string, character: string){
|
||||
this.ConnexionInstance.joinARoom(sceneKey, character);
|
||||
}
|
||||
|
||||
/**
|
||||
* Share position in game
|
||||
* @param ListMessageUserPosition
|
||||
|
@ -120,7 +124,7 @@ export class GameManager {
|
|||
}
|
||||
|
||||
pushPlayerPosition(event: HasMovedEvent) {
|
||||
this.ConnexionInstance.sharePosition(event.x, event.y, event.character, event.direction);
|
||||
this.ConnexionInstance.sharePosition(event.x, event.y, event.character, this.currentGameScene.scene.key, event.direction);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface, Creat
|
|||
|
||||
|
||||
// Let's generate the circle for the group delimiter
|
||||
|
||||
//TODO they are error with cercle
|
||||
this.circleTexture = this.textures.createCanvas('circleSprite', 96, 96);
|
||||
if(!this.circleTexture || this.circleTexture.context){
|
||||
return;
|
||||
|
@ -268,6 +268,11 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface, Creat
|
|||
//create collision
|
||||
this.createCollisionWithPlayer();
|
||||
this.createCollisionObject();
|
||||
|
||||
//join room
|
||||
this.GameManager.joinRoom(this.scene.key, this.CurrentPlayer.PlayerTexture);
|
||||
|
||||
//listen event to share position of user
|
||||
this.CurrentPlayer.on(hasMovedEventName, this.pushPlayerPosition.bind(this))
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue