diff --git a/Assets/Resources/Games/fillbots.prefab b/Assets/Resources/Games/fillbots.prefab index 76ea11922..4c0fd34ec 100644 --- a/Assets/Resources/Games/fillbots.prefab +++ b/Assets/Resources/Games/fillbots.prefab @@ -1,5 +1,173 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1003750069750248827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3643512110700383513} + - component: {fileID: 1763172560784356611} + m_Layer: 0 + m_Name: sprite (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3643512110700383513 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1003750069750248827} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0.82, y: 2.9, z: 0} + m_LocalScale: {x: -1.05, y: -1.05, z: -1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7119416205577292686} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &1763172560784356611 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1003750069750248827} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -1700906063, guid: 4b169e5816c948044a7180609226f690, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.8406422, y: 1.2700001} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1357523065438581312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1324394319157697572} + - component: {fileID: 7071740477323100105} + m_Layer: 0 + m_Name: sprite (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1324394319157697572 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357523065438581312} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.82, y: 2.2, z: 0} + m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7119416205577292686} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &7071740477323100105 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357523065438581312} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -1700906063, guid: 4b169e5816c948044a7180609226f690, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.8406422, y: 1.2700001} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3033488538015571006 GameObject: m_ObjectHideFlags: 0 @@ -109,7 +277,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3360561158326092178} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.03, y: 7.08, z: 0} + m_LocalPosition: {x: -0.03, y: 6.85, z: 0} m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} m_ConstrainProportionsScale: 0 m_Children: [] @@ -238,6 +406,7 @@ Transform: - {fileID: 1845226730608648896} - {fileID: 129524151738043757} - {fileID: 7239244036234646882} + - {fileID: 7119416205577292686} - {fileID: 821380393148258481} m_Father: {fileID: 5681901217470064799} m_RootOrder: 2 @@ -453,6 +622,90 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &5261196688349855366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1024117699009270687} + - component: {fileID: 6683900082800117606} + m_Layer: 0 + m_Name: sprite (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1024117699009270687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5261196688349855366} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0.82, y: 0.7, z: 0} + m_LocalScale: {x: -1.05, y: -1.05, z: -1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7119416205577292686} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &6683900082800117606 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5261196688349855366} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -1700906063, guid: 4b169e5816c948044a7180609226f690, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.8406422, y: 1.2700001} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5302613409706782677 GameObject: m_ObjectHideFlags: 0 @@ -595,7 +848,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5480829552489951304} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.03, y: 2.58, z: 0} + m_LocalPosition: {x: -0.03, y: 1.56, z: 0} m_LocalScale: {x: 1.05, y: 1.05, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -727,8 +980,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: e2107d00b7f359746b7b1acd361a36a1, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.38431373} + m_Sprite: {fileID: 21300000, guid: 0f6862a559f12a84488f618e606bec2e, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.5411765} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -938,7 +1191,7 @@ Transform: - {fileID: 1588626132168789274} - {fileID: 5118038246686077097} - {fileID: 1945548446059564651} - - {fileID: 6360603708818355651} + - {fileID: 7115372295053300498} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1148,6 +1401,41 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7705013002443324631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7119416205577292686} + m_Layer: 0 + m_Name: smear long + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7119416205577292686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7705013002443324631} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1324394319157697572} + - {fileID: 3643512110700383513} + - {fileID: 5672649818254682005} + - {fileID: 1024117699009270687} + m_Father: {fileID: 1945548446059564651} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8220226989504142724 GameObject: m_ObjectHideFlags: 0 @@ -1211,7 +1499,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 1945548446059564651} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7213697906022386451 SpriteRenderer: @@ -1253,7 +1541,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_Sprite: {fileID: -1321602317, guid: 4b169e5816c948044a7180609226f690, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1382,6 +1670,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8816786964202830277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5672649818254682005} + - component: {fileID: 5626372691960277169} + m_Layer: 0 + m_Name: sprite (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5672649818254682005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816786964202830277} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.82, y: 1.1, z: 0} + m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7119416205577292686} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!212 &5626372691960277169 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8816786964202830277} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -1700906063, guid: 4b169e5816c948044a7180609226f690, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.8406422, y: 1.2700001} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &9174145963951091069 GameObject: m_ObjectHideFlags: 0 @@ -1778,6 +2150,68 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3} m_PrefabInstance: {fileID: 4593698792861692591} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5998474256261010265 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5681901217470064799} + m_Modifications: + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalPosition.y + value: -4.52 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7038732336128464859, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + propertyPath: m_Name + value: BotSmall + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} +--- !u!4 &7115372295053300498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3566918977115226187, guid: 8041c7a98068d5c438ea1d3814c5fe8c, type: 3} + m_PrefabInstance: {fileID: 5998474256261010265} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6241264839279890417 PrefabInstance: m_ObjectHideFlags: 0 @@ -1850,69 +2284,3 @@ SpriteRenderer: m_CorrespondingSourceObject: {fileID: 670297123598137949, guid: 672acf3ada15b4b44a8d1580bad1900c, type: 3} m_PrefabInstance: {fileID: 6241264839279890417} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7621597685357475208 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5681901217470064799} - m_Modifications: - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalPosition.x - value: 6.64 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalPosition.y - value: -4.52 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7038732336128464859, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_Name - value: BotLarge - objectReference: {fileID: 0} - - target: {fileID: 7038732336128464859, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} ---- !u!4 &6360603708818355651 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3566918977115226187, guid: dce796f0e6eb3d7449ba04e1e2d72d9b, type: 3} - m_PrefabInstance: {fileID: 7621597685357475208} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Filler.controller b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Filler.controller index 2cdb06015..00362d0cc 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Filler.controller +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Filler.controller @@ -59,7 +59,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HoldBeat + m_Name: HoldBeatMedium m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -78,6 +78,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-6116357444065736309 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ReleaseSmall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d5bf48b1763840543ba286ddb0f22366, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-6104741972818819771 AnimatorStateMachine: serializedVersion: 6 @@ -117,6 +143,18 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2051370804418554317} m_Position: {x: 620, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3267811042837312039} + m_Position: {x: 850, y: 330, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4899116019880682414} + m_Position: {x: 740, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6116357444065736309} + m_Position: {x: 810, y: 260, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8805235138673822171} + m_Position: {x: 780, y: 200, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -153,6 +191,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-4899116019880682414 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HoldSmall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 877a3fc33b5e4bc4db2ae826f5759ec7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2051370804418554317 AnimatorState: serializedVersion: 6 @@ -208,7 +272,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Release + m_Name: ReleaseMedium m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -227,6 +291,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &3267811042837312039 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ReleaseWhiffSmall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 012c49e4e7b4c2d489db28854fee74a6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &3993177224735866095 AnimatorState: serializedVersion: 6 @@ -234,7 +324,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Hold + m_Name: HoldMedium m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -260,7 +350,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ReleaseWhiff + m_Name: ReleaseWhiffMedium m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -331,3 +421,29 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &8805235138673822171 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HoldBeatSmall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: c4a0fba599e398142ac22fc18d4d770b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Hold.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Hold.anim index 965dfb46c..2444e0c63 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Hold.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Hold.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} + value: {x: 0, y: 0.9, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -30,13 +30,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: JuicerHolder/Juicer + path: Impact - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.37, z: 0} + value: {x: 0, y: -2.15, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -52,9 +52,18 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.9, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -0.03, y: 1.9, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} @@ -62,9 +71,37 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Impact + path: JuicerHolder/Juicer m_ScaleCurves: [] m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Impact + classID: 1 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -93,34 +130,6 @@ AnimationClip: path: smear classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Impact - classID: 1 - script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -143,14 +152,21 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 1038942689 + path: 1960092468 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3282421041 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3282421041 + path: 1038942689 attribute: 2086281974 script: {fileID: 0} typeID: 1 @@ -164,7 +180,7 @@ AnimationClip: customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 1960092468 + path: 3282421041 attribute: 1 script: {fileID: 0} typeID: 4 @@ -177,13 +193,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3282421041 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: - {fileID: -1046236702, guid: 4b169e5816c948044a7180609226f690, type: 3} - {fileID: 1305542816, guid: 4b169e5816c948044a7180609226f690, type: 3} @@ -210,176 +219,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.016 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: JuicerHolder/Juicer - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 2.812 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: JuicerHolder/Juicer - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: JuicerHolder/Juicer - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -2.37 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: smear - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Impact - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -437,6 +276,185 @@ AnimationClip: path: Impact classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Impact + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: JuicerHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: JuicerHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: JuicerHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.03 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: smear + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_HoldBeat.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_HoldBeat.anim index 7695b70af..ef54d9bd0 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_HoldBeat.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_HoldBeat.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.37, z: 0} + value: {x: 0, y: -2.15, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -36,13 +36,31 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.03, y: 1.9, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -76,13 +94,6 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 1960092468 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 3855767137 attribute: 1 script: {fileID: 0} typeID: 4 @@ -90,6 +101,13 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1960092468 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3855767137 attribute: 1 script: {fileID: 0} typeID: 4 @@ -147,7 +165,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.37 + value: -2.15 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -185,10 +203,10 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.03 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -204,13 +222,31 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -224,9 +260,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Release.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Release.anim index 114a0e4fc..a231bea22 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Release.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_Release.anim @@ -37,119 +37,38 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: -2.09, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: 30.08392, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.016666668 - value: {x: 0, y: -1.64, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 0, y: -1.05, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.05 - value: {x: 0, y: -0.67, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: -0.33, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.083333336 - value: {x: 0, y: 0.01, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 0.35, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.122669466, z: 0.33333334} - serializedVersion: 3 time: 0.11666667 value: {x: 0, y: 0.49, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: 0.06001042, z: 0} + outSlope: {x: 0, y: 6.599998, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.8463752, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: 0.74, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.71, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: -0.9723502, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.16666667 - value: {x: 0, y: 0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.18333334 - value: {x: 0, y: 0.38, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 0.23, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.69100034, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: -7.846282, z: 0} + outSlope: {x: 0, y: 4.2, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.97448146, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -160,27 +79,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} + inWeight: {x: 0, y: 0, z: 0.33333334} + outWeight: {x: 0, y: 0, z: 0.33333334} - serializedVersion: 3 time: 0.13333334 - value: {x: -0.016, y: 2.924, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 2, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.03, y: 2.58, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.56, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -220,6 +139,13 @@ AnimationClip: classID: 1 script: {fileID: 0} m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 448890005, guid: 4b169e5816c948044a7180609226f690, type: 3} + attribute: m_Sprite + path: Impact + classID: 212 + script: {fileID: 0} - curve: - time: 0 value: {fileID: 217573045, guid: 4b169e5816c948044a7180609226f690, type: 3} @@ -231,13 +157,6 @@ AnimationClip: path: JuicerHolder/Juicer classID: 212 script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: 448890005, guid: 4b169e5816c948044a7180609226f690, type: 3} - attribute: m_Sprite - path: Impact - classID: 212 - script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -273,13 +192,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 1960092468 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 3282421041 attribute: 0 @@ -287,11 +199,18 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1960092468 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: + - {fileID: 448890005, guid: 4b169e5816c948044a7180609226f690, type: 3} - {fileID: 217573045, guid: 4b169e5816c948044a7180609226f690, type: 3} - {fileID: -141069093, guid: 4b169e5816c948044a7180609226f690, type: 3} - {fileID: 217573045, guid: 4b169e5816c948044a7180609226f690, type: 3} - - {fileID: 448890005, guid: 4b169e5816c948044a7180609226f690, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -404,120 +323,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -532,118 +343,37 @@ AnimationClip: time: 0 value: -2.09 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: 30.08392 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: -1.64 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -1.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: -0.67 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.33 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.01 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.35 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.122669466 - serializedVersion: 3 time: 0.11666667 value: 0.49 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0.06001042 + outSlope: 6.599998 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.8463752 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.74 + value: 0.71 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: -0.9723502 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.66 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.38 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.23 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.69100034 - serializedVersion: 3 time: 0.21666667 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: -7.846282 + outSlope: 4.2 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.97448146 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -664,114 +394,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -784,31 +406,13 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 + value: -0.03 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: -0.016 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -821,7 +425,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 + value: 1.78 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -830,7 +434,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.13333334 - value: 2.924 + value: 2 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -839,7 +443,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 2.58 + value: 1.56 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -865,24 +469,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_ReleaseWhiff.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_ReleaseWhiff.anim index ad157274a..273b59ef3 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_ReleaseWhiff.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Large_ReleaseWhiff.anim @@ -21,119 +21,38 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: -2.09, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: 30.08392, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.016666668 - value: {x: 0, y: -1.64, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 0, y: -1.05, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.05 - value: {x: 0, y: -0.67, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: -0.33, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.083333336 - value: {x: 0, y: 0.01, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 0.35, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.122669466, z: 0.33333334} - serializedVersion: 3 time: 0.11666667 value: {x: 0, y: 0.49, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: 0.06001042, z: 0} + outSlope: {x: 0, y: 6.599998, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.8463752, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: 0.74, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.71, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: -0.9723502, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.16666667 - value: {x: 0, y: 0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.18333334 - value: {x: 0, y: 0.38, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 0.23, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.69100034, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: -7.846282, z: 0} + outSlope: {x: 0, y: 4.2, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.97448146, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -144,27 +63,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} + inWeight: {x: 0, y: 0, z: 0.33333334} + outWeight: {x: 0, y: 0, z: 0.33333334} - serializedVersion: 3 time: 0.13333334 - value: {x: -0.016, y: 2.924, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 2, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.03, y: 2.58, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.56, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -246,120 +165,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -374,118 +185,37 @@ AnimationClip: time: 0 value: -2.09 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: 30.08392 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: -1.64 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -1.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: -0.67 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.33 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.01 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.35 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.122669466 - serializedVersion: 3 time: 0.11666667 value: 0.49 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0.06001042 + outSlope: 6.599998 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.8463752 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.74 + value: 0.71 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: -0.9723502 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.66 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.38 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.23 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.69100034 - serializedVersion: 3 time: 0.21666667 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: -7.846282 + outSlope: 4.2 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.97448146 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -506,114 +236,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -626,31 +248,13 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 + value: -0.03 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: -0.016 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -663,7 +267,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 + value: 1.78 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -672,7 +276,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.13333334 - value: 2.924 + value: 2 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -681,7 +285,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 2.58 + value: 1.56 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -707,24 +311,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Hold.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Hold.anim index 9910a3ceb..ca8ace658 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Hold.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Hold.anim @@ -20,9 +20,18 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -0.03, y: 1.9, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} @@ -36,7 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.37, z: 0} + value: {x: 0, y: -2.15, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -142,6 +151,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 1960092468 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 1038942689 attribute: 2086281974 @@ -163,13 +179,6 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 1960092468 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3855767137 attribute: 1 @@ -215,10 +224,10 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.03 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -234,13 +243,22 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1.9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -254,9 +272,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -291,7 +309,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.37 + value: -2.15 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_HoldBeat.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_HoldBeat.anim index a3a3cd601..d49aae9f7 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_HoldBeat.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_HoldBeat.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.37, z: 0} + value: {x: 0, y: -2.15, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -36,13 +36,31 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.03, y: 1.9, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -76,13 +94,6 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 1960092468 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 3855767137 attribute: 1 script: {fileID: 0} typeID: 4 @@ -90,6 +101,13 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1960092468 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3855767137 attribute: 1 script: {fileID: 0} typeID: 4 @@ -147,7 +165,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.37 + value: -2.15 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -185,10 +203,10 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.03 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -204,13 +222,31 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -224,9 +260,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Release.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Release.anim index c3cf48eab..ad1d091cd 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Release.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_Release.anim @@ -37,119 +37,38 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: -2.09, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: Infinity, z: Infinity} + outSlope: {x: 0, y: 30.08392, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.016666668 - value: {x: 0, y: -1.64, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 0, y: -1.05, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.05 - value: {x: 0, y: -0.67, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: -0.33, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.083333336 - value: {x: 0, y: 0.01, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 0.35, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.122669466, z: 0.33333334} - serializedVersion: 3 time: 0.11666667 value: {x: 0, y: 0.49, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: 0.06001042, z: Infinity} + outSlope: {x: 0, y: 6.599998, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.8463752, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: 0.74, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.71, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: -0.9723502, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.16666667 - value: {x: 0, y: 0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.18333334 - value: {x: 0, y: 0.38, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 0.23, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.69100034, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: -7.846282, z: 0} + outSlope: {x: 0, y: 4.2, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.97448146, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -160,27 +79,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} + inWeight: {x: 0, y: 0, z: 0.33333334} + outWeight: {x: 0, y: 0, z: 0.33333334} - serializedVersion: 3 time: 0.13333334 - value: {x: -0.016, y: 2.924, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 2, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.03, y: 2.58, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.56, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -410,63 +329,47 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: JuicerHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.016666668 - value: 0 + time: 0 + value: -0.03 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.033333335 - value: 0 + time: 0 + value: 1.78 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 + time: 0.13333334 + value: 2 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -475,43 +378,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 + value: 1.56 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -521,8 +388,27 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: JuicerHolder + attribute: m_LocalPosition.y + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: JuicerHolder/Juicer classID: 4 script: {fileID: 0} - curve: @@ -532,118 +418,37 @@ AnimationClip: time: 0 value: -2.09 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: 30.08392 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: -1.64 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -1.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: -0.67 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.33 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.01 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.35 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.122669466 - serializedVersion: 3 time: 0.11666667 value: 0.49 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0.06001042 + outSlope: 6.599998 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.8463752 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.74 + value: 0.71 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: -0.9723502 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.66 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.38 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.23 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.69100034 - serializedVersion: 3 time: 0.21666667 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: -7.846282 + outSlope: 4.2 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.97448146 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -658,236 +463,17 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.016 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: -0.016 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: JuicerHolder/Juicer - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 2.812 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 2.924 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 2.58 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: JuicerHolder/Juicer - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: JuicerHolder/Juicer + path: JuicerHolder classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_ReleaseWhiff.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_ReleaseWhiff.anim index bc90fd032..fd88c87c0 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_ReleaseWhiff.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Medium_ReleaseWhiff.anim @@ -21,119 +21,38 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: -2.09, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: 30.08392, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.016666668 - value: {x: 0, y: -1.64, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 0, y: -1.05, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.05 - value: {x: 0, y: -0.67, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: -0.33, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.083333336 - value: {x: 0, y: 0.01, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.1 - value: {x: 0, y: 0.35, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.122669466, z: 0.33333334} - serializedVersion: 3 time: 0.11666667 value: {x: 0, y: 0.49, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: 0.06001042, z: 0} + outSlope: {x: 0, y: 6.599998, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.8463752, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: 0.74, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.71, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: -0.9723502, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.16666667 - value: {x: 0, y: 0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.18333334 - value: {x: 0, y: 0.38, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 0.23, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.69100034, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: 0, y: -7.846282, z: 0} + outSlope: {x: 0, y: 4.2, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.97448146, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -144,27 +63,27 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0, z: 0} - outWeight: {x: 0, y: 0, z: 0} + inWeight: {x: 0, y: 0, z: 0.33333334} + outWeight: {x: 0, y: 0, z: 0.33333334} - serializedVersion: 3 time: 0.13333334 - value: {x: -0.016, y: 2.924, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 2, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.03, y: 2.58, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: -0.03, y: 1.56, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -246,120 +165,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -374,118 +185,37 @@ AnimationClip: time: 0 value: -2.09 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: 30.08392 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: -1.64 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -1.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: -0.67 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.33 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.01 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.35 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.122669466 - serializedVersion: 3 time: 0.11666667 value: 0.49 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0.06001042 + outSlope: 6.599998 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.8463752 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.74 + value: 0.71 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: -0.9723502 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.66 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.38 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.23 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.69100034 - serializedVersion: 3 time: 0.21666667 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: -7.846282 + outSlope: 4.2 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.97448146 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -506,114 +236,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -626,31 +248,13 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 + value: -0.03 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: -0.016 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -663,7 +267,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 + value: 1.78 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -672,7 +276,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.13333334 - value: 2.924 + value: 2 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -681,7 +285,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 2.58 + value: 1.56 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -707,24 +311,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Hold.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Hold.anim index 109801cea..7405840be 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Hold.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Hold.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} + value: {x: 0, y: -1.7, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -30,13 +30,13 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: JuicerHolder/Juicer + path: Impact - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.37, z: 0} + value: {x: 0, y: -4.8, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -52,9 +52,18 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.9, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -0.03, y: 1.9, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} @@ -62,7 +71,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Impact + path: JuicerHolder/Juicer m_ScaleCurves: [] m_FloatCurves: - curve: @@ -90,7 +99,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: smear + path: Impact classID: 1 script: {fileID: 0} - curve: @@ -118,7 +127,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Impact + path: smear long classID: 1 script: {fileID: 0} m_PPtrCurves: @@ -143,14 +152,21 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 1038942689 + path: 1960092468 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3282421041 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3282421041 + path: 2078944298 attribute: 2086281974 script: {fileID: 0} typeID: 1 @@ -164,7 +180,7 @@ AnimationClip: customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 1960092468 + path: 3282421041 attribute: 1 script: {fileID: 0} typeID: 4 @@ -177,13 +193,6 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3282421041 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: - {fileID: -1046236702, guid: 4b169e5816c948044a7180609226f690, type: 3} - {fileID: 1305542816, guid: 4b169e5816c948044a7180609226f690, type: 3} @@ -215,7 +224,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -226,7 +235,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: JuicerHolder/Juicer + path: Impact classID: 4 script: {fileID: 0} - curve: @@ -234,7 +243,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 + value: -1.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -245,7 +254,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: JuicerHolder/Juicer + path: Impact classID: 4 script: {fileID: 0} - curve: @@ -264,94 +273,9 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: JuicerHolder/Juicer + path: Impact classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -2.37 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: JuicerHolder - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: smear - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -396,7 +320,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Impact + path: JuicerHolder classID: 4 script: {fileID: 0} - curve: @@ -404,7 +328,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 + value: -4.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -415,7 +339,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Impact + path: JuicerHolder classID: 4 script: {fileID: 0} - curve: @@ -434,9 +358,103 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Impact + path: JuicerHolder classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.03 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: JuicerHolder/Juicer + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: smear long + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_HoldBeat.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_HoldBeat.anim index 13c3b8efc..472b13eb8 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_HoldBeat.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_HoldBeat.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.37, z: 0} + value: {x: 0, y: -4.8, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -36,13 +36,31 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: -0.03, y: 1.9, z: 0} + inSlope: {x: Infinity, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: -0.03, y: 1.78, z: 0} + inSlope: {x: 0, y: Infinity, z: 0} + outSlope: {x: 0, y: Infinity, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -76,13 +94,6 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 1960092468 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 3855767137 attribute: 1 script: {fileID: 0} typeID: 4 @@ -90,6 +101,13 @@ AnimationClip: isPPtrCurve: 0 - serializedVersion: 2 path: 1960092468 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3855767137 attribute: 1 script: {fileID: 0} typeID: 4 @@ -147,7 +165,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.37 + value: -4.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -185,10 +203,10 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.03 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 @@ -204,13 +222,31 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 1.9 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 1.78 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -224,9 +260,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0 outWeight: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Release.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Release.anim index a6f92335f..1250808bd 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Release.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_Release.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.019, y: 0.122, z: 0} + value: {x: -0.019, y: -2.08, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -36,63 +36,63 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.09, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -4.4, z: 0} + inSlope: {x: 0, y: Infinity, z: Infinity} + outSlope: {x: 0, y: 30.08392, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.122669466, z: 0.33333334} - serializedVersion: 3 time: 0.016666668 - value: {x: 0, y: -1.64, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -3.7608733, z: 0} + inSlope: {x: Infinity, y: 45.515682, z: Infinity} + outSlope: {x: Infinity, y: 45.515682, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: 0, y: -1.05, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -2.9193308, z: 0} + inSlope: {x: Infinity, y: 54.373806, z: Infinity} + outSlope: {x: Infinity, y: 54.373806, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.05 - value: {x: 0, y: -0.67, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -1.9849333, z: 0} + inSlope: {x: Infinity, y: 56.658306, z: Infinity} + outSlope: {x: Infinity, y: 56.658306, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0, y: -0.33, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -1.0672406, z: 0} + inSlope: {x: Infinity, y: 52.369183, z: Infinity} + outSlope: {x: Infinity, y: 52.369183, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0, y: 0.01, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -0.27581394, z: 0} + inSlope: {x: Infinity, y: 41.506413, z: Infinity} + outSlope: {x: Infinity, y: 41.506413, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0, y: 0.35, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.27978635, z: 0} + inSlope: {x: Infinity, y: 24.070024, z: Infinity} + outSlope: {x: Infinity, y: 24.070024, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -100,44 +100,44 @@ AnimationClip: - serializedVersion: 3 time: 0.11666667 value: {x: 0, y: 0.49, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: Infinity, y: 0.06001042, z: Infinity} + outSlope: {x: Infinity, y: 6.599998, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.8463752, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: 0.74, z: 0} + value: {x: 0, y: 0.71, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: -0.9723502, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.69100034, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: 0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.61446637, z: 0} + inSlope: {x: Infinity, y: -9.711603, z: Infinity} + outSlope: {x: Infinity, y: -9.711603, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.18333334 - value: {x: 0, y: 0.38, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.41228276, z: 0} + inSlope: {x: Infinity, y: -13.770343, z: Infinity} + outSlope: {x: Infinity, y: -13.770343, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0, y: 0.23, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.18145779, z: 0} + inSlope: {x: Infinity, y: -13.148571, z: Infinity} + outSlope: {x: Infinity, y: -13.148571, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -145,11 +145,11 @@ AnimationClip: - serializedVersion: 3 time: 0.21666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: Infinity, y: -7.846282, z: Infinity} + outSlope: {x: Infinity, y: 4.2, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.97448146, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -160,7 +160,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} + value: {x: -0.03, y: 1.78, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -169,7 +169,7 @@ AnimationClip: outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 time: 0.13333334 - value: {x: -0.016, y: 2.924, z: 0} + value: {x: -0.016, y: 2, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -178,7 +178,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.03, y: 2.58, z: 0} + value: {x: -0.03, y: 1.56, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -337,7 +337,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.122 + value: -2.08 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -404,9 +404,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -530,120 +530,39 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.09 + value: -4.4 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: 30.08392 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: -1.64 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -1.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: -0.67 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.33 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.01 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.35 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.122669466 - serializedVersion: 3 time: 0.11666667 value: 0.49 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0.06001042 + outSlope: 6.599998 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.8463752 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.74 + value: 0.71 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: -0.9723502 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.66 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.38 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.23 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.69100034 - serializedVersion: 3 time: 0.21666667 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: -7.846282 + outSlope: 4.2 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.97448146 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -784,7 +703,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 + value: -0.03 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -821,7 +740,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 + value: 1.78 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -830,7 +749,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.13333334 - value: 2.924 + value: 2 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -839,7 +758,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 2.58 + value: 1.56 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_ReleaseWhiff.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_ReleaseWhiff.anim index a55446726..74868533c 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_ReleaseWhiff.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Filler/Small_ReleaseWhiff.anim @@ -20,63 +20,63 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -2.09, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -4.4, z: 0} + inSlope: {x: 0, y: Infinity, z: Infinity} + outSlope: {x: 0, y: 30.08392, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.122669466, z: 0.33333334} - serializedVersion: 3 time: 0.016666668 - value: {x: 0, y: -1.64, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -3.7608733, z: 0} + inSlope: {x: Infinity, y: 45.515682, z: Infinity} + outSlope: {x: Infinity, y: 45.515682, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: 0, y: -1.05, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -2.9193308, z: 0} + inSlope: {x: Infinity, y: 54.373806, z: Infinity} + outSlope: {x: Infinity, y: 54.373806, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.05 - value: {x: 0, y: -0.67, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -1.9849333, z: 0} + inSlope: {x: Infinity, y: 56.658306, z: Infinity} + outSlope: {x: Infinity, y: 56.658306, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0, y: -0.33, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -1.0672406, z: 0} + inSlope: {x: Infinity, y: 52.369183, z: Infinity} + outSlope: {x: Infinity, y: 52.369183, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0, y: 0.01, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: -0.27581394, z: 0} + inSlope: {x: Infinity, y: 41.506413, z: Infinity} + outSlope: {x: Infinity, y: 41.506413, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0, y: 0.35, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.27978635, z: 0} + inSlope: {x: Infinity, y: 24.070024, z: Infinity} + outSlope: {x: Infinity, y: 24.070024, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -84,44 +84,44 @@ AnimationClip: - serializedVersion: 3 time: 0.11666667 value: {x: 0, y: 0.49, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: Infinity, y: 0.06001042, z: Infinity} + outSlope: {x: Infinity, y: 6.599998, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.8463752, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: 0, y: 0.74, z: 0} + value: {x: 0, y: 0.71, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: -0.9723502, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.69100034, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: 0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.61446637, z: 0} + inSlope: {x: Infinity, y: -9.711603, z: Infinity} + outSlope: {x: Infinity, y: -9.711603, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.18333334 - value: {x: 0, y: 0.38, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.41228276, z: 0} + inSlope: {x: Infinity, y: -13.770343, z: Infinity} + outSlope: {x: Infinity, y: -13.770343, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: 0, y: 0.23, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + value: {x: 0, y: 0.18145779, z: 0} + inSlope: {x: Infinity, y: -13.148571, z: Infinity} + outSlope: {x: Infinity, y: -13.148571, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -129,11 +129,11 @@ AnimationClip: - serializedVersion: 3 time: 0.21666667 value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: Infinity, y: -7.846282, z: Infinity} + outSlope: {x: Infinity, y: 4.2, z: Infinity} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.97448146, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -144,7 +144,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.016, y: 2.812, z: 0} + value: {x: -0.03, y: 1.78, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -153,7 +153,7 @@ AnimationClip: outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 time: 0.13333334 - value: {x: -0.016, y: 2.924, z: 0} + value: {x: -0.016, y: 2, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -162,7 +162,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.15 - value: {x: -0.03, y: 2.58, z: 0} + value: {x: -0.03, y: 1.56, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -246,9 +246,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -372,120 +372,39 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.09 + value: -4.4 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: 30.08392 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.016666668 - value: -1.64 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -1.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: -0.67 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.33 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.01 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 0.35 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.122669466 - serializedVersion: 3 time: 0.11666667 value: 0.49 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0.06001042 + outSlope: 6.599998 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.8463752 outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 0.74 + value: 0.71 inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + outSlope: -0.9723502 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 0.66 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.18333334 - value: 0.38 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.23 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0.69100034 - serializedVersion: 3 time: 0.21666667 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: -7.846282 + outSlope: 4.2 + tangentMode: 65 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.97448146 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -626,7 +545,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.016 + value: -0.03 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -663,7 +582,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.812 + value: 1.78 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -672,7 +591,7 @@ AnimationClip: outWeight: 0 - serializedVersion: 3 time: 0.13333334 - value: 2.924 + value: 2 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -681,7 +600,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.15 - value: 2.58 + value: 1.56 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim index 04dc7cfad..d451afbcc 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Large/Success.anim @@ -39,11 +39,11 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: -538342409, guid: 4b169e5816c948044a7180609226f690, type: 3} + value: {fileID: -1789653234, guid: 4b169e5816c948044a7180609226f690, type: 3} - time: 0.083333336 value: {fileID: 1437428146, guid: 4b169e5816c948044a7180609226f690, type: 3} - time: 0.16666667 - value: {fileID: -1789653234, guid: 4b169e5816c948044a7180609226f690, type: 3} + value: {fileID: -538342409, guid: 4b169e5816c948044a7180609226f690, type: 3} attribute: m_Sprite path: classID: 212 @@ -70,9 +70,9 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -538342409, guid: 4b169e5816c948044a7180609226f690, type: 3} - - {fileID: 1437428146, guid: 4b169e5816c948044a7180609226f690, type: 3} - {fileID: -1789653234, guid: 4b169e5816c948044a7180609226f690, type: 3} + - {fileID: 1437428146, guid: 4b169e5816c948044a7180609226f690, type: 3} + - {fileID: -538342409, guid: 4b169e5816c948044a7180609226f690, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -83,7 +83,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim index 2fa6900d2..db2719dab 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Medium/Success.anim @@ -83,7 +83,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim index bda23da89..3d5dc9a4f 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim +++ b/Assets/Resources/Sprites/Games/Fillbots/Animations/Small/Success.anim @@ -83,7 +83,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/Fillbots/Fillbots_main.png.meta b/Assets/Resources/Sprites/Games/Fillbots/Fillbots_main.png.meta index 514672d74..01db4db73 100644 --- a/Assets/Resources/Sprites/Games/Fillbots/Fillbots_main.png.meta +++ b/Assets/Resources/Sprites/Games/Fillbots/Fillbots_main.png.meta @@ -553,8 +553,8 @@ TextureImporter: y: 553 width: 142 height: 210 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -574,8 +574,8 @@ TextureImporter: y: 553 width: 182 height: 190 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -595,8 +595,8 @@ TextureImporter: y: 549 width: 214 height: 170 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -616,8 +616,8 @@ TextureImporter: y: 553 width: 262 height: 150 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1455,7 +1455,7 @@ TextureImporter: x: 536 y: 842 width: 208 - height: 228 + height: 262 alignment: 9 pivot: {x: 0.5, y: 0.07017544} border: {x: 0, y: 0, z: 0, w: 0} @@ -1476,7 +1476,7 @@ TextureImporter: x: 792 y: 842 width: 208 - height: 228 + height: 262 alignment: 9 pivot: {x: 0.5, y: 0.07017544} border: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Sprites/Games/Fillbots/Large Bot Darkness.png b/Assets/Resources/Sprites/Games/Fillbots/legacy/Large Bot Darkness.png similarity index 100% rename from Assets/Resources/Sprites/Games/Fillbots/Large Bot Darkness.png rename to Assets/Resources/Sprites/Games/Fillbots/legacy/Large Bot Darkness.png diff --git a/Assets/Resources/Sprites/Games/Fillbots/Large Bot Darkness.png.meta b/Assets/Resources/Sprites/Games/Fillbots/legacy/Large Bot Darkness.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/Fillbots/Large Bot Darkness.png.meta rename to Assets/Resources/Sprites/Games/Fillbots/legacy/Large Bot Darkness.png.meta diff --git a/Assets/Resources/Sprites/Games/Fillbots/Medium Bot Darkness.png b/Assets/Resources/Sprites/Games/Fillbots/legacy/Medium Bot Darkness.png similarity index 100% rename from Assets/Resources/Sprites/Games/Fillbots/Medium Bot Darkness.png rename to Assets/Resources/Sprites/Games/Fillbots/legacy/Medium Bot Darkness.png diff --git a/Assets/Resources/Sprites/Games/Fillbots/Medium Bot Darkness.png.meta b/Assets/Resources/Sprites/Games/Fillbots/legacy/Medium Bot Darkness.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/Fillbots/Medium Bot Darkness.png.meta rename to Assets/Resources/Sprites/Games/Fillbots/legacy/Medium Bot Darkness.png.meta diff --git a/Assets/Resources/Sprites/Games/Fillbots/Small Bot Darkness.png b/Assets/Resources/Sprites/Games/Fillbots/legacy/Small Bot Darkness.png similarity index 100% rename from Assets/Resources/Sprites/Games/Fillbots/Small Bot Darkness.png rename to Assets/Resources/Sprites/Games/Fillbots/legacy/Small Bot Darkness.png diff --git a/Assets/Resources/Sprites/Games/Fillbots/Small Bot Darkness.png.meta b/Assets/Resources/Sprites/Games/Fillbots/legacy/Small Bot Darkness.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/Fillbots/Small Bot Darkness.png.meta rename to Assets/Resources/Sprites/Games/Fillbots/legacy/Small Bot Darkness.png.meta diff --git a/Assets/Resources/Sprites/Games/Fillbots/ref.png b/Assets/Resources/Sprites/Games/Fillbots/ref.png new file mode 100644 index 000000000..74d0d97f8 Binary files /dev/null and b/Assets/Resources/Sprites/Games/Fillbots/ref.png differ diff --git a/Assets/Resources/Sprites/Games/Fillbots/ref.png.meta b/Assets/Resources/Sprites/Games/Fillbots/ref.png.meta new file mode 100644 index 000000000..52cfffbd6 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Fillbots/ref.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: e2107d00b7f359746b7b1acd361a36a1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Fillbots/ref001.png b/Assets/Resources/Sprites/Games/Fillbots/ref001.png new file mode 100644 index 000000000..7d9f56b19 Binary files /dev/null and b/Assets/Resources/Sprites/Games/Fillbots/ref001.png differ diff --git a/Assets/Resources/Sprites/Games/Fillbots/ref001.png.meta b/Assets/Resources/Sprites/Games/Fillbots/ref001.png.meta new file mode 100644 index 000000000..a7cdc5708 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Fillbots/ref001.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 0f6862a559f12a84488f618e606bec2e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/Fillbots/Fillbots.cs b/Assets/Scripts/Games/Fillbots/Fillbots.cs index 7db703a62..b3d3fc6f0 100644 --- a/Assets/Scripts/Games/Fillbots/Fillbots.cs +++ b/Assets/Scripts/Games/Fillbots/Fillbots.cs @@ -35,6 +35,7 @@ namespace HeavenStudio.Games.Loaders defaultLength = 8f, parameters = new List() { + new Param("type", Scripts_Fillbots.EndType.Both, "Success Reaction", "Set the reaction of the Robot."), new Param("colorFuel", new Color(1f, 0.385f, 0.385f), "Fuel Color", "Set the color of the fuel."), new Param("colorLampOff", new Color(0.635f, 0.635f, 0.185f), "Off Lamp Color", "Set the color of the off lamp."), new Param("colorLampOn", new Color(1f, 1f, 0.42f), "On Lamp Color", "Set the color of the on lamp."), @@ -49,6 +50,7 @@ namespace HeavenStudio.Games.Loaders defaultLength = 12f, parameters = new List() { + new Param("type", Scripts_Fillbots.EndType.Both, "Success Reaction", "Set the reaction of the Robot."), new Param("colorFuel", new Color(1f, 0.385f, 0.385f), "Fuel Color", "Set the color of the fuel."), new Param("colorLampOff", new Color(0.635f, 0.635f, 0.185f), "Off Lamp Color", "Set the color of the off lamp."), new Param("colorLampOn", new Color(1f, 1f, 0.42f), "On Lamp Color", "Set the color of the on lamp."), @@ -63,6 +65,7 @@ namespace HeavenStudio.Games.Loaders defaultLength = 6f, parameters = new List() { + new Param("type", Scripts_Fillbots.EndType.Both, "Success Reaction", "Set the reaction of the Robot."), new Param("colorFuel", new Color(1f, 0.385f, 0.385f), "Fuel Color", "Set the color of the fuel."), new Param("colorLampOff", new Color(0.635f, 0.635f, 0.185f), "Off Lamp Color", "Set the color of the off lamp."), new Param("colorLampOn", new Color(1f, 1f, 0.42f), "On Lamp Color", "Set the color of the on lamp."), @@ -131,6 +134,7 @@ namespace HeavenStudio.Games [SerializeField] private Animator conveyerBelt; [SerializeField] private GameObject blackout; + [System.NonSerialized] public BotSize fillerPosition = BotSize.Medium; public static Fillbots instance; @@ -176,12 +180,26 @@ namespace HeavenStudio.Games } if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) { - filler.DoScaledAnimationAsync("Hold", 0.5f); + string sizeSuffix = fillerPosition switch + { + BotSize.Small => "Small", + BotSize.Medium => "Medium", + BotSize.Large => "Large", + _ => throw new System.NotImplementedException() + }; + filler.DoScaledAnimationAsync("Hold" + sizeSuffix, 0.5f); SoundByte.PlayOneShotGame("fillbots/armExtension"); } if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease)) { - filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f); + string sizeSuffix = fillerPosition switch + { + BotSize.Small => "Small", + BotSize.Medium => "Medium", + BotSize.Large => "Large", + _ => throw new System.NotImplementedException() + }; + filler.DoScaledAnimationAsync("ReleaseWhiff" + sizeSuffix, 0.5f); SoundByte.PlayOneShotGame("fillbots/armRetractionWhiff"); } @@ -280,6 +298,7 @@ namespace HeavenStudio.Games new BeatAction.Action(beat + 3, delegate { if (!PlayerInput.GetIsAction(InputAction_BasicPress)) filler.DoScaledAnimationAsync("FillerPrepare", 0.5f); + fillerPosition = size; conveyerStartBeat = beat + 3; }) }); diff --git a/Assets/Scripts/Games/Fillbots/NtrFillbot.cs b/Assets/Scripts/Games/Fillbots/NtrFillbot.cs index 045acbc98..0ee3feb2c 100644 --- a/Assets/Scripts/Games/Fillbots/NtrFillbot.cs +++ b/Assets/Scripts/Games/Fillbots/NtrFillbot.cs @@ -12,6 +12,22 @@ namespace HeavenStudio.Games.Scripts_Fillbots Large } + public enum BotState + { + Idle, + Holding, + Ace, + Just, + Ng, + } + + public enum EndType + { + Both, + Ace, + Just, + } + public class NtrFillbot : MonoBehaviour { [Header("Properties")] @@ -56,10 +72,11 @@ namespace HeavenStudio.Games.Scripts_Fillbots private Sound fillSound; - private bool holding; + private BotState botState = BotState.Idle; private bool isExplode = false; private float lerpDistance; + private float stackDistanceRate = 0.2f; private float normalizedFill; @@ -90,7 +107,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots public void MoveConveyer(float normalized) { - if (holding) + if (botState is BotState.Holding) { StopConveyer(); return; @@ -192,11 +209,10 @@ namespace HeavenStudio.Games.Scripts_Fillbots } } - if (holding) + if (botState is BotState.Holding) { float normalizedBeat = cond.GetPositionFromBeat(startBeat + 4, holdLength); float normalizedExplodeBeat = cond.GetPositionFromBeat(startBeat + 4, holdLength + 0.25); - float normalizedULTRAExplodeBeat = cond.GetPositionFromBeat(startBeat + 4, holdLength + 1.5f); if (!isExplode && beepEvent != null && beepEvent.enabled && ReportBeat(ref beepEvent.lastReportedBeat)) { @@ -205,7 +221,15 @@ namespace HeavenStudio.Games.Scripts_Fillbots SoundByte.PlayOneShotGame("fillbots/beep"); } fullBody.DoScaledAnimationAsync("HoldBeat", 1f); - game.filler.DoScaledAnimationAsync("HoldBeat", 1f); + + string sizeSuffix = game.fillerPosition switch + { + BotSize.Small => "Small", + BotSize.Medium => "Medium", + BotSize.Large => "Large", + _ => throw new System.NotImplementedException() + }; + game.filler.DoScaledAnimationAsync("HoldBeat" + sizeSuffix, 1f); } fillAnim.DoNormalizedAnimation("Fill", Mathf.Clamp(normalizedBeat, 0, 1)); @@ -229,7 +253,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots fullBody.Play("Dead", 0, 0); fillSound.KillLoop(0); beepEvent.enabled = false; - holding = false; + botState = BotState.Ng; normalizedFill = normalizedBeat; SoundByte.PlayOneShotGame("fillbots/miss"); if (game.conveyerStartBeat == -1) game.conveyerStartBeat = cond.songPositionInBeats + conveyerRestartLength; @@ -239,7 +263,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots fullBody.DoScaledAnimationAsync("ReleaseLate", 0.5f); fillSound.KillLoop(0); beepEvent.enabled = false; - holding = false; + botState = BotState.Ng; normalizedFill = normalizedBeat; SoundByte.PlayOneShotGame("fillbots/miss"); if (game.conveyerStartBeat == -1) game.conveyerStartBeat = cond.songPositionInBeats + conveyerRestartLength; @@ -248,12 +272,19 @@ namespace HeavenStudio.Games.Scripts_Fillbots { fillSound.KillLoop(0); beepEvent.enabled = false; - holding = false; normalizedFill = normalizedBeat; if (game.conveyerStartBeat == -1) game.conveyerStartBeat = cond.songPositionInBeats + conveyerRestartLength; } releaseEvent.Disable(); } + } + else if (botState is BotState.Ace) + { + + } + else if (botState is BotState.Just) + { + } else { @@ -264,7 +295,15 @@ namespace HeavenStudio.Games.Scripts_Fillbots private void JustHold(PlayerActionEvent caller, float state) { - game.filler.DoScaledAnimationAsync("Hold", 0.5f); + string sizeSuffix = game.fillerPosition switch + { + BotSize.Small => "Small", + BotSize.Medium => "Medium", + BotSize.Large => "Large", + _ => throw new System.NotImplementedException() + }; + + game.filler.DoScaledAnimationAsync("Hold" + sizeSuffix, 0.5f); SoundByte.PlayOneShotGame("fillbots/armExtension"); if (state >= 1f || state <= -1f) { @@ -274,7 +313,7 @@ namespace HeavenStudio.Games.Scripts_Fillbots if (game.conveyerStartBeat != -1) game.conveyerNormalizedOffset = Conductor.instance.GetPositionFromBeat(game.conveyerStartBeat, 1); game.conveyerStartBeat = -1; transform.position = new Vector3(0, transform.position.y, 0); - holding = true; + botState = BotState.Holding; fullBody.DoScaledAnimationAsync("Hold", 1f); SoundByte.PlayOneShotGame("fillbots/beep"); fillSound = SoundByte.PlayOneShotGame("fillbots/water", -1, 1 / (float)(holdLength / 3), 1, true); @@ -292,25 +331,53 @@ namespace HeavenStudio.Games.Scripts_Fillbots { fillSound.KillLoop(0); beepEvent.enabled = false; - holding = false; if (game.conveyerStartBeat != -2) game.conveyerStartBeat = caller.timer + caller.startBeat + conveyerRestartLength; + + string sizeSuffix = game.fillerPosition switch + { + BotSize.Small => "Small", + BotSize.Medium => "Medium", + BotSize.Large => "Large", + _ => throw new System.NotImplementedException() + }; if (state >= 1f) { + botState = BotState.Ng; SoundByte.PlayOneShotGame("fillbots/miss"); - game.filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f); + game.filler.DoScaledAnimationAsync("ReleaseWhiff" + sizeSuffix, 0.5f); SoundByte.PlayOneShotGame("fillbots/armRetraction2"); fullBody.DoScaledAnimationAsync("ReleaseLate", 0.5f); return; } else if (state <= -1f) { + botState = BotState.Ng; SoundByte.PlayOneShotGame("fillbots/miss"); - game.filler.DoScaledAnimationAsync("ReleaseWhiff", 0.5f); + game.filler.DoScaledAnimationAsync("ReleaseWhiff" + sizeSuffix, 0.5f); SoundByte.PlayOneShotGame("fillbots/armRetraction2"); fullBody.DoScaledAnimationAsync("ReleaseEarly", 0.5f); return; } - game.filler.DoScaledAnimationAsync("Release", 0.5f); + if (state == 0) + { + botState = BotState.Ace; + } + else + { + botState = BotState.Just; + + // No, Sync to Bop + BeatAction.New(game, new List() + { + new BeatAction.Action(caller.startBeat + caller.timer + 1, delegate { + fullBody.DoScaledAnimationAsync("Success", 0.5f); + }), + new BeatAction.Action(caller.startBeat + caller.timer + 2, delegate { + fullBody.DoScaledAnimationAsync("Success", 0.5f); + }), + }); + } + game.filler.DoScaledAnimationAsync("Release" + sizeSuffix, 0.5f); SoundByte.PlayOneShotGame("fillbots/armRetraction"); fullBody.DoScaledAnimationAsync("Release", 1f); string sizePrefix = size switch @@ -326,15 +393,6 @@ namespace HeavenStudio.Games.Scripts_Fillbots new MultiSound.Sound("fillbots/" + sizePrefix + "OK1", caller.startBeat + caller.timer + 0.5), new MultiSound.Sound("fillbots/" + sizePrefix + "OK2", caller.startBeat + caller.timer + 1), }); - BeatAction.New(game, new List() - { - new BeatAction.Action(caller.startBeat + caller.timer + 1, delegate { - fullBody.DoScaledAnimationAsync("Success", 0.5f); - }), - new BeatAction.Action(caller.startBeat + caller.timer + 2, delegate { - fullBody.DoScaledAnimationAsync("Success", 0.5f); - }), - }); } private void Empty(PlayerActionEvent caller) { }