UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-19 00:06:42 +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-05-16 19:48:13 +02:00
commit b9606f0074
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity
View File

@ -193,7 +193,7 @@ TextMesh:
m_Text: 'Enter <b>PLAY MODE</b> in Unity to see Spineboy animate.
Try moving, jumping, aiming and shooting. (WASD+Spacebar+Left&Right Click, or
XBOX Controller)'
Gamepad)'
m_OffsetZ: 0
m_CharacterSize: 0.12
m_LineSpacing: 1

2
spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity
View File

@ -873,7 +873,7 @@ TextMesh:
m_GameObject: {fileID: 522034802}
m_Text: 'Enter <b>PLAY MODE</b> in Unity to see bearded hero guy animate.
Try moving and jumping. (WASD+Spacebar, or XBOX Controller)'
Try moving and jumping. (WASD+Spacebar, or Gamepad)'
m_OffsetZ: 0
m_CharacterSize: 0.1
m_LineSpacing: 1

2
spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Platformer HingeChain Physics.unity
View File

@ -1421,7 +1421,7 @@ TextMesh:
animated via physics.
Try moving and jumping. (WASD+Spacebar, or XBOX Controller)'
Try moving and jumping. (WASD+Spacebar, or Gamepad)'
m_OffsetZ: 0
m_CharacterSize: 0.1
m_LineSpacing: 1

9
spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyBeginnerView.cs
View File

@ -126,15 +126,13 @@ namespace Spine.Unity.Examples {
var shootTrack = skeletonAnimation.AnimationState.SetAnimation(1, shoot, false);
shootTrack.AttachmentThreshold = 1f;
shootTrack.MixDuration = 0f;
var empty1 = skeletonAnimation.state.AddEmptyAnimation(1, 0.5f, 0.1f);
empty1.AttachmentThreshold = 1f;
skeletonAnimation.state.AddEmptyAnimation(1, 0.5f, 0.1f);
// Play the aim animation on track 2 to aim at the mouse target.
var aimTrack = skeletonAnimation.AnimationState.SetAnimation(2, aim, false);
aimTrack.AttachmentThreshold = 1f;
aimTrack.MixDuration = 0f;
var empty2 = skeletonAnimation.state.AddEmptyAnimation(2, 0.5f, 0.1f);
empty2.AttachmentThreshold = 1f;
skeletonAnimation.state.AddEmptyAnimation(2, 0.5f, 0.1f);
gunSource.pitch = GetRandomPitch(gunsoundPitchOffset);
gunSource.Play();
@ -150,8 +148,7 @@ namespace Spine.Unity.Examples {
}
public void StopPlayingAim () {
var empty2 = skeletonAnimation.state.AddEmptyAnimation(2, 0.5f, 0.1f);
empty2.AttachmentThreshold = 1f;
skeletonAnimation.state.AddEmptyAnimation(2, 0.5f, 0.1f);
}
public void Turn (bool facingLeft) {

6
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRendererCustomMaterials/SkeletonRendererCustomMaterials.cs
View File

@ -90,7 +90,8 @@ namespace Spine.Unity {
continue;
Slot slotObject = skeletonRenderer.skeleton.FindSlot(slotMaterialOverride.slotName);
skeletonRenderer.CustomSlotMaterials[slotObject] = slotMaterialOverride.material;
if (slotObject != null)
skeletonRenderer.CustomSlotMaterials[slotObject] = slotMaterialOverride.material;
}
}
@ -106,7 +107,8 @@ namespace Spine.Unity {
continue;
Slot slotObject = skeletonRenderer.skeleton.FindSlot(slotMaterialOverride.slotName);
if (slotObject == null)
continue;
Material currentMaterial;
if (!skeletonRenderer.CustomSlotMaterials.TryGetValue(slotObject, out currentMaterial))
continue;