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

[unity] Fixed a bug where non-spine json files were reporting false errors.

Browse Source
This commit is contained in:
Harald Csaszar 2019-09-03 12:22:48 +02:00
parent 28d85e12b8
commit af3d657a11
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs
View File

@ -112,7 +112,7 @@ namespace Spine.Unity {
string primaryRuntimeVersionDebugString = compatibleBinaryVersions[0][0] + "." + compatibleBinaryVersions[0][1]; string primaryRuntimeVersionDebugString = compatibleBinaryVersions[0][0] + "." + compatibleBinaryVersions[0][1];
if (string.IsNullOrEmpty(fileVersion.rawVersion)) { if (string.IsNullOrEmpty(fileVersion.rawVersion)) {
Debug.LogWarningFormat("Skeleton '{0}' has no version information. It is incompatible with your runtime version: spine-unity v{1}", asset.name, primaryRuntimeVersionDebugString); // very likely not a Spine skeleton json file at all.
return null; return null;
} }
@ -129,14 +129,14 @@ namespace Spine.Unity {
} }
public static CompatibilityProblemInfo GetCompatibilityProblemInfo (VersionInfo fileVersion) { public static CompatibilityProblemInfo GetCompatibilityProblemInfo (VersionInfo fileVersion) {
if (fileVersion == null)
return null;
CompatibilityProblemInfo info = new CompatibilityProblemInfo(); CompatibilityProblemInfo info = new CompatibilityProblemInfo();
info.actualVersion = fileVersion; info.actualVersion = fileVersion;
info.compatibleVersions = (fileVersion.sourceType == SourceType.Binary) ? compatibleBinaryVersions info.compatibleVersions = (fileVersion.sourceType == SourceType.Binary) ? compatibleBinaryVersions
: compatibleJsonVersions; : compatibleJsonVersions;
if (fileVersion == null)
return info;
foreach (var compatibleVersion in info.compatibleVersions) { foreach (var compatibleVersion in info.compatibleVersions) {
bool majorMatch = fileVersion.version[0] == compatibleVersion[0]; bool majorMatch = fileVersion.version[0] == compatibleVersion[0];
bool minorMatch = fileVersion.version[1] == compatibleVersion[1]; bool minorMatch = fileVersion.version[1] == compatibleVersion[1];