diff --git a/Assets/Resources/Games/spaceDance.prefab b/Assets/Resources/Games/spaceDance.prefab index 91ce76ad..575d7c3e 100644 --- a/Assets/Resources/Games/spaceDance.prefab +++ b/Assets/Resources/Games/spaceDance.prefab @@ -115,88 +115,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1549589572473966324 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5010421801470696111} - - component: {fileID: 2263569436043325215} - m_Layer: 0 - m_Name: guiart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &5010421801470696111 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549589572473966324} - m_LocalRotation: {x: 0, y: 0, z: 0.17674121, w: 0.9842574} - m_LocalPosition: {x: 4.81, y: -0.41, z: 0} - m_LocalScale: {x: 0.3460695, y: 0.33089173, z: 1.076} - m_Children: [] - m_Father: {fileID: 3166716782550672845} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20.36} ---- !u!212 &2263569436043325215 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549589572473966324} - 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: 21300000, guid: 99d93d28725242640bd2e665a4a12666, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.97, y: 9.62} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1594644879434370376 GameObject: m_ObjectHideFlags: 0 @@ -423,7 +341,7 @@ Transform: - {fileID: 4041320545106712838} - {fileID: 8583379417074439379} m_Father: {fileID: 3166716782550672845} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2437153462261212378 GameObject: @@ -906,7 +824,6 @@ Transform: - {fileID: 6689513376791215860} - {fileID: 3210284492103733003} - {fileID: 8934601798955442231} - - {fileID: 5010421801470696111} - {fileID: 2641675102161953886} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/Resources/Sfx/games/spaceDance/inputBad.wav b/Assets/Resources/Sfx/games/spaceDance/inputBad.wav index 1fa7fae2..c91920cb 100644 Binary files a/Assets/Resources/Sfx/games/spaceDance/inputBad.wav and b/Assets/Resources/Sfx/games/spaceDance/inputBad.wav differ diff --git a/Assets/Resources/Sfx/games/spaceDance/inputBad.wav.meta b/Assets/Resources/Sfx/games/spaceDance/inputBad.wav.meta index 2bb20ce1..bfe4947d 100644 --- a/Assets/Resources/Sfx/games/spaceDance/inputBad.wav.meta +++ b/Assets/Resources/Sfx/games/spaceDance/inputBad.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc6ab62bc1e6d24478dab3aa59b137e5 +guid: f13f6f70f1111f646b29527c012b3080 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Scripts/Games/SpaceDance/SpaceDance.cs b/Assets/Scripts/Games/SpaceDance/SpaceDance.cs index 2ad58958..6f1c647c 100644 --- a/Assets/Scripts/Games/SpaceDance/SpaceDance.cs +++ b/Assets/Scripts/Games/SpaceDance/SpaceDance.cs @@ -47,13 +47,14 @@ namespace HeavenStudio.Games if (PlayerInput.Pressed() && !IsExpectingInputNow()) { - + Jukebox.PlayOneShotGame("spaceDance/inputBad"); + // Look at this later, sound effect has some weird clipping on it sometimes?? popping. like. fucking popopop idk why its doing that its fine theres no sample weirdness ughh } } public void DoTurnRight(float beat) { - ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, RightSuccess, RightMiss, RightEmpty); + ScheduleInput(beat, 1f, InputType.DIRECTION_RIGHT_DOWN, RightSuccess, RightMiss, RightEmpty); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("spaceDance/voicelessTurn", beat), new MultiSound.Sound("spaceDance/dancerTurn", beat), @@ -75,7 +76,7 @@ namespace HeavenStudio.Games public void DoSitDown(float beat) { - ScheduleInput(beat, 1f, InputType.STANDARD_DOWN, SitSuccess, SitMiss, SitEmpty); + ScheduleInput(beat, 1f, InputType.DIRECTION_DOWN_DOWN, SitSuccess, SitMiss, SitEmpty); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("spaceDance/voicelessSit", beat), new MultiSound.Sound("spaceDance/dancerLets", beat),