Explorar el Código

[unity] Update sample scenes.

pharan hace 6 años
padre
commit
044f0a764f
Se han modificado 52 ficheros con 1344 adiciones y 741 borrados
  1. 23 0
      spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity
  2. 131 4
      spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity
  3. 160 7
      spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity
  4. 13 4
      spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/BasicPlatformerController.cs
  5. 35 0
      spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/TransitionDictionaryExample.cs
  6. 12 0
      spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/TransitionDictionaryExample.cs.meta
  7. 9 0
      spine-unity/Assets/Spine Examples/Spine/Dragon/ReferenceAssets.meta
  8. 15 0
      spine-unity/Assets/Spine Examples/Spine/Dragon/ReferenceAssets/flying.asset
  9. 9 0
      spine-unity/Assets/Spine Examples/Spine/Dragon/ReferenceAssets/flying.asset.meta
  10. 2 2
      spine-unity/Assets/Spine Examples/Spine/Goblins/goblins_SkeletonData.asset
  11. 15 0
      spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/crouch-from fall.asset
  12. 9 0
      spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/crouch-from fall.asset.meta
  13. 15 0
      spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/idle-from fall.asset
  14. 9 0
      spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/idle-from fall.asset.meta
  15. 0 146
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.atlas.txt
  16. 0 4
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.atlas.txt.meta
  17. 0 116
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.json
  18. 0 4
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.json.meta
  19. BIN
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.png
  20. 0 348
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.png.meta
  21. 0 16
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Atlas.asset
  22. 0 4
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Atlas.asset.meta
  23. 0 26
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Material.mat
  24. 0 4
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Material.mat.meta
  25. 0 22
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_SkeletonData.asset
  26. 0 4
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_SkeletonData.asset.meta
  27. 2 2
      spine-unity/Assets/Spine Examples/Spine/Hero/hero-pro.json
  28. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets.meta
  29. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/aim.asset
  30. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/aim.asset.meta
  31. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/death.asset
  32. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/death.asset.meta
  33. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/hoverboard.asset
  34. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/hoverboard.asset.meta
  35. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle-turn.asset
  36. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle-turn.asset.meta
  37. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle.asset
  38. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle.asset.meta
  39. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/jump.asset
  40. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/jump.asset.meta
  41. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/portal.asset
  42. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/portal.asset.meta
  43. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run-to-idle.asset
  44. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run-to-idle.asset.meta
  45. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run.asset
  46. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run.asset.meta
  47. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/shoot.asset
  48. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/shoot.asset.meta
  49. 15 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/walk.asset
  50. 9 0
      spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/walk.asset.meta
  51. 585 24
      spine-unity/Assets/Spine Examples/Spine/spineboy-unity/spineboy-unity.json
  52. 27 4
      spine-unity/Assets/Spine Examples/Spine/spineboy-unity/spineboy_Material.mat

+ 23 - 0
spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity

@@ -5536,6 +5536,7 @@ GameObject:
   - component: {fileID: 1204355832}
   - component: {fileID: 1204355833}
   - component: {fileID: 1204355834}
+  - component: {fileID: 1204355835}
   m_Layer: 9
   m_Name: Player
   m_TagString: Untagged
@@ -5598,6 +5599,7 @@ MonoBehaviour:
   forceCrouchVelocity: 30
   forceCrouchDuration: 0.4
   skeletonAnimation: {fileID: 658011011}
+  transitions: {fileID: 1204355835}
   walk: {fileID: 11400000, guid: 096b05b71bb32cb409c1c8fd233b7ac3, type: 2}
   run: {fileID: 11400000, guid: cc83238c61de380499565292bef7ada4, type: 2}
   idle: {fileID: 11400000, guid: 8e32f0310bb5c02488c5c002dd41e7cb, type: 2}
@@ -5627,6 +5629,27 @@ MonoBehaviour:
   basePitch: 1
   randomPitchOffset: 0.2
   logDebugMessage: 0
+--- !u!114 &1204355835
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1204355830}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 69a52bf79b7e78e4cb1dfd2d2e698c2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  transitions:
+  - from: {fileID: 11400000, guid: 29c1381a00cfb2c4d996f2a02fcc4506, type: 2}
+    to: {fileID: 11400000, guid: cc83238c61de380499565292bef7ada4, type: 2}
+    transition: {fileID: 11400000, guid: fcca5e996ae24ba43baaaadef1fb6ad9, type: 2}
+  - from: {fileID: 11400000, guid: 29c1381a00cfb2c4d996f2a02fcc4506, type: 2}
+    to: {fileID: 11400000, guid: 8e32f0310bb5c02488c5c002dd41e7cb, type: 2}
+    transition: {fileID: 11400000, guid: 714e39dce7285c145bdf142c38ef9a9b, type: 2}
+  - from: {fileID: 11400000, guid: 29c1381a00cfb2c4d996f2a02fcc4506, type: 2}
+    to: {fileID: 11400000, guid: 25961ff211f6f3947be85f8aab3f2630, type: 2}
+    transition: {fileID: 11400000, guid: 6c587772a6f7df94b934b353291c008c, type: 2}
 --- !u!1 &1217440894
 GameObject:
   m_ObjectHideFlags: 0

+ 131 - 4
spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity

@@ -108,6 +108,83 @@ NavMeshSettings:
     tileSize: 256
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &92207858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 92207862}
+  - component: {fileID: 92207861}
+  - component: {fileID: 92207860}
+  m_Layer: 5
+  m_Name: 3 Canvas - Spawn SkeletonGraphic Sample
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &92207860
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 92207858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &92207861
+Canvas:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 92207858}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &92207862
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 92207858}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1691562007}
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &433620963
 GameObject:
   m_ObjectHideFlags: 0
@@ -224,11 +301,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bb0837af7345d504db63d0c662fd12dc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  skeletonJson: {fileID: 4900000, guid: 8160b67e4c41bd041b948b5e5a86e242, type: 3}
-  atlasText: {fileID: 4900000, guid: 9b2378ddc54f1c94fb80411958000a8c, type: 3}
+  skeletonJson: {fileID: 4900000, guid: e3b64d7eaf0de4e45a00b7065166554d, type: 3}
+  atlasText: {fileID: 4900000, guid: 5c0a5c36970a46e4d8378760ab4a4cfc, type: 3}
   textures:
