Przeglądaj źródła

[unity] Timeline: Fixed compile errors on Unity 2018.4. Closes #2062.

Harald Csaszar 3 lat temu
rodzic
commit
3372ce0ba8

+ 19 - 1
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs

@@ -34,7 +34,7 @@ using UnityEngine;
 using UnityEngine.Timeline;
 using UnityEngine.Timeline;
 
 
 namespace Spine.Unity.Editor {
 namespace Spine.Unity.Editor {
-
+#if UNITY_2019_1_OR_NEWER
 	[CustomTimelineEditor(typeof(SpineAnimationStateGraphicTrack))]
 	[CustomTimelineEditor(typeof(SpineAnimationStateGraphicTrack))]
 	[CanEditMultipleObjects]
 	[CanEditMultipleObjects]
 	public class SpineAnimationStateGraphicTrackInspector : TrackEditor {
 	public class SpineAnimationStateGraphicTrackInspector : TrackEditor {
@@ -46,4 +46,22 @@ namespace Spine.Unity.Editor {
 			return options;
 			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
 }
 }

+ 19 - 0
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs

@@ -34,6 +34,7 @@ using UnityEngine;
 using UnityEngine.Timeline;
 using UnityEngine.Timeline;
 
 
 namespace Spine.Unity.Editor {
 namespace Spine.Unity.Editor {
+#if UNITY_2019_1_OR_NEWER
 	[CustomTimelineEditor(typeof(SpineAnimationStateTrack))]
 	[CustomTimelineEditor(typeof(SpineAnimationStateTrack))]
 	[CanEditMultipleObjects]
 	[CanEditMultipleObjects]
 	public class SpineAnimationStateTrackInspector : TrackEditor {
 	public class SpineAnimationStateTrackInspector : TrackEditor {
@@ -45,4 +46,22 @@ namespace Spine.Unity.Editor {
 			return options;
 			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
 }
 }

+ 2 - 0
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs

@@ -34,6 +34,7 @@ using UnityEngine;
 using UnityEngine.Timeline;
 using UnityEngine.Timeline;
 
 
 namespace Spine.Unity.Editor {
 namespace Spine.Unity.Editor {
+#if UNITY_2019_1_OR_NEWER
 	[CustomTimelineEditor(typeof(SpineSkeletonFlipTrack))]
 	[CustomTimelineEditor(typeof(SpineSkeletonFlipTrack))]
 	[CanEditMultipleObjects]
 	[CanEditMultipleObjects]
 	public class SpineSkeletonFlipTrackInspector : TrackEditor {
 	public class SpineSkeletonFlipTrackInspector : TrackEditor {
@@ -45,4 +46,5 @@ namespace Spine.Unity.Editor {
 			return options;
 			return options;
 		}
 		}
 	}
 	}
+#endif
 }
 }