From b740bd8c6427708f76ba0f621e2a99da1434d90f Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Wed, 6 Dec 2023 14:17:37 -0500 Subject: [PATCH] working out merge conflics (cries) --- .vscode/settings.json | 2 +- Assets/Resources/Games/meatGrinder.prefab | 12 +- .../Animations/Boss/BossAnim.controller | 129 +---- .../MeatGrinder/Animations/Boss/BossBop.anim | 2 +- .../MeatGrinder/Animations/Boss/BossCall.anim | 2 +- .../Animations/Boss/BossEyebrow.anim | 2 +- .../MeatGrinder/Animations/Boss/BossMiss.anim | 2 +- .../Animations/Boss/BossScared.anim | 2 +- .../Animations/Boss/BossSignal.anim | 2 +- .../Animations/Meat/DarkMeatThrown.anim | 486 ------------------ .../Animations/Meat/DarkMeatThrown.anim.meta | 8 - .../Meat/DarkMeat_Thrown.controller | 135 ++--- .../MeatGrinder/Animations/Meat/MeatIdle.anim | 90 +--- .../{LightMeatThrown.anim => MeatThrown.anim} | 98 +--- ...tThrown.anim.meta => MeatThrown.anim.meta} | 0 .../Animations/Tack/TackContent.anim | 2 +- .../Animations/Tack/TackEmptyHit.anim | 2 +- .../Animations/Tack/TackHitBarely.anim | 2 +- .../Animations/Tack/TackHitSuccess.anim | 2 +- .../Animations/Tack/TackWonder.anim | 2 +- Assets/Scripts/Games/MeatGrinder/Meat.cs | 75 +++ Assets/Scripts/Games/MeatGrinder/Meat.cs.meta | 11 + .../Scripts/Games/MeatGrinder/MeatGrinder.cs | 163 +++--- .../Games/MeatGrinder/MeatToss.cs.meta | 2 +- 24 files changed, 228 insertions(+), 1005 deletions(-) delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatThrown.anim delete mode 100644 Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatThrown.anim.meta rename Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/{LightMeatThrown.anim => MeatThrown.anim} (78%) rename Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/{LightMeatThrown.anim.meta => MeatThrown.anim.meta} (100%) create mode 100644 Assets/Scripts/Games/MeatGrinder/Meat.cs create mode 100644 Assets/Scripts/Games/MeatGrinder/Meat.cs.meta diff --git a/.vscode/settings.json b/.vscode/settings.json index d5d9a24c5..54d21e9c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -51,5 +51,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "HeavenStudio.sln" + "dotnet.defaultSolution": "HeavenStudio-AstrlJelly.sln" } \ No newline at end of file diff --git a/Assets/Resources/Games/meatGrinder.prefab b/Assets/Resources/Games/meatGrinder.prefab index a6ccef99a..2046fbb64 100644 --- a/Assets/Resources/Games/meatGrinder.prefab +++ b/Assets/Resources/Games/meatGrinder.prefab @@ -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: 0, y: 0, z: 0} + m_LocalPosition: {x: 1.46, y: -1.23, z: 0} m_LocalScale: {x: 0.6415348, y: 0.6415348, z: 0.6415348} m_ConstrainProportionsScale: 0 m_Children: [] @@ -99,9 +99,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startBeat: 0 - cueLength: 0 - cueBased: 0 - meatType: + 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 Animator: serializedVersion: 5 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossAnim.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossAnim.controller index c45134f44..389e06473 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossAnim.controller +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossAnim.controller @@ -1,30 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-9010492945866378655 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: bossAnnoyed - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -3611536849482802496} - 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 &-8280671437747132002 AnimatorState: serializedVersion: 6 @@ -35,8 +10,7 @@ AnimatorState: m_Name: BossCall m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 7642762717700035768} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -124,28 +98,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-3460911913288570618 -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: -3611536849482802496} - 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!1101 &-3241211448617720692 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -222,8 +174,7 @@ AnimatorState: m_Name: BossSignal m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -3460911913288570618} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -239,31 +190,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-1474196525380159720 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: bossAnnoyed - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -957716402780387173} - 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 &-957716402780387173 AnimatorState: serializedVersion: 6 @@ -380,9 +306,7 @@ AnimatorState: m_Name: BossMiss m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -9010492945866378655} - - {fileID: -1474196525380159720} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -398,50 +322,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &6792835609497543406 -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: -3611536849482802496} - 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!1101 &7642762717700035768 -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: 7709906099263252174} - 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 &7709906099263252174 AnimatorState: serializedVersion: 6 @@ -452,8 +332,7 @@ AnimatorState: m_Name: BossCallIdle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 6792835609497543406} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossBop.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossBop.anim index 43cbde308..ed57d7ae5 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossBop.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossBop.anim @@ -272,7 +272,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/Boss/BossCall.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossCall.anim index 3740354c1..13293e36d 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossCall.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossCall.anim @@ -1604,7 +1604,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/Boss/BossEyebrow.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossEyebrow.anim index 4d6134715..d1f9e103b 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossEyebrow.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossEyebrow.anim @@ -345,7 +345,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/Boss/BossMiss.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossMiss.anim index 17da2b41f..d8ac7ad42 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossMiss.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossMiss.anim @@ -290,7 +290,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/Boss/BossScared.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossScared.anim index 2473fc066..16e5c082f 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossScared.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossScared.anim @@ -278,7 +278,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/Boss/BossSignal.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossSignal.anim index f3c02811c..f5874c66e 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossSignal.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Boss/BossSignal.anim @@ -340,7 +340,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/DarkMeatThrown.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatThrown.anim deleted file mode 100644 index 3c80a830d..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatThrown.anim +++ /dev/null @@ -1,486 +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: DarkMeatThrown - 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: -16, y: -1.2, z: 0} - inSlope: {x: 90.052704, y: 0, z: 0} - outSlope: {x: 90.052704, 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} - - 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} - 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: 17.14285, y: 0, z: 0} - outSlope: {x: 17.14285, 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.5, 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} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.75 - value: {x: 1.5, 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} - 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.6415348, 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.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 - 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.75 - 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} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - - time: 0.15 - value: {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - - time: 0.75 - value: {fileID: -9124615959790710355, 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: 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 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - - {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - - {fileID: -9124615959790710355, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.76666665 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - 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: -16 - inSlope: 90.052704 - outSlope: 90.052704 - 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: 17.14285 - outSlope: 17.14285 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.15 - value: 1.5 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 1.5 - 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: -1.2 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - 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 - value: -1.2 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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.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.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 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - 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 - value: 0.76984173 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.76984173 - 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.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - 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 - value: 0.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.6415348 - 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.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - 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 - value: 0.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.6415348 - 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/DarkMeatThrown.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatThrown.anim.meta deleted file mode 100644 index 356d5c80c..000000000 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeatThrown.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2d575622f33f2264e9dd49d38792bd41 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller index d2bae75cb..c3dc53523 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/DarkMeat_Thrown.controller @@ -1,19 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1109 &-9100981535737129552 -AnimatorTransition: - 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: -6752750947452270917} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 1 --- !u!1102 &-6925001597299006452 AnimatorState: serializedVersion: 6 @@ -40,58 +26,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-6752750947452270917 -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: ---- !u!1102 &-6519314615803248777 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DarkMeatThrown - 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: 2d575622f33f2264e9dd49d38792bd41, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &-6377740148132170919 AnimatorState: serializedVersion: 6 @@ -140,6 +74,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-3570823828933063337 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MeatThrown + 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: --- !u!1102 &-2729320037363072411 AnimatorState: serializedVersion: 6 @@ -189,20 +149,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1109 &-811812897981135681 -AnimatorTransition: - 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: -6519314615803248777} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -234,37 +180,32 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -6519314615803248777} - m_Position: {x: 320, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 6323703256060355657} - m_Position: {x: 320, y: 180, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6752750947452270917} - m_Position: {x: 320, y: 50, z: 0} + m_Position: {x: 440, y: 120, z: 0} - serializedVersion: 1 m_State: {fileID: 7262290551830053764} - m_Position: {x: 550, y: 110, z: 0} + m_Position: {x: 560, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -2729320037363072411} - m_Position: {x: 550, y: 180, z: 0} + m_Position: {x: 320, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -6925001597299006452} - m_Position: {x: 780, y: 110, z: 0} + m_Position: {x: 560, y: 300, z: 0} - serializedVersion: 1 m_State: {fileID: -6377740148132170919} - m_Position: {x: 780, y: 180, z: 0} + m_Position: {x: 320, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3570823828933063337} + m_Position: {x: 440, y: 180, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] - m_EntryTransitions: - - {fileID: -9100981535737129552} - - {fileID: -811812897981135681} + m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 70, y: 50, z: 0} - m_EntryPosition: {x: 70, y: 120, z: 0} - m_ExitPosition: {x: 920, y: 270, z: 0} + m_AnyStatePosition: {x: 460, y: 370, z: 0} + m_EntryPosition: {x: 460, y: 60, z: 0} + m_ExitPosition: {x: 460, y: 420, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 6323703256060355657} --- !u!1102 &6323703256060355657 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim index fea5505ad..9c69e5141 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatIdle.anim @@ -14,23 +14,7 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -16, y: -1.9452, 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_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: [] @@ -40,21 +24,14 @@ AnimationClip: 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 + genericBindings: [] pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -69,65 +46,8 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -16 - 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: -1.9452 - 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} + m_EditorCurves: [] m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 + m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatThrown.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim similarity index 78% rename from Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatThrown.anim rename to Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim index 0920c9649..807fa6cef 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatThrown.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: LightMeatThrown + m_Name: MeatThrown serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -54,15 +54,6 @@ AnimationClip: 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.75 - 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} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -98,30 +89,12 @@ AnimationClip: 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.75 - 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} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 path: m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -4224877059003839859, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - - time: 0.75 - value: {fileID: -4224877059003839859, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -143,22 +116,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -4224877059003839859, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} - - {fileID: -4224877059003839859, guid: adbc5b443bdc23e469209cc4f602d17d, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.76666665 + m_StopTime: 0.15 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -213,15 +177,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 1.7 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -268,15 +223,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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 @@ -323,15 +269,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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 @@ -369,15 +306,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.76984173 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -415,15 +343,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -461,15 +380,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.6415348 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatThrown.anim.meta b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/LightMeatThrown.anim.meta rename to Assets/Resources/Sprites/Games/MeatGrinder/Animations/Meat/MeatThrown.anim.meta diff --git a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackContent.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackContent.anim index 733e2ea78..515b268a3 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackContent.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackContent.anim @@ -448,7 +448,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/Tack/TackEmptyHit.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackEmptyHit.anim index 8852f4d6b..c82c81cdd 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackEmptyHit.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackEmptyHit.anim @@ -976,7 +976,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/Tack/TackHitBarely.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackHitBarely.anim index 99af73b9b..cbb33340d 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackHitBarely.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackHitBarely.anim @@ -928,7 +928,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/Tack/TackHitSuccess.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackHitSuccess.anim index d30d7d2e7..ca6f62140 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackHitSuccess.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackHitSuccess.anim @@ -946,7 +946,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/Tack/TackWonder.anim b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackWonder.anim index ea6a0a231..22556c4a7 100644 --- a/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackWonder.anim +++ b/Assets/Resources/Sprites/Games/MeatGrinder/Animations/Tack/TackWonder.anim @@ -483,7 +483,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/Scripts/Games/MeatGrinder/Meat.cs b/Assets/Scripts/Games/MeatGrinder/Meat.cs new file mode 100644 index 000000000..32eff15de --- /dev/null +++ b/Assets/Scripts/Games/MeatGrinder/Meat.cs @@ -0,0 +1,75 @@ +using HeavenStudio.Util; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace HeavenStudio.Games.Scripts_MeatGrinder +{ + public class Meat : MonoBehaviour + { + public double startBeat; + public MeatType meatType; + + [Header("Animators")] + [SerializeField] private Animator anim; + [SerializeField] private SpriteRenderer sr; + [SerializeField] private Sprite[] meats; + + public enum MeatType + { + DarkMeat, + LightMeat, + BaconBall, + } + + private MeatGrinder game; + + private void Awake() + { + game = MeatGrinder.instance; + sr.sprite = meats[(int)meatType]; + } + + private void Start() + { + 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); + } + + private void Hit(PlayerActionEvent caller, float state) + { + game.TackAnim.SetBool("tackMeated", false); + anim.DoScaledAnimationAsync(meatType.ToString() + "Hit", 0.5f); + + bool isBarely = state is >= 1f or <= -1f; + + game.bossAnnoyed = isBarely; + SoundByte.PlayOneShotGame("meatGrinder/" + (isBarely ? "tink" : "meatHit")); + game.TackAnim.DoScaledAnimationAsync("TackHit" + (isBarely ? "Barely" : "Success"), 0.5f); + } + + private void Miss(PlayerActionEvent caller) + { + game.bossAnnoyed = true; + SoundByte.PlayOneShotGame("meatGrinder/miss"); + + game.TackAnim.DoScaledAnimationAsync("TackMiss" + meatType, 0.5f); + game.TackAnim.SetBool("tackMeated", true); + game.BossAnim.DoScaledAnimationAsync("BossMiss", 0.5f); + + Destroy(gameObject); + } + + private void Nothing(PlayerActionEvent caller) { } + + public void DestroySelf() { + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/Games/MeatGrinder/Meat.cs.meta b/Assets/Scripts/Games/MeatGrinder/Meat.cs.meta new file mode 100644 index 000000000..6350eb4f8 --- /dev/null +++ b/Assets/Scripts/Games/MeatGrinder/Meat.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5e4b8f117d68e142ae364804ec945d3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs index a9ba627ed..877ff9aa2 100644 --- a/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs +++ b/Assets/Scripts/Games/MeatGrinder/MeatGrinder.cs @@ -4,8 +4,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using NaughtyBezierCurves; - namespace HeavenStudio.Games.Loaders { using static Minigames; @@ -15,14 +13,35 @@ namespace HeavenStudio.Games.Loaders { return new Minigame("meatGrinder", "Meat Grinder", "501d18", false, false, new List() { + new GameAction("bop", "Bop") + { + function = delegate { + var e = eventCaller.currentEntity; + MeatGrinder.instance.Bop(e.beat, e.length, e["bop"], e["bossBop"]); + }, + parameters = new List() + { + new Param("bop", true, "Boss Bops?", "Does Boss bop?"), + new Param("bossBop", false, "Boss Bops? (Auto)", "Does Boss Auto bop?"), + }, + resizable = true, + priority = 1, + }, new GameAction("MeatToss", "Meat Toss") { function = delegate { var e = eventCaller.currentEntity; - MeatGrinder.instance.MeatToss(e.beat); + MeatGrinder.instance.MeatToss(e.beat, e["bacon"]); + }, + inactiveFunction = delegate { + MeatGrinder.QueueMeatToss(eventCaller.currentEntity); }, defaultLength = 2f, priority = 2, + parameters = new List() + { + new Param("bacon", false, "Bacon Ball", "Throw a bacon ball instead of the typical meat"), + }, }, new GameAction("StartInterval", "Start Interval") { @@ -47,30 +66,21 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("passTurn", "Pass Turn") { - preFunction = delegate - { - MeatGrinder.PrePassTurn(eventCaller.currentEntity.beat); - }, + preFunction = delegate { MeatGrinder.PrePassTurn(eventCaller.currentEntity.beat); }, preFunctionLength = 1 }, - new GameAction("bop", "Bop") + new GameAction("expressions", "Tack Expressions") { - function = delegate { - var e = eventCaller.currentEntity; - MeatGrinder.instance.Bop(e.beat, e.length, e["bop"], e["bossBop"]); - }, - parameters = new List() - { - new Param("bop", true, "Boss Bops?", "Does Boss bop?"), - new Param("bossBop", false, "Boss Bops? (Auto)", "Does Boss Auto bop?"), - }, - resizable = true, - priority = 1, + function = delegate { MeatGrinder.instance.TackExpression(eventCaller.currentEntity["expression"]); }, + parameters = new List() { + new Param("expression", MeatGrinder.TackExpressions.Content, "Expression", "The expression Tack will display"), + } }, - }, - new List() { "pco", "normal", "repeat" }, - "pcomeat", "en", - new List() { } + } + // , + // new List() { "pco", "normal", "repeat" }, + // "pcomeat", "en", + // new List() { } ); } } @@ -80,11 +90,10 @@ namespace HeavenStudio.Games { using Jukebox; using Scripts_MeatGrinder; - using UnityEngine.UIElements; public class MeatGrinder : Minigame { - static List queuedIntervals = new List(); + static List queuedIntervals = new (); struct QueuedInterval { public double beat; @@ -92,6 +101,8 @@ namespace HeavenStudio.Games public bool autoPassTurn; } + static List queuedMeats = new(); + [Header("Objects")] public GameObject MeatBase; @@ -100,22 +111,17 @@ namespace HeavenStudio.Games public Animator TackAnim; [Header("Variables")] -<<<<<<< HEAD bool bossBop = true; -======= - bool intervalStarted; - double intervalStartBeat; - public double beatInterval = 4f; ->>>>>>> release_1 public bool bossAnnoyed = false; const string sfxName = "meatGrinder/"; public static MeatGrinder instance; - public enum MeatType + public enum TackExpressions { - Dark, - Light, + Content, + // Smug, + Wonder, } protected static bool IA_PadAny(out double dt) @@ -130,7 +136,7 @@ namespace HeavenStudio.Games public static PlayerInput.InputAction InputAction_Press = new("PcoMeatPress", new int[] { IAPressCat, IAFlickCat, IAPressCat }, IA_PadAny, IA_TouchBasicPress, IA_BatonBasicPress); - + private void Awake() { instance = this; @@ -160,9 +166,7 @@ namespace HeavenStudio.Games public override void OnBeatPulse(double beat) { - if (!BossAnim.IsPlayingAnimationNames("BossCall") - && !BossAnim.IsPlayingAnimationNames("BossSignal") - && BeatIsInBopRegion(beat)) + if (!BossAnim.IsPlayingAnimationNames("BossCall", "BossSignal") && BeatIsInBopRegion(beat)) { BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f); } @@ -170,25 +174,10 @@ namespace HeavenStudio.Games public override void OnGameSwitch(double beat) { -<<<<<<< HEAD if (queuedIntervals.Count > 0) { foreach (var interval in queuedIntervals) StartInterval(interval.beat, interval.length, beat, interval.autoPassTurn); queuedIntervals.Clear(); -======= - if (doesBop) - { - for (int i = 0; i < length; i++) - { - BeatAction.New(instance, new List() { - new BeatAction.Action(beat + i, delegate { - if (!BossAnim.IsPlayingAnimationNames("BossCall") && !BossAnim.IsPlayingAnimationNames("BossSignal")) { - BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f); - } - }) - }); - } ->>>>>>> release_1 } } @@ -205,20 +194,18 @@ namespace HeavenStudio.Games public void Bop(double beat, double length, bool doesBop, bool autoBop) { bossBop = autoBop; - if (doesBop) + if (doesBop) { - List bops = new(); - for (int i = 0; i < length; i++) + for (int i = 0; i < length; i++) { - bops.Add(new BeatAction.Action(beat + i, delegate - { - if (!BossAnim.IsPlayingAnimationName("BossCall") && !BossAnim.IsPlayingAnimationName("BossSignal")) - { - BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f); - } - })); + BeatAction.New(instance, new List() { + new BeatAction.Action(beat + i, delegate { + if (!BossAnim.IsPlayingAnimationNames("BossCall") && !BossAnim.IsPlayingAnimationNames("BossSignal")) { + BossAnim.DoScaledAnimationAsync(bossAnnoyed ? "BossMiss" : "Bop", 0.5f); + } + }) + }); } - BeatAction.New(this, bops); } } @@ -226,7 +213,7 @@ namespace HeavenStudio.Games { SoundByte.PlayOneShotGame(sfxName + "startSignal", beat - 1, forcePlay: true); - if (GameManager.instance.currentGame == "meatGrinder") { + if (GameManager.instance.currentGame == "meatGrinder") { instance.StartInterval(beat, length, beat, autoPassTurn); } else { queuedIntervals.Add(new QueuedInterval() { @@ -239,12 +226,8 @@ namespace HeavenStudio.Games public void StartInterval(double beat, float length, double gameSwitchBeat, bool autoPassTurn) { - List actions = new() - { - new BeatAction.Action(beat - 1, delegate - { - if (beat - 1 >= gameSwitchBeat) BossAnim.DoScaledAnimationAsync("BossSignal", 0.5f); - }), + List actions = new() { + new(beat - 1, delegate { BossAnim.DoScaledAnimationFromBeatAsync("BossSignal", 0.5f, beat - 1); }), }; var allCallEvents = GetRelevantMeatCallsBetweenBeat(beat, beat + length); @@ -253,11 +236,10 @@ namespace HeavenStudio.Games { double eventBeat = allCallEvents[i].beat; - if (eventBeat >= gameSwitchBeat) - { - actions.Add(new BeatAction.Action(eventBeat, delegate - { - MeatCall(); + if (eventBeat >= gameSwitchBeat) { + actions.Add(new BeatAction.Action(eventBeat, delegate { + BossAnim.DoScaledAnimationAsync("BossCall", 0.5f); + SoundByte.PlayOneShotGame(sfxName + "signal"); })); } } @@ -270,21 +252,18 @@ namespace HeavenStudio.Games } } - public void MeatToss(double beat) + public static void QueueMeatToss(RiqEntity entity) + { + queuedMeats.Add(entity); + } + + public void MeatToss(double beat, bool bacon) { SoundByte.PlayOneShotGame(sfxName + "toss"); - MeatToss Meat = Instantiate(MeatBase, gameObject.transform).GetComponent(); + Meat Meat = Instantiate(MeatBase, transform).GetComponent(); Meat.startBeat = beat; - Meat.cueLength = 1f; - Meat.cueBased = true; - Meat.meatType = "DarkMeat"; - } - - public void MeatCall() - { - BossAnim.DoScaledAnimationAsync("BossCall", 0.5f); - SoundByte.PlayOneShotGame(sfxName + "signal"); + Meat.meatType = bacon ? Meat.MeatType.BaconBall : Meat.MeatType.DarkMeat; } public static void PrePassTurn(double beat) @@ -300,7 +279,7 @@ namespace HeavenStudio.Games private void PassTurnStandalone(double beat) { - var lastInterval = GetLastIntervalBeforeBeat(beat); + var lastInterval = EventCaller.GetAllInGameManagerList("meatGrinder", new string[] { "StartInterval" }).FindLast(x => x.beat <= beat); if (lastInterval != null) PassTurn(beat, lastInterval.beat, lastInterval.length); } @@ -313,11 +292,9 @@ namespace HeavenStudio.Games { double relativeBeat = allCallEvents[i].beat - intervalBeat; meatCalls.Add(new BeatAction.Action(beat + relativeBeat - 1, delegate { - MeatToss Meat = Instantiate(MeatBase, transform).GetComponent(); - Meat.startBeat = beat; - Meat.cueLength = relativeBeat; - Meat.cueBased = false; - Meat.meatType = "LightMeat"; + Meat Meat = Instantiate(MeatBase, transform).GetComponent(); + Meat.startBeat = beat + relativeBeat - 1; + Meat.meatType = Meat.MeatType.LightMeat; })); } BeatAction.New(this, meatCalls); diff --git a/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta b/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta index 6350eb4f8..4da138d10 100644 --- a/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta +++ b/Assets/Scripts/Games/MeatGrinder/MeatToss.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5e4b8f117d68e142ae364804ec945d3 +guid: 178d1e4de0e9fe04981ca7ab2221e56f MonoImporter: externalObjects: {} serializedVersion: 2