From 10fe60b6d1740df3afc8a414ee75dd1f6844d350 Mon Sep 17 00:00:00 2001
From: Adrian Paschkowski <git@wasdennnoch.me>
Date: Fri, 16 Apr 2021 13:43:14 +0200
Subject: [PATCH] Save and apply target round speed
---
Assets/Scenes/Forest.unity | 2 +-
Assets/Scripts/RoundController.cs | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Assets/Scenes/Forest.unity b/Assets/Scenes/Forest.unity
index 822040a..528c8a9 100644
--- a/Assets/Scenes/Forest.unity
+++ b/Assets/Scenes/Forest.unity
@@ -3362,7 +3362,7 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 579686565}
m_TargetAssemblyTypeName: RoundController, Assembly-CSharp
- m_MethodName: SetGameSpeed
+ m_MethodName: SetRoundSpeed
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
diff --git a/Assets/Scripts/RoundController.cs b/Assets/Scripts/RoundController.cs
index 3872101..9fa186f 100644
--- a/Assets/Scripts/RoundController.cs
+++ b/Assets/Scripts/RoundController.cs
@@ -22,6 +22,7 @@ public class RoundController : MonoBehaviour, IFighterCallback
BaseCameraController cameraController;
int aliveEnemiesCount = 0;
+ float targetRoundGameSpeed = 1f;
public void StartRound()
{
@@ -30,7 +31,7 @@ public class RoundController : MonoBehaviour, IFighterCallback
return;
}
roundRunning = true;
- SetGameSpeed(1f);
+ SetCurrentGameSpeed(targetRoundGameSpeed);
roundCallbacks.ForEach(c => c.OnRoundStart());
aliveEnemiesCount = 0;
@@ -50,7 +51,7 @@ public class RoundController : MonoBehaviour, IFighterCallback
return;
}
roundRunning = false;
- SetGameSpeed(1f);
+ SetCurrentGameSpeed(1f);
roundCallbacks.ForEach(c => c.OnRoundEnd());
}
@@ -66,11 +67,16 @@ public class RoundController : MonoBehaviour, IFighterCallback
}
}
- public void SetGameSpeed(float multiplier)
+ public void SetCurrentGameSpeed(float multiplier)
{
Time.timeScale = multiplier;
}
+ public void SetRoundSpeed(float multiplier)
+ {
+ targetRoundGameSpeed = multiplier;
+ }
+
void Awake()
{
if (instance == null)
@@ -97,7 +103,7 @@ public class RoundController : MonoBehaviour, IFighterCallback
{
// Slowmo-zoom to last dying Figher
var targetGameSpeed = 0.2f;
- SetGameSpeed(targetGameSpeed);
+ SetCurrentGameSpeed(targetGameSpeed);
cameraController.AnimateToPosition(fighter.transform.position + new Vector3(0f, 0.75f), 1.5f, 0.125f * targetGameSpeed);
Invoke(nameof(StopRoundAfterDeath), targetGameSpeed * restartDelayAfterLastFighterDeath);
}
--
GitLab