A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
fix(asset): single-source remote/local asset URL routing
esengined015adc0c766
diff --git a/sdk/src/asset/Assets.ts b/sdk/src/asset/Assets.tsindex 4435c0e83..01645413f 100644--- a/sdk/src/asset/Assets.ts+++ b/sdk/src/asset/Assets.ts@@ -39,6 +39,7 @@ import { fetchDecodePixels } from './imageDecode';import type { SceneData } from '../scene';import { SceneHandle, type ReleaseCallback } from './SceneHandle';import type { AssetRegistry } from './AssetRegistry';+import { UUID_REF_PREFIX } from './AssetRegistry';import type { AssetRefCounter } from './AssetRefCounter';import { log } from '../logger';@@ -532,12 +533,7 @@ export class Assets {.catch(() => { onProgress?.(++loadedCount, totalCount); });for (const asset of model.assetsInGroup(groupName)) {- // A remote group's assets live on the CDN, not in the package: resolve- // to the absolute `<remoteRoot>/<contentHash>.<ext>` url (the backend- // passes absolute urls through). Local / lazy assets resolve normally.- const path = mode === 'remote'- ? this.remoteUrlFor_(asset.path)- : this.resolveLoadPath_(asset.path);+ const path = this.manifestAssetUrl_(asset.path, mode === 'remote');const task = this.groupLoadTask_(path, asset.type, bundle);if (task) promises.push(track(task));}@@ -606,6 +602,17 @@ export class Assets {return `${root.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;}+ /** The load url for a manifest asset. A `remote`-group asset resolves to its+ * `<root>/<path>` CDN url when a root is set; every other case (local / lazy+ * group, or a remote group with no CDN root — same-origin realms like editor+ * Play) resolves through the normal resolver + Catalog. The single remote/local+ * routing rule shared by {@link loadGroup} and {@link fetchAndVerify_}, so a+ * loadGroup'd asset and the same asset reached by a scene `@uuid` ref (via+ * {@link resolveLoadPath_} → {@link remoteAssetPath_}) never resolve two ways. */+ private manifestAssetUrl_(path: string, isRemote: boolean, root: string | undefined = this.remoteRoot_): string {+ return isRemote && root ? this.remoteUrlFor_(path, root) : this.resolveLoadPath_(path);+ }+/*** Fetch a candidate manifest and diff it against the active one WITHOUT* applying anything — the "is there an update, and how big?" query. The@@ -691,7 +698,7 @@ export class Assets {): Promise<AssetDownloadFailure['reason'] | null> {const group = model.group(c.group);const remote = group != null && normalizeBundleMode(group.bundleMode) === 'remote';- const path = remote ? this.remoteUrlFor_(c.path, root) : this.resolveLoadPath_(c.path);+ const path = this.manifestAssetUrl_(c.path, remote, root);try {const url = this.backend.resolveUrl(path);const buf = await this.backend.fetchBinary(url);@@ -1399,7 +1406,9 @@ export class Assets {if (!this.remoteRoot_) return null;const model = this.manifestModel_;if (!model) return null;- const key = ref.startsWith('@uuid:') ? ref.slice(6).toLowerCase() : ref;+ const key = ref.startsWith(UUID_REF_PREFIX)+ ? ref.slice(UUID_REF_PREFIX.length).toLowerCase()+ : ref;const path = model.remoteAssetPath(key) ?? model.remoteAssetPath(ref);return path != null ? this.remoteUrlFor_(path) : null;}