-  - {fileID: 2800000, guid: 4ea2c33e839afb34c98f66e892b3b2d2, type: 3}
-  materialPropertySource: {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353,
+  - {fileID: 2800000, guid: 49bb65eefe08e424bbf7a38bc98ec638, type: 3}
+  materialPropertySource: {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d,
     type: 2}
 --- !u!4 &651278530
 Transform:
@@ -243,6 +320,56 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1691562006
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1691562007}
+  - component: {fileID: 1691562008}
+  m_Layer: 5
+  m_Name: SkeletonGraphic GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1691562007
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1691562006}
+  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: 92207862}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 647, y: -252}
+  m_SizeDelta: {x: 401, y: 394}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1691562008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1691562006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 53c7df9ccd5732543bcd589e8270ba1c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2}
+  startingAnimation: run
+  startingSkin: base
+  skeletonGraphicMaterial: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4,
+    type: 2}
 --- !u!1 &1807176298
 GameObject:
   m_ObjectHideFlags: 0

+ 160 - 7
spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity

@@ -306,7 +306,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 281390091}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1759932691}
+        m_MethodName: Play
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &281390091
@@ -500,7 +511,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 345815836}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1759932691}
+        m_MethodName: Play
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &345815836
@@ -637,7 +659,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &554311660
 GameObject:
@@ -956,7 +978,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &906692068
 GameObject:
@@ -1252,7 +1274,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1384627175}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1759932691}
+        m_MethodName: Play
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &1384627175
@@ -1601,7 +1634,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1650015149}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 1759932691}
+        m_MethodName: Play
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &1650015149
@@ -1750,7 +1794,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1703211042
 MonoBehaviour:
@@ -1767,6 +1811,115 @@ MonoBehaviour:
   templateSkinName: base
   runtimeMaterial: {fileID: 0}
   runtimeAtlas: {fileID: 0}
+--- !u!1 &1759932690
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1759932692}
+  - component: {fileID: 1759932691}
+  m_Layer: 0
+  m_Name: UI Sounds
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!82 &1759932691
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1759932690}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: e986056f914f4974896a49527ca80041, type: 3}
+  m_PlayOnAwake: 0
+  m_Volume: 0.2
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+--- !u!4 &1759932692
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1759932690}
+  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: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1913338857
 GameObject:
   m_ObjectHideFlags: 0

+ 13 - 4
spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/BasicPlatformerController.cs

