_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
_Bastler
2022-01-07 09:59:00 +01:00
parent 899621dd03 adac0df05d
commit 5cc573ac49
41 changed files with 538 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/src/Phaser/Companion/Companion.ts
+9 -7
View File
@@ -41,13 +41,15 @@ export class Companion extends Container {
this.companionName = name;
this._pictureStore = writable(undefined);
texturePromise.then((resource) => {
this.addResource(resource);
this.invisible = false;
return this.getSnapshot().then((htmlImageElementSrc) => {
this._pictureStore.set(htmlImageElementSrc);
});
});
texturePromise
.then((resource) => {
this.addResource(resource);
this.invisible = false;
return this.getSnapshot().then((htmlImageElementSrc) => {
this._pictureStore.set(htmlImageElementSrc);
});
})
.catch((e) => console.error(e));
this.scene.physics.world.enableBody(this);
front/src/Phaser/Companion/CompanionTexturesLoadingManager.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import { COMPANION_RESOURCES, CompanionResourceDescriptionInterface } from "./Co
export const getAllCompanionResources = (loader: LoaderPlugin): CompanionResourceDescriptionInterface[] => {
COMPANION_RESOURCES.forEach((resource: CompanionResourceDescriptionInterface) => {
lazyLoadCompanionResource(loader, resource.name);
lazyLoadCompanionResource(loader, resource.name).catch((e) => console.error(e));
});
return COMPANION_RESOURCES;