UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 17:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed SkeletonGraphicInspector having inconsistent private access specifier, changed to protected. Closes #2715

Browse Source
This commit is contained in:
Harald Csaszar 2024-12-17 16:27:56 +01:00
parent 3514e2070b
commit 951a4d7c86
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs
View File

@ -57,19 +57,19 @@ namespace Spine.Unity.Editor {
static GUILayoutOption ReloadButtonWidth { get { return reloadButtonWidth = reloadButtonWidth ?? GUILayout.Width(GUI.skin.label.CalcSize(new GUIContent(ReloadButtonString)).x + 20); } } static GUILayoutOption ReloadButtonWidth { get { return reloadButtonWidth = reloadButtonWidth ?? GUILayout.Width(GUI.skin.label.CalcSize(new GUIContent(ReloadButtonString)).x + 20); } }
static GUIStyle ReloadButtonStyle { get { return EditorStyles.miniButton; } } static GUIStyle ReloadButtonStyle { get { return EditorStyles.miniButton; } }
SerializedProperty material, color; protected SerializedProperty material, color;
SerializedProperty additiveMaterial, multiplyMaterial, screenMaterial; protected SerializedProperty additiveMaterial, multiplyMaterial, screenMaterial;
SerializedProperty skeletonDataAsset, initialSkinName; protected SerializedProperty skeletonDataAsset, initialSkinName;
SerializedProperty startingAnimation, startingLoop, timeScale, freeze, protected SerializedProperty startingAnimation, startingLoop, timeScale, freeze,
updateTiming, updateWhenInvisible, unscaledTime, layoutScaleMode, editReferenceRect; updateTiming, updateWhenInvisible, unscaledTime, layoutScaleMode, editReferenceRect;
SerializedProperty physicsPositionInheritanceFactor, physicsRotationInheritanceFactor, physicsMovementRelativeTo; protected SerializedProperty physicsPositionInheritanceFactor, physicsRotationInheritanceFactor, physicsMovementRelativeTo;
SerializedProperty initialFlipX, initialFlipY; protected SerializedProperty initialFlipX, initialFlipY;
SerializedProperty meshGeneratorSettings; protected SerializedProperty meshGeneratorSettings;
SerializedProperty useClipping, zSpacing, tintBlack, canvasGroupCompatible, pmaVertexColors, addNormals, calculateTangents, immutableTriangles; protected SerializedProperty useClipping, zSpacing, tintBlack, canvasGroupCompatible, pmaVertexColors, addNormals, calculateTangents, immutableTriangles;
SerializedProperty allowMultipleCanvasRenderers, separatorSlotNames, enableSeparatorSlots, protected SerializedProperty allowMultipleCanvasRenderers, separatorSlotNames, enableSeparatorSlots,
updateSeparatorPartLocation, updateSeparatorPartScale; updateSeparatorPartLocation, updateSeparatorPartScale;
SerializedProperty raycastTarget, maskable; protected SerializedProperty raycastTarget, maskable;
readonly GUIContent UseClippingLabel = new GUIContent("Use Clipping", readonly GUIContent UseClippingLabel = new GUIContent("Use Clipping",
"When disabled, clipping attachments are ignored. This may be used to save performance."); "When disabled, clipping attachments are ignored. This may be used to save performance.");
@ -94,7 +94,7 @@ namespace Spine.Unity.Editor {
"Calculates the tangents per frame. Use this if you are using lit shaders (usually with normal maps) that " + "Calculates the tangents per frame. Use this if you are using lit shaders (usually with normal maps) that " +
"require vertex tangents."); "require vertex tangents.");
readonly GUIContent ImmutableTrianglesLabel = new GUIContent("Immutable Triangles", readonly GUIContent ImmutableTrianglesLabel = new GUIContent("Immutable Triangles",
"Enable to optimize rendering for skeletons that never change attachment visbility"); "Enable to optimize rendering for skeletons that never change attachment visibility");
readonly GUIContent UnscaledTimeLabel = new GUIContent("Unscaled Time", readonly GUIContent UnscaledTimeLabel = new GUIContent("Unscaled Time",
"If enabled, AnimationState uses unscaled game time (Time.unscaledDeltaTime), " + "If enabled, AnimationState uses unscaled game time (Time.unscaledDeltaTime), " +
@ -138,7 +138,7 @@ namespace Spine.Unity.Editor {
} }
} }
void OnEnable () { protected virtual void OnEnable () {
#if NEW_PREFAB_SYSTEM #if NEW_PREFAB_SYSTEM
isInspectingPrefab = false; isInspectingPrefab = false;
#else #else
@ -211,7 +211,7 @@ namespace Spine.Unity.Editor {
#endif #endif
} }
void OnDisable () { protected virtual void OnDisable () {
#if NEWPLAYMODECALLBACKS #if NEWPLAYMODECALLBACKS
EditorApplication.playModeStateChanged -= OnPlaymodeChanged; EditorApplication.playModeStateChanged -= OnPlaymodeChanged;
#else #else
@ -221,14 +221,14 @@ namespace Spine.Unity.Editor {
} }
#if NEWPLAYMODECALLBACKS #if NEWPLAYMODECALLBACKS
void OnPlaymodeChanged (PlayModeStateChange mode) { protected virtual void OnPlaymodeChanged (PlayModeStateChange mode) {
#else #else
void OnPlaymodeChanged () { void OnPlaymodeChanged () {
#endif #endif
DisableEditReferenceRectMode(); DisableEditReferenceRectMode();
} }
void DisableEditReferenceRectMode () { protected virtual void DisableEditReferenceRectMode () {
foreach (UnityEngine.Object c in targets) { foreach (UnityEngine.Object c in targets) {
SkeletonGraphic component = (SkeletonGraphic)c; SkeletonGraphic component = (SkeletonGraphic)c;
component.EditReferenceRect = false; component.EditReferenceRect = false;

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity", "name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime", "displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core.", "description": "This plugin provides the spine-unity runtime core.",
"version": "4.2.92", "version": "4.2.93",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",