From 83a12ebf9a8da0fea06d42db18ffd4f5d7552491 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu, 18 May 2023 22:12:06 +0200 Subject: [PATCH] Down sound added (#422) --- Assets/Resources/Games/spaceSoccer.prefab | 136 +----------------- .../Resources/Sfx/games/spaceSoccer/down.ogg | Bin 0 -> 20986 bytes .../Sfx/games/spaceSoccer/down.ogg.meta | 22 +++ Assets/Scripts/Games/SpaceSoccer/Ball.cs | 28 +--- .../Scripts/Games/SpaceSoccer/SpaceSoccer.cs | 40 +++--- 5 files changed, 52 insertions(+), 174 deletions(-) create mode 100644 Assets/Resources/Sfx/games/spaceSoccer/down.ogg create mode 100644 Assets/Resources/Sfx/games/spaceSoccer/down.ogg.meta diff --git a/Assets/Resources/Games/spaceSoccer.prefab b/Assets/Resources/Games/spaceSoccer.prefab index 6c44695a8..5f2599111 100644 --- a/Assets/Resources/Games/spaceSoccer.prefab +++ b/Assets/Resources/Games/spaceSoccer.prefab @@ -453,7 +453,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3584310800769874311} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7463739741518075090 SpriteRenderer: @@ -904,17 +904,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 848efddf5f5eaa94eacf8601e36f81bf, type: 3} m_Name: m_EditorClassIdentifier: - inList: 0 - state: - gameObject: {fileID: 0} - early: 0 - perfect: 0 - late: 0 - createBeat: 0 - eligibleHitsList: [] - aceTimes: 0 - isEligible: 0 - triggersAutoplay: 1 canKick: 0 canHighKick: 0 kickLeft: 0 @@ -1211,17 +1200,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 848efddf5f5eaa94eacf8601e36f81bf, type: 3} m_Name: m_EditorClassIdentifier: - inList: 0 - state: - gameObject: {fileID: 0} - early: 0 - perfect: 0 - late: 0 - createBeat: 0 - eligibleHitsList: [] - aceTimes: 0 - isEligible: 0 - triggersAutoplay: 1 canKick: 0 canHighKick: 0 kickLeft: 0 @@ -1313,7 +1291,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3584310800769874311} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8255833927689275432 MeshFilter: @@ -1426,7 +1404,6 @@ Transform: m_Children: - {fileID: 2191273313861422334} - {fileID: 1133941631262721853} - - {fileID: 2021733110626493915} - {fileID: 3997811236443330485} - {fileID: 45563227638450708} - {fileID: 32085857618286105} @@ -1463,7 +1440,7 @@ MonoBehaviour: - tag: pos: {x: 1.5724581, y: -1.3358305, z: 0} target: {fileID: 0} - height: 4.1 + height: 5 duration: 1.4 useLastRealPos: 1 values: [] @@ -1479,14 +1456,14 @@ MonoBehaviour: anchor: {fileID: 0} positions: - tag: - pos: {x: -3.900663, y: -6.300388, z: 0} + pos: {x: -6, y: -6, z: 0} target: {fileID: 0} height: 10 duration: 2.35 useLastRealPos: 0 values: [] - tag: - pos: {x: 2.5349154, y: -6.116786, z: 0} + pos: {x: -1, y: -6, z: 0} target: {fileID: 0} height: 0 duration: 0 @@ -1504,7 +1481,7 @@ MonoBehaviour: useLastRealPos: 1 values: [] - tag: - pos: {x: -0.44, y: -5.756623, z: 0} + pos: {x: -3.5, y: -6, z: 0} target: {fileID: 0} height: 0 duration: 0 @@ -1782,104 +1759,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4365805729759623217 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2021733110626493915} - - component: {fileID: 9095461183267835975} - - component: {fileID: 8422221005665590405} - m_Layer: 0 - m_Name: kickFX - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2021733110626493915 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4365805729759623217} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.67, y: -1.05, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3584310800769874311} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &9095461183267835975 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4365805729759623217} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - 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: 9 - m_Sprite: {fileID: -6047660829741247071, guid: ed47c3fa4e916ff478c0f1b6fb057aa4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.48235294} - 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!114 &8422221005665590405 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4365805729759623217} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 54588eb7ee0680643aeaf61dcf609903, type: 3} - m_Name: - m_EditorClassIdentifier: - time: 0.08 --- !u!1 &4832865564766322567 GameObject: m_ObjectHideFlags: 0 @@ -2665,7 +2544,6 @@ MonoBehaviour: kicker: {fileID: 0} holder: {fileID: 7976131226454805035} spriteHolder: {fileID: 6132156590540490080} - kickFX: {fileID: 4365805729759623217} startBeat: 0 state: 0 nextAnimBeat: 0 @@ -2786,7 +2664,7 @@ Transform: m_Children: - {fileID: 2966367777699113700} m_Father: {fileID: 3584310800769874311} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8605359988194706959 GameObject: diff --git a/Assets/Resources/Sfx/games/spaceSoccer/down.ogg b/Assets/Resources/Sfx/games/spaceSoccer/down.ogg new file mode 100644 index 0000000000000000000000000000000000000000..2ff54c0d3e16453443cebfb52b37b7957c03bf21 GIT binary patch literal 20986 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sfx/games/spaceSoccer/down.ogg.meta b/Assets/Resources/Sfx/games/spaceSoccer/down.ogg.meta new file mode 100644 index 000000000..0211ecec6 --- /dev/null +++ b/Assets/Resources/Sfx/games/spaceSoccer/down.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 63b8cc7b1c3460e4eb3f12bf288045f9 +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/Scripts/Games/SpaceSoccer/Ball.cs b/Assets/Scripts/Games/SpaceSoccer/Ball.cs index 68f553a94..237f5be6c 100644 --- a/Assets/Scripts/Games/SpaceSoccer/Ball.cs +++ b/Assets/Scripts/Games/SpaceSoccer/Ball.cs @@ -16,7 +16,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer [HideInInspector] public Kicker kicker; [SerializeField] private GameObject holder; [SerializeField] private GameObject spriteHolder; - [SerializeField] private GameObject kickFX; [Space(10)] //[SerializeField] private BezierCurve3D dispenseCurve; //[SerializeField] private BezierCurve3D kickCurve; @@ -148,8 +147,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer //kickCurve.KeyPoints[0].transform.position = holder.transform.position; //kickPath.positions[0].pos = holder.transform.position; UpdateLastRealPos(); - - HitFX(); } public void HighKick() @@ -161,8 +158,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer //highKickCurve.KeyPoints[0].transform.position = holder.transform.position; //highKickPath.positions[0].pos = holder.transform.position; UpdateLastRealPos(); - - HitFX(); } public void Toe() @@ -185,9 +180,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer //toeCurve.KeyPoints[1].transform.localPosition = new Vector3(6.49f, 0); toePath.positions[1].pos = new Vector3(6.49f, 0); } - - - HitFX(); } private void Update() @@ -206,10 +198,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer //dispenseCurve.KeyPoints[0].transform.position = new Vector3(kicker.transform.GetChild(0).position.x - 6f, kicker.transform.GetChild(0).position.y - 6f); //dispenseCurve.KeyPoints[1].transform.position = new Vector3(kicker.transform.GetChild(0).position.x - 1f, kicker.transform.GetChild(0).position.y - 6f); - - dispensePath.positions[0].pos = new Vector3(-6f, -6f); - dispensePath.positions[1].pos = new Vector3(-1f, -6f); - //holder.transform.localPosition = dispenseCurve.GetPoint(normalizedBeatAnim); holder.transform.localPosition = GetPathPositionFromBeat(dispensePath, Mathf.Max(beat, startBeat), out float height, startBeat); spriteHolder.transform.eulerAngles = new Vector3(0, 0, Mathf.Lerp(0f, -1440f, normalizedBeatAnim)); @@ -219,7 +207,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer { float normalizedBeatAnim = Conductor.instance.GetPositionFromBeat(startBeat, 1.5f); - kickPath.positions[0].pos = lastRealPos; if (!lastKickLeft) { //kickCurve.KeyPoints[1].transform.position = new Vector3(kicker.transform.GetChild(0).position.x + 0.5f, kicker.transform.GetChild(0).position.y - 6f); @@ -244,9 +231,6 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer //highKickCurve.KeyPoints[1].transform.position = new Vector3(kicker.transform.GetChild(0).position.x - 3.5f, kicker.transform.GetChild(0).position.y - 6f); - highKickPath.positions[0].pos = lastRealPos; - highKickPath.positions[1].pos = new Vector3(-3.5f, -6f); - //holder.transform.localPosition = highKickCurve.GetPoint(normalizedBeatAnim); holder.transform.localPosition = GetPathPositionFromBeat(highKickPath, Mathf.Max(beat, startBeat), out float height, startBeat); spriteHolder.transform.eulerAngles = new Vector3(0, 0, Mathf.Lerp(lastSpriteRot, lastSpriteRot + 360f, normalizedBeatAnim)); @@ -254,11 +238,9 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer } case State.Toe: { - float normalizedBeatAnim = Conductor.instance.GetPositionFromBeat(startBeat, GetAnimLength(State.Toe) + 0.35f); + //float normalizedBeatAnim = Conductor.instance.GetPositionFromBeat(startBeat, GetAnimLength(State.Toe) + 0.35f); toePath.positions[0].duration = GetAnimLength(State.Toe) + 0.35f; - toePath.positions[0].pos = lastRealPos; - if (!lastKickLeft) { //toeCurve.KeyPoints[1].transform.position = new Vector3(kicker.transform.GetChild(0).position.x + 0.5f, kicker.transform.GetChild(0).position.y - 6f); @@ -272,20 +254,12 @@ namespace HeavenStudio.Games.Scripts_SpaceSoccer //holder.transform.localPosition = toeCurve.GetPoint(normalizedBeatAnim); holder.transform.localPosition = GetPathPositionFromBeat(toePath, Mathf.Max(beat, startBeat), out float height, startBeat); - spriteHolder.transform.eulerAngles = new Vector3(0, 0, Mathf.Lerp(lastSpriteRot, -860f, normalizedBeatAnim)); break; } } holder.transform.position = new Vector3(holder.transform.position.x, holder.transform.position.y, kicker.transform.GetChild(0).position.z); } - private void HitFX() - { - GameObject kickfx = Instantiate(kickFX.gameObject, SpaceSoccer.instance.transform); - kickfx.SetActive(true); - kickfx.transform.position = holder.transform.position; - } - private void SetState(State newState) { state = newState; diff --git a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs index da0ff431e..c83719271 100644 --- a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs +++ b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs @@ -14,13 +14,17 @@ namespace HeavenStudio.Games.Loaders { new GameAction("ball dispense", "Ball Dispense") { - function = delegate { SpaceSoccer.instance.Dispense(eventCaller.currentEntity.beat, !eventCaller.currentEntity["toggle"]); }, + function = delegate { SpaceSoccer.instance.Dispense(eventCaller.currentEntity.beat, !eventCaller.currentEntity["toggle"], false, eventCaller.currentEntity["down"]); }, defaultLength = 2f, parameters = new List() { - new Param("toggle", false, "Disable Sound", "Disables the dispense sound") + new Param("toggle", false, "Disable Sound", "Disables the dispense sound"), + new Param("down", false, "Down Sound", "Will the Down sound be played?") }, - inactiveFunction = delegate { if (!eventCaller.currentEntity["toggle"]) { SpaceSoccer.DispenseSound(eventCaller.currentEntity.beat); } } + inactiveFunction = delegate + { + if (!eventCaller.currentEntity["toggle"]) { SpaceSoccer.DispenseSound(eventCaller.currentEntity.beat, eventCaller.currentEntity["down"]);} + } }, new GameAction("high kick-toe!", "High Kick-Toe!") { @@ -91,11 +95,11 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("scroll", "Scrolling Background") { - function = delegate { var e = eventCaller.currentEntity; SpaceSoccer.instance.UpdateScrollSpeed(e.beat, e["x"], e["y"]); }, + function = delegate { var e = eventCaller.currentEntity; SpaceSoccer.instance.UpdateScrollSpeed(e["x"], e["y"]); }, defaultLength = 1f, parameters = new List() { - new Param("x", new EntityTypes.Float(-5f, 5f, 0.045f), "Horizontal", "How many horizontal loops in 1 beat?"), - new Param("y", new EntityTypes.Float(-5f, 5f, 0.16f), "Vertical", "How many vertical loops in 1 beat?"), + new Param("x", new EntityTypes.Float(-5f, 5f, 0.09f), "Horizontal", "How fast does the background move horizontally?"), + new Param("y", new EntityTypes.Float(-5f, 5f, 0.32f), "Vertical", "How fast does the background move vertically?"), } }, new GameAction("stopBall", "Stop Ball") @@ -195,8 +199,8 @@ namespace HeavenStudio.Games float scrollBeat; float scrollOffsetX; float scrollOffsetY; - float currentScrollLengthX = 0.045f; - float currentScrollLengthY = 0.16f; + float currentScrollLengthX = 0.09f; + float currentScrollLengthY = 0.32f; Tween bgColorTween; Tween dotColorTween; #region Space Kicker Position Easing @@ -234,8 +238,8 @@ namespace HeavenStudio.Games private void Update() { var cond = Conductor.instance; - float normalizedX = (cond.songPositionInBeats - scrollBeat) * currentScrollLengthX; - float normalizedY = (cond.songPositionInBeats - scrollBeat) * currentScrollLengthY; + float normalizedX = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthX; + float normalizedY = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthY; backgroundSprite.NormalizedX = -scrollOffsetX - normalizedX; backgroundSprite.NormalizedY = -scrollOffsetY - normalizedY; @@ -329,14 +333,13 @@ namespace HeavenStudio.Games return default(SuperCurveObject.Path); } - public void UpdateScrollSpeed(float beat, float scrollSpeedX, float scrollSpeedY) + public void UpdateScrollSpeed(float scrollSpeedX, float scrollSpeedY) { - var cond = Conductor.instance; - scrollOffsetX = (cond.songPositionInBeats - scrollBeat) * currentScrollLengthX; - scrollOffsetY = (cond.songPositionInBeats - scrollBeat) * currentScrollLengthY; + scrollOffsetX = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthX; + scrollOffsetY = (Time.realtimeSinceStartup - scrollBeat) * currentScrollLengthY; currentScrollLengthX = scrollSpeedX; currentScrollLengthY = scrollSpeedY; - scrollBeat = beat; + scrollBeat = Time.realtimeSinceStartup; } public void EaseSpaceKickersPositions(float beat, float length, int ease, float xDistance, float yDistance, float zDistance) @@ -439,7 +442,7 @@ namespace HeavenStudio.Games if (ballDispensed) Dispense(lastDispensedBeat, false, true); } - public void Dispense(float beat, bool playSound = true, bool ignorePlayer = false) + public void Dispense(float beat, bool playSound = true, bool ignorePlayer = false, bool playDown = false) { if (!ballDispensed) lastDispensedBeat = beat; ballDispensed = true; @@ -456,7 +459,7 @@ namespace HeavenStudio.Games ball_.Init(kicker, beat); if (kicker.player && playSound) { - DispenseSound(beat); + DispenseSound(beat, playDown); } kicker.DispenseBall(beat); @@ -464,8 +467,9 @@ namespace HeavenStudio.Games } } - public static void DispenseSound(float beat) + public static void DispenseSound(float beat, bool playDown) { + if (playDown) Jukebox.PlayOneShot("games/spaceSoccer/down", beat); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("spaceSoccer/dispenseNoise", beat),