From a46b747898a6c046eda30102bbd4c906a3766e49 Mon Sep 17 00:00:00 2001 From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com> Date: Wed, 17 Aug 2022 11:31:55 -0500 Subject: [PATCH] something --- Assets/Scripts/GameCamera.cs | 4 +++- Assets/Scripts/Minigames.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/GameCamera.cs b/Assets/Scripts/GameCamera.cs index eb91009c..a87002cf 100644 --- a/Assets/Scripts/GameCamera.cs +++ b/Assets/Scripts/GameCamera.cs @@ -150,6 +150,7 @@ namespace HeavenStudio float dy = func(rotEluerLast.y, e.valB, Mathf.Min(prog, 1f)); float dz = func(rotEluerLast.z, e.valC, Mathf.Min(prog, 1f)); rotEluer = new Vector3(dx, dy, dz); + } if (prog > 1f) { @@ -169,7 +170,8 @@ namespace HeavenStudio EasingFunction.Function func = EasingFunction.GetEasingFunction(e.ease); float dx = func(positionLast.x, e.valA, Mathf.Min(prog, 1f)); float dy = func(positionLast.y, e.valA, Mathf.Min(prog, 1f)); - shakeResult = new Vector3(dx, dy); + shakeResult = new Vector3(Mathf.Sin(dx * 3.14159265f * 5f) * e.valA, Mathf.Sin(dy * 3.14159265f * 10f) * e.valA); + } if (prog > 1f) { diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 08d3ecda..7fe4fb04 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -337,7 +337,7 @@ namespace HeavenStudio //TODO: move cam }, 1f, true, new List() { - new Param("valA", new EntityTypes.Float(0, 50, 10), "Intensity") + new Param("valA", new EntityTypes.Float(0, 10, 2), "Intensity") } ), new GameAction("move camera", delegate