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 3e4c95dfa..bb957c22b 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 @@ -372,7 +372,6 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 disableRenderingOnOverride: 1 _animationName: idle loop: 1 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 7c5ca0bce..6a89ce95a 100644 Binary files a/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/Animation Tester.unity and b/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/Animation Tester.unity differ diff --git a/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/SpineAnimationTesterTool.cs b/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/SpineAnimationTesterTool.cs index 37cf5f8ba..f759b49ec 100644 --- a/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/SpineAnimationTesterTool.cs +++ b/spine-unity/Assets/Spine Examples/Other Examples/Animation Tester/SpineAnimationTesterTool.cs @@ -17,6 +17,15 @@ namespace Spine.Unity.Examples { public bool useOverrideMixDuration; public float overrideMixDuration = 0.2f; + public bool useOverrideAttachmentThreshold = true; + + [Range(0f,1f)] + public float attachmentThreshold = 0.5f; + + public bool useOverrideDrawOrderThreshold; + [Range(0f, 1f)] + public float drawOrderThreshold = 0.5f; + [System.Serializable] public struct AnimationControl { [SpineAnimation] @@ -94,14 +103,24 @@ namespace Spine.Unity.Examples { // Check each control, and play the appropriate animation. if (Input.GetKeyDown(control.key)) { + TrackEntry trackEntry; if (!string.IsNullOrEmpty(control.animationName)) { - var trackEntry = animationState.SetAnimation(trackIndex, control.animationName, control.loop); + trackEntry = animationState.SetAnimation(trackIndex, control.animationName, control.loop); + + } else { + float mix = control.useCustomMixDuration ? control.mixDuration : animationState.Data.DefaultMix; + trackEntry = animationState.SetEmptyAnimation(trackIndex, mix); + } + + if (trackEntry != null) { if (control.useCustomMixDuration) trackEntry.MixDuration = control.mixDuration; - } else { - float mix = control.useCustomMixDuration ? control.mixDuration : animationState.Data.DefaultMix; - animationState.SetEmptyAnimation(trackIndex, mix); + if (useOverrideAttachmentThreshold) + trackEntry.AttachmentThreshold = attachmentThreshold; + + if (useOverrideDrawOrderThreshold) + trackEntry.DrawOrderThreshold = drawOrderThreshold; } // Don't parse more than one animation per track. diff --git a/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity b/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity new file mode 100644 index 000000000..ec3adb1c1 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity @@ -0,0 +1,692 @@ +%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: 8 + 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.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, 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} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 8 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 3 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFiltering: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 + m_LightingDataAsset: {fileID: 0} + m_ShadowMaskMode: 2 +--- !u!196 &4 +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.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + m_NavMeshData: {fileID: 0} +--- !u!21 &185304931 +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} +--- !u!1 &200188759 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 200188764} + - component: {fileID: 200188763} + - component: {fileID: 200188762} + - component: {fileID: 200188761} + - component: {fileID: 200188760} + 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 &200188760 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + 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} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 200188759} + m_Enabled: 1 +--- !u!20 &200188763 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 200188759} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.41089964, g: 0.5221931, b: 0.58823526, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + 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: 1 + m_AllowMSAA: 1 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!4 &200188764 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 200188759} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &267173954 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 267173958} + - component: {fileID: 267173957} + - component: {fileID: 267173956} + - component: {fileID: 267173955} + m_Layer: 0 + m_Name: Spine GameObject (spineboy-pro) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &267173955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 267173954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2} + initialSkinName: default + initialFlipX: 0 + initialFlipY: 0 + separatorSlotNames: + - head + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + addNormals: 0 + calculateTangents: 0 + disableRenderingOnOverride: 1 + _animationName: run + loop: 1 + timeScale: 1 +--- !u!23 &267173956 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 267173954} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} + - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, 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: -4 +--- !u!33 &267173957 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 267173954} + m_Mesh: {fileID: 0} +--- !u!4 &267173958 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 267173954} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.53, y: -4.14, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1573089138} + - {fileID: 1776944555} + - {fileID: 1476882955} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1280556233 +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_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.000007110106} + - _Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &1476882951 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1476882955} + - component: {fileID: 1476882954} + - component: {fileID: 1476882953} + - component: {fileID: 1476882952} + m_Layer: 0 + m_Name: 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1476882952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1476882951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1c0b968d1e7333b499e347acb644f1c1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!23 &1476882953 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1476882951} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, 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: 5 +--- !u!33 &1476882954 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1476882951} + m_Mesh: {fileID: 0} +--- !u!4 &1476882955 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1476882951} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.63, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 267173958} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1573089137 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1573089138} + - component: {fileID: 1573089139} + m_Layer: 0 + m_Name: BoneFollower + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1573089138 +Transform: + m_ObjectHideFlags: 0 + 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_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1738947319} + m_Father: {fileID: 267173958} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1573089139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1573089137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a1fd8daaed7b64148a34acb96ba14ce1, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonRenderer: {fileID: 267173955} + boneName: head + followZPosition: 1 + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + initializeOnAwake: 1 +--- !u!1 &1738947315 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1738947319} + - component: {fileID: 1738947318} + - component: {fileID: 1738947317} + - component: {fileID: 1738947316} + - component: {fileID: 1738947320} + m_Layer: 0 + m_Name: Spine GameObject (whirlyblendmodes) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1738947316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1738947315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: a515487a7cc6cca479d8c7c700c9145d, 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 + disableRenderingOnOverride: 1 + _animationName: animation + loop: 1 + timeScale: 1 +--- !u!23 &1738947317 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1738947315} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} + - {fileID: 1280556233} + - {fileID: 185304931} + - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, 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 &1738947318 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1738947315} + m_Mesh: {fileID: 0} +--- !u!4 &1738947319 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1738947315} + m_LocalRotation: {x: -0, y: -0, z: 0.78918, w: -0.61416197} + m_LocalPosition: {x: 2.003, y: -0.445, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1573089138} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -104.218} +--- !u!210 &1738947320 +SortingGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1738947315} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &1776944551 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1776944555} + - component: {fileID: 1776944554} + - component: {fileID: 1776944553} + - component: {fileID: 1776944552} + m_Layer: 0 + m_Name: 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1776944552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1776944551} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1c0b968d1e7333b499e347acb644f1c1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!23 &1776944553 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1776944551} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_Materials: + - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, 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: -17 +--- !u!33 &1776944554 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1776944551} + m_Mesh: {fileID: 0} +--- !u!4 &1776944555 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1776944551} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.15, y: 0.36, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 267173958} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity.meta b/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity.meta new file mode 100644 index 000000000..d2821a508 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Other Examples/BlendModes.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a9f938ebd96eda46b25875547a2c188 +timeCreated: 1538614434 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: 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 f36bb0745..95d1867c7 100644 Binary files a/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity and b/spine-unity/Assets/Spine Examples/Other Examples/Mix and Match Equip.unity differ 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 3075864f5..14dd2bc19 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 @@ -170,6 +170,123 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &219658205 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 219658210} + - component: {fileID: 219658209} + - component: {fileID: 219658208} + - component: {fileID: 219658207} + - component: {fileID: 219658206} + m_Layer: 0 + m_Name: Spine GameObject (spineboy) (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &219658206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 219658205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62982591830b87b45a3f6efd3ee82630, type: 3} + m_Name: + m_EditorClassIdentifier: + originalMaterial: {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, type: 2} + replacementMaterial: {fileID: 2100000, guid: 99689194ebb5b66469537473d95c68c9, type: 2} + replacementEnabled: 1 + skeletonAnimation: {fileID: 219658207} + phasePropertyName: _GrayPhase + phase: 1 +--- !u!114 &219658207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 219658205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2} + initialSkinName: base + initialFlipX: 0 + initialFlipY: 0 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + addNormals: 0 + calculateTangents: 0 + disableRenderingOnOverride: 1 + _animationName: run + loop: 1 + timeScale: 1 +--- !u!23 &219658208 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 219658205} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, 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 &219658209 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 219658205} + m_Mesh: {fileID: 0} +--- !u!4 &219658210 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 219658205} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.97, y: -1.75, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &508727089 GameObject: m_ObjectHideFlags: 0 @@ -214,7 +331,6 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -232,7 +348,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 128e02fa6a4f5964fa898757a425b354, type: 2} + - {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -265,8 +381,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 508727089} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3, y: -2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -3.46, y: -1.82, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -345,7 +461,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: -0.000030518, y: -344} + m_AnchoredPosition: {x: -451, y: -287} m_SizeDelta: {x: 969, y: 93} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1057001081 @@ -432,7 +548,6 @@ MonoBehaviour: singleSubmesh: 0 addNormals: 0 calculateTangents: 0 - logErrors: 0 disableRenderingOnOverride: 1 _animationName: run loop: 1 @@ -450,7 +565,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 128e02fa6a4f5964fa898757a425b354, type: 2} + - {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -483,8 +598,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1334021432} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3, y: -2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -6.62, y: 0.08, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -620,6 +735,123 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1576132083 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1576132089} + - component: {fileID: 1576132088} + - component: {fileID: 1576132087} + - component: {fileID: 1576132086} + - component: {fileID: 1576132085} + m_Layer: 0 + m_Name: Spine GameObject (spineboy) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1576132085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1576132083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62982591830b87b45a3f6efd3ee82630, type: 3} + m_Name: + m_EditorClassIdentifier: + originalMaterial: {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, type: 2} + replacementMaterial: {fileID: 2100000, guid: 99689194ebb5b66469537473d95c68c9, type: 2} + replacementEnabled: 1 + skeletonAnimation: {fileID: 1576132086} + phasePropertyName: _GrayPhase + phase: 0.468 +--- !u!114 &1576132086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1576132083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2} + initialSkinName: base + initialFlipX: 0 + initialFlipY: 0 + separatorSlotNames: [] + zSpacing: 0 + useClipping: 1 + immutableTriangles: 0 + pmaVertexColors: 1 + clearStateOnDisable: 0 + tintBlack: 0 + singleSubmesh: 0 + addNormals: 0 + calculateTangents: 0 + disableRenderingOnOverride: 1 + _animationName: run + loop: 1 + timeScale: 1 +--- !u!23 &1576132087 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1576132083} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, 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 &1576132088 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1576132083} + m_Mesh: {fileID: 0} +--- !u!4 &1576132089 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1576132083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.18, y: 0.28, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1909315727 GameObject: m_ObjectHideFlags: 0 @@ -706,6 +938,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1057001080} + - {fileID: 1968442398} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -714,3 +947,79 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1968442397 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1968442398} + - component: {fileID: 1968442400} + - component: {fileID: 1968442399} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1968442398 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1968442397} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.000005, y: 1.000005, z: 1.000005} + m_Children: [] + m_Father: {fileID: 1909315731} + m_RootOrder: 1 + 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: 482, y: -254} + m_SizeDelta: {x: 969, y: 93} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1968442399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1968442397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 'These Spineboys use the same SkeletonData as the ones on the left. + + But have substituted Materials that use a different shader.' +--- !u!222 &1968442400 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1968442397} diff --git a/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/AnimationState with Mecanim.unity b/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/AnimationState with Mecanim.unity index aaf9462cd..7480edb7f 100644 Binary files a/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/AnimationState with Mecanim.unity and b/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/AnimationState with Mecanim.unity differ diff --git a/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Hero.controller b/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Hero.controller index ae8ec504c..a379ce3c4 100644 Binary files a/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Hero.controller and b/spine-unity/Assets/Spine Examples/Other Examples/StateMachine SkeletonAnimation/Hero.controller differ diff --git a/spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs b/spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs index 8e2871915..bd1ed4c26 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Getting Started Scripts/SpineboyTargetController.cs @@ -23,8 +23,9 @@ namespace Spine.Unity.Examples { var mousePosition = Input.mousePosition; var worldMousePosition = camera.ScreenToWorldPoint(mousePosition); var skeletonSpacePoint = skeletonAnimation.transform.InverseTransformPoint(worldMousePosition); - //if (skeletonAnimation.Skeleton.FlipX) skeletonSpacePoint.x *= -1; - bone.SetPosition(skeletonSpacePoint); + skeletonSpacePoint.x *= skeletonAnimation.Skeleton.ScaleX; + skeletonSpacePoint.y *= skeletonAnimation.Skeleton.ScaleY; + bone.SetLocalPosition(skeletonSpacePoint); } } diff --git a/spine-unity/Assets/Spine Examples/Scripts/MaterialReplacementExample.cs b/spine-unity/Assets/Spine Examples/Scripts/MaterialReplacementExample.cs new file mode 100644 index 000000000..9a934cab8 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Scripts/MaterialReplacementExample.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Spine.Unity.Examples { + public class MaterialReplacementExample : MonoBehaviour { + + public Material originalMaterial; + public Material replacementMaterial; + public bool replacementEnabled = true; + public SkeletonAnimation skeletonAnimation; + + [Space] + public string phasePropertyName = "_FillPhase"; + [Range(0f, 1f)] public float phase = 1f; + + bool previousEnabled; + MaterialPropertyBlock mpb; + + void Start () { + previousEnabled = replacementEnabled; + SetReplacementEnabled(replacementEnabled); + mpb = new MaterialPropertyBlock(); + } + + void Update () { + mpb.SetFloat(phasePropertyName, phase); + GetComponent().SetPropertyBlock(mpb); + + if (previousEnabled != replacementEnabled) + SetReplacementEnabled(replacementEnabled); + + previousEnabled = replacementEnabled; + + } + + void SetReplacementEnabled (bool active) { + if (replacementEnabled) { + skeletonAnimation.CustomMaterialOverride[originalMaterial] = replacementMaterial; + } else { + skeletonAnimation.CustomMaterialOverride.Remove(originalMaterial); + } + } + + } +} + diff --git a/spine-unity/Assets/Spine Examples/Scripts/MaterialReplacementExample.cs.meta b/spine-unity/Assets/Spine Examples/Scripts/MaterialReplacementExample.cs.meta new file mode 100644 index 000000000..4e52103f6 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Scripts/MaterialReplacementExample.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 62982591830b87b45a3f6efd3ee82630 +timeCreated: 1539082420 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs b/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs index 7b26a419c..fa277f331 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Mix and Match Character Customize/EquipsVisualsComponentExample.cs @@ -24,7 +24,7 @@ namespace Spine.Unity.Examples { // OPTIONAL: Add all the attachments from the template skin. var templateSkin = skeletonAnimation.Skeleton.Data.FindSkin(templateSkinName); if (templateSkin != null) - equipsSkin.Append(templateSkin); + equipsSkin.AddAttachments(templateSkin); skeletonAnimation.Skeleton.Skin = equipsSkin; RefreshSkeletonAttachments(); @@ -40,8 +40,8 @@ namespace Spine.Unity.Examples { // 1. Collect all the attachments of all active skins. collectedSkin = collectedSkin ?? new Skin("Collected skin"); collectedSkin.Clear(); - collectedSkin.Append(skeletonAnimation.Skeleton.Data.DefaultSkin); - collectedSkin.Append(equipsSkin); + collectedSkin.AddAttachments(skeletonAnimation.Skeleton.Data.DefaultSkin); + collectedSkin.AddAttachments(equipsSkin); // 2. Create a repacked skin. var repackedSkin = collectedSkin.GetRepackedSkin("Repacked skin", skeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial, out runtimeMaterial, out runtimeAtlas); diff --git a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs index 1f40d26fd..eeebe0d4b 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatch.cs @@ -118,8 +118,8 @@ namespace Spine.Unity.Examples { // Under the hood, this relies on if (repack) { var repackedSkin = new Skin("repacked skin"); - repackedSkin.Append(skeleton.Data.DefaultSkin); // Include the "default" skin. (everything outside of skin placeholders) - repackedSkin.Append(customSkin); // Include your new custom skin. + repackedSkin.AddAttachments(skeleton.Data.DefaultSkin); // Include the "default" skin. (everything outside of skin placeholders) + repackedSkin.AddAttachments(customSkin); // Include your new custom skin. repackedSkin = repackedSkin.GetRepackedSkin("repacked skin", sourceMaterial, out runtimeMaterial, out runtimeAtlas); // Pack all the items in the skin. skeleton.SetSkin(repackedSkin); // Assign the repacked skin to your Skeleton. if (bbFollower != null) bbFollower.Initialize(true); diff --git a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs index 9aee9cfed..2c27f02ca 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/MixAndMatchGraphic.cs @@ -118,8 +118,8 @@ namespace Spine.Unity.Examples { // call Skin.GetRepackedSkin to get a cloned skin with cloned attachments that all use one texture. if (repack) { var repackedSkin = new Skin("repacked skin"); - repackedSkin.Append(skeleton.Data.DefaultSkin); - repackedSkin.Append(customSkin); + repackedSkin.AddAttachments(skeleton.Data.DefaultSkin); + repackedSkin.AddAttachments(customSkin); repackedSkin = repackedSkin.GetRepackedSkin("repacked skin", sourceMaterial, out runtimeMaterial, out runtimeAtlas); skeleton.SetSkin(repackedSkin); } else { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs index 4c34947b9..e59a3bcf8 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/CombinedSkin.cs @@ -20,7 +20,7 @@ namespace Spine.Unity.Examples { combinedSkin.Clear(); foreach (var skinName in skinsToCombine) { var skin = skeleton.Data.FindSkin(skinName); - if (skin != null) combinedSkin.Append(skin); + if (skin != null) combinedSkin.AddAttachments(skin); } skeleton.SetSkin(combinedSkin); diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs index c61f654e1..950d0c3b6 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/Legacy/SpriteAttacher.cs @@ -34,7 +34,7 @@ using UnityEngine; using System.Collections.Generic; using Spine.Unity.Modules.AttachmentTools; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Examples { public class SpriteAttacher : MonoBehaviour { public const string DefaultPMAShader = "Spine/Skeleton"; public const string DefaultStraightAlphaShader = "Sprites/Default"; @@ -50,16 +50,16 @@ namespace Spine.Unity.Modules { void OnValidate () { var skeletonComponent = GetComponent(); var skeletonRenderer = skeletonComponent as SkeletonRenderer; - bool apma; + bool applyPMA; if (skeletonRenderer != null) { - apma = skeletonRenderer.pmaVertexColors; + applyPMA = skeletonRenderer.pmaVertexColors; } else { var skeletonGraphic = skeletonComponent as SkeletonGraphic; - apma = skeletonGraphic != null && skeletonGraphic.MeshGenerator.settings.pmaVertexColors; + applyPMA = skeletonGraphic != null && skeletonGraphic.MeshGenerator.settings.pmaVertexColors; } - if (apma) { + if (applyPMA) { try { sprite.texture.GetPixel(0, 0); } catch (UnityException e) { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonColorInitialize.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonColorInitialize.cs index fef37f7ad..fa2822111 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonColorInitialize.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonColorInitialize.cs @@ -3,7 +3,7 @@ using UnityEngine; using Spine; using Spine.Unity; -namespace Spine.Unity.Examples { +namespace Spine.Unity.Prototyping { /// /// Stores and serializes initial settings for a Spine Skeleton component. The settings only get applied on Start at runtime. public class SkeletonColorInitialize : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SpineEventUnityHandler.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SpineEventUnityHandler.cs index bbe2564bc..416f3cdbe 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SpineEventUnityHandler.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SpineEventUnityHandler.cs @@ -32,7 +32,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; -namespace Spine.Unity.Modules { +namespace Spine.Unity.Prototyping { public class SpineEventUnityHandler : MonoBehaviour { diff --git a/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs b/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs index b3fd7235d..a145d2150 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs @@ -56,8 +56,7 @@ namespace Spine.Unity.Examples { if (skeletonRenderer == null) return; var skeleton = skeletonRenderer.skeleton; if (skeleton == null) return; - fillAnimation.Animation.Apply(skeleton, 0, percent, false, null, 1f, MixBlend.Setup, MixDirection.In); - + fillAnimation.Animation.PoseSkeleton(skeleton, percent); skeleton.Update(Time.deltaTime); skeleton.UpdateWorldTransform(); } diff --git a/spine-unity/Assets/Spine Examples/Scripts/SpineboyFootplanter.cs b/spine-unity/Assets/Spine Examples/Scripts/SpineboyFootplanter.cs index 4124239ac..ef1e30768 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/SpineboyFootplanter.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/SpineboyFootplanter.cs @@ -184,8 +184,8 @@ namespace Spine.Unity.Examples { nearFoot.UpdateStepProgress(deltaTime, stepSpeed, shuffleDistance, forward, backward); farFoot.UpdateStepProgress(deltaTime, stepSpeed, shuffleDistance, forward, backward); - nearFootBone.SetPosition(thisTransform.InverseTransformPoint(nearFoot.worldPos)); - farFootBone.SetPosition(thisTransform.InverseTransformPoint(farFoot.worldPos)); + nearFootBone.SetLocalPosition(thisTransform.InverseTransformPoint(nearFoot.worldPos)); + farFootBone.SetLocalPosition(thisTransform.InverseTransformPoint(farFoot.worldPos)); } diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset index b896b9b1e..de8ead202 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat index fcd3cac3a..afe2ac7f2 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat index 681ee3dfe..53e0ab476 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset index cbec1821d..ca81907ba 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat index 139017eff..3bd4acb92 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset index 2c9247231..08a155189 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat index 34aab2b2f..4f13dcbab 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset index 31a0abcac..90776f83d 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat index bbe477e7b..10a8e03e6 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset index 986563dc2..9c786b0f6 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat index 6e919b903..2649ff10d 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset index cd1c56807..6f377a39e 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat index 8127bd028..49dcc1e07 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_SkeletonData.asset index 712993750..c6733b293 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_SkeletonData.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_SkeletonData.asset @@ -13,8 +13,9 @@ MonoBehaviour: m_EditorClassIdentifier: atlasAssets: - {fileID: 11400000, guid: bb54bdab69af2bb49b35577b80dcaad9, type: 2} - skeletonJSON: {fileID: 4900000, guid: c3921acb20cbc25418859f1b213d3d3f, type: 3} scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: c3921acb20cbc25418859f1b213d3d3f, type: 3} + skeletonDataModifiers: [] fromAnimation: [] toAnimation: [] duration: [] diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset index ae06e6659..fb0687f7a 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat index 993985b66..e7580bdce 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_SkeletonData.asset index 68f84d5b1..f9bf5b30c 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_SkeletonData.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_SkeletonData.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset index f39a7c8f8..a5a928852 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat index 202d336b6..062647744 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset index b4687c403..49b6a02f9 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat index 8f29ebb54..418a14f81 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_SkeletonData.asset index b88d2bb1c..30d27d431 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_SkeletonData.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_SkeletonData.asset @@ -13,9 +13,9 @@ MonoBehaviour: m_EditorClassIdentifier: atlasAssets: - {fileID: 11400000, guid: d5fc231712b346f459c8583fa224a669, type: 2} - spriteCollection: {fileID: 0} scale: 0.01 skeletonJSON: {fileID: 4900000, guid: 3ae635b4540c450408d30a8afb9f75a7, type: 3} + skeletonDataModifiers: [] fromAnimation: [] toAnimation: [] duration: [] diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset index 6345965aa..8546d47cc 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat index d5b1aff7d..0b86156cb 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Atlas.asset deleted file mode 100644 index ba397a3fa..000000000 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Atlas.asset and /dev/null differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Material.mat deleted file mode 100644 index 5d905e8cb..000000000 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Material.mat and /dev/null differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.atlas.txt rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.atlas.txt.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.atlas.txt.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.png rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma.png.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset new file mode 100644 index 000000000..bcf2de1ba --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: stretchyman-diffuse-pma_Atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 492ecfd45cd2de542bc20043b10ee4aa, type: 3} + materials: + - {fileID: 2100000, guid: 824cfb62bcbe3db49a3ce6db7e3757d1, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Atlas.asset.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Atlas.asset.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat new file mode 100644 index 000000000..f639fcdd0 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: stretchyman-diffuse-pma_Material + m_Shader: {fileID: 4800000, guid: 2ce511398fb980f41b7d316c51534590, type: 3} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FIXED_NORMALS _FIXED_NORMALS_VIEWSPACE + _NORMALMAP + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + AlphaDepth: true + IGNOREPROJECTOR: true + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BlendTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: d00f264cbe0cc4a49a54a221ee812855, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DiffuseRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 2800000, guid: 4cad8f072f658544a80ba2b271aec125, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 33f10ea7e20549d40a1c23a1adc3f760, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _BlendAmount: 0 + - _BlendMode: 0 + - _Brightness: 1 + - _BumpScale: 1 + - _Cull: 0 + - _CustomRenderQueue: 0 + - _Cutoff: 0.1 + - _DstBlend: 10 + - _EmissionPower: 1 + - _EnableExternalAlpha: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _Hue: 0 + - _Metallic: 0 + - _RenderQueue: 0 + - _RimPower: 1.79 + - _Saturation: 1 + - _ShadowAlphaCutoff: 0.1 + - _SrcBlend: 1 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} + - _FixedNormal: {r: 0, g: 0, b: 1, a: 1} + - _OverlayColor: {r: 0, g: 0, b: 0, a: 0} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Material.mat.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-diffuse-pma_Material.mat.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-emission.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-emission.png similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-emission.png rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-emission.png diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-emission.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-emission.png.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-emission.png.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-emission.png.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-normals.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-normals.png similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-normals.png rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-normals.png diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-normals.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-normals.png.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman-normals.png.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-normals.png.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman.json rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman.json.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman.json.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman_SkeletonData.asset similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman_SkeletonData.asset rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman_SkeletonData.asset diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman_SkeletonData.asset.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman_SkeletonData.asset.meta similarity index 100% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/Strechyman/stretchyman_SkeletonData.asset.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman_SkeletonData.asset.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset index 0567fbb03..f094e27c2 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat index b254ca6cc..9d639058a 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_SkeletonData.asset index 713fdc941..43313d878 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_SkeletonData.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_SkeletonData.asset @@ -15,6 +15,7 @@ MonoBehaviour: - {fileID: 11400000, guid: 2bedc3c43dd49f346a4c9e8a87e2fed7, type: 2} scale: 0.01 skeletonJSON: {fileID: 4900000, guid: 8160b67e4c41bd041b948b5e5a86e242, type: 3} + skeletonDataModifiers: [] fromAnimation: - idle - run diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity_SkeletonData.asset index d19b7c450..c1cf8a317 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity_SkeletonData.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity_SkeletonData.asset @@ -15,6 +15,7 @@ MonoBehaviour: - {fileID: 11400000, guid: b4b8457d6cb8fec49a40be5b71d79e51, type: 2} scale: 0.01 skeletonJSON: {fileID: 4900000, guid: e3b64d7eaf0de4e45a00b7065166554d, type: 3} + skeletonDataModifiers: [] fromAnimation: - run - pole diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset index 1d9c3120b..6938779a2 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset and b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat new file mode 100644 index 000000000..1e12403e9 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: spineboy_Material Grayscale + m_Shader: {fileID: 4800000, guid: ea7e7c05f36541b4bb280f98ebda8ba1, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 49bb65eefe08e424bbf7a38bc98ec638, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _CloakPhase: 0 + - _Cutoff: 0.1 + - _FillPhase: 0 + - _Phase: 1 + - _RefractionStrength: 0.01 + - _StraightAlphaInput: 0 + - _node_3476: 0 + m_Colors: + - _Black: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _FillColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat.meta new file mode 100644 index 000000000..986146647 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99689194ebb5b66469537473d95c68c9 +timeCreated: 1489559535 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat index 3689fb3f4..89ba93e92 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat and b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes.meta new file mode 100644 index 000000000..8805ed219 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 3d0a5267ad0c0de47a9ce7a147b1dc87 +folderAsset: yes +timeCreated: 1538613636 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt new file mode 100644 index 000000000..a236d1d6b --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt @@ -0,0 +1,13 @@ + +whirlyblendmodes.png +size: 512,512 +format: RGBA8888 +filter: Linear,Linear +repeat: none +whirly + rotate: false + xy: 2, 2 + size: 256, 256 + orig: 256, 256 + offset: 0, 0 + index: -1 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt.meta new file mode 100644 index 000000000..dbca57f45 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.atlas.txt.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 188756a89517d7649a67fb53606220f5 +timeCreated: 1538613637 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json new file mode 100644 index 000000000..3b46c7b11 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json @@ -0,0 +1,58 @@ +{ +"skeleton": { "hash": "4EjYsXrRSJ3nIgaF9KU0KeSvFQA", "spine": "3.7.42-beta", "width": 456.69, "height": 360.67, "images": "", "audio": "" }, +"bones": [ + { "name": "root" }, + { "name": "_rotation", "parent": "root", "color": "abe323ff" }, + { "name": "additive", "parent": "root", "x": -37.18, "y": -104.42 }, + { "name": "multiply", "parent": "root", "x": 75.86 }, + { "name": "normal", "parent": "root" }, + { "name": "screen", "parent": "root", "x": -124.58 } +], +"slots": [ + { "name": "normal", "bone": "normal", "color": "ff9100ff", "attachment": "whirly" }, + { "name": "multiply", "bone": "multiply", "color": "905e9eff", "attachment": "whirly", "blend": "multiply" }, + { "name": "screen", "bone": "screen", "color": "0670c6ff", "attachment": "whirly", "blend": "screen" }, + { "name": "additive", "bone": "additive", "color": "0670c6ff", "attachment": "whirly", "blend": "additive" } +], +"transform": [ + { + "name": "rotation", + "order": 0, + "bones": [ "additive", "multiply", "normal", "screen" ], + "target": "_rotation", + "translateMix": 0, + "scaleMix": 0, + "shearMix": 0 + } +], +"skins": { + "default": { + "additive": { + "whirly": { "rotation": -0.06, "width": 256, "height": 256 } + }, + "multiply": { + "whirly": { "rotation": -0.06, "width": 256, "height": 256 } + }, + "normal": { + "whirly": { "rotation": -0.06, "width": 256, "height": 256 } + }, + "screen": { + "whirly": { "rotation": -0.06, "width": 256, "height": 256 } + } + } +}, +"animations": { + "animation": { + "bones": { + "_rotation": { + "rotate": [ + { "time": 0, "angle": 0 }, + { "time": 0.3333, "angle": -120 }, + { "time": 0.6667, "angle": 120 }, + { "time": 1, "angle": 0 } + ] + } + } + } +} +} \ No newline at end of file diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json.meta new file mode 100644 index 000000000..04dc053b6 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a6f51aad0fef5a40aeedfeec5c0b8b2 +timeCreated: 1538613637 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png new file mode 100644 index 000000000..88e45db4c Binary files /dev/null and b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta new file mode 100644 index 000000000..bfd52f26c --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: dc1b9f9665c8aa74799404a1d2038e3d +timeCreated: 1538613637 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset new file mode 100644 index 000000000..a24c4b3a7 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: whirlyblendmodes_Atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 188756a89517d7649a67fb53606220f5, type: 3} + materials: + - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset.meta new file mode 100644 index 000000000..76f38814d --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: db7ac54cc9ef711408d53c53b765b9a3 +timeCreated: 1538613637 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat new file mode 100644 index 000000000..f8e44b27e --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: whirlyblendmodes_Material + m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: dc1b9f9665c8aa74799404a1d2038e3d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + - _StraightAlphaInput: 0 + m_Colors: [] diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat.meta new file mode 100644 index 000000000..2fc691676 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e162c08da1abc294cb851248f51dfc40 +timeCreated: 1538613637 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset new file mode 100644 index 000000000..72897ad55 --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset @@ -0,0 +1,24 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: whirlyblendmodes_SkeletonData + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: db7ac54cc9ef711408d53c53b765b9a3, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 1a6f51aad0fef5a40aeedfeec5c0b8b2, type: 3} + skeletonDataModifiers: + - {fileID: 11400000, guid: 22c0225612a65ee4fb15bad49f644762, type: 2} + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0 + controller: {fileID: 0} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset.meta new file mode 100644 index 000000000..727db377d --- /dev/null +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a515487a7cc6cca479d8c7c700c9145d +timeCreated: 1538613637 +licenseType: Pro +NativeFormatImporter: + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: