Geri/Roses
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: new rose spawn animation

Browse source
This commit is contained in:
Gerard Gascón 2024-04-21 23:31:28 +02:00
parent b3996c6831
commit 1580910ec1
113 changed files with 6558 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assets/Scripts/View/Dependencies.cs
View file

@ -16,6 +16,8 @@ namespace View {
public SaveGame Saver { private set; get; }
public LoadGame Loader { private set; get; }
public SpawnRose Spawner { private set; get; }
private void Awake() {
Score = new Score(10, 10);
@ -28,7 +30,8 @@ namespace View {
IInputCallback inputCallback = new InputCallbackCollection(new[] { visibility, growParticles });
IRoseGrow growAnimation = FindObjectOfType<GrowAnimation>();
ExpressionClick = new ExpressionClick(Score, input, spawner, growAnimation, inputCallback);
ExpressionClick = new ExpressionClick(Score, input, growAnimation, inputCallback);
Spawner = new SpawnRose(Score, spawner);
CustomInput = new CustomInput();

17
Assets/Scripts/View/Scene/GardenFlower.cs
View file

@ -1,18 +1,31 @@
using System;
using System.Collections;
using UnityEngine;
using Animation = FramedAnimator.Animation;
using Animator = FramedAnimator.Animator;
using Random = UnityEngine.Random;
namespace View.Scene {
public class GardenFlower : MonoBehaviour {
[SerializeField] private SpriteRenderer sprite;
[SerializeField] private Sprite[] randomSprites;
[SerializeField] private Animation[] randomAnimation;
[SerializeField] private Animator animator;
private static readonly int WindOffset = Shader.PropertyToID("_WindOffset");
[SerializeField] private float randomRotation;
[SerializeField] private float startRandomMaxDelay;
private void Awake() {
sprite.sprite = randomSprites[Random.Range(0, randomSprites.Length)];
transform.rotation = Quaternion.Euler(0f, 0f, Random.Range(-randomRotation, randomRotation));
}
private IEnumerator Start() {
sprite.material.SetFloat(WindOffset, Random.Range(0f, 2f * Mathf.PI));
animator.ChangeAnimation(randomAnimation[Random.Range(0, randomAnimation.Length)]);
yield return new WaitForSeconds(Random.Range(0f, startRandomMaxDelay));
animator.PlayUntil(1f);
}
}
}

3
Assets/Scripts/View/Scene/GrowAnimation.cs
View file

@ -16,10 +16,12 @@ namespace View.Scene {
[SerializeField] private EventReference gloomEvent;
private Score _score;
private SpawnRose _spawnRose;
private bool _firstUpdate = true;
private void Start() {
_score = FindObjectOfType<Dependencies>().Score;
_spawnRose = FindObjectOfType<Dependencies>().Spawner;
animator.OnAnimationEnd += AnimationEnded;
}
@ -33,6 +35,7 @@ namespace View.Scene {
}
if (animationName == "Rosa_End") {
_spawnRose.Execute();
animator.ChangeAnimation(growAnimation);
animator.PlayUntil(_score.GrowPercentage);
}