Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:07:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Catchy Tune: New sprites, animations, bug fixes (#204)

Browse Source 
* catchy tune setup work, animations

* more catchy tune progress

* catchy tune: gameplay implemented, animation adjustments

* more animation work catchy tune

* more animation work catchy tune

* adjust icon metadata

* code cleanup

left remarks for minigame developer

* Catchy Tune new sprites

* Catchy Tune miss animations, fix bugs

* barely animation

* Catchy Tune several things

* barely sounds
* miss animation for pineapple
* background for catchy tune 2
* new game action for switching bg

* Catchy Tune cleanup, asset bundle

Co-authored-by: minenice55 <star.elementa@gmail.com>
This commit is contained in:
kkuhn317
2023-01-16 20:15:06 -05:00
committed by GitHub
parent 4a92db679a
commit ab30f1a88e
109 changed files with 16290 additions and 1630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Assets/Scripts/Games/CatchyTune/Fruit.cs
View File

@ -2,7 +2,6 @@ using System.Collections;
using System.Collections.Generic;
using System;
using UnityEngine;
using NaughtyBezierCurves;
using HeavenStudio.Util;
@ -18,6 +17,8 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
public bool side;
public float barelyStart = 0f;
public bool smile;
private string soundText;
@ -74,13 +75,14 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
// minenice: note - needs PlayerActionEvent implementation
private void Update()
{
Conductor cond = Conductor.instance;
float tempo = cond.songBpm;
float playbackSpeed = cond.musicSource.pitch;
anim.DoScaledAnimation("fruit bounce", startBeat, beatLength + (isPineapple ? 1f : 0.5f));
float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, beatLength);
if (barelyStart > 0f)
{
anim.DoScaledAnimation("barely", barelyStart, isPineapple ? 2f : 1f);
}
else
{
anim.DoScaledAnimation("fruit bounce", startBeat, beatLength + (isPineapple ? 4f : 2f));
}
}
public static void PlaySound(float startBeat, bool side, bool isPineapple)
@ -133,10 +135,29 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
private void CatchFruit(PlayerActionEvent caller, float state)
{
//minenice: TODO - near misses (-1 > state > 1)
Jukebox.PlayOneShotGame(soundText + "Catch");
game.catchSuccess(side, isPineapple, smile, startBeat + beatLength);
Destroy(this.gameObject);
if (state <= -1f || state >= 1f)
{
//near miss (barely)
barelyStart = Conductor.instance.songPositionInBeats;
game.catchBarely(side);
// play near miss animation
anim.DoScaledAnimation("barely", barelyStart, isPineapple ? 2f : 1f);
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(barelyStart + (isPineapple ? 2f : 1f), delegate { Destroy(this.gameObject); }),
});
}
else
{
Jukebox.PlayOneShotGame(soundText + "Catch");
game.catchSuccess(side, isPineapple, smile, startBeat + beatLength);
Destroy(this.gameObject);
}
}
private void Miss(PlayerActionEvent caller)
@ -145,7 +166,7 @@ namespace HeavenStudio.Games.Scripts_CatchyTune
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(startBeat + beatLength + (isPineapple ? 1f : 0.5f), delegate { Destroy(this.gameObject); }),
new BeatAction.Action(startBeat + beatLength + (isPineapple ? 3f : 1.5f), delegate { Destroy(this.gameObject); }),
});
}