From 9656b54d9eeca04f4458f3ca426e9aa29200e55b Mon Sep 17 00:00:00 2001 From: Braedon Date: Tue, 8 Feb 2022 22:58:25 -0500 Subject: [PATCH] Rhythm tweezers logic but not really --- Assets/Resources/Games/rhythmTweezers.prefab | 405 +++++++++++++++++- .../Resources/Sfx/games/rhythmTweezers.meta | 8 + .../games/rhythmTweezers/longAppear.ogg.meta | 22 + .../games/rhythmTweezers/longPull1.ogg.meta | 22 + .../games/rhythmTweezers/longPull2.ogg.meta | 22 + .../games/rhythmTweezers/longPull3.ogg.meta | 22 + .../games/rhythmTweezers/longPull4.ogg.meta | 22 + .../games/rhythmTweezers/longPullEnd.ogg.meta | 22 + .../games/rhythmTweezers/register.ogg.meta | 22 + .../games/rhythmTweezers/shortAppear.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck1.ogg.meta | 22 + .../rhythmTweezers/shortPluck10.ogg.meta | 22 + .../rhythmTweezers/shortPluck11.ogg.meta | 22 + .../rhythmTweezers/shortPluck12.ogg.meta | 22 + .../rhythmTweezers/shortPluck13.ogg.meta | 22 + .../rhythmTweezers/shortPluck14.ogg.meta | 22 + .../rhythmTweezers/shortPluck15.ogg.meta | 22 + .../rhythmTweezers/shortPluck16.ogg.meta | 22 + .../rhythmTweezers/shortPluck17.ogg.meta | 22 + .../rhythmTweezers/shortPluck18.ogg.meta | 22 + .../rhythmTweezers/shortPluck19.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck2.ogg.meta | 22 + .../rhythmTweezers/shortPluck20.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck3.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck4.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck5.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck6.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck7.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck8.ogg.meta | 22 + .../games/rhythmTweezers/shortPluck9.ogg.meta | 22 + .../RhythmTweezers/Animations/Hairs.meta | 8 + .../Animations/Hairs/HairHolder.controller | 72 ++++ .../Hairs/HairHolder.controller.meta | 8 + .../Animations/Hairs/SmallAppear.anim | 80 ++++ .../Animations/Hairs/SmallAppear.anim.meta | 8 + .../Animations/TweezerHolder.controller | 101 +++++ .../Animations/TweezerHolder.controller.meta | 8 + .../Animations/Tweezers_Idle.anim | 68 +++ .../Animations/Tweezers_Idle.anim.meta | 8 + .../Animations/Tweezers_Pluck.anim | 330 ++++++++++++++ .../Animations/Tweezers_Pluck.anim.meta | 8 + .../RhythmTweezers/hairAndThings.png.meta | 12 + Assets/Scripts/Conductor.cs | 2 +- Assets/Scripts/Games/RhythmTweezers/Hair.cs | 33 ++ .../Scripts/Games/RhythmTweezers/Hair.cs.meta | 11 + .../Games/RhythmTweezers/RhythmTweezers.cs | 51 ++- .../Scripts/Games/RhythmTweezers/Tweezers.cs | 42 ++ .../Games/RhythmTweezers/Tweezers.cs.meta | 11 + Assets/Scripts/Minigames.cs | 5 +- 49 files changed, 1884 insertions(+), 11 deletions(-) create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/longAppear.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/longPull1.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/longPull2.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/longPull3.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/longPull4.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/longPullEnd.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/register.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortAppear.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck1.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck10.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck11.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck12.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck13.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck14.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck15.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck16.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck17.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck18.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck19.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck2.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck20.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck3.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck4.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck5.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck6.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck7.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck8.ogg.meta create mode 100644 Assets/Resources/Sfx/games/rhythmTweezers/shortPluck9.ogg.meta create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs.meta create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller.meta create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim.meta create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller.meta create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim.meta create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim create mode 100644 Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim.meta create mode 100644 Assets/Scripts/Games/RhythmTweezers/Hair.cs create mode 100644 Assets/Scripts/Games/RhythmTweezers/Hair.cs.meta create mode 100644 Assets/Scripts/Games/RhythmTweezers/Tweezers.cs create mode 100644 Assets/Scripts/Games/RhythmTweezers/Tweezers.cs.meta diff --git a/Assets/Resources/Games/rhythmTweezers.prefab b/Assets/Resources/Games/rhythmTweezers.prefab index 42e8ccad..3957b2c1 100644 --- a/Assets/Resources/Games/rhythmTweezers.prefab +++ b/Assets/Resources/Games/rhythmTweezers.prefab @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2002856028339003249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6879237219359362440} + m_Layer: 0 + m_Name: Hairs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6879237219359362440 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002856028339003249} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.63809526, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8539794534233051743} + m_Father: {fileID: 1118188506360081759} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2500345393670765108 GameObject: m_ObjectHideFlags: 0 @@ -199,6 +230,7 @@ Transform: - {fileID: 6544443528640677978} - {fileID: 8812709733616465685} - {fileID: 3938391035996190295} + - {fileID: 6879237219359362440} m_Father: {fileID: 5813499711186931250} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -281,6 +313,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3942464277001988917} + - component: {fileID: 3391455012319192365} + - component: {fileID: 574744067652312223} m_Layer: 0 m_Name: TweezerHolder m_TagString: Untagged @@ -295,14 +329,211 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3684904985109994079} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: -0.5, w: 0.8660254} m_LocalPosition: {x: 0, y: 3.68, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2763505388420312793} + - {fileID: 3093870637168933024} m_Father: {fileID: 5813499711186931250} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -60} +--- !u!114 &3391455012319192365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3684904985109994079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8ea112b8d0c51343bca3ebc026d0295, type: 3} + m_Name: + m_EditorClassIdentifier: + hitOnFrame: 0 +--- !u!95 &574744067652312223 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3684904985109994079} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b1a3ac1406c5e3a41bbbc0b64f38d0c7, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3699538017268986033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3093870637168933024} + - component: {fileID: 6708651066604212979} + m_Layer: 0 + m_Name: Zoom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3093870637168933024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3699538017268986033} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: -8.863, z: 0} + m_LocalScale: {x: 3.2, y: 3.2, z: 1} + m_Children: [] + m_Father: {fileID: 3942464277001988917} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6708651066604212979 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3699538017268986033} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 949200655566714557, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.92, y: 1.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3758930662465072685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1958772841327951779} + - component: {fileID: 7740319080085001650} + m_Layer: 0 + m_Name: Hair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1958772841327951779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3758930662465072685} + m_LocalRotation: {x: 0, y: 0.008726558, z: 0, w: 0.999962} + m_LocalPosition: {x: -0, y: -1.3562, z: -0} + m_LocalScale: {x: 1, y: 0.8, z: 1} + m_Children: [] + m_Father: {fileID: 8539794534233051743} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 1, z: 0} +--- !u!212 &7740319080085001650 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3758930662465072685} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 50 + m_Sprite: {fileID: -4253719726650700378, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.6, y: 0.84} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3875933705046909520 GameObject: m_ObjectHideFlags: 0 @@ -385,6 +616,164 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4104508031135416673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8539794534233051743} + - component: {fileID: 6663364336420735003} + - component: {fileID: 3086344219459406337} + m_Layer: 0 + m_Name: HairHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8539794534233051743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4104508031135416673} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.8214286, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1958772841327951779} + m_Father: {fileID: 6879237219359362440} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6663364336420735003 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4104508031135416673} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0668b1912cbbd9841baf495221d8fcbe, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3086344219459406337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4104508031135416673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e340a4511265794abbce4ce7b756b33, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + isEligible: 0 + eligibleHitsList: [] + aceTimes: 0 + createBeat: 0 +--- !u!1 &5285659482387172336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6940817485402149263} + - component: {fileID: 472057130531380511} + m_Layer: 0 + m_Name: BG (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &6940817485402149263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5285659482387172336} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.1587, y: -0.1652, z: 0} + m_LocalScale: {x: 18.9426, y: 11.7704, z: 1} + m_Children: [] + m_Father: {fileID: 5813499711186931250} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &472057130531380511 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5285659482387172336} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1000 + m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} + m_Color: {r: 0.6313726, g: 0.30980393, b: 0.6313726, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5360739558959415856 GameObject: m_ObjectHideFlags: 0 @@ -498,6 +887,7 @@ Transform: - {fileID: 1118188506360081759} - {fileID: 3942464277001988917} - {fileID: 5813499711658895220} + - {fileID: 6940817485402149263} - {fileID: 6036835737833856008} m_Father: {fileID: 0} m_RootOrder: 0 @@ -516,6 +906,13 @@ MonoBehaviour: m_EditorClassIdentifier: EligibleHits: [] firstEnable: 0 + Vegetable: {fileID: 3177931334588542204} + Tweezers: {fileID: 3684904985109994079} + HairsHolder: {fileID: 2002856028339003249} + tweezersBeatOffset: 2 + tweezersRotOffset: {x: -202, y: 180} + rotSpd: 10.5 + offset: 59 --- !u!1 &5813499711658895222 GameObject: m_ObjectHideFlags: 0 @@ -588,7 +985,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: -1000 m_Sprite: {fileID: 7482667652216324306, guid: ef2fa2a75dc283e40b9d4fe1f20dc6fb, type: 3} - m_Color: {r: 0.6313726, g: 0.30980393, b: 0.6313726, a: 1} + m_Color: {r: 0.8479425, g: 1, b: 0.759434, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -791,7 +1188,7 @@ Transform: m_LocalScale: {x: 1.03, y: 1.03, z: 1} m_Children: [] m_Father: {fileID: 5813499711186931250} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5123189426333598919 SpriteRenderer: @@ -834,7 +1231,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 100 m_Sprite: {fileID: 21300000, guid: 2723b94c2b1ab8e44898a44a546f7ceb, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 0.36078432} + m_Color: {r: 0, g: 0.58743, b: 1, a: 0.36078432} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/Resources/Sfx/games/rhythmTweezers.meta b/Assets/Resources/Sfx/games/rhythmTweezers.meta new file mode 100644 index 00000000..74b63be4 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db5e695e23634a64e9a30249ba1b4854 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rhythmTweezers/longAppear.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/longAppear.ogg.meta new file mode 100644 index 00000000..51001663 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/longAppear.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 857b6918e06dcb64b932930c88199415 +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/rhythmTweezers/longPull1.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/longPull1.ogg.meta new file mode 100644 index 00000000..2312aeb8 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/longPull1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2ba6c463fabfbfd4cb1859a8e50a4bfa +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/rhythmTweezers/longPull2.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/longPull2.ogg.meta new file mode 100644 index 00000000..03cf6713 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/longPull2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b58b9cc3881f32a4c90cc4391b91e7ba +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/rhythmTweezers/longPull3.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/longPull3.ogg.meta new file mode 100644 index 00000000..08b358ef --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/longPull3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 14457c0bda1ddb24d88df65c9910bfe4 +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/rhythmTweezers/longPull4.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/longPull4.ogg.meta new file mode 100644 index 00000000..f7446c44 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/longPull4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 06553cd27650a2a47b959f887053ad8f +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/rhythmTweezers/longPullEnd.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/longPullEnd.ogg.meta new file mode 100644 index 00000000..5994ff72 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/longPullEnd.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3676ea28013ac514e8bb0bceece46bb4 +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/rhythmTweezers/register.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/register.ogg.meta new file mode 100644 index 00000000..48d17e2b --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/register.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b32f5245dc70c06448040d3eb599e3dd +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/rhythmTweezers/shortAppear.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortAppear.ogg.meta new file mode 100644 index 00000000..70b7eb3c --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortAppear.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 488ce8bff042e054fb3e586865100fa6 +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/rhythmTweezers/shortPluck1.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck1.ogg.meta new file mode 100644 index 00000000..1fed8be0 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6f21baeda4b5cc04980ba243e89c4668 +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/rhythmTweezers/shortPluck10.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck10.ogg.meta new file mode 100644 index 00000000..f039528e --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck10.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e7ad8925eb713fe44bba3a4f129c2d04 +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/rhythmTweezers/shortPluck11.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck11.ogg.meta new file mode 100644 index 00000000..6e421e10 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck11.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a71a41478b83c7042b74413ec1901620 +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/rhythmTweezers/shortPluck12.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck12.ogg.meta new file mode 100644 index 00000000..f1288b8f --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck12.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e583d415ffc797f43a2572e14475de82 +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/rhythmTweezers/shortPluck13.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck13.ogg.meta new file mode 100644 index 00000000..7b8cf762 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck13.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3d43757218c041b4cbc9fdeb525ad39f +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/rhythmTweezers/shortPluck14.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck14.ogg.meta new file mode 100644 index 00000000..791269e4 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck14.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2a1f5ea67cac1894d962eab771306e04 +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/rhythmTweezers/shortPluck15.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck15.ogg.meta new file mode 100644 index 00000000..d760c7c4 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck15.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1e18e92267931d447bf1e461c8d0eeeb +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/rhythmTweezers/shortPluck16.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck16.ogg.meta new file mode 100644 index 00000000..1ddf3ef3 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck16.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d2f4ab9d9358ef7438e03f03e521ebc6 +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/rhythmTweezers/shortPluck17.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck17.ogg.meta new file mode 100644 index 00000000..e01c1ff1 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck17.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 903572918b4fcd44c8a002062d096cf3 +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/rhythmTweezers/shortPluck18.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck18.ogg.meta new file mode 100644 index 00000000..342e6610 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck18.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7237b41e19b17c648b7bb604afd413cf +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/rhythmTweezers/shortPluck19.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck19.ogg.meta new file mode 100644 index 00000000..cc0c2fa3 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck19.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c3279e9189c0ef146849f85d0dc847ed +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/rhythmTweezers/shortPluck2.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck2.ogg.meta new file mode 100644 index 00000000..bc57f329 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 54e7de6ea0c82d244a2105ca428f6936 +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/rhythmTweezers/shortPluck20.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck20.ogg.meta new file mode 100644 index 00000000..8a51a091 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck20.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7f78d0ef3fc55774eb20839569875275 +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/rhythmTweezers/shortPluck3.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck3.ogg.meta new file mode 100644 index 00000000..a8586077 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck3.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e535b801b95984546a063efccc1550d9 +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/rhythmTweezers/shortPluck4.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck4.ogg.meta new file mode 100644 index 00000000..e72dc245 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck4.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ffc283fbcc71def46bf5bdbb1d2e10e3 +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/rhythmTweezers/shortPluck5.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck5.ogg.meta new file mode 100644 index 00000000..3c5699ea --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck5.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5376099279b38b348bb0ec078fbb2cc1 +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/rhythmTweezers/shortPluck6.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck6.ogg.meta new file mode 100644 index 00000000..19fc2f7e --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck6.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bf8933414d40389419d86268dc7353ef +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/rhythmTweezers/shortPluck7.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck7.ogg.meta new file mode 100644 index 00000000..c6928f59 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck7.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f0c6a2aaca4a34247a02334cf343fb7e +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/rhythmTweezers/shortPluck8.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck8.ogg.meta new file mode 100644 index 00000000..6fa0c32d --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck8.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 20a4490d63022c543b53a355e0e0fbb3 +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/rhythmTweezers/shortPluck9.ogg.meta b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck9.ogg.meta new file mode 100644 index 00000000..6e293802 --- /dev/null +++ b/Assets/Resources/Sfx/games/rhythmTweezers/shortPluck9.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f130760db76c98e42acd562e3a957187 +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/RhythmTweezers/Animations/Hairs.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs.meta new file mode 100644 index 00000000..d3ac555a --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 396df4f43835b68478e37a054084b110 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller new file mode 100644 index 00000000..99de4637 --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HairHolder + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3946908619749028560} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &3946908619749028560 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8081536976595334241} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8081536976595334241} +--- !u!1102 &8081536976595334241 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SmallAppear + 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: 52f727fd76ba6424d8fefce94e716404, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller.meta new file mode 100644 index 00000000..e492a97e --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/HairHolder.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0668b1912cbbd9841baf495221d8fcbe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim new file mode 100644 index 00000000..73ccbd1d --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim @@ -0,0 +1,80 @@ +%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: SmallAppear + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -2419696912005567714, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - time: 0.022222223 + value: {fileID: 1401937738139682868, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - time: 0.044444446 + value: {fileID: 1805905626023431962, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - time: 0.06666667 + value: {fileID: 3562159510210354730, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - time: 0.08888889 + value: {fileID: -4253719726650700378, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + attribute: m_Sprite + path: Hair + classID: 212 + script: {fileID: 0} + m_SampleRate: 45 + 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: 1019596327 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -2419696912005567714, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - {fileID: 1401937738139682868, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - {fileID: 1805905626023431962, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - {fileID: 3562159510210354730, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - {fileID: -4253719726650700378, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.11111111 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim.meta new file mode 100644 index 00000000..6931d973 --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Hairs/SmallAppear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52f727fd76ba6424d8fefce94e716404 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller new file mode 100644 index 00000000..379c4f0d --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8752041430346390069 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3376492982542374214} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5883602102224777227} + m_Position: {x: 235, y: 65, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -3376492982542374214} +--- !u!1102 &-5883602102224777227 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tweezers_Pluck + 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: d6a709a73417eef48b6cfd02ab9b6cc2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-3376492982542374214 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tweezers_Idle + 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: 5733fa65b49c5c74d9bd2baf3d1ad2c4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TweezerHolder + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8752041430346390069} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller.meta new file mode 100644 index 00000000..be0a60db --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/TweezerHolder.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1a3ac1406c5e3a41bbbc0b64f38d0c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim new file mode 100644 index 00000000..36d980cf --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim @@ -0,0 +1,68 @@ +%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: Tweezers_Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 8479415764655094244, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + attribute: m_Sprite + path: Tweezers + 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: 183621861 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 8479415764655094244, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim.meta new file mode 100644 index 00000000..984bf8fd --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5733fa65b49c5c74d9bd2baf3d1ad2c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim new file mode 100644 index 00000000..a498d4e7 --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim @@ -0,0 +1,330 @@ +%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: Tweezers_Pluck + 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: -0, y: -7.403, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: -0, y: -8.05, 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: Tweezers + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0, y: -8.696, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Zoom + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Zoom + classID: 1 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -5355649897007194340, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - time: 0.21666667 + value: {fileID: 8479415764655094244, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + attribute: m_Sprite + path: Tweezers + 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: 183621861 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 387569226 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 183621861 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 387569226 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: -5355649897007194340, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + - {fileID: 8479415764655094244, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.23333333 + 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: -0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Tweezers + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -7.403 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: -8.05 + 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: Tweezers + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Tweezers + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Zoom + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Zoom + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -8.696 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Zoom + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Zoom + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim.meta new file mode 100644 index 00000000..50e3b376 --- /dev/null +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6a709a73417eef48b6cfd02ab9b6cc2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/hairAndThings.png.meta b/Assets/Resources/Sprites/Games/RhythmTweezers/hairAndThings.png.meta index df6a1a4f..168c3ec9 100644 --- a/Assets/Resources/Sprites/Games/RhythmTweezers/hairAndThings.png.meta +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/hairAndThings.png.meta @@ -201,6 +201,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 48387e1a..ba166bc4 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -157,7 +157,7 @@ namespace RhythmHeavenMania public float GetLoopPositionFromBeat(float beatOffset, float length) { - return Mathf.Repeat(songPositionInBeats + beatOffset, length); + return Mathf.Repeat((songPositionInBeats / length) + beatOffset, 1); } public float GetPositionFromBeat(float startBeat, float length) diff --git a/Assets/Scripts/Games/RhythmTweezers/Hair.cs b/Assets/Scripts/Games/RhythmTweezers/Hair.cs new file mode 100644 index 00000000..f954a109 --- /dev/null +++ b/Assets/Scripts/Games/RhythmTweezers/Hair.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RhythmHeavenMania.Games.RhythmTweezers +{ + public class Hair : PlayerActionObject + { + public float createBeat; + + private void Update() + { + float stateBeat = Conductor.instance.GetPositionFromBeat(createBeat, 4f); + StateCheck(stateBeat); + + if (PlayerInput.Pressed() && RhythmTweezers.instance.Tweezers.GetComponent().hitOnFrame == 0) + { + if (state.perfect) + { + Ace(); + } + } + } + + public void Ace() + { + Tweezers tweezers = RhythmTweezers.instance.Tweezers.GetComponent(); + tweezers.Pluck(true, this); + + tweezers.hitOnFrame++; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/RhythmTweezers/Hair.cs.meta b/Assets/Scripts/Games/RhythmTweezers/Hair.cs.meta new file mode 100644 index 00000000..74197756 --- /dev/null +++ b/Assets/Scripts/Games/RhythmTweezers/Hair.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4e340a4511265794abbce4ce7b756b33 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs index ca1cc836..1f96d2cf 100644 --- a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs +++ b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs @@ -6,18 +6,59 @@ using RhythmHeavenMania.Util; namespace RhythmHeavenMania.Games.RhythmTweezers { + // use PlayerActionObject for the actual tweezers but this isn't playable rn so IDC public class RhythmTweezers : Minigame { - // Start is called before the first frame update - void Start() - { + public GameObject Vegetable; + public GameObject Tweezers; + [SerializeField] private GameObject HairsHolder; + + public float tweezersBeatOffset; + public Vector2 tweezersRotOffset; + public float rotSpd; + public float offset; + + public static RhythmTweezers instance { get; set; } + + private void Awake() + { + instance = this; } - // Update is called once per frame - void Update() + private void Start() { + float beat = 0; + float offset = 0f; + BeatAction.New(HairsHolder, new List() + { + new BeatAction.Action(beat + offset, delegate { SpawnHair(beat + offset); }), + new BeatAction.Action(beat + 1f + offset, delegate { SpawnHair(beat + 1f + offset); }), + new BeatAction.Action(beat + 2f + offset, delegate + { + SpawnHair(beat + 2f + offset); + }), + new BeatAction.Action(beat + 3f + offset, delegate { SpawnHair(beat + 3f + offset); }), + }); + } + private void SpawnHair(float beat) + { + Jukebox.PlayOneShotGame("rhythmTweezers/shortAppear", beat); + GameObject hair = Instantiate(HairsHolder.transform.GetChild(0).gameObject, HairsHolder.transform); + hair.SetActive(true); + + float rot = ((offset / 3f) * (beat * 2f)) - offset; + + hair.transform.eulerAngles = new Vector3(0, 0, rot); + hair.GetComponent().createBeat = beat; + } + + private void Update() + { + float normalizedBeat = Conductor.instance.GetLoopPositionFromBeat(tweezersBeatOffset, rotSpd); + float rot = Mathf.Lerp(tweezersRotOffset.x, tweezersRotOffset.y, normalizedBeat); + Tweezers.transform.eulerAngles = new Vector3(0, 0, rot); } } } diff --git a/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs b/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs new file mode 100644 index 00000000..eb519193 --- /dev/null +++ b/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs @@ -0,0 +1,42 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.RhythmTweezers +{ + public class Tweezers : MonoBehaviour + { + public int hitOnFrame; + private Animator anim; + + private void Start() + { + anim = GetComponent(); + } + + private void LateUpdate() + { + if (PlayerInput.Pressed()) + { + hitOnFrame = 0; + } + } + + public void Pluck(bool ace, Hair hair) + { + anim.Play("Tweezers_Pluck", 0, 0); + + if (hitOnFrame > 0) return; + // tweezer pluck anim here + + if (ace) + { + RhythmTweezers.instance.Vegetable.GetComponent().Play("Hop", 0, 0); + Jukebox.PlayOneShotGame($"rhythmTweezers/shortPluck{Random.Range(1, 21)}"); + Destroy(hair.gameObject); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs.meta b/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs.meta new file mode 100644 index 00000000..c6993ae4 --- /dev/null +++ b/Assets/Scripts/Games/RhythmTweezers/Tweezers.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d8ea112b8d0c51343bca3ebc026d0295 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index b51d8259..d49fa25a 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -187,7 +187,10 @@ namespace RhythmHeavenMania new GameAction("break c'mon ooh", delegate { DJSchool.instance.BreakCmon(eventCaller.currentEntity.beat); }, 3f), new GameAction("scratch-o hey", delegate { DJSchool.instance.ScratchoHey(eventCaller.currentEntity.beat); }, 3f), }), - /*new Minigame("rhythmRally", "Rhythm Rally", "B888F8", true, false, new List() + /*new Minigame("rhythmTweezers", "VeggieTales", "008c97", false, false, new List() + { + }), + new Minigame("rhythmRally", "Rhythm Rally", "B888F8", true, false, new List() { }),