mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enough. Tweaking.

Browse source
This commit is contained in:
Rapandrasmus 2023-10-07 22:33:50 +02:00
parent 4d9ed82f9e
commit b5140d10b1
6 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assets/Resources/Games/animalAcrobat.prefab
View file

@ -528,6 +528,7 @@ MonoBehaviour:
_jumpDistance: 8 _jumpDistance: 8
_jumpDistanceGiraffe: 32 _jumpDistanceGiraffe: 32
_jumpStartCameraDistance: 3 _jumpStartCameraDistance: 3
_jumpStartDistance: -1.25
_giraffeCameraZoom: 12 _giraffeCameraZoom: 12
--- !u!1 &9154566379104488428 --- !u!1 &9154566379104488428
GameObject: GameObject:

5
Assets/Resources/Prefabs/Games/AnimalAcrobat/Giraffe.prefab
View file

@ -303,7 +303,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_fullRotRange: 160 _fullRotRange: 160
_spawnOffset: -1
_holdLength: 4 _holdLength: 4
_ease: 4 _ease: 4
_rotateRoot: {fileID: 4208995891253938729} _rotateRoot: {fileID: 4208995891253938729}
@ -361,7 +360,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3911272779464478738} m_GameObject: {fileID: 3911272779464478738}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 2.659, y: 0.68099976, z: 0} m_LocalPosition: {x: 2.459, y: 0.68099976, z: 0}
m_LocalScale: {x: 0.75091, y: 0.75091, z: 0.75091} m_LocalScale: {x: 0.75091, y: 0.75091, z: 0.75091}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -562,7 +561,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5674205584559157106} m_GameObject: {fileID: 5674205584559157106}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.6, y: 0.8, z: 0} m_LocalPosition: {x: 2.4, y: 0.8, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:

7
Assets/Resources/Prefabs/Games/AnimalAcrobat/WhiteMonkey.prefab
View file

@ -108,7 +108,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1326311291227833683} m_GameObject: {fileID: 1326311291227833683}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1.9, z: 0} m_LocalPosition: {x: 0, y: -1.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -141,7 +141,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1656536018348746482} m_GameObject: {fileID: 1656536018348746482}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -162,7 +162,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_fullRotRange: 160 _fullRotRange: 160
_spawnOffset: 0
_holdLength: 1 _holdLength: 1
_ease: 4 _ease: 4
_rotateRoot: {fileID: 2068126119450832752} _rotateRoot: {fileID: 2068126119450832752}
@ -373,7 +372,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7319071693544032937} m_GameObject: {fileID: 7319071693544032937}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.49, z: 0} m_LocalPosition: {x: 1.25, y: 0.49, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:

9
Assets/Resources/Prefabs/Games/AnimalAcrobat/WhiteMonkeys.prefab
View file

@ -649,7 +649,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3530077400513613063} m_GameObject: {fileID: 3530077400513613063}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.8995676, y: 0.44255477, z: 0.13394769} m_LocalPosition: {x: 1.649568, y: 0.44255477, z: 0.13394769}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@ -1116,7 +1116,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5202088941643817628} m_GameObject: {fileID: 5202088941643817628}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.9, y: 0.53, z: 0.13394769} m_LocalPosition: {x: 1.65, y: 0.53, z: 0.13394769}
m_LocalScale: {x: 0.75091, y: 0.75091, z: 0.75091} m_LocalScale: {x: 0.75091, y: 0.75091, z: 0.75091}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -1933,7 +1933,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_fullRotRange: 160 _fullRotRange: 160
_spawnOffset: 0
_holdLength: 3 _holdLength: 3
_ease: 4 _ease: 4
_rotateRoot: {fileID: 3903953954711634507} _rotateRoot: {fileID: 3903953954711634507}
@ -1993,7 +1992,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8302616130811808557} m_GameObject: {fileID: 8302616130811808557}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.164, y: 1.959, z: 0.13394769} m_LocalPosition: {x: 1.914, y: 1.959, z: 0.13394769}
m_LocalScale: {x: 0.75091, y: 0.75091, z: 0.75091} m_LocalScale: {x: 0.75091, y: 0.75091, z: 0.75091}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
@ -2160,7 +2159,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9082431704919230402} m_GameObject: {fileID: 9082431704919230402}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -8.6, z: 0} m_LocalPosition: {x: 0, y: -8.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []

3
Assets/Scripts/Games/AnimalAcrobat/AcrobatObstacle.cs
View file

@ -13,7 +13,6 @@ namespace HeavenStudio.Games.Scripts_AnimalAcrobat
[Header("Values")] [Header("Values")]
[SerializeField] private float _fullRotRange; [SerializeField] private float _fullRotRange;
[SerializeField] private float _spawnOffset;
[SerializeField] private double _holdLength; [SerializeField] private double _holdLength;
[SerializeField] private EasingFunction.Ease _ease = EasingFunction.Ease.EaseInOutQuad; [SerializeField] private EasingFunction.Ease _ease = EasingFunction.Ease.EaseInOutQuad;
@ -22,8 +21,6 @@ namespace HeavenStudio.Games.Scripts_AnimalAcrobat
private float _halfRotRange; private float _halfRotRange;
private EasingFunction.Function _func; private EasingFunction.Function _func;
public float SpawnOffset => _spawnOffset;
[Header("Components")] [Header("Components")]
[SerializeField] private Transform _rotateRoot; [SerializeField] private Transform _rotateRoot;
[SerializeField] private Transform _gripPoint; [SerializeField] private Transform _gripPoint;

3
Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs
View file

@ -68,6 +68,7 @@ namespace HeavenStudio.Games
[SerializeField] private float _jumpDistance = 8; [SerializeField] private float _jumpDistance = 8;
[SerializeField] private float _jumpDistanceGiraffe = 16; [SerializeField] private float _jumpDistanceGiraffe = 16;
[SerializeField] private float _jumpStartCameraDistance = 4; [SerializeField] private float _jumpStartCameraDistance = 4;
[SerializeField] private float _jumpStartDistance = -1;
[SerializeField] private float _giraffeCameraZoom = 5; [SerializeField] private float _giraffeCameraZoom = 5;
private List<AcrobatObstacle> _pooledElephants = new(), _pooledGiraffes = new(), _pooledMonkeysLong = new(), _pooledMonkeysShort = new(); private List<AcrobatObstacle> _pooledElephants = new(), _pooledGiraffes = new(), _pooledMonkeysLong = new(), _pooledMonkeysShort = new();
@ -250,7 +251,7 @@ namespace HeavenStudio.Games
}; };
var animal = pooledObstacles.Find(x => x.IsAvailableAtBeat(currentAnimal.startBeat)); var animal = pooledObstacles.Find(x => x.IsAvailableAtBeat(currentAnimal.startBeat));
if (_animalPoolIndex == 0) _animalSummatedDistance = animal.SpawnOffset; if (_animalPoolIndex == 0) _animalSummatedDistance = _jumpStartDistance;
animal.gameObject.SetActive(true); animal.gameObject.SetActive(true);
double expBeat = currentAnimal.startBeat + currentAnimal.length; double expBeat = currentAnimal.startBeat + currentAnimal.length;