From 87b474b1ba26cf2e2ab6938b025485c341093e1e Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Mon, 7 Mar 2022 00:00:54 -0500 Subject: [PATCH] Working Drumming Practice --- .../Resources/Games/drummingPractice.prefab | 90 ++++ .../Sfx/games/drummingPractice/drum.ogg | Bin 0 -> 28133 bytes .../Sfx/games/drummingPractice/drum.ogg.meta | 22 + .../Sfx/games/drummingPractice/miss.ogg | Bin 0 -> 20130 bytes .../Sfx/games/drummingPractice/miss.ogg.meta | 22 + .../Animations/DrummerAnimator.controller | 107 +++- .../Animations/DrummerBop.anim | 148 ++---- .../Animations/DrummerHitLeft.anim | 9 +- .../Animations/DrummerHitRight.anim | 9 +- .../Animations/DrummerIdle.anim | 484 ++---------------- .../Scripts/Games/DrummingPractice/Drummer.cs | 59 +++ .../Games/DrummingPractice/DrummerHit.cs | 77 +++ .../Games/DrummingPractice/DrummerHit.cs.meta | 11 + .../DrummingPractice/DrummingPractice.cs | 67 ++- Assets/Scripts/Minigames.cs | 7 +- 15 files changed, 555 insertions(+), 557 deletions(-) create mode 100644 Assets/Resources/Sfx/games/drummingPractice/drum.ogg create mode 100644 Assets/Resources/Sfx/games/drummingPractice/drum.ogg.meta create mode 100644 Assets/Resources/Sfx/games/drummingPractice/miss.ogg create mode 100644 Assets/Resources/Sfx/games/drummingPractice/miss.ogg.meta create mode 100644 Assets/Scripts/Games/DrummingPractice/DrummerHit.cs create mode 100644 Assets/Scripts/Games/DrummingPractice/DrummerHit.cs.meta diff --git a/Assets/Resources/Games/drummingPractice.prefab b/Assets/Resources/Games/drummingPractice.prefab index 12eee3b3e..8ce844a21 100644 --- a/Assets/Resources/Games/drummingPractice.prefab +++ b/Assets/Resources/Games/drummingPractice.prefab @@ -1,5 +1,92 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1267604445988741763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3533843519173060812} + m_Layer: 0 + m_Name: Hits + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3533843519173060812 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1267604445988741763} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6252367538665576760} + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2707293855688477128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6252367538665576760} + - component: {fileID: 1376774670981630850} + m_Layer: 0 + m_Name: Hit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6252367538665576760 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707293855688477128} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3533843519173060812} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1376774670981630850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2707293855688477128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a4698fb27db1ad4995391c5b6cd1ddb, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + eligibleHitsList: [] + aceTimes: 0 + isEligible: 0 + triggersAutoplay: 1 + startBeat: 0 --- !u!1 &6253388915924582274 GameObject: m_ObjectHideFlags: 0 @@ -114,6 +201,7 @@ Transform: - {fileID: 7454105062301250827} - {fileID: 8362243043720385897} - {fileID: 4767419199465391264} + - {fileID: 3533843519173060812} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -135,6 +223,8 @@ MonoBehaviour: player: {fileID: 1392736437434169712} leftDrummer: {fileID: 12689295882508562} rightDrummer: {fileID: 3893632247804889307} + hitPrefab: {fileID: 2707293855688477128} + count: 0 --- !u!1 &8963803634876878173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sfx/games/drummingPractice/drum.ogg b/Assets/Resources/Sfx/games/drummingPractice/drum.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3d6a8b0f6f5aab0dcbd49c22cc3bb1ef297c9669 GIT binary patch literal 28133 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%0DQS$XXhEw&9j2barPc{ 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 Qo@j;QPEY-&p5cN21Fadv@&Et; literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sfx/games/drummingPractice/drum.ogg.meta b/Assets/Resources/Sfx/games/drummingPractice/drum.ogg.meta new file mode 100644 index 000000000..8bd92682e --- /dev/null +++ b/Assets/Resources/Sfx/games/drummingPractice/drum.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6700bc1bfa3dcec47ba19227beb16ac6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/drummingPractice/miss.ogg b/Assets/Resources/Sfx/games/drummingPractice/miss.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ac6947ca4d14c803c44408ac5ab784baa80fc5a4 GIT binary patch literal 20130 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sfx/games/drummingPractice/miss.ogg.meta b/Assets/Resources/Sfx/games/drummingPractice/miss.ogg.meta new file mode 100644 index 000000000..44007a54f --- /dev/null +++ b/Assets/Resources/Sfx/games/drummingPractice/miss.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4719f52b355bc9e48a08ca31f50338ef +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerAnimator.controller b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerAnimator.controller index 2a1ff9885..568ef11d9 100644 --- a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerAnimator.controller +++ b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerAnimator.controller @@ -8,9 +8,10 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HitRight - m_Speed: 0.25 + m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -2027018955617299144} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -34,9 +35,10 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bop - m_Speed: 0.25 + m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -4831383733179702630} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -60,9 +62,10 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HitLeft - m_Speed: 0.25 + m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 7579008626126242272} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -86,7 +89,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PrepareRight - m_Speed: 0.25 + m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -104,6 +107,72 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-5688770049663966888 +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: 6351492053978300819} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-4831383733179702630 +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: 6351492053978300819} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2027018955617299144 +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: 6351492053978300819} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -134,7 +203,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PrepareLeft - m_Speed: 0.25 + m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] m_StateMachineBehaviours: [] @@ -178,6 +247,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7579008626126242272 +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: 6351492053978300819} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &8828564168240574946 AnimatorStateMachine: serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerBop.anim b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerBop.anim index 7e7636007..9e120489b 100644 --- a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerBop.anim +++ b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerBop.anim @@ -27,7 +27,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.11666667 + time: 0.083333336 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -52,7 +52,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.11666667 + time: 0.083333336 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -77,7 +77,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.11666667 + time: 0.083333336 value: {x: 0, y: 0, z: 20} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -102,7 +102,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.11666667 + time: 0.083333336 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -127,7 +127,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.11666667 + time: 0.083333336 value: {x: 0, y: 0, z: -20} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -153,16 +153,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.016666668 - value: {x: 0.02, y: -0.53, 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.11666667 + time: 0.083333336 value: {x: 0.02, y: -0.014337629, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -187,7 +178,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.11666667 + time: 0.083333336 value: {x: -1.43, y: 0.12, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -212,7 +203,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.11666667 + time: 0.083333336 value: {x: -0.088, y: 0.255, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -237,7 +228,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.11666667 + time: 0.083333336 value: {x: 1.43, y: 0.12, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -262,7 +253,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.11666667 + time: 0.083333336 value: {x: 0.088, y: 0.255, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -288,7 +279,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.11666667 + time: 0.083333336 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -313,15 +304,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 3 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -341,15 +323,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 3 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -361,7 +334,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - - time: 0.11666667 + - time: 0.083333336 value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} attribute: m_Sprite path: Body/LeftHand/LeftDrumstick @@ -370,7 +343,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - - time: 0.11666667 + - time: 0.083333336 value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} attribute: m_Sprite path: Body/RightHand/RightDrumstick @@ -498,7 +471,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.13333334 + m_StopTime: 0.1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -527,7 +500,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0.02 inSlope: 0 outSlope: 0 @@ -555,16 +528,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.016666668 - value: -0.53 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: -0.014337629 inSlope: 0 outSlope: 0 @@ -592,7 +556,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -620,7 +584,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -648,7 +612,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -676,7 +640,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -704,7 +668,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: -1.43 inSlope: 0 outSlope: 0 @@ -732,7 +696,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0.12 inSlope: 0 outSlope: 0 @@ -760,7 +724,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -788,7 +752,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -816,7 +780,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -844,7 +808,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -872,7 +836,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: -0.088 inSlope: 0 outSlope: 0 @@ -900,7 +864,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0.255 inSlope: 0 outSlope: 0 @@ -928,7 +892,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -956,7 +920,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -984,7 +948,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1012,7 +976,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 20 inSlope: 0 outSlope: 0 @@ -1040,7 +1004,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 1.43 inSlope: 0 outSlope: 0 @@ -1068,7 +1032,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0.12 inSlope: 0 outSlope: 0 @@ -1096,7 +1060,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1124,7 +1088,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1152,7 +1116,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1180,7 +1144,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1208,7 +1172,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0.088 inSlope: 0 outSlope: 0 @@ -1236,7 +1200,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0.255 inSlope: 0 outSlope: 0 @@ -1264,7 +1228,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1292,7 +1256,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1320,7 +1284,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 0 inSlope: 0 outSlope: 0 @@ -1348,7 +1312,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: -20 inSlope: 0 outSlope: 0 @@ -1376,7 +1340,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 1 inSlope: 0 outSlope: 0 @@ -1404,7 +1368,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 1 inSlope: 0 outSlope: 0 @@ -1432,7 +1396,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.083333336 value: 1 inSlope: 0 outSlope: 0 @@ -1459,15 +1423,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 3 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1487,15 +1442,6 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.13333334 - value: 3 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitLeft.anim b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitLeft.anim index 48a875a7e..dada7a900 100644 --- a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitLeft.anim +++ b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitLeft.anim @@ -2148,4 +2148,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.016666668 + functionName: EndHit + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitRight.anim b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitRight.anim index 5d5e1da7e..a68aee945 100644 --- a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitRight.anim +++ b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerHitRight.anim @@ -2427,4 +2427,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.016666668 + functionName: EndHit + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerIdle.anim b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerIdle.anim index 9c18c6497..514b29e5b 100644 --- a/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerIdle.anim +++ b/Assets/Resources/Sprites/Games/DrummingPractice/Animations/DrummerIdle.anim @@ -26,15 +26,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: 1 - value: {x: 0, y: 0, 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 @@ -51,15 +42,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: 1 - value: {x: 0, y: 0, 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 @@ -76,15 +58,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: 1 - value: {x: 0, y: 0, z: 20} - 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 @@ -101,15 +74,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: 1.0166667 - value: {x: 0, y: 0, 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 @@ -126,15 +90,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: 1.0166667 - value: {x: 0, y: 0, z: -20} - 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 @@ -152,15 +107,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: 1 - value: {x: 0.02, y: -0.014337629, 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 @@ -177,15 +123,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: 1 - value: {x: -1.43, y: 0.12, 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 @@ -202,15 +139,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: 1 - value: {x: -0.088, y: 0.255, 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 @@ -227,15 +155,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: 1.0166667 - value: {x: 1.43, y: 0.12, 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 @@ -252,15 +171,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: 1.0166667 - value: {x: 0.088, y: 0.255, 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 @@ -278,15 +188,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: 1 - value: {x: 1, y: 1, z: 1} - 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 @@ -296,8 +197,6 @@ AnimationClip: - curve: - time: 0 value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - - time: 1 - value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} attribute: m_Sprite path: Body/LeftHand/LeftDrumstick classID: 212 @@ -305,8 +204,6 @@ AnimationClip: - curve: - time: 0 value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - - time: 1.0166667 - value: {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} attribute: m_Sprite path: Body/RightHand/RightDrumstick classID: 212 @@ -412,14 +309,12 @@ AnimationClip: pptrCurveMapping: - {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - - {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} - - {fileID: -6295135488227773171, guid: 75ff12e8f30ba5a4aba0d8c4268d28a8, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0333333 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -447,15 +342,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.02 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -475,15 +361,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -0.014337629 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -503,15 +380,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -531,15 +399,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -559,15 +418,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -587,15 +437,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -615,15 +456,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -643,15 +475,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -671,15 +494,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -699,15 +513,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -1.43 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -727,15 +532,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -755,15 +551,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -783,15 +570,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -811,15 +589,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -839,15 +608,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -867,15 +627,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -895,15 +646,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -923,15 +665,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 20 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -951,15 +684,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -0.088 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -979,15 +703,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.255 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1007,15 +722,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - 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 @@ -1035,15 +741,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - value: 1.43 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1063,15 +760,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - value: 0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1091,15 +779,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1119,15 +798,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1147,15 +817,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1175,15 +836,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1203,15 +855,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - value: 0.088 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1231,15 +874,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - value: 0.255 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1259,15 +893,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1287,15 +912,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1315,15 +931,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - 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 @@ -1343,15 +950,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 - value: -20 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1367,7 +965,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Body/RightHand + path: Body/LeftHand/LeftDrumstick classID: 4 script: {fileID: 0} - curve: @@ -1377,7 +975,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Body/RightHand + path: Body/LeftHand/LeftDrumstick classID: 4 script: {fileID: 0} - curve: @@ -1387,7 +985,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Body/RightHand + path: Body/LeftHand/LeftDrumstick classID: 4 script: {fileID: 0} - curve: @@ -1397,7 +995,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Body + path: Body/RightHand/RightDrumstick classID: 4 script: {fileID: 0} - curve: @@ -1407,7 +1005,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Body + path: Body/RightHand/RightDrumstick classID: 4 script: {fileID: 0} - curve: @@ -1417,7 +1015,37 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Body + path: Body/RightHand/RightDrumstick + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Body/RightHand + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Body/RightHand + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Body/RightHand classID: 4 script: {fileID: 0} - curve: @@ -1456,8 +1084,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Body/LeftHand/LeftDrumstick + attribute: m_LocalEulerAngles.x + path: Body classID: 4 script: {fileID: 0} - curve: @@ -1467,37 +1095,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Body/LeftHand/LeftDrumstick - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Body/LeftHand/LeftDrumstick - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Body/RightHand/RightDrumstick - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Body/RightHand/RightDrumstick + path: Body classID: 4 script: {fileID: 0} - curve: @@ -1507,7 +1105,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Body/RightHand/RightDrumstick + path: Body classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Scripts/Games/DrummingPractice/Drummer.cs b/Assets/Scripts/Games/DrummingPractice/Drummer.cs index dcb4eb3a3..0ea2d27ad 100644 --- a/Assets/Scripts/Games/DrummingPractice/Drummer.cs +++ b/Assets/Scripts/Games/DrummingPractice/Drummer.cs @@ -17,7 +17,11 @@ namespace RhythmHeavenMania.Games.DrummingPractice public SpriteRenderer face; public bool player = false; + public int mii = 0; + public int count = 0; + + private bool hitting = false; [System.Serializable] public class MiiFace @@ -25,5 +29,60 @@ namespace RhythmHeavenMania.Games.DrummingPractice public List Sprites; } + private void Update() + { + if (player && PlayerInput.Pressed()) + { + Hit(false); + } + } + + public void SetFace(int type) + { + face.sprite = miiFaces[mii].Sprites[type]; + } + + public void Bop() + { + if (animator.IsAnimationNotPlaying()) + animator.Play("Bop", 0, 0); + } + + public void Prepare(int type) + { + count = type; + if (count % 2 == 0) + animator.Play("PrepareLeft", 0, 0); + else + animator.Play("PrepareRight", 0, 0); + } + + public void Hit(bool hit) + { + if (!hitting) + { + if (count % 2 == 0) + animator.Play("HitLeft", 0, 0); + else + animator.Play("HitRight", 0, 0); + count++; + + if (player) + { + if (hit) + Jukebox.PlayOneShotGame("drummingPractice/hit"); + else + Jukebox.PlayOneShotGame("drummingPractice/miss"); + } + + hitting = true; + } + } + + public void EndHit() + { + hitting = false; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs new file mode 100644 index 000000000..47ef89d1c --- /dev/null +++ b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs @@ -0,0 +1,77 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.DrummingPractice +{ + public class DrummerHit : PlayerActionObject + { + public float startBeat; + private bool hit = false; + private bool hasHit = false; + + // Start is called before the first frame update + void Start() + { + PlayerActionInit(gameObject, startBeat); + } + + public override void OnAce() + { + Hit(true); + } + + // Update is called once per frame + void Update() + { + if (Conductor.instance.GetPositionFromBeat(startBeat, 2) >= 1) + { + DrummingPractice.instance.SetFaces(0); + CleanUp(); + } + + if (!hit && Conductor.instance.GetPositionFromBeat(startBeat, 1) >= 1) + { + Jukebox.PlayOneShotGame("drummingPractice/drum"); + DrummingPractice.instance.leftDrummer.Hit(true); + DrummingPractice.instance.rightDrummer.Hit(true); + hit = true; + if (hasHit) CleanUp(); + } + + float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 1f); + StateCheck(normalizedBeat); + + if (PlayerInput.Pressed()) + { + if (state.perfect) + { + Hit(true); + } else if (state.notPerfect()) + { + Hit(false); + } + } + } + + public void Hit(bool _hit) + { + if (!hasHit) + { + DrummingPractice.instance.player.Hit(_hit); + DrummingPractice.instance.SetFaces(_hit ? 1 : 2); + + hasHit = true; + + if (hit) CleanUp(); + } + } + + public void CleanUp() + { + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs.meta b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs.meta new file mode 100644 index 000000000..7a14ec4c1 --- /dev/null +++ b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6a4698fb27db1ad4995391c5b6cd1ddb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs b/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs index cc9422188..862a9c447 100644 --- a/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs +++ b/Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs @@ -15,7 +15,10 @@ namespace RhythmHeavenMania.Games.DrummingPractice public Drummer player; public Drummer leftDrummer; public Drummer rightDrummer; + public GameObject hitPrefab; + public GameEvent bop = new GameEvent(); + public int count = 0; public static DrummingPractice instance; @@ -24,9 +27,71 @@ namespace RhythmHeavenMania.Games.DrummingPractice instance = this; } + // TODO: Move this to OnGameSwitch() when functional? + private void Start() + { + player.mii = UnityEngine.Random.Range(0, player.miiFaces.Count); + do + { + leftDrummer.mii = UnityEngine.Random.Range(0, leftDrummer.miiFaces.Count); + } + while (leftDrummer.mii == player.mii); + do + { + rightDrummer.mii = UnityEngine.Random.Range(0, rightDrummer.miiFaces.Count); + } + while (rightDrummer.mii == leftDrummer.mii || rightDrummer.mii == player.mii); + + SetFaces(0); + } + private void Update() { - + if (Conductor.instance.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1)) + { + if (Conductor.instance.songPositionInBeats >= bop.startBeat && Conductor.instance.songPositionInBeats < bop.startBeat + bop.length) + { + Bop(); + } + } + } + + public void SetBop(float beat, float length) + { + bop.startBeat = beat; + bop.length = length; + } + + public void Bop() + { + player.Bop(); + leftDrummer.Bop(); + rightDrummer.Bop(); + } + + public void Prepare(float beat) + { + int type = count % 2; + player.Prepare(type); + leftDrummer.Prepare(type); + rightDrummer.Prepare(type); + count++; + + SetFaces(0); + Jukebox.PlayOneShotGame("drummingPractice/prepare"); + + GameObject hit = Instantiate(hitPrefab); + hit.transform.parent = hitPrefab.transform.parent; + hit.SetActive(true); + DrummerHit h = hit.GetComponent(); + h.startBeat = beat; + } + + public void SetFaces(int type) + { + player.SetFace(type); + leftDrummer.SetFace(type); + rightDrummer.SetFace(type); } } diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index d13719893..51b77fa8e 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -18,6 +18,7 @@ using RhythmHeavenMania.Games.TapTrial; using RhythmHeavenMania.Games.CropStomp; using RhythmHeavenMania.Games.WizardsWaltz; using RhythmHeavenMania.Games.MrUpbeat; +using RhythmHeavenMania.Games.DrummingPractice; namespace RhythmHeavenMania { @@ -383,9 +384,11 @@ namespace RhythmHeavenMania new Param("toggle", false, "Applause") }), }), - new Minigame("drummingPractice", "Drumming Practice \n[WIP don't use]", "2BCF33", false, false, new List() + new Minigame("drummingPractice", "Drumming Practice", "2BCF33", false, false, new List() { - + new GameAction("bop", delegate { var e = eventCaller.currentEntity; DrummingPractice.instance.SetBop(e.beat, e.length); }, 0.5f, true), + new GameAction("drum", delegate { DrummingPractice.instance.Prepare(eventCaller.currentEntity.beat); }, 2f), + }), /*new Minigame("spaceDance", "Space Dance", "B888F8", new List() {