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

Merge branch '3.8' into 4.0

Browse Source
This commit is contained in:
Harald Csaszar 2021-07-06 12:14:15 +02:00
commit 20aebce749
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs
View File

@ -52,7 +52,12 @@ namespace Spine.Unity {
/// <summary> /// <summary>
/// This is the Spine.AnimationState object of this SkeletonAnimation. You can control animations through it. /// This is the Spine.AnimationState object of this SkeletonAnimation. You can control animations through it.
/// Note that this object, like .skeleton, is not guaranteed to exist in Awake. Do all accesses and caching to it in Start</summary> /// Note that this object, like .skeleton, is not guaranteed to exist in Awake. Do all accesses and caching to it in Start</summary>
public Spine.AnimationState AnimationState { get { return this.state; } } public Spine.AnimationState AnimationState {
get {
Initialize(false);
return this.state;
}
}
private bool wasUpdatedAfterInit = true; private bool wasUpdatedAfterInit = true;
#endregion #endregion
@ -105,6 +110,7 @@ namespace Spine.Unity {
} }
} }
set { set {
Initialize(false);
if (_animationName == value) { if (_animationName == value) {
TrackEntry entry = state.GetCurrent(0); TrackEntry entry = state.GetCurrent(0);
if (entry != null && entry.loop == loop) if (entry != null && entry.loop == loop)

7
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs
View File

@ -382,7 +382,12 @@ namespace Spine.Unity {
public event SkeletonRendererDelegate OnMeshAndMaterialsUpdated; public event SkeletonRendererDelegate OnMeshAndMaterialsUpdated;
protected Spine.AnimationState state; protected Spine.AnimationState state;
public Spine.AnimationState AnimationState { get { return state; } } public Spine.AnimationState AnimationState {
get {
Initialize(false);
return state;
}
}
[SerializeField] protected Spine.Unity.MeshGenerator meshGenerator = new MeshGenerator(); [SerializeField] protected Spine.Unity.MeshGenerator meshGenerator = new MeshGenerator();
public Spine.Unity.MeshGenerator MeshGenerator { get { return this.meshGenerator; } } public Spine.Unity.MeshGenerator MeshGenerator { get { return this.meshGenerator; } }