UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed warnings/messages reported by Microsoft's Analyzers for Unity. Closes #1753.

Browse Source
This commit is contained in:
Harald Csaszar 2020-10-06 16:16:49 +02:00
parent 40d738d8b8
commit 977133fc38
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine Examples/Scripts/FootSoldierExample.cs
View File

@ -70,7 +70,7 @@ namespace Spine.Unity.Examples {
} }
void Apply (SkeletonRenderer skeletonRenderer) { void Apply (SkeletonRenderer skeletonRenderer) {
StartCoroutine("Blink"); StartCoroutine(Blink());
} }
void Update () { void Update () {

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs
View File

@ -108,7 +108,7 @@ namespace Spine.Unity.Editor {
} }
serializedObject.Update(); serializedObject.Update();
atlasAsset = atlasAsset ?? (SpineAtlasAsset)target; atlasAsset = (atlasAsset == null) ? (SpineAtlasAsset)target : atlasAsset;
EditorGUI.BeginChangeCheck(); EditorGUI.BeginChangeCheck();
EditorGUILayout.PropertyField(atlasFile); EditorGUILayout.PropertyField(atlasFile);
EditorGUILayout.PropertyField(materials, true); EditorGUILayout.PropertyField(materials, true);

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineSpriteAtlasAssetInspector.cs
View File

@ -71,7 +71,7 @@ namespace Spine.Unity.Editor {
} }
serializedObject.Update(); serializedObject.Update();
atlasAsset = atlasAsset ?? (SpineSpriteAtlasAsset)target; atlasAsset = (atlasAsset == null) ? (SpineSpriteAtlasAsset)target : atlasAsset;
if (atlasAsset.RegionsNeedLoading) { if (atlasAsset.RegionsNeedLoading) {
if (GUILayout.Button(SpineInspectorUtility.TempContent("Load regions by entering Play mode"), GUILayout.Height(20))) { if (GUILayout.Button(SpineInspectorUtility.TempContent("Load regions by entering Play mode"), GUILayout.Height(20))) {

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs
View File

@ -621,7 +621,7 @@ namespace Spine.Unity.Editor {
int[] triangles = attachment.Triangles; int[] triangles = attachment.Triangles;
Color color = new Color(attachment.R, attachment.G, attachment.B, attachment.A); Color color = new Color(attachment.R, attachment.G, attachment.B, attachment.A);
mesh = mesh ?? new Mesh(); mesh = (mesh == null) ? new Mesh() : mesh;
mesh.triangles = new int[0]; mesh.triangles = new int[0];

2
spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateBehaviour.cs
View File

@ -48,7 +48,9 @@ namespace Spine.Unity.Playables {
public bool customDuration = false; public bool customDuration = false;
public bool useBlendDuration = true; public bool useBlendDuration = true;
[SerializeField] [SerializeField]
#pragma warning disable 414
private bool isInitialized = false; // required to read preferences values from editor side. private bool isInitialized = false; // required to read preferences values from editor side.
#pragma warning restore 414
public float mixDuration = 0.1f; public float mixDuration = 0.1f;
[Range(0, 1f)] [Range(0, 1f)]