@@ -32,6 +32,7 @@ using UnityEngine;
 using Spine.Unity;
 
 namespace Spine.Unity.Examples {
+
 	[RequireComponent(typeof(CharacterController))]
 	public class BasicPlatformerController : MonoBehaviour {
 
@@ -56,6 +57,7 @@ namespace Spine.Unity.Examples {
 		public SkeletonAnimation skeletonAnimation;
 
 		[Header("Animation")]
+		public TransitionDictionaryExample transitions;
 		public AnimationReferenceAsset walk;
 		public AnimationReferenceAsset run;
 		public AnimationReferenceAsset idle;
@@ -149,6 +151,7 @@ namespace Spine.Unity.Examples {
 			controller.Move(velocity * dt);
 
 			// Animation
+			// Determine target animation.
 			if (isGrounded) {
 				if (doCrouch) {
 					targetAnimation = crouch;
@@ -162,17 +165,23 @@ namespace Spine.Unity.Examples {
 				targetAnimation = velocity.y > 0 ? jump : fall;
 			}
 
-
+			// Handle change in target animation.
 			if (previousTargetAnimation != targetAnimation) {
-				if (targetAnimation == run && previousTargetAnimation == fall) {
-					skeletonAnimation.AnimationState.SetAnimation(0, runFromFall, false);
-					skeletonAnimation.AnimationState.AddAnimation(0, run, true, 0f);
+				Animation transition = null;
+				if (transitions != null && previousTargetAnimation != null) {
+					transition = transitions.GetTransition(previousTargetAnimation, targetAnimation);
+				}
+
+				if (transition != null) {
+					skeletonAnimation.AnimationState.SetAnimation(0, transition, false).MixDuration = 0.05f;
+					skeletonAnimation.AnimationState.AddAnimation(0, targetAnimation, true, 0f);
 				} else {
 					skeletonAnimation.AnimationState.SetAnimation(0, targetAnimation, true);
 				}
 			}
 			previousTargetAnimation = targetAnimation;
 
+			// Face intended direction.
 			if (input.x != 0)
 				skeletonAnimation.Skeleton.FlipX = input.x < 0;
 

+ 35 - 0
spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/TransitionDictionaryExample.cs

@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Spine.Unity.Examples {
+
+	// This is an example of how you could store animation transitions for use in your animation system.
+	// More ideally, this would be stored in a ScriptableObject in asset form rather than in a MonoBehaviour.
+	public sealed class TransitionDictionaryExample : MonoBehaviour {
+
+		[System.Serializable]
+		public struct SerializedEntry {
+			public AnimationReferenceAsset from;
+			public AnimationReferenceAsset to;
+			public AnimationReferenceAsset transition;
+		}
+
+		[SerializeField]
+		List<SerializedEntry> transitions = new List<SerializedEntry>();
+		readonly Dictionary<AnimationStateData.AnimationPair, Animation> dictionary = new Dictionary<AnimationStateData.AnimationPair, Animation>();
+
+		void Start () {
+			dictionary.Clear();
+			foreach (var e in transitions) {
+				dictionary.Add(new AnimationStateData.AnimationPair(e.from.Animation, e.to.Animation), e.transition.Animation);
+			}
+		}
+
+		public Animation GetTransition (Animation from, Animation to) {
+			Animation result;
+			dictionary.TryGetValue(new AnimationStateData.AnimationPair(from, to), out result);
+			return result;
+		}
+	}
+}

+ 12 - 0
spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/TransitionDictionaryExample.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 69a52bf79b7e78e4cb1dfd2d2e698c2d
+timeCreated: 1524024687
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/Dragon/ReferenceAssets.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: cb8919029832c8c4ca37da93a1a3c789
+folderAsset: yes
+timeCreated: 1533450451
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/Dragon/ReferenceAssets/flying.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: flying
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: 76506fa7fbeed084ab2dfb084648c628, type: 2}
+  animationName: flying

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/Dragon/ReferenceAssets/flying.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6ebf5ff4fe518d346a2c300657f33055
+timeCreated: 1533450451
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
spine-unity/Assets/Spine Examples/Spine/Goblins/goblins_SkeletonData.asset

@@ -13,10 +13,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   atlasAssets:
   - {fileID: 11400000, guid: bb54bdab69af2bb49b35577b80dcaad9, type: 2}
-  skeletonJSON: {fileID: 4900000, guid: c3921acb20cbc25418859f1b213d3d3f, type: 3}
   scale: 0.01
+  skeletonJSON: {fileID: 4900000, guid: c3921acb20cbc25418859f1b213d3d3f, type: 3}
   fromAnimation: []
   toAnimation: []
   duration: []
   defaultMix: 0
-  controller: {fileID: 0}
+  controller: {fileID: 9100000, guid: be216d1c65329bb44bd49ae3c4fee3a0, type: 2}

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/crouch-from fall.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: crouch-from fall
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: 2f899e95232e6144786de8fb99678a8d, type: 2}
+  animationName: crouch-from fall

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/crouch-from fall.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6c587772a6f7df94b934b353291c008c
+timeCreated: 1524037841
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/idle-from fall.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: idle-from fall
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: 2f899e95232e6144786de8fb99678a8d, type: 2}
+  animationName: idle-from fall

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/Hero/ReferenceAssets/idle-from fall.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 714e39dce7285c145bdf142c38ef9a9b
+timeCreated: 1524037841
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 146
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.atlas.txt

@@ -1,146 +0,0 @@
-
-hero-mesh.png
-size: 1024,256
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-body
-  rotate: false
-  xy: 324, 81
-  size: 97, 95
-  orig: 97, 95
-  offset: 0, 0
-  index: -1
-cape
-  rotate: false
-  xy: 176, 88
-  size: 146, 159
-  orig: 146, 159
-  offset: 0, 0
-  index: -1
-eyes
-  rotate: false
-  xy: 604, 216
-  size: 82, 31
-  orig: 82, 31
-  offset: 0, 0
-  index: -1
-fingers
-  rotate: false
-  xy: 877, 214
-  size: 31, 33
-  orig: 31, 33
-  offset: 0, 0
-  index: -1
-foot1
-  rotate: false
-  xy: 743, 205
-  size: 50, 42
-  orig: 50, 42
-  offset: 0, 0
-  index: -1
-foot2
-  rotate: false
-  xy: 688, 209
-  size: 53, 38
-  orig: 53, 38
-  offset: 0, 0
-  index: -1
-forearm1
-  rotate: false
-  xy: 795, 198
-  size: 41, 49
-  orig: 41, 49
-  offset: 0, 0
-  index: -1
-forearm2
-  rotate: false
-  xy: 910, 215
-  size: 31, 32
-  orig: 31, 32
-  offset: 0, 0
-  index: -1
-hand1
-  rotate: false
-  xy: 838, 199
-  size: 37, 48
-  orig: 37, 48
-  offset: 0, 0
-  index: -1
-hand2
-  rotate: false
-  xy: 286, 49
-  size: 31, 37
-  orig: 31, 37
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 2, 74
-  size: 172, 173
-  orig: 172, 173
-  offset: 0, 0
-  index: -1
-mantles
-  rotate: false
-  xy: 2, 17
-  size: 136, 55
-  orig: 136, 55
-  offset: 0, 0
-  index: -1
-mouth
-  rotate: false
-  xy: 2, 2
-  size: 61, 13
-  orig: 61, 13
-  offset: 0, 0
-  index: -1
-shin1
-  rotate: false
-  xy: 482, 119
-  size: 53, 57
-  orig: 53, 57
-  offset: 0, 0
-  index: -1
-shin2
-  rotate: false
-  xy: 192, 32
-  size: 51, 54
-  orig: 51, 54
-  offset: 0, 0
-  index: -1
-sword
-  rotate: false
-  xy: 324, 178
-  size: 216, 69
-  orig: 216, 69
-  offset: 0, 0
-  index: -1
-thigh1
-  rotate: false
-  xy: 542, 184
-  size: 60, 63
-  orig: 60, 63
-  offset: 0, 0
-  index: -1
-thigh2
-  rotate: false
-  xy: 423, 112
-  size: 57, 64
-  orig: 57, 64
-  offset: 0, 0
-  index: -1
-upperarm1
-  rotate: false
-  xy: 140, 16
-  size: 50, 56
-  orig: 50, 56
-  offset: 0, 0
-  index: -1
-upperarm2
-  rotate: false
-  xy: 245, 27
-  size: 39, 59
-  orig: 39, 59
-  offset: 0, 0
-  index: -1

+ 0 - 4
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.atlas.txt.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 0517c1f3a6aec5740aad7827a823c3db
-TextScriptImporter:
-  userData: 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 116
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.json


+ 0 - 4
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.json.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 1d300d9a4480c99409d838b49f344f7a
-TextScriptImporter:
-  userData: 

BIN
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.png


+ 0 - 348
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh.png.meta

@@ -1,348 +0,0 @@
-fileFormatVersion: 2
-guid: 8d970daea81f33648ae2d84ab59c88d4
-timeCreated: 1487920373
-licenseType: Free
-TextureImporter:
-  fileIDToRecycleName:
-    21300000: body
-    21300002: cape
-    21300004: eyes
-    21300006: fingers
-    21300008: foot1
-    21300010: foot2
-    21300012: forearm1
-    21300014: forearm2
-    21300016: hand1
-    21300018: hand2
-    21300020: head
-    21300022: mantles
-    21300024: mouth
-    21300026: shin1
-    21300028: shin2
-    21300030: sword
-    21300032: thigh1
-    21300034: thigh2
-    21300036: upperarm1
-    21300038: upperarm2
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 1
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: -3
-  maxTextureSize: 2048
-  textureSettings:
-    filterMode: 2
-    aniso: 7
-    mipBias: -1
-    wrapMode: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: body
-      rect:
-        serializedVersion: 2
-        x: 324
-        y: 80
-        width: 97
-        height: 95
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: cape
-      rect:
-        serializedVersion: 2
-        x: 176
-        y: 9
-        width: 146
-        height: 159
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: eyes
-      rect:
-        serializedVersion: 2
-        x: 604
-        y: 9
-        width: 82
-        height: 31
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: fingers
-      rect:
-        serializedVersion: 2
-        x: 877
-        y: 9
-        width: 31
-        height: 33
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: foot1
-      rect:
-        serializedVersion: 2
-        x: 743
-        y: 9
-        width: 50
-        height: 42
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: foot2
-      rect:
-        serializedVersion: 2
-        x: 688
-        y: 9
-        width: 53
-        height: 38
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: forearm1
-      rect:
-        serializedVersion: 2
-        x: 795
-        y: 9
-        width: 41
-        height: 49
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: forearm2
-      rect:
-        serializedVersion: 2
-        x: 910
-        y: 9
-        width: 31
-        height: 32
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: hand1
-      rect:
-        serializedVersion: 2
-        x: 838
-        y: 9
-        width: 37
-        height: 48
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: hand2
-      rect:
-        serializedVersion: 2
-        x: 286
-        y: 170
-        width: 31
-        height: 37
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: head
-      rect:
-        serializedVersion: 2
-        x: 2
-        y: 9
-        width: 172
-        height: 173
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: mantles
-      rect:
-        serializedVersion: 2
-        x: 2
-        y: 184
-        width: 136
-        height: 55
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: mouth
-      rect:
-        serializedVersion: 2
-        x: 2
-        y: 241
-        width: 61
-        height: 13
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: shin1
-      rect:
-        serializedVersion: 2
-        x: 482
-        y: 80
-        width: 53
-        height: 57
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: shin2
-      rect:
-        serializedVersion: 2
-        x: 192
-        y: 170
-        width: 51
-        height: 54
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: sword
-      rect:
-        serializedVersion: 2
-        x: 324
-        y: 9
-        width: 216
-        height: 69
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: thigh1
-      rect:
-        serializedVersion: 2
-        x: 542
-        y: 9
-        width: 60
-        height: 63
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: thigh2
-      rect:
-        serializedVersion: 2
-        x: 423
-        y: 80
-        width: 57
-        height: 64
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: upperarm1
-      rect:
-        serializedVersion: 2
-        x: 140
-        y: 184
-        width: 50
-        height: 56
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: upperarm2
-      rect:
-        serializedVersion: 2
-        x: 245
-        y: 170
-        width: 39
-        height: 59
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 16
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Atlas.asset

@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
-  m_Name: hero-mesh_Atlas
-  m_EditorClassIdentifier: 
-  atlasFile: {fileID: 4900000, guid: 0517c1f3a6aec5740aad7827a823c3db, type: 3}
-  materials:
-  - {fileID: 2100000, guid: b04b8c6e4c57e78449f243c27617a2cd, type: 2}

+ 0 - 4
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Atlas.asset.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 54d41b08afeefd44292ae69c4a235aa9
-NativeFormatImporter:
-  userData: 

+ 0 - 26
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Material.mat

@@ -1,26 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: hero-mesh_Material
-  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 5
-  m_EnableInstancingVariants: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 8d970daea81f33648ae2d84ab59c88d4, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _Cutoff: 0.1
-    m_Colors: []

+ 0 - 4
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_Material.mat.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: b04b8c6e4c57e78449f243c27617a2cd
-NativeFormatImporter:
-  userData: 

+ 0 - 22
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_SkeletonData.asset

@@ -1,22 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
-  m_Name: hero-mesh_SkeletonData
-  m_EditorClassIdentifier: 
-  atlasAssets:
-  - {fileID: 11400000, guid: 54d41b08afeefd44292ae69c4a235aa9, type: 2}
-  skeletonJSON: {fileID: 4900000, guid: 1d300d9a4480c99409d838b49f344f7a, type: 3}
-  scale: 0.01
-  fromAnimation: []
-  toAnimation: []
-  duration: []
-  defaultMix: 0.15
-  controller: {fileID: 9100000, guid: 867430a8599276b4e901c8f84e1bf590, type: 2}

+ 0 - 4
spine-unity/Assets/Spine Examples/Spine/Hero/hero-mesh_SkeletonData.asset.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: a5967d74cd1f3c741ba7758da7511bcf
-NativeFormatImporter:
-  userData: 

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 2 - 2
spine-unity/Assets/Spine Examples/Spine/Hero/hero-pro.json


+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0683baa0dca88d046bd7321a345049bd
+folderAsset: yes
+timeCreated: 1533450462
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/aim.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: aim
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: aim

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/aim.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 588934282d051ff40b98274c2853111b
+timeCreated: 1533450462
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/death.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: death
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: death

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/death.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b65ee8120b37bef4faf74c00de068d90
+timeCreated: 1533450462
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/hoverboard.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: hoverboard
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: hoverboard

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/hoverboard.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: c0f53129cfc74d24a87bd0653c8b18b4
+timeCreated: 1533450462
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle-turn.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: idle-turn
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: idle-turn

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle-turn.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: c5305bf8303ad2045b2f0b5932c61a4b
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: idle
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: idle

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/idle.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8d0bbfed4e13b03468027ca1ff1ac393
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/jump.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: jump
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: jump

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/jump.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0f7e9027876af9d46afcafb094ebf6ac
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/portal.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: portal
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: portal

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/portal.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bdea9619beae9244c8dd6f5c97c715af
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run-to-idle.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: run-to-idle
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: run-to-idle

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run-to-idle.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b13f034d459e81449aca80ba24f0eb80
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: run
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: run

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/run.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: eeb713d753330e444ba8f36c9987c20b
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/shoot.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: shoot
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: shoot

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/shoot.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 201e80c89830f114bb5b1eb666e31a51
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/walk.asset

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
+  m_Name: walk
+  m_EditorClassIdentifier: 
+  skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2}
+  animationName: walk

+ 9 - 0
spine-unity/Assets/Spine Examples/Spine/spineboy-pro/ReferenceAssets/walk.asset.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d9f47ddb952496b44b02fba73258e3dc
+timeCreated: 1533450463
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 585 - 24
spine-unity/Assets/Spine Examples/Spine/spineboy-unity/spineboy-unity.json

@@ -1,6 +1,6 @@
 {
 "skeleton": {
-	"hash": "/TOc8ZCRqVHx2Z5rHf8FIeR4q4E",
+	"hash": "cwpUEgLuMJTa1mvhbplDvBw8W+0",
 	"spine": "3.6.52",
 	"width": 470.71,
 	"height": 731.57,
@@ -40,12 +40,15 @@
 	{ "name": "rear_upper_arm", "parent": "torso", "length": 51.94, "rotation": -169.56, "x": 92.36, "y": -19.22, "color": "ff000dff" },
 	{ "name": "rear_bracer", "parent": "rear_upper_arm", "length": 34.56, "rotation": 23.15, "x": 51.36, "color": "ff000dff" },
 	{ "name": "gun", "parent": "rear_bracer", "length": 43.11, "rotation": 5.35, "x": 34.42, "y": -0.45, "color": "ff000dff" },
-	{ "name": "gun2", "parent": "root", "x": 390.37, "y": 534.39 },
-	{ "name": "gun3", "parent": "root", "x": 227.4, "y": 464.27 },
-	{ "name": "gun4", "parent": "root", "x": 250.14, "y": 672.72 },
+	{ "name": "gun2", "parent": "root", "rotation": -59.72, "x": 390.37, "y": 534.39 },
+	{ "name": "gun3", "parent": "root", "rotation": -77.87, "x": 227.4, "y": 464.27 },
+	{ "name": "gun4", "parent": "root", "rotation": -86.3, "x": 250.14, "y": 672.72 },
+	{ "name": "gun rotation", "parent": "root", "x": 334.56, "y": 492, "color": "abe323ff" },
 	{ "name": "gunTip", "parent": "gun", "rotation": 6.83, "x": 201.04, "y": 52.13, "color": "ff000dff" },
 	{ "name": "neck", "parent": "torso", "length": 25.45, "rotation": -31.54, "x": 127.5, "y": -0.31, "color": "e0da19ff" },
 	{ "name": "head", "parent": "neck", "length": 263.58, "rotation": 23.18, "x": 27.66, "y": -0.26, "color": "e0da19ff" },
+	{ "name": "muzzle2 free", "parent": "root" },
+	{ "name": "muzzle3 free", "parent": "root" },
 	{ "name": "pathbone", "parent": "root", "x": 71.67, "y": 368.83 },
 	{ "name": "rear_thigh", "parent": "hip", "length": 85.72, "rotation": -72.54, "x": 8.91, "y": -5.63, "color": "ff000dff" },
 	{ "name": "rear_shin", "parent": "rear_thigh", "length": 121.88, "rotation": -19.83, "x": 86.1, "y": -1.33, "color": "ff000dff" },
@@ -77,6 +80,8 @@
 	{ "name": "gun2", "bone": "gun2" },
 	{ "name": "gun3", "bone": "gun3" },
 	{ "name": "gun4", "bone": "gun4" },
+	{ "name": "muzzle2", "bone": "muzzle2 free", "blend": "additive" },
+	{ "name": "muzzle3", "bone": "muzzle3 free", "blend": "additive" },
 	{ "name": "gunspath", "bone": "pathbone", "attachment": "gunspath" },
 	{ "name": "projectile source", "bone": "gunTip", "attachment": "projectile source" }
 ],
@@ -106,6 +111,39 @@
 		"translateMix": 0,
 		"scaleMix": 0,
 		"shearMix": 0
+	},
+	{
+		"name": "gun2 rotation",
+		"order": 4,
+		"bones": [ "gun2" ],
+		"target": "gun rotation",
+		"rotation": 72.7,
+		"rotateMix": 0,
+		"translateMix": 0,
+		"scaleMix": 0,
+		"shearMix": 0
+	},
+	{
+		"name": "gun3 rotation",
+		"order": 5,
+		"bones": [ "gun3" ],
+		"target": "gun rotation",
+		"rotation": -116.2,
+		"rotateMix": 0,
+		"translateMix": 0,
+		"scaleMix": 0,
+		"shearMix": 0
+	},
+	{
+		"name": "gun4 rotation",
+		"order": 6,
+		"bones": [ "gun4" ],
+		"target": "gun rotation",
+		"rotation": 166.9,
+		"rotateMix": 0,
+		"translateMix": 0,
+		"scaleMix": 0,
+		"shearMix": 0
 	}
 ],
 "path": [
@@ -148,21 +186,21 @@
 			"front_upper_arm": { "x": 28.31, "y": 7.37, "rotation": 97.9, "width": 54, "height": 97 }
 		},
 		"gun2": {
-			"gun": { "x": 43.59, "y": -39.79, "width": 210, "height": 203 }
+			"gun": { "x": 43.59, "y": -39.79, "rotation": 83.87, "width": 210, "height": 203 }
 		},
 		"gun3": {
-			"gun": { "x": 39.79, "y": -39.8, "width": 210, "height": 203 }
+			"gun": { "x": 39.79, "y": -39.8, "rotation": 101.48, "width": 210, "height": 203 }
 		},
 		"gun4": {
-			"gun": { "x": 41.69, "y": -36, "width": 210, "height": 203 }
+			"gun": { "x": 41.69, "y": -36, "rotation": 111.08, "width": 210, "height": 203 }
 		},
 		"gunspath": {
 			"gunspath": {
 				"type": "path",
 				"closed": true,
-				"lengths": [ 534.73, 1020.73, 1497.06, 1846.09 ],
-				"vertexCount": 12,
-				"vertices": [ -175.36, 204.8, -71.34, 203.78, 121.95, 201.89, 376.27, 145.38, 369.88, -13.62, 363.36, -174.04, 157.89, -197.96, -31.54, -205.54, -224.8, -211.56, -421.28, -97.38, -436.34, -4.18, -453.89, 104.42 ],
+				"lengths": [ 559.93, 1333.08 ],
+				"vertexCount": 6,
+				"vertices": [ 169.43, -419.28, 139.24, -43.51, 111.84, 297.59, -220.3, -362.22, -282.74, -117.7, -400, 341.5 ],
 				"color": "ffffffff"
 			}
 		},
@@ -184,6 +222,12 @@
 		"muzzle": {
 			"muzzle": { "x": 18.25, "y": 5.45, "rotation": 0.15, "width": 462, "height": 400 }
 		},
+		"muzzle2": {
+			"muzzle": { "x": 60.83, "width": 462, "height": 400 }
+		},
+		"muzzle3": {
+			"muzzle": { "x": 60.83, "width": 462, "height": 400 }
+		},
 		"neck": {
 			"neck": { "x": 9.77, "y": -3.01, "rotation": -55.22, "width": 36, "height": 41 }
 		},
@@ -784,6 +828,11 @@
 					{ "time": 1.6667, "name": null }
 				]
 			},
