From 3d7a4b3c055e30e7f3877748f9f2085b3fc21ee9 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Wed, 26 Feb 2020 20:43:30 +0100 Subject: [PATCH] [unity] Cleaned up and re-serialized all Spine Examples example scenes in regards to problems with recent Unity versions (some assets did not display due to serialization differences / auto update problems). --- .../1 The Spine GameObject.unity | 20 +- .../2 Controlling Animation.unity | 20 +- .../3 Controlling Animation Continued.unity | 20 +- .../4 Object Oriented Sample.unity | 196 ++- .../Getting Started/5 Basic Platformer.unity | 8 - .../Getting Started/6 SkeletonGraphic.unity | 26 +- .../Animation Tester/Animation Tester.unity | 22 +- .../Other Examples/AtlasRegionAttacher.unity | 20 +- .../Other Examples/BlendModes.unity | 171 ++- .../Other Examples/Dragon.unity | 514 -------- .../Other Examples/Dragon.unity.meta | 4 - .../Other Examples/Drunkboy.unity | 41 +- .../Other Examples/FixedTimestepUpdates.unity | 31 +- .../Other Examples/Freezeboy.unity | 367 +++++- .../Instantiate from Script.unity | 26 +- .../Other Examples/Mix and Match Equip.unity | 19 +- .../Other Examples/Mix and Match.unity | 36 +- .../Per Instance Material Properties.unity | 36 +- .../SkeletonAnimationMulti.unity | 16 +- .../SkeletonRenderSeparator.unity | 205 ++- .../SkeletonUtility Animated Physics.unity | 66 +- .../Other Examples/SkeletonUtility Eyes.unity | 197 ++- .../SkeletonUtility GroundConstraint.unity | 28 +- ...tility Platformer HingeChain Physics.unity | 8 - .../SkeletonUtility Ragdoll.unity | 1135 ++++++++--------- .../Other Examples/SpineGauge.unity | 32 +- .../Other Examples/Sprite Shaders.unity | 86 +- .../SpriteMask and RectMask2D.unity | 32 +- ...Mecanim Logic SkeletonAnimation View.unity | 21 +- .../Other Examples/VertexEffect.unity | 28 +- 30 files changed, 1858 insertions(+), 1573 deletions(-) delete mode 100644 spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity delete mode 100644 spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity.meta diff --git a/spine-unity/Assets/Spine Examples/Getting Started/1 The Spine GameObject.unity b/spine-unity/Assets/Spine Examples/Getting Started/1 The Spine GameObject.unity index 9f14bc7f1..e1a26f085 100644 --- a/spine-unity/Assets/Spine Examples/Getting Started/1 The Spine GameObject.unity +++ b/spine-unity/Assets/Spine Examples/Getting Started/1 The Spine GameObject.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -152,7 +152,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: main loop: 1 @@ -340,7 +344,6 @@ GameObject: m_Component: - component: {fileID: 611702906} - component: {fileID: 611702905} - - component: {fileID: 611702904} - component: {fileID: 611702903} - component: {fileID: 611702902} m_Layer: 0 @@ -358,13 +361,6 @@ AudioListener: m_GameObject: {fileID: 611702901} m_Enabled: 1 --- !u!124 &611702903 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 611702901} - m_Enabled: 1 ---- !u!92 &611702904 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Getting Started/2 Controlling Animation.unity b/spine-unity/Assets/Spine Examples/Getting Started/2 Controlling Animation.unity index 0ac357583..9f6de7b00 100644 --- a/spine-unity/Assets/Spine Examples/Getting Started/2 Controlling Animation.unity +++ b/spine-unity/Assets/Spine Examples/Getting Started/2 Controlling Animation.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -207,7 +207,6 @@ GameObject: m_Component: - component: {fileID: 611702906} - component: {fileID: 611702905} - - component: {fileID: 611702904} - component: {fileID: 611702903} - component: {fileID: 611702902} m_Layer: 0 @@ -225,13 +224,6 @@ AudioListener: m_GameObject: {fileID: 611702901} m_Enabled: 1 --- !u!124 &611702903 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 611702901} - m_Enabled: 1 ---- !u!92 &611702904 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -331,7 +323,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: idle loop: 1 diff --git a/spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity b/spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity index 7746902a0..e65fa0844 100644 --- a/spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity +++ b/spine-unity/Assets/Spine Examples/Getting Started/3 Controlling Animation Continued.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -279,7 +279,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: loop: 0 @@ -622,7 +626,6 @@ GameObject: m_Component: - component: {fileID: 1604340976} - component: {fileID: 1604340975} - - component: {fileID: 1604340974} - component: {fileID: 1604340973} - component: {fileID: 1604340972} m_Layer: 0 @@ -640,13 +643,6 @@ AudioListener: m_GameObject: {fileID: 1604340971} m_Enabled: 1 --- !u!124 &1604340973 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1604340971} - m_Enabled: 1 ---- !u!92 &1604340974 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity b/spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity index bb957c22b..5ae47ed95 100644 --- a/spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity +++ b/spine-unity/Assets/Spine Examples/Getting Started/4 Object Oriented Sample.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -247,7 +247,6 @@ GameObject: m_Component: - component: {fileID: 611702906} - component: {fileID: 611702905} - - component: {fileID: 611702904} - component: {fileID: 611702903} - component: {fileID: 611702902} m_Layer: 0 @@ -265,13 +264,6 @@ AudioListener: m_GameObject: {fileID: 611702901} m_Enabled: 1 --- !u!124 &611702903 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 611702901} - m_Enabled: 1 ---- !u!92 &611702904 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -372,6 +364,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: idle loop: 1 @@ -469,7 +466,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonAnimation: {fileID: 816033310} boneName: shoot target - camera: {fileID: 611702905} + cam: {fileID: 611702905} --- !u!1 &1090490184 GameObject: m_ObjectHideFlags: 0 @@ -1082,7 +1079,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2088845776} m_LocalRotation: {x: 0, y: 0, z: 0.08045987, w: 0.99675786} - m_LocalPosition: {x: 2.9171321, y: 3.744694, z: 0} + m_LocalPosition: {x: 2.917376, y: 3.743913, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 816033313} @@ -1101,6 +1098,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonRenderer: {fileID: 816033310} boneName: gunTip + followXYPosition: 1 followZPosition: 0 followBoneRotation: 0 followSkeletonFlip: 1 @@ -1108,7 +1106,7 @@ MonoBehaviour: initializeOnAwake: 1 --- !u!199 &2088845779 ParticleSystemRenderer: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -1157,6 +1155,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!198 &2088845780 ParticleSystem: m_ObjectHideFlags: 0 @@ -1169,7 +1168,9 @@ ParticleSystem: looping: 0 prewarm: 0 playOnAwake: 0 + useUnscaledTime: 0 autoRandomSeed: 1 + useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -1583,14 +1584,29 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 ShapeModule: - serializedVersion: 4 + serializedVersion: 5 enabled: 1 type: 10 angle: 25 length: 5 - boxX: 1 - boxY: 1 - boxZ: 1 + boxThickness: {x: 0, y: 0, z: 0} + radiusThickness: 1 + donutRadius: 0.2 + m_Position: {x: 0, y: 0, z: 0} + m_Rotation: {x: 0, y: 0, z: 0} + m_Scale: {x: 1, y: 1, z: 1} + placementMode: 0 + m_Mesh: {fileID: 0} + m_MeshRenderer: {fileID: 0} + m_SkinnedMeshRenderer: {fileID: 0} + m_MeshMaterialIndex: 0 + m_MeshNormalOffset: 0 + m_UseMeshMaterialIndex: 0 + m_UseMeshColors: 1 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 + randomPositionAmount: 0 radius: value: 1 mode: 0 @@ -1681,18 +1697,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - placementMode: 0 - m_Mesh: {fileID: 0} - m_MeshRenderer: {fileID: 0} - m_SkinnedMeshRenderer: {fileID: 0} - m_MeshMaterialIndex: 0 - m_MeshNormalOffset: 0 - m_MeshScale: 1 - m_UseMeshMaterialIndex: 0 - m_UseMeshColors: 1 - alignToDirection: 0 - randomDirectionAmount: 0 - sphericalDirectionAmount: 0 EmissionModule: enabled: 1 serializedVersion: 4 @@ -2110,6 +2114,7 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: enabled: 0 + mode: 0 frameOverTime: serializedVersion: 2 minMaxState: 1 @@ -2201,6 +2206,8 @@ ParticleSystem: flipU: 0 flipV: 0 randomRow: 1 + sprites: + - sprite: {fileID: 0} VelocityModule: enabled: 0 x: @@ -2967,6 +2974,129 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 remapEnabled: 0 + positionAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + sizeAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 SizeBySpeedModule: enabled: 0 curve: @@ -3292,6 +3422,10 @@ ParticleSystem: serializedVersion: 3 type: 0 collisionMode: 0 + colliderForce: 0 + multiplyColliderForceByParticleSize: 0 + multiplyColliderForceByParticleSpeed: 0 + multiplyColliderForceByCollisionAngle: 1 plane0: {fileID: 0} plane1: {fileID: 0} plane2: {fileID: 0} @@ -3595,6 +3729,7 @@ ParticleSystem: sizeAffectsWidth: 1 sizeAffectsLifetime: 0 inheritParticleColor: 1 + generateLightingData: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -4279,6 +4414,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &2111197922 Transform: m_ObjectHideFlags: 0 diff --git a/spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity b/spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity index 54aaf7e41..685e4bc01 100644 --- a/spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity +++ b/spine-unity/Assets/Spine Examples/Getting Started/5 Basic Platformer.unity @@ -2296,7 +2296,6 @@ GameObject: m_Component: - component: {fileID: 1178284506} - component: {fileID: 1178284510} - - component: {fileID: 1178284509} - component: {fileID: 1178284508} - component: {fileID: 1178284507} - component: {fileID: 1178284511} @@ -2328,13 +2327,6 @@ AudioListener: m_GameObject: {fileID: 1178284505} m_Enabled: 1 --- !u!124 &1178284508 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1178284505} - m_Enabled: 1 ---- !u!92 &1178284509 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Getting Started/6 SkeletonGraphic.unity b/spine-unity/Assets/Spine Examples/Getting Started/6 SkeletonGraphic.unity index 0e6c167c3..b35d13663 100644 --- a/spine-unity/Assets/Spine Examples/Getting Started/6 SkeletonGraphic.unity +++ b/spine-unity/Assets/Spine Examples/Getting Started/6 SkeletonGraphic.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -212,7 +212,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 140863499} - m_LocalRotation: {x: -0, y: -0, z: 0.6421143, w: 0.766609} + m_LocalRotation: {x: -0, y: -0, z: 0.64198506, w: 0.76671714} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -221,7 +221,7 @@ RectTransform: 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: -11.670258, y: 578.2387} + m_AnchoredPosition: {x: -12.049179, y: 499.93677} m_SizeDelta: {x: 100, y: 54.64} m_Pivot: {x: -0.15, y: -2.04} --- !u!114 &140863501 @@ -280,6 +280,7 @@ MonoBehaviour: followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 0 + followXYPosition: 1 followZPosition: 1 --- !u!1 &189134934 GameObject: @@ -495,7 +496,6 @@ GameObject: m_Component: - component: {fileID: 611702906} - component: {fileID: 611702905} - - component: {fileID: 611702904} - component: {fileID: 611702903} - component: {fileID: 611702902} m_Layer: 0 @@ -513,13 +513,6 @@ AudioListener: m_GameObject: {fileID: 611702901} m_Enabled: 1 --- !u!124 &611702903 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 611702901} - m_Enabled: 1 ---- !u!92 &611702904 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -599,7 +592,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 759111374} - m_LocalRotation: {x: 0, y: 0, z: 0.012748675, w: 0.99991876} + m_LocalRotation: {x: 0, y: 0, z: 0.012304246, w: 0.9999243} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -608,7 +601,7 @@ RectTransform: 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: 214.28879, y: 127.327515} + m_AnchoredPosition: {x: 164.98044, y: 39.06775} m_SizeDelta: {x: 35.7, y: 54.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &759111376 @@ -667,6 +660,7 @@ MonoBehaviour: followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 0 + followXYPosition: 1 followZPosition: 1 --- !u!1 &774800193 GameObject: @@ -1228,7 +1222,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2091633435} m_Direction: 2 m_Value: 1 - m_Size: 0.2719017 + m_Size: 0.27235755 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/Animation Tester.unity b/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/Animation Tester.unity index 6a89ce95a..9ad54d6ce 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/Animation Tester.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/Animation Tester.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -520,6 +520,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 @@ -735,7 +740,6 @@ GameObject: m_Component: - component: {fileID: 1938840570} - component: {fileID: 1938840569} - - component: {fileID: 1938840568} - component: {fileID: 1938840567} - component: {fileID: 1938840566} m_Layer: 0 @@ -753,13 +757,6 @@ AudioListener: m_GameObject: {fileID: 1938840565} m_Enabled: 1 --- !u!124 &1938840567 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1938840565} - m_Enabled: 1 ---- !u!92 &1938840568 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -967,6 +964,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &2124548741 Transform: m_ObjectHideFlags: 0 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/AtlasRegionAttacher.unity b/spine-unity/Assets/Spine Examples/Other Examples/AtlasRegionAttacher.unity index c7d04ad73..ee0e99651 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/AtlasRegionAttacher.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/AtlasRegionAttacher.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -117,7 +117,6 @@ GameObject: m_Component: - component: {fileID: 626664556} - component: {fileID: 626664555} - - component: {fileID: 626664554} - component: {fileID: 626664553} - component: {fileID: 626664552} m_Layer: 0 @@ -135,13 +134,6 @@ AudioListener: m_GameObject: {fileID: 626664551} m_Enabled: 1 --- !u!124 &626664553 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 626664551} - m_Enabled: 1 ---- !u!92 &626664554 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -282,7 +274,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: loop: 1 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity b/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity index 8b4bb3055..6585b53bc 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,7 +117,6 @@ GameObject: m_Component: - component: {fileID: 200188764} - component: {fileID: 200188763} - - component: {fileID: 200188762} - component: {fileID: 200188761} - component: {fileID: 200188760} m_Layer: 0 @@ -135,13 +134,6 @@ AudioListener: m_GameObject: {fileID: 200188759} m_Enabled: 1 --- !u!124 &200188761 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 200188759} - m_Enabled: 1 ---- !u!92 &200188762 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -242,6 +234,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -319,15 +316,15 @@ MonoBehaviour: partsRenderers: - {fileID: 1776944552} - {fileID: 1476882952} ---- !u!21 &522217957 +--- !u!21 &1024021235 Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: whirlyblendmodes_Material SkeletonPMAMultiply - m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} - m_ShaderKeywords: + m_Name: whirlyblendmodes_Material SkeletonPMAAdditive + m_Shader: {fileID: 4800000, guid: 53efa1d97f5d9f74285d4330cda14e36, type: 3} + m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -348,10 +345,61 @@ Material: m_Floats: - : 0 - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 m_Colors: - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007110106} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} +--- !u!21 &1265643925 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: whirlyblendmodes_Material SkeletonPMAScreen + m_Shader: {fileID: 4800000, guid: 4e8caa36c07aacf4ab270da00784e4d9, type: 3} + m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - : + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: dc1b9f9665c8aa74799404a1d2038e3d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - : 0 + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007121922} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} --- !u!1 &1476882951 GameObject: m_ObjectHideFlags: 0 @@ -433,6 +481,48 @@ Transform: m_Father: {fileID: 267173958} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1570194746 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: whirlyblendmodes_Material SkeletonPMAMultiply + m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} + m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - : + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: dc1b9f9665c8aa74799404a1d2038e3d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - : 0 + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 0 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007110106} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} --- !u!1 &1573089137 GameObject: m_ObjectHideFlags: 0 @@ -455,8 +545,8 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1573089137} - m_LocalRotation: {x: 0, y: 0, z: 0.72986394, w: 0.68359244} - m_LocalPosition: {x: 0.6028927, y: 3.6779804, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0.72986406, w: 0.6835923} + m_LocalPosition: {x: 0.6023901, y: 3.6781247, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1738947319} @@ -476,6 +566,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonRenderer: {fileID: 267173955} boneName: head + followXYPosition: 1 followZPosition: 1 followBoneRotation: 1 followSkeletonFlip: 1 @@ -525,6 +616,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: animation loop: 1 @@ -543,9 +639,9 @@ MeshRenderer: m_ReflectionProbeUsage: 0 m_Materials: - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} - - {fileID: 522217957} - - {fileID: 2036777000} - - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} + - {fileID: 1570194746} + - {fileID: 1265643925} + - {fileID: 1024021235} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -675,36 +771,3 @@ Transform: m_Father: {fileID: 267173958} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &2036777000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: whirlyblendmodes_Material SkeletonPMAScreen - m_Shader: {fileID: 4800000, guid: 4e8caa36c07aacf4ab270da00784e4d9, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - : - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: dc1b9f9665c8aa74799404a1d2038e3d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - : 0 - - _Cutoff: 0.1 - - _StraightAlphaInput: 0 - m_Colors: - - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007121922} - - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity b/spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity deleted file mode 100644 index 121803bc8..000000000 --- a/spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity +++ /dev/null @@ -1,514 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &4 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 1 - m_BakeResolution: 50 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 0 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 0 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 1024 - m_ReflectionCompression: 2 - m_MixedBakeMode: 1 - m_BakeBackend: 0 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 ---- !u!196 &5 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666666 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &95248287 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 95248291} - - component: {fileID: 95248290} - - component: {fileID: 95248289} - - component: {fileID: 95248288} - m_Layer: 0 - m_Name: dragon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &95248288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95248287} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 76506fa7fbeed084ab2dfb084648c628, type: 2} - initialSkinName: - initialFlipX: 0 - initialFlipY: 0 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - fixDrawOrder: 0 - addNormals: 0 - calculateTangents: 0 - maskInteraction: 0 - maskMaterials: - materialsMaskDisabled: [] - materialsInsideMask: [] - materialsOutsideMask: [] - disableRenderingOnOverride: 1 - _animationName: flying - loop: 1 - timeScale: 1 ---- !u!23 &95248289 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95248287} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &95248290 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95248287} - m_Mesh: {fileID: 0} ---- !u!4 &95248291 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95248287} - 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: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &133751936 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 133751938} - - component: {fileID: 133751937} - m_Layer: 0 - m_Name: Directional light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &133751937 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133751936} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1.1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &133751938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 133751936} - m_LocalRotation: {x: -0.25000006, y: 0.24999964, z: -0.06698721, w: -0.9330128} - m_LocalPosition: {x: 0, y: 4.27, z: 15.66} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 30, y: -30, z: 0} ---- !u!1 &560289061 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 560289065} - - component: {fileID: 560289064} - - component: {fileID: 560289062} - m_Layer: 0 - m_Name: ground Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &560289062 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 560289061} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &560289064 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 560289061} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &560289065 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 560289061} - m_LocalRotation: {x: -0.17233427, y: 0, z: 0, w: 0.9850386} - m_LocalPosition: {x: 0, y: -3.0956457, z: 3.37} - m_LocalScale: {x: 17, y: 0.64, z: 20} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1604340971 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1604340976} - - component: {fileID: 1604340975} - - component: {fileID: 1604340973} - - component: {fileID: 1604340972} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1604340972 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604340971} - m_Enabled: 1 ---- !u!124 &1604340973 -Behaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604340971} - m_Enabled: 1 ---- !u!20 &1604340975 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604340971} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0 - far clip plane: 1000 - field of view: 47.7 - orthographic: 1 - orthographic size: 4.57 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1604340976 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1604340971} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.16189003, z: -2.45} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity.meta b/spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity.meta deleted file mode 100644 index df51d2cfe..000000000 --- a/spine-unity/Assets/Spine Examples/Other Examples/Dragon.unity.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 49dcd2c3fdec1a04eb07cdfc9e0b5065 -DefaultImporter: - userData: diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Drunkboy.unity b/spine-unity/Assets/Spine Examples/Other Examples/Drunkboy.unity index 237cbea6e..39cd8fe84 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Drunkboy.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Drunkboy.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -188,6 +188,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!65 &21238541 BoxCollider: m_ObjectHideFlags: 0 @@ -219,6 +221,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &43338986 GameObject: m_ObjectHideFlags: 0 @@ -268,6 +271,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &103730714 GameObject: m_ObjectHideFlags: 0 @@ -348,6 +352,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!65 &103730718 BoxCollider: m_ObjectHideFlags: 0 @@ -379,6 +385,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &147153470 GameObject: m_ObjectHideFlags: 0 @@ -601,6 +608,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &253903409 Transform: m_ObjectHideFlags: 0 @@ -829,7 +837,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: idle loop: 1 @@ -899,6 +911,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: boneRoot: {fileID: 1469977169} + flipBy180DegreeRotation: 0 skeletonRenderer: {fileID: 264945298} --- !u!114 &264945303 MonoBehaviour: @@ -950,7 +963,6 @@ GameObject: m_Component: - component: {fileID: 480895076} - component: {fileID: 480895075} - - component: {fileID: 480895074} - component: {fileID: 480895073} - component: {fileID: 480895072} m_Layer: 0 @@ -968,13 +980,6 @@ AudioListener: m_GameObject: {fileID: 480895071} m_Enabled: 1 --- !u!124 &480895073 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 480895071} - m_Enabled: 1 ---- !u!92 &480895074 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -1214,6 +1219,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &841681499 Transform: m_ObjectHideFlags: 0 @@ -1310,6 +1316,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &885175052 Transform: m_ObjectHideFlags: 0 @@ -1372,6 +1379,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &943283501 GameObject: m_ObjectHideFlags: 0 @@ -1464,6 +1472,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &976482695 Rigidbody: m_ObjectHideFlags: 0 @@ -1510,6 +1520,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &1052878340 GameObject: m_ObjectHideFlags: 0 @@ -1593,6 +1604,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &1052878343 Transform: m_ObjectHideFlags: 0 @@ -1655,6 +1667,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &1469977168 GameObject: m_ObjectHideFlags: 0 @@ -1841,6 +1854,7 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} --- !u!1 &1999119559 GameObject: m_ObjectHideFlags: 0 @@ -1918,3 +1932,4 @@ MonoBehaviour: scale: 0 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 264945302} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/FixedTimestepUpdates.unity b/spine-unity/Assets/Spine Examples/Other Examples/FixedTimestepUpdates.unity index 157186e76..bde701b80 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/FixedTimestepUpdates.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/FixedTimestepUpdates.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -168,6 +168,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 @@ -437,6 +442,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 @@ -518,7 +528,6 @@ GameObject: m_Component: - component: {fileID: 1660595242} - component: {fileID: 1660595241} - - component: {fileID: 1660595240} - component: {fileID: 1660595239} - component: {fileID: 1660595238} m_Layer: 0 @@ -536,13 +545,6 @@ AudioListener: m_GameObject: {fileID: 1660595237} m_Enabled: 1 --- !u!124 &1660595239 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1660595237} - m_Enabled: 1 ---- !u!92 &1660595240 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -658,6 +660,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Freezeboy.unity b/spine-unity/Assets/Spine Examples/Other Examples/Freezeboy.unity index 2351e2c34..2c69d3473 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Freezeboy.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Freezeboy.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,7 +117,6 @@ GameObject: m_Component: - component: {fileID: 70090558} - component: {fileID: 70090557} - - component: {fileID: 70090556} - component: {fileID: 70090555} - component: {fileID: 70090554} m_Layer: 0 @@ -135,13 +134,6 @@ AudioListener: m_GameObject: {fileID: 70090553} m_Enabled: 1 --- !u!124 &70090555 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 70090553} - m_Enabled: 1 ---- !u!92 &70090556 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -226,7 +218,9 @@ ParticleSystem: looping: 1 prewarm: 0 playOnAwake: 1 + useUnscaledTime: 0 autoRandomSeed: 1 + useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -712,14 +706,29 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 ShapeModule: - serializedVersion: 4 + serializedVersion: 5 enabled: 1 type: 10 angle: 25 length: 5 - boxX: 3.2321572 - boxY: 1.06 - boxZ: 1.18 + boxThickness: {x: 0, y: 0, z: 0} + radiusThickness: 1 + donutRadius: 0.2 + m_Position: {x: 0, y: 0, z: 0} + m_Rotation: {x: 0, y: 0, z: 0} + m_Scale: {x: 1, y: 1, z: 1} + placementMode: 0 + m_Mesh: {fileID: 0} + m_MeshRenderer: {fileID: 0} + m_SkinnedMeshRenderer: {fileID: 0} + m_MeshMaterialIndex: 0 + m_MeshNormalOffset: 0 + m_UseMeshMaterialIndex: 0 + m_UseMeshColors: 1 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 + randomPositionAmount: 0 radius: value: 1.2846714 mode: 0 @@ -810,18 +819,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - placementMode: 0 - m_Mesh: {fileID: 0} - m_MeshRenderer: {fileID: 0} - m_SkinnedMeshRenderer: {fileID: 0} - m_MeshMaterialIndex: 0 - m_MeshNormalOffset: 0 - m_MeshScale: 1 - m_UseMeshMaterialIndex: 0 - m_UseMeshColors: 1 - alignToDirection: 0 - randomDirectionAmount: 0 - sphericalDirectionAmount: 0 EmissionModule: enabled: 1 serializedVersion: 4 @@ -1233,6 +1230,7 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: enabled: 0 + mode: 0 frameOverTime: serializedVersion: 2 minMaxState: 1 @@ -1324,6 +1322,8 @@ ParticleSystem: flipU: 0 flipV: 0 randomRow: 1 + sprites: + - sprite: {fileID: 0} VelocityModule: enabled: 0 x: @@ -2096,6 +2096,129 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 remapEnabled: 0 + positionAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + sizeAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 SizeBySpeedModule: enabled: 0 curve: @@ -2421,6 +2544,10 @@ ParticleSystem: serializedVersion: 3 type: 0 collisionMode: 0 + colliderForce: 0 + multiplyColliderForceByParticleSize: 0 + multiplyColliderForceByParticleSpeed: 0 + multiplyColliderForceByCollisionAngle: 1 plane0: {fileID: 0} plane1: {fileID: 0} plane2: {fileID: 0} @@ -2724,6 +2851,7 @@ ParticleSystem: sizeAffectsWidth: 1 sizeAffectsLifetime: 0 inheritParticleColor: 1 + generateLightingData: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -3353,7 +3481,7 @@ ParticleSystem: m_RotationOrder: 4 --- !u!199 &772326265 ParticleSystemRenderer: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -3402,6 +3530,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!4 &772326266 Transform: m_ObjectHideFlags: 0 @@ -3460,7 +3589,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: idle loop: 1 @@ -3580,7 +3713,9 @@ ParticleSystem: looping: 0 prewarm: 0 playOnAwake: 1 + useUnscaledTime: 0 autoRandomSeed: 1 + useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -4066,14 +4201,29 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 ShapeModule: - serializedVersion: 4 + serializedVersion: 5 enabled: 1 type: 10 angle: 25 length: 5 - boxX: 3.2321572 - boxY: 1.06 - boxZ: 1.18 + boxThickness: {x: 0, y: 0, z: 0} + radiusThickness: 1 + donutRadius: 0.2 + m_Position: {x: 0, y: 0, z: 0} + m_Rotation: {x: 0, y: 0, z: 0} + m_Scale: {x: 1, y: 1, z: 1} + placementMode: 0 + m_Mesh: {fileID: 0} + m_MeshRenderer: {fileID: 0} + m_SkinnedMeshRenderer: {fileID: 0} + m_MeshMaterialIndex: 0 + m_MeshNormalOffset: 0 + m_UseMeshMaterialIndex: 0 + m_UseMeshColors: 1 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 + randomPositionAmount: 0 radius: value: 1.2846714 mode: 0 @@ -4164,18 +4314,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - placementMode: 0 - m_Mesh: {fileID: 0} - m_MeshRenderer: {fileID: 0} - m_SkinnedMeshRenderer: {fileID: 0} - m_MeshMaterialIndex: 0 - m_MeshNormalOffset: 0 - m_MeshScale: 1 - m_UseMeshMaterialIndex: 0 - m_UseMeshColors: 1 - alignToDirection: 0 - randomDirectionAmount: 0 - sphericalDirectionAmount: 0 EmissionModule: enabled: 1 serializedVersion: 4 @@ -4587,6 +4725,7 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: enabled: 0 + mode: 0 frameOverTime: serializedVersion: 2 minMaxState: 1 @@ -4678,6 +4817,8 @@ ParticleSystem: flipU: 0 flipV: 0 randomRow: 1 + sprites: + - sprite: {fileID: 0} VelocityModule: enabled: 0 x: @@ -5450,6 +5591,129 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 remapEnabled: 0 + positionAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + sizeAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 SizeBySpeedModule: enabled: 0 curve: @@ -5775,6 +6039,10 @@ ParticleSystem: serializedVersion: 3 type: 0 collisionMode: 0 + colliderForce: 0 + multiplyColliderForceByParticleSize: 0 + multiplyColliderForceByParticleSpeed: 0 + multiplyColliderForceByCollisionAngle: 1 plane0: {fileID: 0} plane1: {fileID: 0} plane2: {fileID: 0} @@ -6078,6 +6346,7 @@ ParticleSystem: sizeAffectsWidth: 1 sizeAffectsLifetime: 0 inheritParticleColor: 1 + generateLightingData: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -6707,7 +6976,7 @@ ParticleSystem: m_RotationOrder: 4 --- !u!199 &1698605631 ParticleSystemRenderer: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -6756,6 +7025,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!1 &1777124191 GameObject: m_ObjectHideFlags: 0 @@ -6779,7 +7049,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1777124191} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.14759994, y: 2.2935, z: 0} + m_LocalPosition: {x: -0.14759997, y: 2.2935, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 772326266} @@ -6799,6 +7069,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonRenderer: {fileID: 1126206820} boneName: torso + followXYPosition: 1 followZPosition: 0 followBoneRotation: 0 followSkeletonFlip: 1 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity b/spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity index c4c9a94c7..be3fb983a 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Instantiate from Script.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,25 +71,23 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 + m_PVRFiltering: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -196,7 +194,6 @@ GameObject: m_Component: - component: {fileID: 433620968} - component: {fileID: 433620967} - - component: {fileID: 433620966} - component: {fileID: 433620965} - component: {fileID: 433620964} m_Layer: 0 @@ -214,13 +211,6 @@ AudioListener: m_GameObject: {fileID: 433620963} m_Enabled: 1 --- !u!124 &433620965 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 433620963} - m_Enabled: 1 ---- !u!92 &433620966 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity b/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity index 95d1867c7..e2aa930bf 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -559,7 +559,6 @@ GameObject: m_Component: - component: {fileID: 520624629} - component: {fileID: 520624628} - - component: {fileID: 520624627} - component: {fileID: 520624626} - component: {fileID: 520624625} m_Layer: 0 @@ -577,13 +576,6 @@ AudioListener: m_GameObject: {fileID: 520624624} m_Enabled: 1 --- !u!124 &520624626 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 520624624} - m_Enabled: 1 ---- !u!92 &520624627 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -1696,6 +1688,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match.unity b/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match.unity index 5d65e1420..11b64dbb9 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -191,7 +191,6 @@ GameObject: m_Component: - component: {fileID: 520624629} - component: {fileID: 520624628} - - component: {fileID: 520624627} - component: {fileID: 520624626} - component: {fileID: 520624625} m_Layer: 0 @@ -209,13 +208,6 @@ AudioListener: m_GameObject: {fileID: 520624624} m_Enabled: 1 --- !u!124 &520624626 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 520624624} - m_Enabled: 1 ---- !u!92 &520624627 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -593,6 +585,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!1 &1262477660 GameObject: m_ObjectHideFlags: 0 @@ -798,7 +791,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -986,7 +983,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -1054,7 +1055,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fdd7c8b428f700c438a6a14addca0346, type: 3} m_Name: m_EditorClassIdentifier: - baseSkinName: base + templateAttachmentsSkin: base sourceMaterial: {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, type: 2} visorSprite: {fileID: 21300000, guid: 4f554405f8f06164db0773d689da243c, type: 3} visorSlot: goggles @@ -1063,6 +1064,7 @@ MonoBehaviour: gunSlot: gun gunKey: gun repack: 1 + bbFollower: {fileID: 0} runtimeAtlas: {fileID: 1983722037} runtimeMaterial: {fileID: 1758308948} --- !u!21 &1758308948 @@ -1217,10 +1219,13 @@ Texture2D: m_ImageCount: 1 m_TextureDimension: 2 m_TextureSettings: + serializedVersion: 2 m_FilterMode: 1 m_Aniso: 1 m_MipBias: 0 - m_WrapMode: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 1 image data: 4194304 @@ -1299,6 +1304,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!1 &2010453060 GameObject: m_ObjectHideFlags: 0 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Per Instance Material Properties.unity b/spine-unity/Assets/Spine Examples/Other Examples/Per Instance Material Properties.unity index 14dd2bc19..0278af381 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Per Instance Material Properties.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Per Instance Material Properties.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -231,6 +231,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -331,6 +336,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -548,6 +558,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -655,7 +670,6 @@ GameObject: m_Component: - component: {fileID: 1408234536} - component: {fileID: 1408234535} - - component: {fileID: 1408234534} - component: {fileID: 1408234533} - component: {fileID: 1408234532} m_Layer: 0 @@ -673,13 +687,6 @@ AudioListener: m_GameObject: {fileID: 1408234531} m_Enabled: 1 --- !u!124 &1408234533 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1408234531} - m_Enabled: 1 ---- !u!92 &1408234534 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -796,6 +803,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonAnimationMulti.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonAnimationMulti.unity index f3b981fe2..03b7590a6 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonAnimationMulti.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonAnimationMulti.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -172,7 +172,6 @@ GameObject: m_Component: - component: {fileID: 1616673266} - component: {fileID: 1616673265} - - component: {fileID: 1616673264} - component: {fileID: 1616673263} - component: {fileID: 1616673262} m_Layer: 0 @@ -190,13 +189,6 @@ AudioListener: m_GameObject: {fileID: 1616673261} m_Enabled: 1 --- !u!124 &1616673263 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1616673261} - m_Enabled: 1 ---- !u!92 &1616673264 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonRenderSeparator.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonRenderSeparator.unity index 7a37165a4..1b35f9f1e 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonRenderSeparator.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonRenderSeparator.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -264,7 +264,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -430,7 +434,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565117361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3626752, y: 3.7231483, z: 0} + m_LocalPosition: {x: -1.3628243, y: 3.7229316, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 93048079} @@ -438,7 +442,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!199 &565117363 ParticleSystemRenderer: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -487,6 +491,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!114 &565117364 MonoBehaviour: m_ObjectHideFlags: 0 @@ -500,6 +505,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonRenderer: {fileID: 93048076} boneName: front_fist + followXYPosition: 1 followZPosition: 0 followBoneRotation: 0 followSkeletonFlip: 0 @@ -517,7 +523,9 @@ ParticleSystem: looping: 1 prewarm: 0 playOnAwake: 1 + useUnscaledTime: 0 autoRandomSeed: 1 + useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -1003,14 +1011,29 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 ShapeModule: - serializedVersion: 4 + serializedVersion: 5 enabled: 1 - type: 11 + type: 10 angle: 25 length: 5 - boxX: 1 - boxY: 1 - boxZ: 1 + boxThickness: {x: 0, y: 0, z: 0} + radiusThickness: 0 + donutRadius: 0.2 + m_Position: {x: 0, y: 0, z: 0} + m_Rotation: {x: 0, y: 0, z: 0} + m_Scale: {x: 1, y: 1, z: 1} + placementMode: 0 + m_Mesh: {fileID: 0} + m_MeshRenderer: {fileID: 0} + m_SkinnedMeshRenderer: {fileID: 0} + m_MeshMaterialIndex: 0 + m_MeshNormalOffset: 0 + m_UseMeshMaterialIndex: 0 + m_UseMeshColors: 1 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 + randomPositionAmount: 0 radius: value: 0.16 mode: 0 @@ -1101,18 +1124,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - placementMode: 0 - m_Mesh: {fileID: 0} - m_MeshRenderer: {fileID: 0} - m_SkinnedMeshRenderer: {fileID: 0} - m_MeshMaterialIndex: 0 - m_MeshNormalOffset: 0 - m_MeshScale: 1 - m_UseMeshMaterialIndex: 0 - m_UseMeshColors: 1 - alignToDirection: 0 - randomDirectionAmount: 0 - sphericalDirectionAmount: 0 EmissionModule: enabled: 1 serializedVersion: 4 @@ -1525,6 +1536,7 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: enabled: 0 + mode: 0 frameOverTime: serializedVersion: 2 minMaxState: 1 @@ -1616,6 +1628,8 @@ ParticleSystem: flipU: 0 flipV: 0 randomRow: 1 + sprites: + - sprite: {fileID: 0} VelocityModule: enabled: 0 x: @@ -2382,6 +2396,129 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 remapEnabled: 0 + positionAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + sizeAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 SizeBySpeedModule: enabled: 0 curve: @@ -2707,6 +2844,10 @@ ParticleSystem: serializedVersion: 3 type: 0 collisionMode: 0 + colliderForce: 0 + multiplyColliderForceByParticleSize: 0 + multiplyColliderForceByParticleSpeed: 0 + multiplyColliderForceByCollisionAngle: 1 plane0: {fileID: 0} plane1: {fileID: 0} plane2: {fileID: 0} @@ -3010,6 +3151,7 @@ ParticleSystem: sizeAffectsWidth: 1 sizeAffectsLifetime: 0 inheritParticleColor: 1 + generateLightingData: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -3788,6 +3930,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!4 &774732877 Transform: m_ObjectHideFlags: 0 @@ -3871,6 +4014,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!1 &1406277772 GameObject: m_ObjectHideFlags: 0 @@ -3941,6 +4085,7 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!1 &1498924765 GameObject: m_ObjectHideFlags: 0 @@ -3950,7 +4095,6 @@ GameObject: m_Component: - component: {fileID: 1498924770} - component: {fileID: 1498924769} - - component: {fileID: 1498924768} - component: {fileID: 1498924767} - component: {fileID: 1498924766} m_Layer: 0 @@ -3968,13 +4112,6 @@ AudioListener: m_GameObject: {fileID: 1498924765} m_Enabled: 1 --- !u!124 &1498924767 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1498924765} - m_Enabled: 1 ---- !u!92 &1498924768 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -4446,7 +4583,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: loop: 0 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Animated Physics.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Animated Physics.unity index a2bd7137e..61527e3de 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Animated Physics.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Animated Physics.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -182,6 +182,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: boneRoot: {fileID: 44654813} + flipBy180DegreeRotation: 0 skeletonRenderer: {fileID: 120294523} --- !u!114 &120294523 MonoBehaviour: @@ -208,7 +209,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 @@ -316,6 +321,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &163089578 Rigidbody: m_ObjectHideFlags: 0 @@ -362,6 +369,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &196322038 GameObject: m_ObjectHideFlags: 0 @@ -414,6 +422,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!54 &196322041 Rigidbody: m_ObjectHideFlags: 0 @@ -461,6 +470,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!65 &196322043 BoxCollider: m_ObjectHideFlags: 0 @@ -524,6 +535,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!59 &350419679 HingeJoint: m_ObjectHideFlags: 0 @@ -556,6 +568,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &350419680 Rigidbody: m_ObjectHideFlags: 0 @@ -633,6 +647,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &520760180 GameObject: m_ObjectHideFlags: 0 @@ -685,6 +700,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!54 &520760183 Rigidbody: m_ObjectHideFlags: 0 @@ -732,6 +748,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!65 &520760185 BoxCollider: m_ObjectHideFlags: 0 @@ -782,6 +800,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!4 &574377924 Transform: m_ObjectHideFlags: 0 @@ -827,6 +846,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &574377926 Rigidbody: m_ObjectHideFlags: 0 @@ -919,6 +940,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &682744182 Rigidbody: m_ObjectHideFlags: 0 @@ -965,6 +988,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &733897517 GameObject: m_ObjectHideFlags: 0 @@ -1016,6 +1040,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!59 &733897520 HingeJoint: m_ObjectHideFlags: 0 @@ -1048,6 +1073,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &733897521 Rigidbody: m_ObjectHideFlags: 0 @@ -1127,6 +1154,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!59 &871208811 HingeJoint: m_ObjectHideFlags: 0 @@ -1159,6 +1187,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &871208812 Rigidbody: m_ObjectHideFlags: 0 @@ -1235,6 +1265,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &976394122 GameObject: m_ObjectHideFlags: 0 @@ -1244,7 +1275,6 @@ GameObject: m_Component: - component: {fileID: 976394127} - component: {fileID: 976394126} - - component: {fileID: 976394125} - component: {fileID: 976394124} - component: {fileID: 976394123} m_Layer: 0 @@ -1262,13 +1292,6 @@ AudioListener: m_GameObject: {fileID: 976394122} m_Enabled: 1 --- !u!124 &976394124 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 976394122} - m_Enabled: 1 ---- !u!92 &976394125 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -1389,6 +1412,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &1261549072 Rigidbody: m_ObjectHideFlags: 0 @@ -1435,6 +1460,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &1285379174 GameObject: m_ObjectHideFlags: 0 @@ -1489,6 +1515,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!54 &1285379177 Rigidbody: m_ObjectHideFlags: 0 @@ -1530,6 +1557,7 @@ MonoBehaviour: detachedShadow: 0 parent: {fileID: 0} hideShadow: 1 + physicsSystem: 1 --- !u!1 &1342167691 GameObject: m_ObjectHideFlags: 0 @@ -1556,7 +1584,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1342167691} m_LocalRotation: {x: 0, y: 0, z: 0.9905574, w: 0.13709891} - m_LocalPosition: {x: -0.2087, y: 0.0687, z: 0} + m_LocalPosition: {x: -0.20879999, y: 0.0686, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 682744180} @@ -1577,6 +1605,7 @@ MonoBehaviour: detachedShadow: 0 parent: {fileID: 0} hideShadow: 1 + physicsSystem: 1 --- !u!54 &1342167694 Rigidbody: m_ObjectHideFlags: 0 @@ -1623,6 +1652,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &1421488703 GameObject: m_ObjectHideFlags: 0 @@ -1672,6 +1702,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &1524588283 GameObject: m_ObjectHideFlags: 0 @@ -1752,6 +1783,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!65 &1524588287 BoxCollider: m_ObjectHideFlags: 0 @@ -1783,6 +1816,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &1714294601 GameObject: m_ObjectHideFlags: 0 @@ -1835,6 +1869,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!54 &1714294604 Rigidbody: m_ObjectHideFlags: 0 @@ -1882,6 +1917,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!65 &1714294606 BoxCollider: m_ObjectHideFlags: 0 @@ -1946,6 +1983,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!59 &1769886738 HingeJoint: m_ObjectHideFlags: 0 @@ -1978,6 +2016,8 @@ HingeJoint: m_BreakTorque: Infinity m_EnableCollision: 0 m_EnablePreprocessing: 1 + m_MassScale: 1 + m_ConnectedMassScale: 1 --- !u!54 &1769886739 Rigidbody: m_ObjectHideFlags: 0 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Eyes.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Eyes.unity index ac5100ef3..625b43a0a 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Eyes.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Eyes.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -371,6 +371,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 554350589} --- !u!1 &148233141 GameObject: m_ObjectHideFlags: 0 @@ -403,7 +404,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!199 &148233143 ParticleSystemRenderer: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} @@ -452,6 +453,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} + m_MaskInteraction: 0 --- !u!198 &148233144 ParticleSystem: m_ObjectHideFlags: 0 @@ -464,7 +466,9 @@ ParticleSystem: looping: 1 prewarm: 1 playOnAwake: 1 + useUnscaledTime: 0 autoRandomSeed: 1 + useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -878,14 +882,29 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 ShapeModule: - serializedVersion: 4 + serializedVersion: 5 enabled: 1 - type: 11 + type: 10 angle: 25 length: 5 - boxX: 1 - boxY: 1 - boxZ: 1 + boxThickness: {x: 0, y: 0, z: 0} + radiusThickness: 0 + donutRadius: 0.2 + m_Position: {x: 0, y: 0, z: 0} + m_Rotation: {x: 0, y: 0, z: 0} + m_Scale: {x: 1, y: 1, z: 1} + placementMode: 0 + m_Mesh: {fileID: 0} + m_MeshRenderer: {fileID: 0} + m_SkinnedMeshRenderer: {fileID: 0} + m_MeshMaterialIndex: 0 + m_MeshNormalOffset: 0 + m_UseMeshMaterialIndex: 0 + m_UseMeshColors: 1 + alignToDirection: 0 + randomDirectionAmount: 0 + sphericalDirectionAmount: 0 + randomPositionAmount: 0 radius: value: 0.444762 mode: 0 @@ -976,18 +995,6 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - placementMode: 0 - m_Mesh: {fileID: 0} - m_MeshRenderer: {fileID: 0} - m_SkinnedMeshRenderer: {fileID: 0} - m_MeshMaterialIndex: 0 - m_MeshNormalOffset: 0 - m_MeshScale: 1 - m_UseMeshMaterialIndex: 0 - m_UseMeshColors: 1 - alignToDirection: 0 - randomDirectionAmount: 0 - sphericalDirectionAmount: 0 EmissionModule: enabled: 1 serializedVersion: 4 @@ -1358,6 +1365,7 @@ ParticleSystem: m_NumAlphaKeys: 2 UVModule: enabled: 0 + mode: 0 frameOverTime: serializedVersion: 2 minMaxState: 1 @@ -1449,6 +1457,8 @@ ParticleSystem: flipU: 0 flipV: 0 randomRow: 1 + sprites: + - sprite: {fileID: 0} VelocityModule: enabled: 0 x: @@ -2215,6 +2225,129 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 remapEnabled: 0 + positionAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + sizeAmount: + serializedVersion: 2 + minMaxState: 0 + scalar: 0 + minScalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + 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 SizeBySpeedModule: enabled: 0 curve: @@ -2540,6 +2673,10 @@ ParticleSystem: serializedVersion: 3 type: 0 collisionMode: 0 + colliderForce: 0 + multiplyColliderForceByParticleSize: 0 + multiplyColliderForceByParticleSpeed: 0 + multiplyColliderForceByCollisionAngle: 1 plane0: {fileID: 0} plane1: {fileID: 0} plane2: {fileID: 0} @@ -2843,6 +2980,7 @@ ParticleSystem: sizeAffectsWidth: 1 sizeAffectsLifetime: 0 inheritParticleColor: 1 + generateLightingData: 0 colorOverLifetime: serializedVersion: 2 minMaxState: 0 @@ -3544,6 +3682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: boneRoot: {fileID: 376564976} + flipBy180DegreeRotation: 0 skeletonRenderer: {fileID: 554350590} --- !u!114 &554350590 MonoBehaviour: @@ -3570,7 +3709,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: loop: 0 @@ -3776,6 +3919,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 554350589} --- !u!1 &1842554116 GameObject: m_ObjectHideFlags: 0 @@ -3785,7 +3929,6 @@ GameObject: m_Component: - component: {fileID: 1842554121} - component: {fileID: 1842554120} - - component: {fileID: 1842554119} - component: {fileID: 1842554118} - component: {fileID: 1842554117} m_Layer: 0 @@ -3803,13 +3946,6 @@ AudioListener: m_GameObject: {fileID: 1842554116} m_Enabled: 1 --- !u!124 &1842554118 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1842554116} - m_Enabled: 1 ---- !u!92 &1842554119 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -3934,3 +4070,4 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 554350589} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility GroundConstraint.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility GroundConstraint.unity index a80498941..d64150230 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility GroundConstraint.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility GroundConstraint.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -132,7 +132,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 36219066} m_LocalRotation: {x: 0, y: 0, z: -0.52048814, w: 0.8538689} - m_LocalPosition: {x: -2.3326, y: 1.2458895, z: 0} + m_LocalPosition: {x: -2.3326, y: 1.2458897, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 973814792} @@ -178,6 +178,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &44654812 GameObject: m_ObjectHideFlags: 0 @@ -254,6 +255,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: boneRoot: {fileID: 44654813} + flipBy180DegreeRotation: 0 skeletonRenderer: {fileID: 120294523} --- !u!114 &120294523 MonoBehaviour: @@ -280,7 +282,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 @@ -410,6 +416,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!1 &976394122 GameObject: m_ObjectHideFlags: 0 @@ -419,7 +426,6 @@ GameObject: m_Component: - component: {fileID: 976394127} - component: {fileID: 976394126} - - component: {fileID: 976394125} - component: {fileID: 976394124} - component: {fileID: 976394123} m_Layer: 0 @@ -437,13 +443,6 @@ AudioListener: m_GameObject: {fileID: 976394122} m_Enabled: 1 --- !u!124 &976394124 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 976394122} - m_Enabled: 1 ---- !u!92 &976394125 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -638,6 +637,7 @@ MonoBehaviour: scale: 1 zPosition: 1 overrideAlpha: 1 + hierarchy: {fileID: 120294522} --- !u!4 &1984548219 Transform: m_ObjectHideFlags: 0 @@ -645,7 +645,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1984548216} m_LocalRotation: {x: 0, y: 0, z: -0.00829022, w: 0.99996567} - m_LocalPosition: {x: 2.9747999, y: 0.33127287, z: 0} + m_LocalPosition: {x: 2.9747999, y: 0.33127284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 973814792} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Platformer HingeChain Physics.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Platformer HingeChain Physics.unity index 722894100..cd97cdc6c 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Platformer HingeChain Physics.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Platformer HingeChain Physics.unity @@ -3043,7 +3043,6 @@ GameObject: m_Component: - component: {fileID: 1178284506} - component: {fileID: 1178284510} - - component: {fileID: 1178284509} - component: {fileID: 1178284508} - component: {fileID: 1178284507} - component: {fileID: 1178284511} @@ -3075,13 +3074,6 @@ AudioListener: m_GameObject: {fileID: 1178284505} m_Enabled: 1 --- !u!124 &1178284508 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1178284505} - m_Enabled: 1 ---- !u!92 &1178284509 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity index 1c55a3be8..71296e6eb 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -78,7 +78,7 @@ LightmapSettings: m_PVRSampleCount: 500 m_PVRBounces: 2 m_PVRFiltering: 0 - m_PVRFilteringMode: 1 + m_PVRFilteringMode: 2 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -108,6 +108,183 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &92814982 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 92814989} + - component: {fileID: 92814988} + - component: {fileID: 92814987} + - component: {fileID: 92814986} + - component: {fileID: 92814985} + - component: {fileID: 92814984} + - component: {fileID: 92814983} + m_Layer: 0 + m_Name: Raggedy Spineboy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &92814983 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.25825587, y: 3.1820273} + - {x: 0.31586242, y: 3.1818907} + - {x: 0.55882263, y: 2.040349} + - {x: 0.434707, y: 0.0013669459} + - {x: -0.45539615, y: 0.0013672132} + - {x: -0.61691463, y: 2.0021477} +--- !u!114 &92814984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 849a7739a7df0754882fcb34c09df4c1, type: 3} + m_Name: + m_EditorClassIdentifier: + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + restoreDuration: 0.5 + launchVelocity: {x: 40, y: 85} +--- !u!114 &92814985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e74a49a26242a214d9084fde00bfe3ab, type: 3} + m_Name: + m_EditorClassIdentifier: + startingBoneName: hip + stopBoneNames: [] + applyOnStart: 0 + disableIK: 1 + disableOtherConstraints: 0 + pinStartBone: 0 + gravityScale: 3 + thickness: 0.125 + rotationLimit: 20 + rootMass: 40 + massFalloffFactor: 0.504 + colliderLayer: 0 + mix: 1 +--- !u!114 &92814986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 57484171e9b9c7243aa3117bc663e7b9, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + _animationName: animation + loop: 1 + timeScale: 1 +--- !u!23 &92814987 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &92814988 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_Mesh: {fileID: 0} +--- !u!4 &92814989 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 92814982} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.55, y: -3.07, 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} --- !u!1 &136357263 GameObject: m_ObjectHideFlags: 0 @@ -134,7 +311,7 @@ MonoBehaviour: m_GameObject: {fileID: 136357263} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -150,7 +327,7 @@ MonoBehaviour: m_GameObject: {fileID: 136357263} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -158,7 +335,7 @@ MonoBehaviour: m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 + m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -195,192 +372,13 @@ RectTransform: m_Children: - {fileID: 2122594306} m_Father: {fileID: 0} - m_RootOrder: 5 + 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 &138285500 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 183998, guid: 5c60df38c5334a249b38ac8cddc6433b, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 138285507} - - component: {fileID: 138285506} - - component: {fileID: 138285505} - - component: {fileID: 138285504} - - component: {fileID: 138285503} - - component: {fileID: 138285502} - - component: {fileID: 138285501} - m_Layer: 0 - m_Name: Raggedy Spineboy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!60 &138285501 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 6083998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.25825587, y: 3.1820273} - - {x: 0.31586242, y: 3.1818907} - - {x: 0.55882263, y: 2.040349} - - {x: 0.434707, y: 0.0013669459} - - {x: -0.45539615, y: 0.0013672132} - - {x: -0.61691463, y: 2.0021477} ---- !u!114 &138285502 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 849a7739a7df0754882fcb34c09df4c1, type: 3} - m_Name: - m_EditorClassIdentifier: - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 - restoreDuration: 0.5 - launchVelocity: {x: 40, y: 85} ---- !u!114 &138285503 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483996, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e74a49a26242a214d9084fde00bfe3ab, type: 3} - m_Name: - m_EditorClassIdentifier: - startingBoneName: hip - stopBoneNames: [] - applyOnStart: 0 - disableIK: 1 - disableOtherConstraints: 0 - pinStartBone: 0 - gravityScale: 3 - thickness: 0.125 - rotationLimit: 20 - rootMass: 40 - massFalloffFactor: 0.504 - colliderLayer: 0 - mix: 1 ---- !u!114 &138285504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483994, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 57484171e9b9c7243aa3117bc663e7b9, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - addNormals: 0 - calculateTangents: 0 - logErrors: 0 - disableRenderingOnOverride: 1 - _animationName: animation - loop: 1 - timeScale: 1 ---- !u!23 &138285505 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2383998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &138285506 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3383998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_Mesh: {fileID: 0} ---- !u!4 &138285507 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 483998, guid: 5c60df38c5334a249b38ac8cddc6433b, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 138285500} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.55, y: -3.07, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &279948894 GameObject: m_ObjectHideFlags: 0 @@ -656,185 +654,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 469940167} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &689192947 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 183998, guid: 5c60df38c5334a249b38ac8cddc6433b, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 689192954} - - component: {fileID: 689192953} - - component: {fileID: 689192952} - - component: {fileID: 689192951} - - component: {fileID: 689192950} - - component: {fileID: 689192949} - - component: {fileID: 689192948} - m_Layer: 0 - m_Name: Raggedy Spineboy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!60 &689192948 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 6083998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.25825587, y: 3.1820273} - - {x: 0.31586242, y: 3.1818907} - - {x: 0.55882263, y: 2.040349} - - {x: 0.434707, y: 0.0013669459} - - {x: -0.45539615, y: 0.0013672132} - - {x: -0.61691463, y: 2.0021477} ---- !u!114 &689192949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 849a7739a7df0754882fcb34c09df4c1, type: 3} - m_Name: - m_EditorClassIdentifier: - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 - restoreDuration: 0.5 - launchVelocity: {x: 40, y: 85} ---- !u!114 &689192950 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483996, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e74a49a26242a214d9084fde00bfe3ab, type: 3} - m_Name: - m_EditorClassIdentifier: - startingBoneName: hip - stopBoneNames: [] - applyOnStart: 0 - disableIK: 1 - disableOtherConstraints: 0 - pinStartBone: 0 - gravityScale: 3 - thickness: 0.125 - rotationLimit: 20 - rootMass: 40 - massFalloffFactor: 0.504 - colliderLayer: 0 - mix: 1 ---- !u!114 &689192951 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483994, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 57484171e9b9c7243aa3117bc663e7b9, type: 2} - initialSkinName: default - initialFlipX: 0 - initialFlipY: 0 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - addNormals: 0 - calculateTangents: 0 - logErrors: 0 - disableRenderingOnOverride: 1 - _animationName: animation - loop: 1 - timeScale: 1 ---- !u!23 &689192952 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2383998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &689192953 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3383998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_Mesh: {fileID: 0} ---- !u!4 &689192954 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 483998, guid: 5c60df38c5334a249b38ac8cddc6433b, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 689192947} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.67, y: -3.07, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &890899334 GameObject: m_ObjectHideFlags: 0 @@ -1015,6 +834,183 @@ Transform: m_Father: {fileID: 1241879115} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1063411338 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1063411345} + - component: {fileID: 1063411344} + - component: {fileID: 1063411343} + - component: {fileID: 1063411342} + - component: {fileID: 1063411341} + - component: {fileID: 1063411340} + - component: {fileID: 1063411339} + m_Layer: 0 + m_Name: Raggedy Spineboy (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &1063411339 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.25825587, y: 3.1820273} + - {x: 0.31586242, y: 3.1818907} + - {x: 0.55882263, y: 2.040349} + - {x: 0.434707, y: 0.0013669459} + - {x: -0.45539615, y: 0.0013672132} + - {x: -0.61691463, y: 2.0021477} +--- !u!114 &1063411340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 849a7739a7df0754882fcb34c09df4c1, type: 3} + m_Name: + m_EditorClassIdentifier: + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + restoreDuration: 0.5 + launchVelocity: {x: 40, y: 85} +--- !u!114 &1063411341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e74a49a26242a214d9084fde00bfe3ab, type: 3} + m_Name: + m_EditorClassIdentifier: + startingBoneName: hip + stopBoneNames: [] + applyOnStart: 0 + disableIK: 1 + disableOtherConstraints: 0 + pinStartBone: 0 + gravityScale: 3 + thickness: 0.125 + rotationLimit: 20 + rootMass: 40 + massFalloffFactor: 0.504 + colliderLayer: 0 + mix: 1 +--- !u!114 &1063411342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 57484171e9b9c7243aa3117bc663e7b9, type: 2} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + _animationName: animation + loop: 1 + timeScale: 1 +--- !u!23 &1063411343 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1063411344 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_Mesh: {fileID: 0} +--- !u!4 &1063411345 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1063411338} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.67, y: -3.07, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1241879114 GameObject: m_ObjectHideFlags: 0 @@ -1050,7 +1046,7 @@ Transform: - {fileID: 1446269955} - {fileID: 469940168} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1332258640 GameObject: @@ -1061,7 +1057,6 @@ GameObject: m_Component: - component: {fileID: 1332258645} - component: {fileID: 1332258644} - - component: {fileID: 1332258643} - component: {fileID: 1332258642} - component: {fileID: 1332258641} m_Layer: 0 @@ -1079,13 +1074,6 @@ AudioListener: m_GameObject: {fileID: 1332258640} m_Enabled: 1 --- !u!124 &1332258642 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1332258640} - m_Enabled: 1 ---- !u!92 &1332258643 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -1236,185 +1224,6 @@ Transform: m_Father: {fileID: 1241879115} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1417061241 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 183998, guid: 5c60df38c5334a249b38ac8cddc6433b, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1417061248} - - component: {fileID: 1417061247} - - component: {fileID: 1417061246} - - component: {fileID: 1417061245} - - component: {fileID: 1417061244} - - component: {fileID: 1417061243} - - component: {fileID: 1417061242} - m_Layer: 0 - m_Name: Raggedy Spineboy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!60 &1417061242 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 6083998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.25825587, y: 3.1820273} - - {x: 0.31586242, y: 3.1818907} - - {x: 0.55882263, y: 2.040349} - - {x: 0.434707, y: 0.0013669459} - - {x: -0.45539615, y: 0.0013672132} - - {x: -0.61691463, y: 2.0021477} ---- !u!114 &1417061243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 849a7739a7df0754882fcb34c09df4c1, type: 3} - m_Name: - m_EditorClassIdentifier: - groundMask: - serializedVersion: 2 - m_Bits: 4294967295 - restoreDuration: 0.5 - launchVelocity: {x: 40, y: 85} ---- !u!114 &1417061244 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483996, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e74a49a26242a214d9084fde00bfe3ab, type: 3} - m_Name: - m_EditorClassIdentifier: - startingBoneName: hip - stopBoneNames: [] - applyOnStart: 0 - disableIK: 1 - disableOtherConstraints: 0 - pinStartBone: 0 - gravityScale: 3 - thickness: 0.125 - rotationLimit: 20 - rootMass: 40 - massFalloffFactor: 0.504 - colliderLayer: 0 - mix: 1 ---- !u!114 &1417061245 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483994, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} - m_Name: - m_EditorClassIdentifier: - skeletonDataAsset: {fileID: 11400000, guid: 57484171e9b9c7243aa3117bc663e7b9, type: 2} - initialSkinName: default - initialFlipX: 1 - initialFlipY: 0 - separatorSlotNames: [] - zSpacing: 0 - useClipping: 1 - immutableTriangles: 0 - pmaVertexColors: 1 - clearStateOnDisable: 0 - tintBlack: 0 - singleSubmesh: 0 - addNormals: 0 - calculateTangents: 0 - logErrors: 0 - disableRenderingOnOverride: 1 - _animationName: animation - loop: 1 - timeScale: 1 ---- !u!23 &1417061246 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2383998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &1417061247 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 3383998, guid: 5c60df38c5334a249b38ac8cddc6433b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_Mesh: {fileID: 0} ---- !u!4 &1417061248 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 483998, guid: 5c60df38c5334a249b38ac8cddc6433b, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1417061241} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.5, y: -3.06, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1442886939 GameObject: m_ObjectHideFlags: 0 @@ -1595,6 +1404,183 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1446269954} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1686250041 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1686250048} + - component: {fileID: 1686250047} + - component: {fileID: 1686250046} + - component: {fileID: 1686250045} + - component: {fileID: 1686250044} + - component: {fileID: 1686250043} + - component: {fileID: 1686250042} + m_Layer: 0 + m_Name: Raggedy Spineboy (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &1686250042 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.25825587, y: 3.1820273} + - {x: 0.31586242, y: 3.1818907} + - {x: 0.55882263, y: 2.040349} + - {x: 0.434707, y: 0.0013669459} + - {x: -0.45539615, y: 0.0013672132} + - {x: -0.61691463, y: 2.0021477} +--- !u!114 &1686250043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 849a7739a7df0754882fcb34c09df4c1, type: 3} + m_Name: + m_EditorClassIdentifier: + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + restoreDuration: 0.5 + launchVelocity: {x: 40, y: 85} +--- !u!114 &1686250044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e74a49a26242a214d9084fde00bfe3ab, type: 3} + m_Name: + m_EditorClassIdentifier: + startingBoneName: hip + stopBoneNames: [] + applyOnStart: 0 + disableIK: 1 + disableOtherConstraints: 0 + pinStartBone: 0 + gravityScale: 3 + thickness: 0.125 + rotationLimit: 20 + rootMass: 40 + massFalloffFactor: 0.504 + colliderLayer: 0 + mix: 1 +--- !u!114 &1686250045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: 57484171e9b9c7243aa3117bc663e7b9, type: 2} + initialSkinName: + initialFlipX: 1 + initialFlipY: 0 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + addNormals: 0 + calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] + disableRenderingOnOverride: 1 + _animationName: animation + loop: 1 + timeScale: 1 +--- !u!23 &1686250046 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1686250047 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_Mesh: {fileID: 0} +--- !u!4 &1686250048 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1686250041} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.5, y: -3.06, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1938155299 GameObject: m_ObjectHideFlags: 0 @@ -1621,10 +1607,9 @@ MonoBehaviour: m_GameObject: {fileID: 1938155299} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3} m_Name: m_EditorClassIdentifier: - m_ForceModuleActive: 0 --- !u!114 &1938155301 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1633,16 +1618,9 @@ MonoBehaviour: m_GameObject: {fileID: 1938155299} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, 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 &1938155302 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1651,12 +1629,9 @@ MonoBehaviour: m_GameObject: {fileID: 1938155299} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 5 --- !u!4 &1938155303 Transform: m_ObjectHideFlags: 0 @@ -1668,7 +1643,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1949578535 GameObject: @@ -1808,7 +1783,7 @@ MonoBehaviour: m_GameObject: {fileID: 2122594305} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1822,9 +1797,9 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1887,6 +1862,20 @@ Light: m_Lightmapping: 1 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 + m_FalloffTable: + m_Table[0]: 0 + m_Table[1]: 0 + m_Table[2]: 0 + m_Table[3]: 0 + m_Table[4]: 0 + m_Table[5]: 0 + m_Table[6]: 0 + m_Table[7]: 0 + m_Table[8]: 0 + m_Table[9]: 0 + m_Table[10]: 0 + m_Table[11]: 0 + m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -1902,5 +1891,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SpineGauge.unity b/spine-unity/Assets/Spine Examples/Other Examples/SpineGauge.unity index c7ce64f97..432657f3b 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SpineGauge.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SpineGauge.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 1 m_BakeResolution: 50 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -170,7 +170,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: idle loop: 1 @@ -272,7 +276,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: idle loop: 1 @@ -421,7 +429,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 --- !u!23 &795271516 MeshRenderer: @@ -626,7 +638,6 @@ GameObject: m_Component: - component: {fileID: 1611520407} - component: {fileID: 1611520406} - - component: {fileID: 1611520405} - component: {fileID: 1611520404} - component: {fileID: 1611520403} m_Layer: 0 @@ -644,13 +655,6 @@ AudioListener: m_GameObject: {fileID: 1611520402} m_Enabled: 1 --- !u!124 &1611520404 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1611520402} - m_Enabled: 1 ---- !u!92 &1611520405 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Sprite Shaders.unity b/spine-unity/Assets/Spine Examples/Other Examples/Sprite Shaders.unity index 272ead443..8ace79e86 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Sprite Shaders.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/Sprite Shaders.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -156,6 +156,20 @@ Light: m_Lightmapping: 4 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 0 + m_FalloffTable: + m_Table[0]: 0 + m_Table[1]: 0 + m_Table[2]: 0 + m_Table[3]: 0 + m_Table[4]: 0 + m_Table[5]: 0 + m_Table[6]: 0 + m_Table[7]: 0 + m_Table[8]: 0 + m_Table[9]: 0 + m_Table[10]: 0 + m_Table[11]: 0 + m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -333,6 +347,20 @@ Light: m_Lightmapping: 4 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 0 + m_FalloffTable: + m_Table[0]: 0 + m_Table[1]: 0 + m_Table[2]: 0 + m_Table[3]: 0 + m_Table[4]: 0 + m_Table[5]: 0 + m_Table[6]: 0 + m_Table[7]: 0 + m_Table[8]: 0 + m_Table[9]: 0 + m_Table[10]: 0 + m_Table[11]: 0 + m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -462,7 +490,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 1 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 --- !u!23 &933136135 MeshRenderer: @@ -564,6 +596,20 @@ Light: m_Lightmapping: 4 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 0 + m_FalloffTable: + m_Table[0]: 0 + m_Table[1]: 0 + m_Table[2]: 0 + m_Table[3]: 0 + m_Table[4]: 0 + m_Table[5]: 0 + m_Table[6]: 0 + m_Table[7]: 0 + m_Table[8]: 0 + m_Table[9]: 0 + m_Table[10]: 0 + m_Table[11]: 0 + m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -650,6 +696,8 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!1 &1387304064 GameObject: m_ObjectHideFlags: 0 @@ -699,6 +747,20 @@ Light: m_Lightmapping: 4 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 + m_FalloffTable: + m_Table[0]: 0 + m_Table[1]: 0 + m_Table[2]: 0 + m_Table[3]: 0 + m_Table[4]: 0 + m_Table[5]: 0 + m_Table[6]: 0 + m_Table[7]: 0 + m_Table[8]: 0 + m_Table[9]: 0 + m_Table[10]: 0 + m_Table[11]: 0 + m_Table[12]: 0 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_ShadowRadius: 0 @@ -800,6 +862,8 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 --- !u!1 &1537129159 GameObject: m_ObjectHideFlags: 0 @@ -906,7 +970,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 1 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: sneak loop: 1 @@ -982,7 +1050,6 @@ GameObject: m_Component: - component: {fileID: 1667748205} - component: {fileID: 1667748204} - - component: {fileID: 1667748203} - component: {fileID: 1667748202} - component: {fileID: 1667748201} m_Layer: 0 @@ -1000,13 +1067,6 @@ AudioListener: m_GameObject: {fileID: 1667748200} m_Enabled: 1 --- !u!124 &1667748202 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1667748200} - m_Enabled: 1 ---- !u!92 &1667748203 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/SpriteMask and RectMask2D.unity b/spine-unity/Assets/Spine Examples/Other Examples/SpriteMask and RectMask2D.unity index ce18fcf24..e38656595 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/SpriteMask and RectMask2D.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/SpriteMask and RectMask2D.unity @@ -538,7 +538,6 @@ GameObject: m_Component: - component: {fileID: 611702906} - component: {fileID: 611702905} - - component: {fileID: 611702904} - component: {fileID: 611702903} - component: {fileID: 611702902} m_Layer: 0 @@ -556,13 +555,6 @@ AudioListener: m_GameObject: {fileID: 611702901} m_Enabled: 1 --- !u!124 &611702903 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 611702901} - m_Enabled: 1 ---- !u!92 &611702904 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -650,7 +642,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.06853585, y: 0.734} m_AnchorMax: {x: 0.9065521, y: 0.96417403} - m_AnchoredPosition: {x: 6.3999996, y: 5.054001} + m_AnchoredPosition: {x: 6.3999996, y: 5.054016} m_SizeDelta: {x: 185.6, y: 19.099998} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &616330780 @@ -825,12 +817,9 @@ MonoBehaviour: calculateTangents: 0 maskInteraction: 2 maskMaterials: - materialsMaskDisabled: - - {fileID: 2100000, guid: 3d645292a7b9c7547bf7b14caa569410, type: 2} - materialsInsideMask: - - {fileID: 0} - materialsOutsideMask: - - {fileID: 2100000, guid: 4bbf1af7150ed574095b8679b9a72db3, type: 2} + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: roar loop: 1 @@ -848,7 +837,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 4bbf1af7150ed574095b8679b9a72db3, type: 2} + - {fileID: 2100000, guid: 3d645292a7b9c7547bf7b14caa569410, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1127,12 +1116,9 @@ MonoBehaviour: calculateTangents: 0 maskInteraction: 1 maskMaterials: - materialsMaskDisabled: - - {fileID: 2100000, guid: 3d645292a7b9c7547bf7b14caa569410, type: 2} - materialsInsideMask: - - {fileID: 2100000, guid: 11b8e87884357884a8d31758fca91bb7, type: 2} - materialsOutsideMask: - - {fileID: 0} + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: roar loop: 1 @@ -1150,7 +1136,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 11b8e87884357884a8d31758fca91bb7, type: 2} + - {fileID: 2100000, guid: 3d645292a7b9c7547bf7b14caa569410, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Mecanim Logic SkeletonAnimation View.unity b/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Mecanim Logic SkeletonAnimation View.unity index e273b51de..9fac85745 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Mecanim Logic SkeletonAnimation View.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Mecanim Logic SkeletonAnimation View.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -323,6 +323,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: loop: 1 @@ -619,7 +624,6 @@ GameObject: m_Component: - component: {fileID: 1042501233} - component: {fileID: 1042501232} - - component: {fileID: 1042501231} - component: {fileID: 1042501230} - component: {fileID: 1042501229} m_Layer: 0 @@ -637,13 +641,6 @@ AudioListener: m_GameObject: {fileID: 1042501228} m_Enabled: 1 --- !u!124 &1042501230 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1042501228} - m_Enabled: 1 ---- !u!92 &1042501231 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/VertexEffect.unity b/spine-unity/Assets/Spine Examples/Other Examples/VertexEffect.unity index 0bb1e7c28..4aac9f2ae 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/VertexEffect.unity +++ b/spine-unity/Assets/Spine Examples/Other Examples/VertexEffect.unity @@ -42,7 +42,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -71,7 +71,7 @@ LightmapSettings: m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 - m_MixedBakeMode: 3 + m_MixedBakeMode: 2 m_BakeBackend: 0 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -87,7 +87,7 @@ LightmapSettings: m_PVRFilteringAtrousNormalSigma: 1 m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -164,7 +164,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1 @@ -230,7 +234,6 @@ GameObject: m_Component: - component: {fileID: 1172465389} - component: {fileID: 1172465388} - - component: {fileID: 1172465387} - component: {fileID: 1172465386} - component: {fileID: 1172465385} m_Layer: 0 @@ -248,13 +251,6 @@ AudioListener: m_GameObject: {fileID: 1172465384} m_Enabled: 1 --- !u!124 &1172465386 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1172465384} - m_Enabled: 1 ---- !u!92 &1172465387 Behaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -367,7 +363,11 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 + maskInteraction: 0 + maskMaterials: + materialsMaskDisabled: [] + materialsInsideMask: [] + materialsOutsideMask: [] disableRenderingOnOverride: 1 _animationName: walk loop: 1