diff --git a/Assets/Resources/Games/ringside.prefab b/Assets/Resources/Games/ringside.prefab index d66688313..556dbc030 100644 --- a/Assets/Resources/Games/ringside.prefab +++ b/Assets/Resources/Games/ringside.prefab @@ -1207,6 +1207,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2491317645076743625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5999410346070300933} + - component: {fileID: 6842277617367247143} + m_Layer: 0 + m_Name: Heart (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5999410346070300933 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2491317645076743625} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.18, y: -0.27, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_Children: [] + m_Father: {fileID: 4587579683068271383} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6842277617367247143 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2491317645076743625} + 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: 3308023554267677584, guid: 88f7ca5bc2eedd444ab8591b7a8aaa4f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.76, y: 1.59} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2522886593395799626 GameObject: m_ObjectHideFlags: 0 @@ -1917,6 +1999,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4022143684380958992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4570328220642732472} + - component: {fileID: 7602910542816856538} + m_Layer: 0 + m_Name: Heart (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4570328220642732472 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4022143684380958992} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.18, y: -0.27, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_Children: [] + m_Father: {fileID: 4587579683068271383} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7602910542816856538 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4022143684380958992} + 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: 3308023554267677584, guid: 88f7ca5bc2eedd444ab8591b7a8aaa4f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.76, y: 1.59} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4103242784226033443 GameObject: m_ObjectHideFlags: 0 @@ -2659,6 +2823,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5655326358126945913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2865083737653270893} + - component: {fileID: 5941111309138233819} + m_Layer: 0 + m_Name: Heart (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2865083737653270893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5655326358126945913} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.18, y: -0.27, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_Children: [] + m_Father: {fileID: 4587579683068271383} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5941111309138233819 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5655326358126945913} + 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: 3308023554267677584, guid: 88f7ca5bc2eedd444ab8591b7a8aaa4f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.76, y: 1.59} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5744544502052836762 GameObject: m_ObjectHideFlags: 0 @@ -2772,6 +3018,10 @@ Transform: - {fileID: 1240408948063473728} - {fileID: 4052224801691616465} - {fileID: 1731527069594134225} + - {fileID: 2949032975643681887} + - {fileID: 4570328220642732472} + - {fileID: 5999410346070300933} + - {fileID: 2865083737653270893} m_Father: {fileID: 4877982029399319523} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4612,3 +4862,85 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9188356859941680808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2949032975643681887} + - component: {fileID: 218535819817791060} + m_Layer: 0 + m_Name: Heart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2949032975643681887 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9188356859941680808} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.18, y: -0.27, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_Children: [] + m_Father: {fileID: 4587579683068271383} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &218535819817791060 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9188356859941680808} + 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: 3308023554267677584, guid: 88f7ca5bc2eedd444ab8591b7a8aaa4f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.76, y: 1.59} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Scripts/Games/Ringside/Ringside.cs b/Assets/Scripts/Games/Ringside/Ringside.cs index 3ac5578e0..92c3672a5 100644 --- a/Assets/Scripts/Games/Ringside/Ringside.cs +++ b/Assets/Scripts/Games/Ringside/Ringside.cs @@ -22,6 +22,16 @@ namespace HeavenStudio.Games.Loaders function = delegate {var e = eventCaller.currentEntity; Ringside.instance.ThatTrue(e.beat); }, defaultLength = 0.75f }, + new GameAction("wubbaDubbaAlt", "Wub Dubba Dubba") + { + function = delegate {var e = eventCaller.currentEntity; Ringside.instance.QuestionAlt(e.beat); }, + defaultLength = 1.25f + }, + new GameAction("woahYouGoBigGuy", "Woah You Go Big Guy!") + { + function = delegate {var e = eventCaller.currentEntity; Ringside.instance.BigGuy(e.beat); }, + defaultLength = 4f + }, }); } } @@ -72,6 +82,18 @@ namespace HeavenStudio.Games }, forcePlay: true); } + public void QuestionAlt(float beat) + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound($"ringside/wub{currentQuestion}", beat), + new MultiSound.Sound($"ringside/dubba{currentQuestion}-1", beat + 0.5f), + new MultiSound.Sound($"ringside/dubba{currentQuestion}-2", beat + 0.75f), + new MultiSound.Sound($"ringside/dubba{currentQuestion}-3", beat + 1f), + new MultiSound.Sound($"ringside/dubba{currentQuestion}-4", beat + 1.25f), + }, forcePlay: true); + } + public void ThatTrue(float beat) { MultiSound.Play(new MultiSound.Sound[] @@ -79,7 +101,7 @@ namespace HeavenStudio.Games new MultiSound.Sound($"ringside/that{currentQuestion}", beat + 0.25f), new MultiSound.Sound($"ringside/true{currentQuestion}", beat + 0.75f), }, forcePlay: true); - ScheduleInput(beat, 1.75f, InputType.STANDARD_DOWN, JustQuestion, MissQuestion, Nothing); + ScheduleInput(beat, 1.75f, InputType.STANDARD_DOWN, JustQuestion, Miss, Nothing); if (currentQuestion < 3) { currentQuestion++; @@ -90,6 +112,31 @@ namespace HeavenStudio.Games } } + public void BigGuy(float beat) + { + float youBeat = 0.65f; + if (currentQuestion == 3) youBeat = 0.7f; + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound($"ringside/woah{currentQuestion}", beat), + new MultiSound.Sound($"ringside/you{currentQuestion}", beat + youBeat), + new MultiSound.Sound($"ringside/go{currentQuestion}", beat + 1f), + new MultiSound.Sound($"ringside/big{currentQuestion}", beat + 1.5f), + new MultiSound.Sound($"ringside/guy{currentQuestion}", beat + 2f), + }, forcePlay: true); + + ScheduleInput(beat, 2.5f, InputType.STANDARD_DOWN, JustBigGuyFirst, Miss, Nothing); + ScheduleInput(beat, 3f, InputType.STANDARD_DOWN, JustBigGuySecond, Miss, Nothing); + if (currentQuestion < 3) + { + currentQuestion++; + } + else + { + currentQuestion = 1; + } + } + public void JustQuestion(PlayerActionEvent caller, float state) { if (state >= 1f || state <= -1f) @@ -109,7 +156,39 @@ namespace HeavenStudio.Games }); } - public void MissQuestion(PlayerActionEvent caller) + public void JustBigGuyFirst(PlayerActionEvent caller, float state) + { + if (state >= 1f || state <= -1f) + { + return; + } + SuccessBigGuyFirst(); + } + + public void SuccessBigGuyFirst() + { + Jukebox.PlayOneShotGame($"ringside/muscles1"); + } + + public void JustBigGuySecond(PlayerActionEvent caller, float state) + { + if (state >= 1f || state <= -1f) + { + return; + } + SuccessBigGuySecond(); + } + + public void SuccessBigGuySecond() + { + Jukebox.PlayOneShotGame($"ringside/muscles2"); + BeatAction.New(instance.gameObject, new List() + { + new BeatAction.Action(Conductor.instance.songPositionInBeats + 0.5f, delegate { Jukebox.PlayOneShotGame("ringside/musclesCamera"); }), + }); + } + + public void Miss(PlayerActionEvent caller) { }