mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-06 18:56:54 +08:00
[unity] Cleanup BoundingBoxFollower support for active skin.
This commit is contained in:
parent
90789b130c
commit
9d242ea90a
@ -1299,3 +1299,65 @@ SpriteRenderer:
|
|||||||
m_AdaptiveModeThreshold: 0.5
|
m_AdaptiveModeThreshold: 0.5
|
||||||
m_SpriteTileMode: 0
|
m_SpriteTileMode: 0
|
||||||
m_WasSpriteAssigned: 1
|
m_WasSpriteAssigned: 1
|
||||||
|
--- !u!1 &2010453060
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
serializedVersion: 5
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2010453063}
|
||||||
|
- component: {fileID: 2010453062}
|
||||||
|
- component: {fileID: 2010453061}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: EventSystem
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &2010453061
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2010453060}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_HorizontalAxis: Horizontal
|
||||||
|
m_VerticalAxis: Vertical
|
||||||
|
m_SubmitButton: Submit
|
||||||
|
m_CancelButton: Cancel
|
||||||
|
m_InputActionsPerSecond: 10
|
||||||
|
m_RepeatDelay: 0.5
|
||||||
|
m_ForceModuleActive: 0
|
||||||
|
--- !u!114 &2010453062
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2010453060}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_FirstSelected: {fileID: 0}
|
||||||
|
m_sendNavigationEvents: 1
|
||||||
|
m_DragThreshold: 5
|
||||||
|
--- !u!4 &2010453063
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_PrefabParentObject: {fileID: 0}
|
||||||
|
m_PrefabInternal: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2010453060}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 5
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|||||||
@ -54,6 +54,7 @@ namespace Spine.Unity.Examples {
|
|||||||
|
|
||||||
[Header("Runtime Repack")]
|
[Header("Runtime Repack")]
|
||||||
public bool repack = true;
|
public bool repack = true;
|
||||||
|
public BoundingBoxFollower bbFollower;
|
||||||
|
|
||||||
[Header("Do not assign")]
|
[Header("Do not assign")]
|
||||||
public Texture2D runtimeAtlas;
|
public Texture2D runtimeAtlas;
|
||||||
@ -122,6 +123,7 @@ namespace Spine.Unity.Examples {
|
|||||||
repackedSkin.Append(customSkin);
|
repackedSkin.Append(customSkin);
|
||||||
repackedSkin = repackedSkin.GetRepackedSkin("repacked skin", sourceMaterial, out runtimeMaterial, out runtimeAtlas);
|
repackedSkin = repackedSkin.GetRepackedSkin("repacked skin", sourceMaterial, out runtimeMaterial, out runtimeAtlas);
|
||||||
skeleton.SetSkin(repackedSkin);
|
skeleton.SetSkin(repackedSkin);
|
||||||
|
if (bbFollower != null) bbFollower.Initialize(true);
|
||||||
} else {
|
} else {
|
||||||
skeleton.SetSkin(customSkin);
|
skeleton.SetSkin(customSkin);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -115,7 +115,8 @@ namespace Spine.Unity {
|
|||||||
foreach (var skin in skeleton.Data.Skins)
|
foreach (var skin in skeleton.Data.Skins)
|
||||||
AddSkin(skin, slotIndex);
|
AddSkin(skin, slotIndex);
|
||||||
|
|
||||||
AddSkin(skeleton.skin, slotIndex);
|
if (skeleton.skin != null)
|
||||||
|
AddSkin(skeleton.skin, slotIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BoundingBoxFollower.DebugMessages) {
|
if (BoundingBoxFollower.DebugMessages) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user