From 1b55d071fb4a5367bc3e32341d23d1e3d9e7afa6 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:56:12 +0200 Subject: [PATCH] epic camera fixes --- Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab | 2 +- Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab b/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab index 0c04124cd..363248f65 100644 --- a/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab +++ b/Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab @@ -302,7 +302,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _fullRotRange: 160 - _spawnOffset: 10.408 + _spawnOffset: 2.6 _holdLength: 4 _ease: 4 _rotateRoot: {fileID: 4208995891253938729} diff --git a/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs b/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs index 3623128ab..d53c8be5c 100644 --- a/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs +++ b/Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs @@ -120,6 +120,7 @@ namespace HeavenStudio.Games private int _animalCameraIndex = 0; private float _lastCameraX = 0; private double _cameraHoldTime = 1; + private bool _lastCameraAnimalWasGiraffe = false; private void CameraUpdate(Conductor cond) { @@ -127,7 +128,7 @@ namespace HeavenStudio.Games var currentAnimal = _queuedAnimals[_animalCameraIndex]; - float distance = (_animalCameraIndex == 0) ? _jumpStartCameraDistance : _jumpDistance; + float distance = (_animalCameraIndex == 0) ? _jumpStartCameraDistance : (_lastCameraAnimalWasGiraffe ? _jumpDistanceGiraffe : _jumpDistance); float normalizedHold = cond.GetPositionFromBeat(currentAnimal.startBeat, currentAnimal.GetHoldLengthFromType()); @@ -161,6 +162,7 @@ namespace HeavenStudio.Games _cameraHoldTime = (currentAnimal.type == AnimalType.Giraffe) ? 4 : 2; _lastCameraX += distance + currentAnimal.rotationDistance; _animalCameraIndex++; + _lastCameraAnimalWasGiraffe = currentAnimal.type == AnimalType.Giraffe; } private void AnimalPoolUpdate(Conductor cond)