diff --git a/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs b/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs index eafa1e616..c6382f26c 100644 --- a/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs +++ b/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs @@ -8,9 +8,7 @@ public class tk2dSpineSkeletonDataAsset : ScriptableObject { public tk2dSpriteCollection.NormalGenerationMode normalGenerationMode = tk2dSpriteCollection.NormalGenerationMode.None; public TextAsset skeletonJSON; - - public float scale = 1; - + public string[] fromAnimation; public string[] toAnimation; public float[] duration; @@ -44,8 +42,8 @@ public class tk2dSpineSkeletonDataAsset : ScriptableObject { } SkeletonJson json = new SkeletonJson(new tk2dSpineAttachmentLoader(spritesData)); - json.Scale = scale; - + json.Scale = 1.0f / (spritesData.invOrthoSize * spritesData.halfTargetHeight); + try { skeletonData = json.ReadSkeletonData(new StringReader(skeletonJSON.text)); } catch (Exception ex) { diff --git a/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs b/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs index cc97f67ce..b04e839bf 100644 --- a/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs +++ b/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs @@ -11,7 +11,6 @@ public class tk2dSpineSkeletonDataAssetInspector : Editor { /* */ private SerializedProperty skeletonJSON; - private SerializedProperty scale; private SerializedProperty fromAnimation; private SerializedProperty toAnimation; private SerializedProperty duration; @@ -34,7 +33,6 @@ public class tk2dSpineSkeletonDataAssetInspector : Editor { } skeletonJSON = serializedObject.FindProperty("skeletonJSON"); - scale = serializedObject.FindProperty("scale"); fromAnimation = serializedObject.FindProperty("fromAnimation"); toAnimation = serializedObject.FindProperty("toAnimation"); duration = serializedObject.FindProperty("duration"); @@ -65,7 +63,6 @@ public class tk2dSpineSkeletonDataAssetInspector : Editor { } EditorGUILayout.PropertyField(skeletonJSON); - EditorGUILayout.PropertyField(scale); SkeletonData skeletonData = asset.GetSkeletonData(); if(skeletonData != null) { diff --git a/spine-tk2d/Example/Example.unity b/spine-tk2d/Example/Example.unity index 5894de058..702f61b67 100644 Binary files a/spine-tk2d/Example/Example.unity and b/spine-tk2d/Example/Example.unity differ diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab index 04503b943..edc774a60 100644 Binary files a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab and b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab differ diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab index 4e78a9631..9a17d5408 100644 Binary files a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab and b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas.prefab differ diff --git a/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset b/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset index 03a8d2bac..a68094f07 100644 Binary files a/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset and b/spine-tk2d/Example/Spineboy/Skeleton/SpineboySkeletonAsset.asset differ