+			"gunspath": {
+				"attachment": [
+					{ "time": 0, "name": "gunspath" }
+				]
+			},
 			"mouth": {
 				"attachment": [
 					{ "time": 0, "name": "mouth_smile" },
@@ -816,6 +865,38 @@
 					{ "time": 1.3333, "name": null },
 					{ "time": 2.5333, "name": null }
 				]
+			},
+			"muzzle2": {
+				"attachment": [
+					{ "time": 0.7667, "name": "muzzle" },
+					{ "time": 0.8333, "name": null },
+					{ "time": 0.8667, "name": "muzzle" },
+					{ "time": 0.9333, "name": null },
+					{ "time": 0.9667, "name": "muzzle" },
+					{ "time": 1.0333, "name": null },
+					{ "time": 1.0667, "name": "muzzle" },
+					{ "time": 1.1333, "name": null },
+					{ "time": 1.1667, "name": "muzzle" },
+					{ "time": 1.2333, "name": null },
+					{ "time": 1.2667, "name": "muzzle" },
+					{ "time": 1.3333, "name": null }
+				]
+			},
+			"muzzle3": {
+				"attachment": [
+					{ "time": 0.8333, "name": "muzzle" },
+					{ "time": 0.9, "name": null },
+					{ "time": 0.9333, "name": "muzzle" },
+					{ "time": 1, "name": null },
+					{ "time": 1.0333, "name": "muzzle" },
+					{ "time": 1.1, "name": null },
+					{ "time": 1.1333, "name": "muzzle" },
+					{ "time": 1.2, "name": null },
+					{ "time": 1.2333, "name": "muzzle" },
+					{ "time": 1.3, "name": null },
+					{ "time": 1.3333, "name": "muzzle" },
+					{ "time": 1.4, "name": null }
+				]
 			}
 		},
 		"bones": {
@@ -1246,8 +1327,8 @@
 						"angle": 15.51,
 						"curve": [ 0.324, 0.12, 0.658, 0.47 ]
 					},
