From 1359fc3e0cb20ae65e1448d0f5cdae2743706ef2 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Sat, 7 Oct 2023 19:28:43 +0200 Subject: [PATCH] tweaks part one billion --- Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab | 2 +- .../Prefabs/Games/AnimalAcrobat/WhiteMonkey.prefab | 2 +- Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab b/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab index 3a3634d54..3074f3eb2 100644 --- a/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab +++ b/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab @@ -303,7 +303,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _fullRotRange: 160 - _spawnOffset: 2.6 + _spawnOffset: 0.6 _holdLength: 4 _ease: 4 _rotateRoot: {fileID: 4208995891253938729} diff --git a/Assets/Resources/Prefabs/Games/AnimalAcrobat/WhiteMonkey.prefab b/Assets/Resources/Prefabs/Games/AnimalAcrobat/WhiteMonkey.prefab index 7919aab9e..699bfe87c 100644 --- a/Assets/Resources/Prefabs/Games/AnimalAcrobat/WhiteMonkey.prefab +++ b/Assets/Resources/Prefabs/Games/AnimalAcrobat/WhiteMonkey.prefab @@ -108,7 +108,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1326311291227833683} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.685, z: 0} + m_LocalPosition: {x: 0, y: -1.78, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs b/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs index be555b4d6..6c0801072 100644 --- a/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs +++ b/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs @@ -108,7 +108,6 @@ namespace HeavenStudio.Games private Util.EasingFunction.Function _funcEaseInOut; private Util.EasingFunction.Function _funcEaseOut; - private Util.EasingFunction.Function _funcSharp; private double _jumpBeat = double.MaxValue; @@ -119,7 +118,6 @@ namespace HeavenStudio.Games instance = this; _funcEaseInOut = Util.EasingFunction.GetEasingFunction(Util.EasingFunction.Ease.EaseInOutQuad); _funcEaseOut = Util.EasingFunction.GetEasingFunction(Util.EasingFunction.Ease.EaseOutQuad); - _funcSharp = Util.EasingFunction.GetEasingFunction(Util.EasingFunction.Ease.EaseOutQuart); } private void Update() @@ -175,8 +173,8 @@ namespace HeavenStudio.Games { if (normalizedTravel < 0.5) { - float normalizedOut = cond.GetPositionFromBeat(currentAnimal.startBeat - _cameraHoldTime, 1); - newZ = _funcSharp(0, _giraffeCameraZoom, Mathf.Clamp01(normalizedOut)); + float normalizedOut = cond.GetPositionFromBeat(currentAnimal.startBeat - _cameraHoldTime, 0.5); + newZ = _funcEaseOut(0, _giraffeCameraZoom, Mathf.Clamp01(normalizedOut)); } else {