TO SQUASH: Fixed issue.
This commit is contained in:
@@ -54,6 +54,14 @@ public class BallBase : MonoBehaviour
|
||||
{
|
||||
player.GetComponent<Player>().OnBarHit();
|
||||
}
|
||||
|
||||
// Notify other systems if needed.
|
||||
var worldFiller = GameObject.FindGameObjectWithTag("WorldFiller");
|
||||
|
||||
if (worldFiller != null)
|
||||
{
|
||||
worldFiller.GetComponent<WorldFiller>().ClearWalls();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -107,6 +107,12 @@ public class LevelEnder : MonoBehaviour
|
||||
{
|
||||
addScoreTimer = 0.0f;
|
||||
addScoreToPlayer = AddScore();
|
||||
|
||||
if (!addScoreToPlayer)
|
||||
{
|
||||
tallyShown = false;
|
||||
StartCoroutine(ProceedToNextLevel());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -260,4 +266,47 @@ public class LevelEnder : MonoBehaviour
|
||||
yield return new WaitForSeconds(7.3f - 3.0f - (player.multiplier != 1.0f ? 0.75f : 0.0f));
|
||||
addScoreToPlayer = true;
|
||||
}
|
||||
|
||||
private IEnumerator ProceedToNextLevel()
|
||||
{
|
||||
musicManager.PauseMusic();
|
||||
|
||||
yield return new WaitForSeconds(1.0f);
|
||||
|
||||
player.OnLevelEnd();
|
||||
|
||||
// Reenable spawners.
|
||||
multiplierSpawner.StartSpawning();
|
||||
sharkSpawner.StartSpawning();
|
||||
cakeSpawner.StartSpawning();
|
||||
ballSpawner.StartSpawning();
|
||||
|
||||
// Reset state.
|
||||
levelEnded = false;
|
||||
tallyShown = false;
|
||||
addScoreToPlayer = false;
|
||||
scoreTotal = 0;
|
||||
addScoreTimer = 0.0f;
|
||||
|
||||
// Clear text labels.
|
||||
timeBonus.text = "";
|
||||
totalBonus.text = "";
|
||||
isolationBonus.text = "";
|
||||
overachieverBonus.text = "";
|
||||
isolationCount.text = "";
|
||||
overachieverPercent.text = "";
|
||||
multiplierBonus.text = "";
|
||||
overarchieverPercentLabel.enabled = false;
|
||||
isolationCountSingleLabel.enabled = false;
|
||||
isolationCountPluralLabel.enabled = false;
|
||||
|
||||
// Hide score tally.
|
||||
levelEndTally.enabled = false;
|
||||
levelEndTallyBackground.enabled = false;
|
||||
|
||||
// TODO: Reset balls.
|
||||
|
||||
// Restart music.
|
||||
musicManager.ResumeMusic();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,12 +65,22 @@ public class MusicManager : MonoBehaviour
|
||||
{
|
||||
if (needsReset)
|
||||
{
|
||||
if (audioSource.isPlaying)
|
||||
{
|
||||
audioSource.Stop();
|
||||
}
|
||||
|
||||
audioSource.clip = null;
|
||||
clipsQueue.Clear();
|
||||
ResetQueue();
|
||||
needsReset = false;
|
||||
}
|
||||
|
||||
audioSource.UnPause();
|
||||
if (audioSource.clip != null && !audioSource.isPlaying)
|
||||
{
|
||||
audioSource.UnPause();
|
||||
}
|
||||
|
||||
isPaused = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@ public class SharkSpawner : Spawner
|
||||
|
||||
public SpriteRenderer gameBoardSpriteRenderer;
|
||||
|
||||
public Player player;
|
||||
|
||||
private Bounds gameBoardBounds;
|
||||
|
||||
private float spawnTimer = 0f;
|
||||
@@ -28,7 +30,7 @@ public class SharkSpawner : Spawner
|
||||
{
|
||||
spawnTimer += Time.fixedDeltaTime;
|
||||
|
||||
if (spawnTimer >= 1f && isActive && isSpawning)
|
||||
if (spawnTimer >= 1f && isActive && isSpawning && player.level >= 10)
|
||||
{
|
||||
spawnTimer = 0f;
|
||||
if (Random.value < spawnProbability)
|
||||
@@ -36,7 +38,7 @@ public class SharkSpawner : Spawner
|
||||
GameObject shark = Instantiate(sharkPrefab, spawnPosition, Quaternion.identity);
|
||||
Shark sharkScript = shark.GetComponent<Shark>();
|
||||
sharkScript.gameBoardSpriteRenderer = gameBoardSpriteRenderer;
|
||||
sharkScript.player = FindAnyObjectByType<Player>();
|
||||
sharkScript.player = player;
|
||||
isActive = false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user