UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 22:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' into 4.0-beta

Browse Source 
Note: the following files were resoluved using ours (4.0-beta state):
- spine-ts/build/spine-all.js.map
- spine-ts/build/spine-player.js.map
This commit is contained in:
Harald Csaszar 2021-05-18 11:37:44 +02:00
commit 646b2934bc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-ts/build/spine-all.js
View File

@ -13358,7 +13358,7 @@ var spine;
skeletonData = json.readSkeletonData(jsonText);
}
catch (e) {
this.showError("Error: could not load skeleton .json.<br><br>" + escapeHtml(JSON.stringify(e)));
this.showError("Error: could not load skeleton .json.<br><br>" + e.toString());
return;
}
}
@ -13369,7 +13369,7 @@ var spine;
skeletonData = binary.readSkeletonData(binaryData);
}
catch (e) {
this.showError("Error: could not load skeleton .skel.<br><br>" + escapeHtml(JSON.stringify(e)));
this.showError("Error: could not load skeleton .skel.<br><br>" + e.toString());
return;
}
}

4
spine-ts/build/spine-player.js
View File

@ -12669,7 +12669,7 @@ var spine;
skeletonData = json.readSkeletonData(jsonText);
}
catch (e) {
this.showError("Error: could not load skeleton .json.<br><br>" + escapeHtml(JSON.stringify(e)));
this.showError("Error: could not load skeleton .json.<br><br>" + e.toString());
return;
}
}
@ -12680,7 +12680,7 @@ var spine;
skeletonData = binary.readSkeletonData(binaryData);
}
catch (e) {
this.showError("Error: could not load skeleton .skel.<br><br>" + escapeHtml(JSON.stringify(e)));
this.showError("Error: could not load skeleton .skel.<br><br>" + e.toString());
return;
}
}

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

@ -867,7 +867,7 @@ module spine {
try {
skeletonData = json.readSkeletonData(jsonText);
} catch (e) {
this.showError("Error: could not load skeleton .json.<br><br>" + escapeHtml(JSON.stringify(e)));
this.showError("Error: could not load skeleton .json.<br><br>" + e.toString());
return;
}
} else {
@ -876,7 +876,7 @@ module spine {
try {
skeletonData = binary.readSkeletonData(binaryData);
} catch (e) {
this.showError("Error: could not load skeleton .skel.<br><br>" + escapeHtml(JSON.stringify(e)));
this.showError("Error: could not load skeleton .skel.<br><br>" + e.toString());
return;
}
}