UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Don't use the anchor part of a spine-player jsonUrl in the asset name.

Browse Source
This commit is contained in:
Nathan Sweet 2021-06-17 01:29:42 -04:00
parent 6d7f773bf1
commit cf35d1e982
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spine-ts/player/src/Player.ts
View File

@ -438,8 +438,13 @@ module spine {
this.assetManager.setRawDataURI(path, data); this.assetManager.setRawDataURI(path, data);
} }
} }
if (config.jsonUrl) this.assetManager.loadText(config.jsonUrl); let jsonUrl = config.jsonUrl;
else this.assetManager.loadBinary(config.skelUrl); if (jsonUrl) {
let hash = jsonUrl.indexOf("#");
if (hash != -1) jsonUrl = jsonUrl.substr(0, hash);
this.assetManager.loadText(jsonUrl);
} else
this.assetManager.loadBinary(config.skelUrl);
this.assetManager.loadTextureAtlas(config.atlasUrl); this.assetManager.loadTextureAtlas(config.atlasUrl);
if (config.backgroundImage && config.backgroundImage.url) if (config.backgroundImage && config.backgroundImage.url)
this.assetManager.loadTexture(config.backgroundImage.url); this.assetManager.loadTexture(config.backgroundImage.url);
@ -866,9 +871,14 @@ module spine {
let skeletonData: SkeletonData; let skeletonData: SkeletonData;
let jsonUrl = this.config.jsonUrl; let jsonUrl = this.config.jsonUrl;
if (jsonUrl) { if (jsonUrl) {
let jsonText = this.assetManager.get(jsonUrl);
let hash = jsonUrl.indexOf("#"); let hash = jsonUrl.indexOf("#");
if (hash != -1) jsonText = JSON.parse(jsonText)[jsonUrl.substr(hash + 1)]; let field = null;
if (hash != -1) {
field = jsonUrl.substr(hash + 1);
jsonUrl = jsonUrl.substr(0, hash);
}
let jsonText = this.assetManager.get(jsonUrl);
if (field) jsonText = JSON.parse(jsonText)[field];
let json = new SkeletonJson(new AtlasAttachmentLoader(atlas)); let json = new SkeletonJson(new AtlasAttachmentLoader(atlas));
try { try {
skeletonData = json.readSkeletonData(jsonText); skeletonData = json.readSkeletonData(jsonText);