-					{ "time": 2.2667, "angle": 5.14, "curve": "stepped" },
-					{ "time": 2.5333, "angle": 5.14 }
+					{ "time": 2.2667, "angle": 8.88, "curve": "stepped" },
+					{ "time": 2.5333, "angle": 8.88 }
 				],
 				"scale": [
 					{ "time": 0, "x": 0.755, "y": 1.31, "curve": "stepped" },
@@ -1902,12 +1983,6 @@
 				]
 			},
 			"pathbone": {
-				"rotate": [
-					{ "time": 0.6667, "angle": 0 },
-					{ "time": 1, "angle": -126.96 },
-					{ "time": 1.3333, "angle": 65.58 },
-					{ "time": 1.6667, "angle": 0 }
-				],
 				"scale": [
 					{ "time": 0.6667, "x": 1, "y": 1 },
 					{ "time": 1.1667, "x": 1.619, "y": 1.619 },
@@ -1916,29 +1991,117 @@
 			},
 			"gun2": {
 				"rotate": [
-					{ "time": 1.6667, "angle": -123.5 }
+					{ "time": 0.6333, "angle": 0 },
+					{ "time": 1.6667, "angle": 208.8 }
 				],
 				"translate": [
 					{ "time": 0.6, "x": -271.69, "y": -301.15 },
-					{ "time": 1.6667, "x": -408.03, "y": -266.19 }
+					{ "time": 1.6667, "x": -470.47, "y": -334.43 }
 				]
 			},
 			"gun3": {
 				"rotate": [
-					{ "time": 1.6667, "angle": -123.5 }
+					{ "time": 0.6333, "angle": 0 },
+					{ "time": 1.6667, "angle": 208.8 }
 				],
 				"translate": [
 					{ "time": 0.6, "x": -111.29, "y": -212.77 },
-					{ "time": 1.6667, "x": -247.64, "y": -177.81 }
+					{ "time": 1.6667, "x": -310.07, "y": -246.05 }
 				]
 			},
 			"gun4": {
 				"rotate": [
-					{ "time": 1.6667, "angle": -123.5 }
+					{ "time": 0.6333, "angle": 0 },
+					{ "time": 1.6667, "angle": 208.8 }
 				],
 				"translate": [
 					{ "time": 0.6, "x": -144.03, "y": -425.54 },
-					{ "time": 1.6667, "x": -280.37, "y": -390.58 }
+					{ "time": 1.6667, "x": -342.81, "y": -458.82 }
+				]
+			},
+			"muzzle2 free": {
+				"rotate": [
+					{ "time": 0.7667, "angle": -21.73, "curve": "stepped" },
+					{ "time": 0.8667, "angle": 172.48, "curve": "stepped" },
+					{ "time": 0.9667, "angle": -139.64, "curve": "stepped" },
+					{ "time": 1.0667, "angle": 24.69, "curve": "stepped" },
+					{ "time": 1.1667, "angle": 176.07, "curve": "stepped" },
+					{ "time": 1.2667, "angle": 52.93 }
+				],
+				"translate": [
+					{ "time": 0.7667, "x": 269.22, "y": 129.31, "curve": "stepped" },
+					{ "time": 0.8667, "x": -567.86, "y": 347.09, "curve": "stepped" },
+					{ "time": 0.9667, "x": -307.84, "y": 56.76, "curve": "stepped" },
+					{ "time": 1.0667, "x": 353.92, "y": 489.89, "curve": "stepped" },
+					{ "time": 1.1667, "x": -332.25, "y": 174.65, "curve": "stepped" },
+					{ "time": 1.2667, "x": -228.55, "y": 693.4 }
+				],
+				"scale": [
+					{ "time": 0.7667, "x": 0.9, "y": 1.202 },
+					{ "time": 0.8333, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 0.8667, "x": 0.9, "y": 1.202 },
+					{ "time": 0.9333, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 0.9667, "x": 0.9, "y": 1.202 },
+					{ "time": 1.0333, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.0667, "x": 0.9, "y": 1.202 },
+					{ "time": 1.1333, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.1667, "x": 0.9, "y": 1.202 },
+					{ "time": 1.2333, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.2667, "x": 0.9, "y": 1.202 },
+					{ "time": 1.3333, "x": 1.045, "y": 0.99 }
+				]
+			},
+			"muzzle3 free": {
+				"rotate": [
+					{ "time": 0.8333, "angle": 40.51, "curve": "stepped" },
+					{ "time": 0.9333, "angle": -63.06, "curve": "stepped" },
+					{ "time": 1.0333, "angle": 126.83, "curve": "stepped" },
+					{ "time": 1.1333, "angle": 125.37, "curve": "stepped" },
+					{ "time": 1.2333, "angle": -136.88, "curve": "stepped" },
+					{ "time": 1.3333, "angle": -36.08 }
+				],
+				"translate": [
+					{ "time": 0.8333, "x": 255.43, "y": 424.36, "curve": "stepped" },
+					{ "time": 0.9333, "x": 139.51, "y": 153.5, "curve": "stepped" },
+					{ "time": 1.0333, "x": -158.92, "y": 533.3, "curve": "stepped" },
+					{ "time": 1.1333, "x": 2.6, "y": 646.64, "curve": "stepped" },
+					{ "time": 1.2333, "x": -42.47, "y": 167.46, "curve": "stepped" },
+					{ "time": 1.3333, "x": 322.45, "y": 254.08 }
+				],
+				"scale": [
+					{ "time": 0.8333, "x": 0.9, "y": 1.202 },
+					{ "time": 0.9, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 0.9333, "x": 0.9, "y": 1.202 },
+					{ "time": 1, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.0333, "x": 0.9, "y": 1.202 },
+					{ "time": 1.1, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.1333, "x": 0.9, "y": 1.202 },
+					{ "time": 1.2, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.2333, "x": 0.9, "y": 1.202 },
+					{ "time": 1.3, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.3333, "x": 0.9, "y": 1.202 },
+					{ "time": 1.4, "x": 1.045, "y": 0.99, "curve": "stepped" },
+					{ "time": 1.4333, "x": 1, "y": 1 }
+				]
+			},
+			"gun rotation": {
+				"rotate": [
+					{ "time": 0.7, "angle": 0 },
+					{ "time": 0.7667, "angle": -120 },
+					{ "time": 0.8333, "angle": 120 },
+					{ "time": 0.9, "angle": 0 },
+					{ "time": 0.9667, "angle": -120 },
+					{ "time": 1.0333, "angle": 120 },
+					{ "time": 1.1, "angle": 0 },
+					{ "time": 1.1667, "angle": -120 },
+					{ "time": 1.2333, "angle": 120 },
+					{ "time": 1.3, "angle": 0 },
+					{ "time": 1.3667, "angle": -120 },
+					{ "time": 1.4333, "angle": 120 },
+					{ "time": 1.5, "angle": 0 },
+					{ "time": 1.5667, "angle": -120 },
+					{ "time": 1.6333, "angle": 120 },
+					{ "time": 1.7, "angle": 0 }
 				]
 			}
 		},
