diff --git a/docker-compose.yaml b/docker-compose.yaml
index 98071437..22b807a7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -43,7 +43,7 @@ services:
- ./front:/usr/src/app
labels:
- "traefik.http.routers.front.rule=Host(`play.workadventure.localhost`)"
- - "traefik.http.routers.front.entryPoints=web,traefik"
+ - "traefik.http.routers.front.entryPoints=web"
- "traefik.http.services.front.loadbalancer.server.port=8080"
- "traefik.http.routers.front-ssl.rule=Host(`play.workadventure.localhost`)"
- "traefik.http.routers.front-ssl.entryPoints=websecure"
diff --git a/front/dist/index.tmpl.html b/front/dist/index.tmpl.html
index a2b44788..dc8d818d 100644
--- a/front/dist/index.tmpl.html
+++ b/front/dist/index.tmpl.html
@@ -29,7 +29,15 @@
+
+
+
+
WorkAdventure
diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css
index e3291ad7..700934a6 100644
--- a/front/dist/resources/style/style.css
+++ b/front/dist/resources/style/style.css
@@ -1175,6 +1175,29 @@ div.action p.action-body{
margin-left: calc(50% - 75px);
border-radius: 15px;
}
+.popUpElement{
+ animation-duration: 1s;
+ animation-delay: 3s;
+ animation-name: slidein;
+}
+.popUpElement p {
+ text-align: left;
+ font-size: 10px;
+ background-color: #727678;
+ color: white;
+}
+.popUpElement div {
+ width: 300px;
+ height: 120px;
+ background-color: #727678;
+}
+
+.popUpElement button {
+ position: center;
+ font-size: 10px;
+}
+
+
@keyframes mymove {
0% {bottom: 40px;}
50% {bottom: 30px;}
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index a90cb6b1..fbd8c820 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -73,6 +73,8 @@ import {addLoader} from "../Components/Loader";
import {ErrorSceneName} from "../Reconnecting/ErrorScene";
import {localUserStore} from "../../Connexion/LocalUserStore";
import {BodyResourceDescriptionInterface} from "../Entity/PlayerTextures";
+import DOMElement = Phaser.GameObjects.DOMElement;
+import Tween = Phaser.Tweens.Tween;
export interface GameSceneInitInterface {
initPosition: PointInterface|null,
@@ -165,6 +167,7 @@ export class GameScene extends ResizableScene implements CenterListener {
private playerName!: string;
private characterLayers!: string[];
+ private popUpElement : DOMElement| undefined;
constructor(private room: Room, MapUrlFile: string, customKey?: string|undefined) {
super({
key: customKey ?? room.id
@@ -648,6 +651,31 @@ export class GameScene extends ResizableScene implements CenterListener {
this.gameMap.onPropertyChange('exitSceneUrl', (newValue, oldValue) => {
if (newValue) this.onMapExit(newValue as string);
});
+ this.gameMap.onPropertyChange('inGameConsoleMessage', (newValue, oldValue, allProps) => {
+ if (newValue !== undefined) {
+ this.popUpElement?.destroy();
+ this.popUpElement = this.add.dom(2100, 150).createFromHTML(newValue as string);
+ this.popUpElement.scale = 0;
+ this.tweens.add({
+ targets : this.popUpElement ,
+ scale : 1,
+ ease : "EaseOut",
+ duration : 400,
+
+
+ });
+
+ this.popUpElement.setClassName("popUpElement");
+ } else {
+ this.tweens.add({
+ targets : this.popUpElement ,
+ scale : 0,
+ ease : "EaseOut",
+ duration : 400,
+
+ });
+ }
+ });
this.gameMap.onPropertyChange('exitUrl', (newValue, oldValue) => {
if (newValue) this.onMapExit(newValue as string);
});
diff --git a/maps/Tuto2.tmx b/maps/Tuto2.tmx
new file mode 100644
index 00000000..7be100d9
--- /dev/null
+++ b/maps/Tuto2.tmx
@@ -0,0 +1,647 @@
+
+