UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 15:24:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0' into 4.1-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-04-06 18:24:23 +02:00
commit 8a77d776f2
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs
View File

@ -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
}

19
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs
View File

@ -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
}

2
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs
View File

@ -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
}