@@ -1960,6 +2123,24 @@
 				{ "time": 1.6333 },
 				{ "time": 1.6667, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
 				{ "time": 2.5333, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+			],
+			"gun2 rotation": [
+				{ "time": 0.6333, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
+				{ "time": 0.7333, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
+				{ "time": 1.4667, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
+				{ "time": 1.6, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+			],
+			"gun3 rotation": [
+				{ "time": 0.6333, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
+				{ "time": 0.7333, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
+				{ "time": 1.4667, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
+				{ "time": 1.6, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
+			],
+			"gun4 rotation": [
+				{ "time": 0.6333, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
+				{ "time": 0.7333, "translateMix": 0, "scaleMix": 0, "shearMix": 0, "curve": "stepped" },
+				{ "time": 1.4667, "translateMix": 0, "scaleMix": 0, "shearMix": 0 },
+				{ "time": 1.6, "rotateMix": 0, "translateMix": 0, "scaleMix": 0, "shearMix": 0 }
 			]
 		},
 		"paths": {
@@ -2673,6 +2854,305 @@
 			}
 		}
 	},
+	"idle footplant": {
+		"slots": {
+			"front_fist": {
+				"attachment": [
+					{ "time": 0, "name": "front_fist_open" }
+				]
+			}
+		},
+		"bones": {
+			"torso": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -5.62,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.8333,
+						"angle": -9.66,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -5.62 }
+				],
+				"translate": [
+					{ "time": 0, "x": -6.5, "y": 0 }
+				]
+			},
+			"front_upper_arm": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -59.85,
+						"curve": [ 0.493, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -54.32,
+						"curve": [ 0.324, 0.11, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -59.85 }
+				],
+				"translate": [
+					{ "time": 0, "x": -7.12, "y": -8.24 },
+					{ "time": 0.6667, "x": -6.32, "y": -8.31 },
+					{ "time": 1.6667, "x": -7.12, "y": -8.24 }
+				]
+			},
+			"rear_upper_arm": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 62.42,
+						"curve": [ 0.504, 0.02, 0.75, 1 ]
+					},
+					{
+						"time": 0.7333,
+						"angle": 43.83,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": 62.42 }
+				],
+				"translate": [
+					{ "time": 0, "x": -1.83, "y": -16.79 },
+					{ "time": 0.6667, "x": 0.35, "y": -15.23 },
+					{ "time": 1.6667, "x": -1.83, "y": -16.79 }
+				]
+			},
+			"neck": {
+				"rotate": [
+					{ "time": 0, "angle": 0 },
+					{ "time": 0.6667, "angle": 2.39 },
+					{ "time": 1.6667, "angle": 0 }
+				]
+			},
+			"front_thigh": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 0.65,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -4.34,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": 0.65 }
+				],
+				"translate": [
+					{ "time": 0, "x": -13.4, "y": 6.7 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 0.897,
+						"y": 1,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 0.826,
+						"y": 1,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "x": 0.897, "y": 1 }
+				]
+			},
+			"front_shin": {
+				"rotate": [
+					{ "time": 0, "angle": -19.29 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 0.994,
+						"y": 1,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "x": 1, "y": 1 }
+				]
+			},
+			"rear_thigh": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 30.51,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 40.15,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": 30.51 }
+				]
+			},
+			"rear_shin": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -23.83,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -43.77,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": -23.83 }
+				]
+			},
+			"front_foot": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 5.14,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 10.05,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": 5.14 }
+				],
+				"scale": [
+					{ "time": 0, "x": 0.755, "y": 1.31 }
+				]
+			},
+			"rear_foot": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -7.34,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 3.85,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "angle": -7.34 }
+				]
+			},
+			"rear_bracer": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -17.16,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 12.53,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -17.16 }
+				]
+			},
+			"head": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -5.51,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -3.12,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -5.51 }
+				]
+			},
+			"front_bracer": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 45.47,
+						"curve": [ 0.493, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": 41.34,
+						"curve": [ 0.321, 0.11, 0.736, 0.92 ]
+					},
+					{ "time": 1.6667, "angle": 45.47 }
+				]
+			},
+			"gun": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": 0,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -15.59,
+						"curve": [ 0.733, 0, 0.77, 0.99 ]
+					},
+					{ "time": 1.6667, "angle": 0 }
+				]
+			},
+			"front_fist": {
+				"rotate": [
+					{
+						"time": 0,
+						"angle": -6.85,
+						"curve": [ 0.493, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"angle": -14.63,
+						"curve": [ 0.324, 0.11, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "angle": -6.85 }
+				],
+				"scale": [
+					{
+						"time": 0,
+						"x": 1,
+						"y": 1,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 0.8,
+						"y": 1.101,
+						"curve": [ 0.25, 0, 0.75, 1 ]
+					},
+					{ "time": 1.6667, "x": 1, "y": 1 }
+				]
+			},
+			"hip": {
+				"translate": [
+					{
+						"time": 0,
+						"x": -6.64,
+						"y": -23.02,
+						"curve": [ 0.236, 0.01, 0.559, 0.99 ]
+					},
+					{
+						"time": 0.6667,
+						"x": 6.28,
+						"y": -35.01,
+						"curve": [ 0.595, 0, 0.653, 1 ]
+					},
+					{ "time": 1.6667, "x": -6.64, "y": -23.02 }
+				]
+			}
+		}
+	},
 	"idlebag": {
 		"slots": {
 			"front_fist": {
@@ -3854,6 +4334,70 @@
 			}
 		}
 	},
