random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-11-25 08:16:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Hotfix] Fix manifest getting loaded before the game is initialized (#4739)

Browse Source 
* Fix manifest being used before the game is initialized

* bump game version

* make manifest fix more future proof

* Revert "make manifest fix more future proof"

This reverts commit 32591b35d0.

* fix locales path for offline builds
This commit is contained in:
Moka 2024-10-27 21:32:30 +01:00 committed by GitHub
parent dfb42e44a6
commit 41380b39b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.1.2", "version": "1.1.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.1.2", "version": "1.1.3",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@material/material-color-utilities": "^0.2.7", "@material/material-color-utilities": "^0.2.7",

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"private": true, "private": true,
"version": "1.1.2", "version": "1.1.3",
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "vite", "start": "vite",

10
src/main.ts
View File

@ -44,7 +44,7 @@ document.fonts.load("16px emerald").then(() => document.fonts.load("10px pkmnems
let game; let game;
const startGame = async () => { const startGame = async (manifest?: any) => {
await initI18n(); await initI18n();
const LoadingScene = (await import("./loading-scene")).LoadingScene; const LoadingScene = (await import("./loading-scene")).LoadingScene;
const BattleScene = (await import("./battle-scene")).default; const BattleScene = (await import("./battle-scene")).default;
@ -94,16 +94,18 @@ const startGame = async () => {
version: version version: version
}); });
game.sound.pauseOnBlur = false; game.sound.pauseOnBlur = false;
if (manifest) {
game["manifest"] = manifest;
}
}; };
fetch("/manifest.json") fetch("/manifest.json")
.then(res => res.json()) .then(res => res.json())
.then(jsonResponse => { .then(jsonResponse => {
startGame(); startGame(jsonResponse.manifest);
game["manifest"] = jsonResponse.manifest;
}).catch(() => { }).catch(() => {
// Manifest not found (likely local build) // Manifest not found (likely local build)
// startGame(); startGame();
}); });
export default game; export default game;

2
src/plugins/i18n.ts
View File

@ -164,7 +164,7 @@ export async function initI18n(): Promise<void> {
} else { } else {
fileName = camelCaseToKebabCase(ns); fileName = camelCaseToKebabCase(ns);
} }
return `/locales/${lng}/${fileName}.json?v=${pkg.version}`; return `./locales/${lng}/${fileName}.json?v=${pkg.version}`;
}, },
}, },
defaultNS: "menu", defaultNS: "menu",