[unity] Allow 3.5 jsons.

This commit is contained in:
pharan 2017-07-20 14:21:38 +08:00
parent 1ddaa81272
commit e4baef5622

View File

@ -1213,7 +1213,7 @@ namespace Spine.Unity.Editor {
#endregion #endregion
#region Checking Methods #region Checking Methods
static int[][] compatibleVersions = { new[] {3, 6, 0} }; static int[][] compatibleVersions = { new[] {3, 6, 0}, new[] {3, 5, 0} };
//static bool isFixVersionRequired = false; //static bool isFixVersionRequired = false;
static bool CheckForValidSkeletonData (string skeletonJSONPath) { static bool CheckForValidSkeletonData (string skeletonJSONPath) {
@ -1272,10 +1272,10 @@ namespace Spine.Unity.Editor {
// Version warning // Version warning
if (isSpineData) { if (isSpineData) {
string runtimeVersion = compatibleVersions[0][0] + "." + compatibleVersions[0][1]; string runtimeVersionDebugString = compatibleVersions[0][0] + "." + compatibleVersions[0][1];
if (string.IsNullOrEmpty(rawVersion)) { if (string.IsNullOrEmpty(rawVersion)) {
Debug.LogWarningFormat("Skeleton '{0}' has no version information. It may be incompatible with your runtime version: spine-unity v{1}", asset.name, runtimeVersion); Debug.LogWarningFormat("Skeleton '{0}' has no version information. It may be incompatible with your runtime version: spine-unity v{1}", asset.name, runtimeVersionDebugString);
} else { } else {
string[] versionSplit = rawVersion.Split('.'); string[] versionSplit = rawVersion.Split('.');
bool match = false; bool match = false;
@ -1292,7 +1292,7 @@ namespace Spine.Unity.Editor {
} }
if (!match) if (!match)
Debug.LogWarningFormat("Skeleton '{0}' (exported with Spine {1}) may be incompatible with your runtime version: spine-unity v{2}", asset.name, rawVersion, runtimeVersion); Debug.LogWarningFormat("Skeleton '{0}' (exported with Spine {1}) may be incompatible with your runtime version: spine-unity v{2}", asset.name, rawVersion, runtimeVersionDebugString);
} }
} }