From 03e6cf460be8a0094cb7b43158154ec080b5f752 Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Fri, 15 Dec 2023 17:06:45 -0500 Subject: [PATCH] push for anims stuff why r unity animations so suck --- Assets/Resources/Games/meatGrinder.prefab | 100 ++++-- .../Animations/Meat/DarkMeatHit.anim | 9 +- .../Animations/Meat/DarkMeatHitIdle.anim | 285 --------------- .../Animations/Meat/DarkMeatHitIdle.anim.meta | 8 - .../Animations/Meat/DarkMeat_Ball.controller | 72 ---- .../Meat/DarkMeat_Ball.controller.meta | 8 - .../Animations/Meat/LightMeatHit.anim | 9 +- .../Animations/Meat/LightMeatHitIdle.anim | 338 ------------------ .../Meat/LightMeatHitIdle.anim.meta | 8 - .../Animations/Meat/LightMeat_Ball.controller | 72 ---- .../Meat/LightMeat_Ball.controller.meta | 8 - .../Meat/LightMeat_Thrown.controller | 72 ---- .../Meat/LightMeat_Thrown.controller.meta | 8 - ..._Thrown.controller => MeatAnim.controller} | 120 +------ ...ntroller.meta => MeatAnim.controller.meta} | 0 .../Animations/Meat/MeatHitIdle.anim | 323 ----------------- .../Animations/Meat/MeatHitIdle.anim.meta | 8 - .../MeatGrinder/Animations/Meat/MeatIdle.anim | 2 +- .../Animations/Meat/MeatIdle.anim.meta | 2 +- .../Animations/Meat/MeatThrown.anim | 166 ++------- Assets/Scripts/Games/MeatGrinder/Meat.cs | 35 +- .../Scripts/Games/MeatGrinder/MeatGrinder.cs | 29 +- Assets/Scripts/Games/MeatGrinder/MeatToss.cs | 73 ---- .../Games/MeatGrinder/MeatToss.cs.meta | 11 - 24 files changed, 166 insertions(+), 1600 deletions(-) delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim.meta delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller.meta delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim.meta delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller.meta delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller.meta rename Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/{DarkMeat_Thrown.controller => MeatAnim.controller} (58%) rename Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/{DarkMeat_Thrown.controller.meta => MeatAnim.controller.meta} (100%) delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim.meta delete mode 100644 Assets/Scripts/Games/MeatGrinder/MeatToss.cs delete mode 100644 Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta diff --git a/Assets/Resources/Games/meatGrinder.prefab b/Assets/Resources/Games/meatGrinder.prefab index 2046fbb64..d1541ef88 100644 --- a/Assets/Resources/Games/meatGrinder.prefab +++ b/Assets/Resources/Games/meatGrinder.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4035877382569997717} - component: {fileID: 9090016194217145924} - component: {fileID: 409730438988014783} - - component: {fileID: 2525979697215420720} + - component: {fileID: 231624041180045168} m_Layer: 0 m_Name: Meat m_TagString: Untagged @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 151360738741628551} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.46, y: -1.23, z: 0} + m_LocalPosition: {x: 0, y: -1.23, z: 0} m_LocalScale: {x: 0.6415348, y: 0.6415348, z: 0.6415348} m_ConstrainProportionsScale: 0 m_Children: [] @@ -75,7 +75,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 25 - m_Sprite: {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -83,7 +83,7 @@ SpriteRenderer: m_Size: {x: 6.92, y: 1.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!114 &409730438988014783 @@ -100,13 +100,11 @@ MonoBehaviour: m_EditorClassIdentifier: startBeat: 0 meatType: 0 - anim: {fileID: 2525979697215420720} - sr: {fileID: 9090016194217145924} meats: - {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - {fileID: -4224877059003839859, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - {fileID: -936998580, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} ---- !u!95 &2525979697215420720 +--- !u!95 &231624041180045168 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 @@ -888,8 +886,8 @@ Transform: m_LocalScale: {x: 0.1213017, y: 0.1213017, z: 0.1213017} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4773680412020886884} - m_RootOrder: 5 + m_Father: {fileID: 4316543350587402345} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1827108650296241172 SpriteRenderer: @@ -1296,12 +1294,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3884870158331433142} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 4.58, z: 0} + m_LocalPosition: {x: 0, y: 4.58, z: 0} m_LocalScale: {x: 0.1213017, y: 0.1213017, z: 0.1213017} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4773680412020886884} - m_RootOrder: 7 + m_Father: {fileID: 4316543350587402345} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5740312479299997546 SpriteRenderer: @@ -1692,8 +1690,8 @@ Transform: m_LocalScale: {x: 0.13055326, y: 0.13055326, z: 0.13055326} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4773680412020886884} - m_RootOrder: 4 + m_Father: {fileID: 4316543350587402345} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &4781199580935872767 SpriteRenderer: @@ -1947,7 +1945,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4773680412020886884} - m_RootOrder: 9 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3780766958517627623 SpriteRenderer: @@ -1989,7 +1987,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: -100 m_Sprite: {fileID: 21300000, guid: f2673d3484257be40bd6af1a40f32b3b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2147,8 +2145,8 @@ Transform: m_LocalScale: {x: 0.1213017, y: 0.1213017, z: 0.1213017} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4773680412020886884} - m_RootOrder: 3 + m_Father: {fileID: 4316543350587402345} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &9177278018785002683 SpriteRenderer: @@ -2254,17 +2252,49 @@ Transform: - {fileID: 4564256392123642655} - {fileID: 3267919402445251047} - {fileID: 5833323549318991154} + - {fileID: 2937015283906010673} + - {fileID: 6116398338649840817} + - {fileID: 3232890611424222781} + - {fileID: 3600842165078314753} + - {fileID: 4316543350587402345} + m_Father: {fileID: 544937591884515791} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6809729426963480446 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4316543350587402345} + m_Layer: 0 + m_Name: Gears + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4316543350587402345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6809729426963480446} + 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: 4255429133276147351} - {fileID: 6673086640620398125} - {fileID: 1612270337899650120} - {fileID: 8638372891015524707} - {fileID: 8463963395356207829} - - {fileID: 2937015283906010673} - - {fileID: 6116398338649840817} - - {fileID: 3232890611424222781} - - {fileID: 3600842165078314753} - m_Father: {fileID: 544937591884515791} - m_RootOrder: 1 + m_Father: {fileID: 4773680412020886884} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7048408843338729873 GameObject: @@ -2464,7 +2494,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4773680412020886884} - m_RootOrder: 8 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5759760895645003122 SpriteRenderer: @@ -2506,7 +2536,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: -150 m_Sprite: {fileID: 21300000, guid: f2673d3484257be40bd6af1a40f32b3b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2628,7 +2658,7 @@ Transform: m_GameObject: {fileID: 8179118432937757279} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3469572, y: 1.3469572, z: 1.3469572} + m_LocalScale: {x: 1.346957, y: 1.3469572, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4773680412020886884} @@ -2674,13 +2704,13 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1 + m_SortingOrder: -32768 m_Sprite: {fileID: 21300000, guid: 02bc34c5a848bac4c94ba914ea1d18f6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 52.780003, y: 31.673157} + m_Size: {x: 66.7024, y: 7.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2968,7 +2998,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4773680412020886884} - m_RootOrder: 10 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6787208589475715512 SpriteRenderer: @@ -3010,7 +3040,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: -50 m_Sprite: {fileID: 21300000, guid: f2673d3484257be40bd6af1a40f32b3b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3052,7 +3082,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4773680412020886884} - m_RootOrder: 11 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5849131264402260118 SpriteRenderer: @@ -3094,7 +3124,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 300 + m_SortingOrder: 15 m_Sprite: {fileID: 21300000, guid: f2673d3484257be40bd6af1a40f32b3b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3136,8 +3166,8 @@ Transform: m_LocalScale: {x: 0.13055326, y: 0.13055326, z: 0.13055326} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4773680412020886884} - m_RootOrder: 6 + m_Father: {fileID: 4316543350587402345} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &18350484223611572 SpriteRenderer: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHit.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHit.anim index 00ceb8ce2..be4650aaa 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHit.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHit.anim @@ -845,4 +845,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroySelf + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim deleted file mode 100644 index 9479c73b4..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim +++ /dev/null @@ -1,285 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DarkMeatHitIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 2.84, y: -4.26, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.083333336 - value: {x: 2.84, y: -4.26, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_ScaleCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.4535959, y: 0.6779637, z: 0.67796373} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.083333336 - value: {x: 0.4535959, y: 0.6779637, z: 0.67796373} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 3 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.083333336 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 2.84 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 2.84 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -4.26 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: -4.26 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - 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.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.4535959 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.4535959 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.6779637 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.6779637 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.67796373 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0.67796373 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.z - path: - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim.meta deleted file mode 100644 index 22818520f..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatHitIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 31b9deab246d6e34f8c00e5248a127b1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller deleted file mode 100644 index b0c31f9db..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-1350355175302476790 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 6294973185423118115} - m_Position: {x: 280, y: 50, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 6294973185423118115} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DarkMeat_Ball - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -1350355175302476790} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &6294973185423118115 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DarkMeatHit - 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: 07aaa5f3a298d04498b0a145b3d5c227, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller.meta deleted file mode 100644 index 163a1b891..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Ball.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1bbfa4ea146af56428de447b28badba6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHit.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHit.anim index 629b05147..efa1774b6 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHit.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHit.anim @@ -845,4 +845,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroySelf + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim deleted file mode 100644 index 71c5d711e..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim +++ /dev/null @@ -1,338 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LightMeatHitIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: -90} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 2.84, y: -4.26, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_ScaleCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.4535959, y: 0.6779637, z: 0.67796373} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -8867440539974192047, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 0 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 3 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: - - {fileID: -8867440539974192047, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.016666668 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 2.84 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -4.26 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.4535959 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.6779637 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.67796373 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.z - path: - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 4 - script: {fileID: 0} - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim.meta deleted file mode 100644 index 43cc6400e..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatHitIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c2e6ea16f9317874cad7ed3d6014d3ce -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller deleted file mode 100644 index 03ae6ba7d..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LightMeat_Ball - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 2729882025137060230} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1107 &2729882025137060230 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 3783172895675453694} - m_Position: {x: 350, y: 20, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 3783172895675453694} ---- !u!1102 &3783172895675453694 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LightMeatHit - 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: 5d2df3152fcfbe944a8b62cb4f6c8090, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller.meta deleted file mode 100644 index 934e39867..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Ball.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc1d082b437af0e4b83d75f4c9bbb542 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller deleted file mode 100644 index c54ef4e5b..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-1601623261108097209 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 6213310166424141736} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 6213310166424141736} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LightMeat_Thrown - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -1601623261108097209} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &6213310166424141736 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LightMeatThrown - 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: 2f1859638009cff48a2f8c9a3bcdb826, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller.meta deleted file mode 100644 index 16a240450..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeat_Thrown.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 73b875b543d9fba439c4b27fc6037da0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatAnim.controller similarity index 58% rename from Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller rename to Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatAnim.controller index c3dc53523..4d80b373c 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatAnim.controller @@ -1,79 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-6925001597299006452 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DarkIdle - 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: 31b9deab246d6e34f8c00e5248a127b1, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-6377740148132170919 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: LightIdle - 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: c2e6ea16f9317874cad7ed3d6014d3ce, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1101 &-5048501266211776613 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6925001597299006452} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-3570823828933063337 AnimatorState: serializedVersion: 6 @@ -88,7 +14,7 @@ AnimatorState: m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 @@ -110,12 +36,11 @@ AnimatorState: m_Name: LightMeatHit m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -1138168516103662538} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 @@ -127,35 +52,13 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-1138168516103662538 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6377740148132170919} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.875 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: DarkMeat_Thrown + m_Name: MeatAnim serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: @@ -189,12 +92,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2729320037363072411} m_Position: {x: 320, y: 240, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6925001597299006452} - m_Position: {x: 560, y: 300, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6377740148132170919} - m_Position: {x: 320, y: 300, z: 0} - serializedVersion: 1 m_State: {fileID: -3570823828933063337} m_Position: {x: 440, y: 180, z: 0} @@ -222,13 +119,13 @@ AnimatorState: m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: be5b2edb99d42c74ca6077e648382740, type: 2} + m_Motion: {fileID: 7400000, guid: 29b550105d0cd9c4fa47fb4df72fb7cc, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -244,12 +141,11 @@ AnimatorState: m_Name: DarkMeatHit m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -5048501266211776613} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatAnim.controller.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller.meta rename to Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatAnim.controller.meta diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim deleted file mode 100644 index 51f708320..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim +++ /dev/null @@ -1,323 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: MeatHitIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: -90} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 1.2, y: -4.26, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_ScaleCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.4535959, y: 0.6779637, z: 0.67796373} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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 - path: - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 3 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1.2 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -4.26 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: - 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.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -90 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.4535959 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.6779637 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.67796373 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalScale.z - path: - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 4 - script: {fileID: 0} - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim.meta deleted file mode 100644 index ab70d61ba..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatHitIdle.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5083ed00f0aaf9f438ce03a73d92b7aa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim index 9c69e5141..f56df21df 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim @@ -36,7 +36,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/MeatGrinder/Animations/Meat/MeatIdle.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim.meta index 34cac6d44..fac92f325 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim.meta +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be5b2edb99d42c74ca6077e648382740 +guid: 29b550105d0cd9c4fa47fb4df72fb7cc NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim index 807fa6cef..c3d4c0fd7 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim @@ -20,39 +20,21 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -16, y: -1.2, z: 0} - inSlope: {x: 90.052704, y: 0, z: 0} - outSlope: {x: 90.052704, y: 0, z: 0} + value: {x: -20, y: -1.2, z: 0} + inSlope: {x: 84.71333, y: 0, z: 0} + outSlope: {x: 46, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 1, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.46122158, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.033333335 - value: {x: -9.11, y: -1.2, z: 0} - inSlope: {x: 151.4832, y: 0, z: 0} - outSlope: {x: 151.4832, y: 0, z: 0} + time: 0.5 + value: {x: 3, y: -1.2, z: 0} + inSlope: {x: 18.085503, y: 0, z: 0} + outSlope: {x: 18.085503, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.4893826, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.083333336 - value: {x: 1, y: -1.2, z: 0} - inSlope: {x: 24.00001, y: 0, z: 0} - outSlope: {x: 24.00001, y: 0, 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.15 - value: {x: 1.7, y: -1.2, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.07372409, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -72,16 +54,7 @@ AnimationClip: 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.76984173, y: 0.6415348, z: 0.6415348} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, 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.15 + time: 0.5 value: {x: 0.76984173, y: 0.6415348, z: 0.6415348} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -122,7 +95,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.15 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -143,39 +116,21 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -16 - inSlope: 90.052704 - outSlope: 90.052704 + value: -20 + inSlope: 84.71333 + outSlope: 46 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.46122158 + - serializedVersion: 3 + time: 0.5 + value: 3 + inSlope: 18.085503 + outSlope: 18.085503 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 1 - - serializedVersion: 3 - time: 0.033333335 - value: -9.11 - inSlope: 151.4832 - outSlope: 151.4832 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.4893826 - - serializedVersion: 3 - time: 0.083333336 - value: 1 - inSlope: 24.00001 - outSlope: 24.00001 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 1.7 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.07372409 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -197,25 +152,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 - value: -1.2 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: -1.2 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 + time: 0.5 value: -1.2 inSlope: 0 outSlope: 0 @@ -243,25 +180,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.083333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 + time: 0.5 value: 0 inSlope: 0 outSlope: 0 @@ -289,16 +208,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 0.76984173 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 + time: 0.5 value: 0.76984173 inSlope: 0 outSlope: 0 @@ -326,16 +236,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 0.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 + time: 0.5 value: 0.6415348 inSlope: 0 outSlope: 0 @@ -363,16 +264,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 - value: 0.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 + time: 0.5 value: 0.6415348 inSlope: 0 outSlope: 0 diff --git a/Assets/Scripts/Games/MeatGrinder/Meat.cs b/Assets/Scripts/Games/MeatGrinder/Meat.cs index 32eff15de..7d9fee53a 100644 --- a/Assets/Scripts/Games/MeatGrinder/Meat.cs +++ b/Assets/Scripts/Games/MeatGrinder/Meat.cs @@ -3,6 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using Starpelly; namespace HeavenStudio.Games.Scripts_MeatGrinder { @@ -11,9 +12,12 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder public double startBeat; public MeatType meatType; + private string meatTypeStr; + private bool isHit = false; + [Header("Animators")] - [SerializeField] private Animator anim; - [SerializeField] private SpriteRenderer sr; + private Animator anim; + private SpriteRenderer sr; [SerializeField] private Sprite[] meats; public enum MeatType @@ -28,24 +32,37 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder private void Awake() { game = MeatGrinder.instance; - sr.sprite = meats[(int)meatType]; + anim = GetComponent(); + sr = GetComponent(); } private void Start() { + meatTypeStr = meatType.ToString(); + sr.sprite = meats[(int)meatType]; + Debug.Log(meats[(int)meatType]); + Debug.Log(sr.sprite.name); + game.ScheduleInput(startBeat, 1, MeatGrinder.InputAction_Press, Hit, Miss, Nothing); } private void Update() { - float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat + 0.5, 1); - anim.DoNormalizedAnimation("MeatThrown", normalizedBeat); + // if (Input.GetKey(KeyCode.G)) { // Insane. + // anim.enabled = true; + // } + Debug.Log(sr.sprite.name); + if (!isHit) { + float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 1.1); + anim.DoNormalizedAnimation("MeatThrown", normalizedBeat); + } } private void Hit(PlayerActionEvent caller, float state) { + isHit = true; game.TackAnim.SetBool("tackMeated", false); - anim.DoScaledAnimationAsync(meatType.ToString() + "Hit", 0.5f); + anim.DoScaledAnimationAsync(meatTypeStr + "Hit", 0.5f); bool isBarely = state is >= 1f or <= -1f; @@ -59,7 +76,7 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder game.bossAnnoyed = true; SoundByte.PlayOneShotGame("meatGrinder/miss"); - game.TackAnim.DoScaledAnimationAsync("TackMiss" + meatType, 0.5f); + game.TackAnim.DoScaledAnimationAsync("TackMiss" + meatTypeStr, 0.5f); game.TackAnim.SetBool("tackMeated", true); game.BossAnim.DoScaledAnimationAsync("BossMiss", 0.5f); @@ -68,6 +85,10 @@ namespace HeavenStudio.Games.Scripts_MeatGrinder private void Nothing(PlayerActionEvent caller) { } + public void SetSprite() { + sr.sprite = meats[(int)meatType]; + } + public void DestroySelf() { Destroy(gameObject); } diff --git a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs index 877ff9aa2..e2b1176bc 100644 --- a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs +++ b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace HeavenStudio.Games.Loaders { using static Minigames; - public static class pcoMeatLoader + public static class PcoMeatLoader { public static Minigame AddGame(EventCaller eventCaller) { @@ -93,7 +93,7 @@ namespace HeavenStudio.Games public class MeatGrinder : Minigame { - static List queuedIntervals = new (); + static List queuedIntervals = new(); struct QueuedInterval { public double beat; @@ -111,7 +111,7 @@ namespace HeavenStudio.Games public Animator TackAnim; [Header("Variables")] - bool bossBop = true; + private bool bossBop = true; public bool bossAnnoyed = false; const string sfxName = "meatGrinder/"; @@ -179,11 +179,11 @@ namespace HeavenStudio.Games foreach (var interval in queuedIntervals) StartInterval(interval.beat, interval.length, beat, interval.autoPassTurn); queuedIntervals.Clear(); } - } - - private RiqEntity GetLastIntervalBeforeBeat(double beat) - { - return EventCaller.GetAllInGameManagerList("meatGrinder", new string[] { "StartInterval" }).FindLast(x => x.beat <= beat); + if (queuedMeats.Count > 0) + { + foreach (var meat in queuedMeats) MeatToss(meat.beat, meat["bacon"]); + queuedMeats.Clear(); + } } private List GetRelevantMeatCallsBetweenBeat(double beat, double endBeat) @@ -209,6 +209,13 @@ namespace HeavenStudio.Games } } + public void TackExpression(int expression) + { + string anim = ((TackExpressions)expression).ToString(); + TackAnim.DoScaledAnimationAsync("Tack" + anim, 0.5f); + Debug.Log(anim); + } + public static void PreInterval(double beat, float length, bool autoPassTurn) { SoundByte.PlayOneShotGame(sfxName + "startSignal", beat - 1, forcePlay: true); @@ -261,9 +268,9 @@ namespace HeavenStudio.Games { SoundByte.PlayOneShotGame(sfxName + "toss"); - Meat Meat = Instantiate(MeatBase, transform).GetComponent(); - Meat.startBeat = beat; - Meat.meatType = bacon ? Meat.MeatType.BaconBall : Meat.MeatType.DarkMeat; + Meat meat = Instantiate(MeatBase, transform).GetComponent(); + meat.startBeat = beat; + meat.meatType = bacon ? Meat.MeatType.BaconBall : Meat.MeatType.DarkMeat; } public static void PrePassTurn(double beat) diff --git a/Assets/Scripts/Games/MeatGrinder/MeatToss.cs b/Assets/Scripts/Games/MeatGrinder/MeatToss.cs deleted file mode 100644 index 901587a8e..000000000 --- a/Assets/Scripts/Games/MeatGrinder/MeatToss.cs +++ /dev/null @@ -1,73 +0,0 @@ -using HeavenStudio.Util; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -using NaughtyBezierCurves; - -namespace HeavenStudio.Games.Scripts_MeatGrinder -{ - public class MeatToss : MonoBehaviour - { - public double startBeat; - public double cueLength; - public bool cueBased; - public string meatType; - - [Header("Animators")] - private Animator anim; - - private MeatGrinder game; - - private void Awake() - { - game = MeatGrinder.instance; - anim = GetComponent(); - } - - private void Start() - { - game.ScheduleInput(startBeat, cueLength, MeatGrinder.InputAction_Press, Hit, Miss, Nothing); - - BeatAction.New(this, new List() { - new BeatAction.Action(cueBased ? startBeat + 0.66f : cueLength + startBeat - 1 + 0.66f, delegate { - anim.DoScaledAnimationAsync(meatType+"Thrown", 0.32f); - }), - }); - } - - private void Update() - { - if (anim.IsPlayingAnimationNames("DarkIdle") || anim.IsPlayingAnimationNames("LightIdle")) GameObject.Destroy(gameObject); - } - - private void InputActions(bool annoyBoss, string whichSfx, string whichAnim) - { - game.bossAnnoyed = annoyBoss; - SoundByte.PlayOneShotGame("meatGrinder/"+whichSfx); - game.TackAnim.DoScaledAnimationAsync(whichAnim, 0.5f); - } - - private void Hit(PlayerActionEvent caller, float state) - { - game.TackAnim.SetBool("tackMeated", false); - anim.DoScaledAnimationAsync(meatType+"Hit", 0.5f); - - if (state >= 1f || state <= -1f) { - InputActions(true, "tink", "TackHitBarely"); - } else { - InputActions(false, "meatHit", "TackHitSuccess"); - } - } - - private void Miss(PlayerActionEvent caller) - { - GameObject.Destroy(gameObject); - InputActions(true, "miss", "TackMiss"+meatType); - game.BossAnim.DoScaledAnimationAsync("BossMiss", 0.5f); - game.TackAnim.SetBool("tackMeated", true); - } - - private void Nothing(PlayerActionEvent caller) { } - } -} diff --git a/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta b/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta deleted file mode 100644 index 4da138d10..000000000 --- a/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 178d1e4de0e9fe04981ca7ab2221e56f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: