Fix co website closing on exit zone
This commit is contained in:
parent
1efcbb4529
commit
1ee0b28f66
@ -37,37 +37,44 @@ export class GameMapPropertiesListener {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.gameMap.onPropertyChange("openWebsite", (newValue, oldValue, allProps) => {
|
this.gameMap.onPropertyChange("openWebsite", (newValue, oldValue, allProps) => {
|
||||||
if (newValue === undefined) {
|
const handler = async () => {
|
||||||
layoutManagerActionStore.removeAction("openWebsite");
|
if (newValue === undefined || newValue !== oldValue) {
|
||||||
coWebsiteManager.closeCoWebsite();
|
|
||||||
} else {
|
|
||||||
const openWebsiteFunction = () => {
|
|
||||||
coWebsiteManager.loadCoWebsite(
|
|
||||||
newValue as string,
|
|
||||||
this.scene.MapUrlFile,
|
|
||||||
allProps.get("openWebsiteAllowApi") as boolean | undefined,
|
|
||||||
allProps.get("openWebsitePolicy") as string | undefined,
|
|
||||||
allProps.get("openWebsiteWidth") as number | undefined
|
|
||||||
);
|
|
||||||
layoutManagerActionStore.removeAction("openWebsite");
|
layoutManagerActionStore.removeAction("openWebsite");
|
||||||
};
|
await coWebsiteManager.closeCoWebsites();
|
||||||
const openWebsiteTriggerValue = allProps.get(TRIGGER_WEBSITE_PROPERTIES);
|
|
||||||
if (openWebsiteTriggerValue && openWebsiteTriggerValue === ON_ACTION_TRIGGER_BUTTON) {
|
|
||||||
let message = allProps.get(WEBSITE_MESSAGE_PROPERTIES);
|
|
||||||
if (message === undefined) {
|
|
||||||
message = "Press SPACE or touch here to open web site";
|
|
||||||
}
|
|
||||||
layoutManagerActionStore.addAction({
|
|
||||||
uuid: "openWebsite",
|
|
||||||
type: "message",
|
|
||||||
message: message,
|
|
||||||
callback: () => openWebsiteFunction(),
|
|
||||||
userInputManager: this.scene.userInputManager,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
openWebsiteFunction();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
if (newValue !== undefined) {
|
||||||
|
const openWebsiteFunction = () => {
|
||||||
|
coWebsiteManager.loadCoWebsite(
|
||||||
|
newValue as string,
|
||||||
|
this.scene.MapUrlFile,
|
||||||
|
allProps.get("openWebsiteAllowApi") as boolean | undefined,
|
||||||
|
allProps.get("openWebsitePolicy") as string | undefined,
|
||||||
|
allProps.get("openWebsiteWidth") as number | undefined
|
||||||
|
);
|
||||||
|
|
||||||
|
layoutManagerActionStore.removeAction("openWebsite");
|
||||||
|
};
|
||||||
|
const openWebsiteTriggerValue = allProps.get(TRIGGER_WEBSITE_PROPERTIES);
|
||||||
|
if (openWebsiteTriggerValue && openWebsiteTriggerValue === ON_ACTION_TRIGGER_BUTTON) {
|
||||||
|
let message = allProps.get(WEBSITE_MESSAGE_PROPERTIES);
|
||||||
|
if (message === undefined) {
|
||||||
|
message = "Press SPACE or touch here to open web site";
|
||||||
|
}
|
||||||
|
layoutManagerActionStore.addAction({
|
||||||
|
uuid: "openWebsite",
|
||||||
|
type: "message",
|
||||||
|
message: message,
|
||||||
|
callback: () => openWebsiteFunction(),
|
||||||
|
userInputManager: this.scene.userInputManager,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
openWebsiteFunction();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
handler();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user