From cf35d1e982000424174f8a3ba81276de099dba2a Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Thu, 17 Jun 2021 01:29:42 -0400 Subject: [PATCH] [ts] Don't use the anchor part of a spine-player jsonUrl in the asset name. --- spine-ts/player/src/Player.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/spine-ts/player/src/Player.ts b/spine-ts/player/src/Player.ts index 246954f2c..532bcd861 100644 --- a/spine-ts/player/src/Player.ts +++ b/spine-ts/player/src/Player.ts @@ -438,8 +438,13 @@ module spine { this.assetManager.setRawDataURI(path, data); } } - if (config.jsonUrl) this.assetManager.loadText(config.jsonUrl); - else this.assetManager.loadBinary(config.skelUrl); + let jsonUrl = config.jsonUrl; + 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); if (config.backgroundImage && config.backgroundImage.url) this.assetManager.loadTexture(config.backgroundImage.url); @@ -866,9 +871,14 @@ module spine { let skeletonData: SkeletonData; let jsonUrl = this.config.jsonUrl; if (jsonUrl) { - let jsonText = this.assetManager.get(jsonUrl); 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)); try { skeletonData = json.readSkeletonData(jsonText);