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

Fixed issues with platform heights on gameswitches

Browse source
This commit is contained in:
Rapandrasmus 2023-06-24 16:11:32 +02:00
parent 09aa2d5aba
commit 4b3cbea538
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/Games/NightWalkAgb/AgbNightWalk.cs
View file

@ -107,7 +107,7 @@ namespace HeavenStudio.Games
public static AgbNightWalk instance; public static AgbNightWalk instance;
public AgbPlayYan playYan; public AgbPlayYan playYan;
[SerializeField] private AgbPlatformHandler platformHandler; [SerializeField] private AgbPlatformHandler platformHandler;
[NonSerialized] public double countInBeat = -1; [NonSerialized] public double countInBeat = double.MinValue;
[NonSerialized] public float countInLength = 8; [NonSerialized] public float countInLength = 8;
[Header("Curves")] [Header("Curves")]
[SerializeField] SuperCurveObject.Path[] jumpPaths; [SerializeField] SuperCurveObject.Path[] jumpPaths;
@ -331,7 +331,7 @@ namespace HeavenStudio.Games
{ {
allEnds.Sort((x, y) => x.beat.CompareTo(y.beat)); allEnds.Sort((x, y) => x.beat.CompareTo(y.beat));
List<RiqEntity> tempEnds = new(); List<RiqEntity> tempEnds = new();
double beat = -1; double beat = double.MinValue;
for (int i = 0; i < allEnds.Count; i++) for (int i = 0; i < allEnds.Count; i++)
{ {
if (allEnds[i].datamodel.Split(2) == "nightWalkAgb") if (allEnds[i].datamodel.Split(2) == "nightWalkAgb")

16
Assets/Scripts/Games/NightWalkAgb/AgbPlatformHandler.cs
View file

@ -19,7 +19,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
public int platformCount = 20; public int platformCount = 20;
private float lastHeight = 0; private float lastHeight = 0;
private float heightToRaiseTo = 0; private float heightToRaiseTo = 0;
private double raiseBeat = -1; private double raiseBeat = double.MinValue;
[NonSerialized] public List<AgbPlatform> allPlatforms = new(); [NonSerialized] public List<AgbPlatform> allPlatforms = new();
private void Awake() private void Awake()
@ -29,7 +29,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
public void SpawnPlatforms(double beat) public void SpawnPlatforms(double beat)
{ {
if (game.countInBeat != -1) if (game.countInBeat != double.MinValue)
{ {
for (int i = 0; i < platformCount; i++) for (int i = 0; i < platformCount; i++)
{ {
@ -42,14 +42,22 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
} }
else else
{ {
double firstInputBeat = Math.Ceiling(beat);
for (int i = 0; i < platformCount; i++) for (int i = 0; i < platformCount; i++)
{ {
AgbPlatform platform = Instantiate(platformRef, transform); AgbPlatform platform = Instantiate(platformRef, transform);
allPlatforms.Add(platform); allPlatforms.Add(platform);
platform.handler = this; platform.handler = this;
platform.StartInput(beat, Math.Ceiling(beat) + i - platformCount); platform.StartInput(beat, firstInputBeat + i - platformCount);
platform.gameObject.SetActive(true); platform.gameObject.SetActive(true);
} }
int lastUnits = game.FindHeightUnitsAtBeat(firstInputBeat - 1);
int currentUnits = game.FindHeightUnitsAtBeat(firstInputBeat);
RaiseHeight(firstInputBeat - 1, lastUnits, currentUnits);
if (lastUnits != currentUnits)
{
game.playYan.Jump(firstInputBeat - 1);
}
} }
} }
@ -58,7 +66,7 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk
var cond = Conductor.instance; var cond = Conductor.instance;
if (cond.isPlaying && !cond.isPaused) if (cond.isPlaying && !cond.isPaused)
{ {
if (raiseBeat != -1) if (raiseBeat != double.MinValue)
{ {
float normalizedBeat = Mathf.Clamp(cond.GetPositionFromBeat(raiseBeat, 1), 0, 1); float normalizedBeat = Mathf.Clamp(cond.GetPositionFromBeat(raiseBeat, 1), 0, 1);
EasingFunction.Function func = EasingFunction.GetEasingFunction(EasingFunction.Ease.EaseOutQuint); EasingFunction.Function func = EasingFunction.GetEasingFunction(EasingFunction.Ease.EaseOutQuint);