From 1121112c1dbfe68159df1602306250458e8280ed Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Wed, 6 Apr 2022 12:41:46 +0200 Subject: [PATCH 1/2] [unity] Minor: Removed leftover .meta file. --- .../Sample Components/Legacy/CustomSkin.cs.meta | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/CustomSkin.cs.meta diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/CustomSkin.cs.meta b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/CustomSkin.cs.meta deleted file mode 100644 index ade04ec0d..000000000 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/CustomSkin.cs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6e55c8477eccddc4cb5c3551a3945ca7 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 3372ce0ba8e095d683667825db5813baa8ae5469 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Wed, 6 Apr 2022 18:21:01 +0200 Subject: [PATCH 2/2] [unity] Timeline: Fixed compile errors on Unity 2018.4. Closes #2062. --- ...pineAnimationStateGraphicTrackInspector.cs | 20 ++++++++++++++++++- .../SpineAnimationStateTrackInspector.cs | 19 ++++++++++++++++++ .../Editor/SpineSkeletonFlipTrackInspector.cs | 2 ++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs index dd362abcf..29b2ed81f 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs @@ -34,7 +34,7 @@ using UnityEngine; using UnityEngine.Timeline; namespace Spine.Unity.Editor { - +#if UNITY_2019_1_OR_NEWER [CustomTimelineEditor(typeof(SpineAnimationStateGraphicTrack))] [CanEditMultipleObjects] public class SpineAnimationStateGraphicTrackInspector : TrackEditor { @@ -46,4 +46,22 @@ namespace Spine.Unity.Editor { return options; } } +#else + [CustomEditor(typeof(SpineAnimationStateGraphicTrack))] + [CanEditMultipleObjects] + public class SpineAnimationStateGraphicTrackInspector : UnityEditor.Editor { + + protected SerializedProperty trackIndexProperty = null; + + public void OnEnable () { + trackIndexProperty = serializedObject.FindProperty("trackIndex"); + } + + public override void OnInspectorGUI () { + serializedObject.Update(); + EditorGUILayout.PropertyField(trackIndexProperty); + serializedObject.ApplyModifiedProperties(); + } + } +#endif } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs index 8cf515804..fec0d4a23 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs @@ -34,6 +34,7 @@ using UnityEngine; using UnityEngine.Timeline; namespace Spine.Unity.Editor { +#if UNITY_2019_1_OR_NEWER [CustomTimelineEditor(typeof(SpineAnimationStateTrack))] [CanEditMultipleObjects] public class SpineAnimationStateTrackInspector : TrackEditor { @@ -45,4 +46,22 @@ namespace Spine.Unity.Editor { return options; } } +#else + [CustomEditor(typeof(SpineAnimationStateTrack))] + [CanEditMultipleObjects] + public class SpineAnimationStateTrackInspector : UnityEditor.Editor { + + protected SerializedProperty trackIndexProperty = null; + + public void OnEnable () { + trackIndexProperty = serializedObject.FindProperty("trackIndex"); + } + + public override void OnInspectorGUI () { + serializedObject.Update(); + EditorGUILayout.PropertyField(trackIndexProperty); + serializedObject.ApplyModifiedProperties(); + } + } +#endif } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs index 7c43fdb99..76aaa06a1 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs @@ -34,6 +34,7 @@ using UnityEngine; using UnityEngine.Timeline; namespace Spine.Unity.Editor { +#if UNITY_2019_1_OR_NEWER [CustomTimelineEditor(typeof(SpineSkeletonFlipTrack))] [CanEditMultipleObjects] public class SpineSkeletonFlipTrackInspector : TrackEditor { @@ -45,4 +46,5 @@ namespace Spine.Unity.Editor { return options; } } +#endif }