Merge branch 'develop' of github.com:thecodingmachine/workadventure

front/src/Phaser/Components/Loader.ts

@@ -3,8 +3,8 @@ import { DirtyScene } from "../Game/DirtyScene";
 
 const LogoNameIndex: string = "logoLoading";
 const TextName: string = "Loading...";
-const LogoResource: string = "resources/logos/logo.png";
-const LogoFrame: ImageFrameConfig = { frameWidth: 307, frameHeight: 59 };
+const LogoResource: string = "static/images/logo.png";
+const LogoFrame: ImageFrameConfig = { frameWidth: 310, frameHeight: 60 };
 
 export const addLoader = (scene: Phaser.Scene): void => {
     // If there is nothing to load, do not display the loader.

front/src/Phaser/Entity/Character.ts

@@ -10,6 +10,7 @@ import { DEPTH_INGAME_TEXT_INDEX } from "../Game/DepthIndexes";
 import { waScaleManager } from "../Services/WaScaleManager";
 import type OutlinePipelinePlugin from "phaser3-rex-plugins/plugins/outlinepipeline-plugin.js";
 import { isSilentStore } from "../../Stores/MediaStore";
+import { lazyLoadPlayerCharacterTextures } from "./PlayerTexturesLoadingManager";
 
 const playerNameY = -25;
 
@@ -57,10 +58,17 @@ export abstract class Character extends Container {
         this.sprites = new Map<string, Sprite>();
 
         //textures are inside a Promise in case they need to be lazyloaded before use.
-        texturesPromise.then((textures) => {
-            this.addTextures(textures, frame);
-            this.invisible = false;
-        });
+        texturesPromise
+            .then((textures) => {
+                this.addTextures(textures, frame);
+                this.invisible = false;
+            })
+            .catch(() => {
+                return lazyLoadPlayerCharacterTextures(scene.load, ["color_22", "eyes_23"]).then((textures) => {
+                    this.addTextures(textures, frame);
+                    this.invisible = false;
+                });
+            });
 
         this.playerName = new Text(scene, 0, playerNameY, name, {
             fontFamily: '"Press Start 2P"',