From 594158cee35cfc92f7089f8b69c762022a503d3f Mon Sep 17 00:00:00 2001 From: Carson Kompon Date: Mon, 28 Feb 2022 15:43:32 -0500 Subject: [PATCH] Added camera zoom --- Assets/Resources/Games/rhythmRally.prefab | 2 +- Assets/Scripts/Games/RhythmRally/RhythmRally.cs | 6 ++++-- Assets/Scripts/Minigames.cs | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Assets/Resources/Games/rhythmRally.prefab b/Assets/Resources/Games/rhythmRally.prefab index 0b4d2f14..fb1169d6 100644 --- a/Assets/Resources/Games/rhythmRally.prefab +++ b/Assets/Resources/Games/rhythmRally.prefab @@ -865,6 +865,7 @@ MonoBehaviour: eligibleHitsList: [] aceTimes: 0 isEligible: 0 + triggersAutoplay: 1 --- !u!1 &3340141389927785323 GameObject: m_ObjectHideFlags: 0 @@ -1739,7 +1740,6 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 renderQuadTrans: {fileID: 743597382397742394} - cameraPos: {fileID: 6509993024069972873} cameraPivot: {fileID: 5472155158897914726} ball: {fileID: 1668061868608559892} ballShadow: {fileID: 7207398029238753263} diff --git a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs index ad0a0fc5..415412e4 100644 --- a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs +++ b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs @@ -341,9 +341,11 @@ namespace RhythmHeavenMania.Games.RhythmRally inPose = true; } - public void ChangeCameraAngle(Vector3 rotation, float length, Ease ease, RotateMode rotateMode) + public void ChangeCameraAngle(Vector3 rotation, float camZoom, float length, Ease ease, RotateMode rotateMode) { - cameraPivot.DORotate(rotation, length * Conductor.instance.secPerBeat, rotateMode).SetEase(ease); + var len = length * Conductor.instance.secPerBeat; + cameraPivot.DORotate(rotation, len, rotateMode).SetEase(ease); + cameraPivot.DOScale(camZoom, len).SetEase(ease); } public void PrepareFastRally(float beat, RallySpeed speedChange) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index d4eb53d7..9051608a 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -330,9 +330,10 @@ namespace RhythmHeavenMania new GameAction("camera", delegate { var e = eventCaller.currentEntity; var rotation = new Vector3(0, e.valA, 0); - RhythmRally.instance.ChangeCameraAngle(rotation, e.length, (Ease)e.type, (RotateMode)e.type2); + RhythmRally.instance.ChangeCameraAngle(rotation, e.valB, e.length, (Ease)e.type, (RotateMode)e.type2); }, 4, true, new List() { new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Angle"), + new Param("valB", new EntityTypes.Float(0.5f, 4f, 1), "Zoom"), new Param("type", Ease.Linear, "Ease"), new Param("type2", RotateMode.Fast, "Rotation Mode") } ),