+	"one frame": {
+		"bones": {
+			"torso": {
+				"rotate": [
+					{ "time": 0, "angle": -40.91 }
+				]
+			},
+			"front_upper_arm": {
+				"rotate": [
+					{ "time": 0, "angle": -82.02 }
+				]
+			},
+			"front_bracer": {
+				"rotate": [
+					{ "time": 0, "angle": -20.01 }
+				]
+			},
+			"front_thigh": {
+				"rotate": [
+					{ "time": 0, "angle": -52.83 }
+				]
+			},
+			"front_shin": {
+				"rotate": [
+					{ "time": 0, "angle": 1.08 }
+				]
+			},
+			"rear_upper_arm": {
+				"rotate": [
+					{ "time": 0, "angle": 79.86 }
+				]
+			},
+			"rear_bracer": {
+				"rotate": [
+					{ "time": 0, "angle": -21.97 }
+				]
+			},
+			"gun": {
+				"rotate": [
+					{ "time": 0, "angle": 22.35 }
+				]
+			},
+			"neck": {
+				"rotate": [
+					{ "time": 0, "angle": 0.84 }
+				]
+			},
+			"head": {
+				"rotate": [
+					{ "time": 0, "angle": -25.39 }
+				]
+			},
+			"rear_thigh": {
+				"rotate": [
+					{ "time": 0, "angle": 40.87 }
+				]
+			},
+			"rear_shin": {
+				"rotate": [
+					{ "time": 0, "angle": 23.61 }
+				]
+			}
+		}
+	},
 	"pole": {
 		"slots": {
 			"eye": {
@@ -5045,6 +5589,23 @@
 					{ "time": 0.0333, "name": "muzzle" },
 					{ "time": 0.1667, "name": null }
 				]
+			},
+			"muzzle2": {
+				"color": [
+					{
+						"time": 0.0225,
+						"color": "ffad76ff",
+						"curve": [ 0.175, 0.43, 0.534, 0.75 ]
+					},
+					{
+						"time": 0.0333,
+						"color": "ffc197ff",
+						"curve": [ 0.286, 0.99, 0.774, 1 ]
+					},
+					{ "time": 0.0667, "color": "ffffffff" },
+					{ "time": 0.1, "color": "ffbc8fee" },
+					{ "time": 0.1667, "color": "ffa18000" }
+				]
 			}
 		},
 		"bones": {

+ 27 - 4
spine-unity/Assets/Spine Examples/Spine/spineboy-unity/spineboy_Material.mat

@@ -7,29 +7,52 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: spineboy_Material
-  m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3}
-  m_ShaderKeywords: 
+  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
-  stringTagMap: {}
+  stringTagMap:
+    AlphaDepth: False
+    IGNOREPROJECTOR: true
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BlendTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 49bb65eefe08e424bbf7a38bc98ec638, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     - PixelSnap: 0
+    - _BlendAmount: 0
+    - _Brightness: 1
     - _CloakPhase: 0
-    - _Cutoff: 0.1
+    - _Cull: 0
+    - _CustomRenderQueue: 0
+    - _Cutoff: 0.103
+    - _DstBlend: 10
+    - _EnableExternalAlpha: 0
     - _FillPhase: 0
+    - _Hue: 0
     - _RefractionStrength: 0.01
+    - _RenderQueue: 0
+    - _Saturation: 1
+    - _ShadowAlphaCutoff: 0.1
+    - _SrcBlend: 1
+    - _ZWrite: 1
     - _node_3476: 0
     m_Colors:
     - _Black: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OverlayColor: {r: 0, g: 0, b: 0, a: 0}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio