From 22d3dff7267e8c15ed99472426f17a7fe6486c72 Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 15 Aug 2022 13:20:14 -0700 Subject: [PATCH] Format code --- Assets/Scripts/Audio/AudioPlayer.cs | 19 +++---------------- Assets/Scripts/Audio/BGMManager.cs | 2 +- Assets/Scripts/Audio/Footsteps.cs | 2 +- Assets/Scripts/Scenes/LoadScene.cs | 1 - Assets/Scripts/Scenes/SingletonManager.cs | 5 ++--- Assets/Scripts/Utilities/TerrainTypeFinder.cs | 2 +- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/Assets/Scripts/Audio/AudioPlayer.cs b/Assets/Scripts/Audio/AudioPlayer.cs index 05e02a5..a0ce6ce 100644 --- a/Assets/Scripts/Audio/AudioPlayer.cs +++ b/Assets/Scripts/Audio/AudioPlayer.cs @@ -1,21 +1,8 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; namespace Scampz.GameJam { - public class AudioPlayer : MonoBehaviour - { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - } + public class AudioPlayer : MonoBehaviour + { + } } diff --git a/Assets/Scripts/Audio/BGMManager.cs b/Assets/Scripts/Audio/BGMManager.cs index 2c4658a..4455db2 100644 --- a/Assets/Scripts/Audio/BGMManager.cs +++ b/Assets/Scripts/Audio/BGMManager.cs @@ -8,7 +8,7 @@ namespace Scampz.GameJam.Assets.Scripts public class BGMManager : MonoBehaviour { public static BGMManager Instance { get; private set; } - + [SerializeField] private AudioSource audioSource; diff --git a/Assets/Scripts/Audio/Footsteps.cs b/Assets/Scripts/Audio/Footsteps.cs index e94504b..c553382 100644 --- a/Assets/Scripts/Audio/Footsteps.cs +++ b/Assets/Scripts/Audio/Footsteps.cs @@ -23,7 +23,7 @@ namespace Scampz.GameJam private AudioClip GetAudioClip() { var terrainType = TerrainTypeFinder.Find(); - switch(terrainType) + switch (terrainType) { case TerrainType.Grass: return grassStep; diff --git a/Assets/Scripts/Scenes/LoadScene.cs b/Assets/Scripts/Scenes/LoadScene.cs index d199366..2e8f15c 100644 --- a/Assets/Scripts/Scenes/LoadScene.cs +++ b/Assets/Scripts/Scenes/LoadScene.cs @@ -1,4 +1,3 @@ -using Scampz.GameJam.Assets.Scripts; using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/Scripts/Scenes/SingletonManager.cs b/Assets/Scripts/Scenes/SingletonManager.cs index b657835..2819d2e 100644 --- a/Assets/Scripts/Scenes/SingletonManager.cs +++ b/Assets/Scripts/Scenes/SingletonManager.cs @@ -1,14 +1,13 @@ -using Scampz.GameJam.Assets.Scripts; using UnityEngine; using UnityEngine.SceneManagement; -namespace Scampz.GameJam +namespace Scampz.GameJam.Assets.Scripts { public class SingletonManager : MonoBehaviour { void Start() { - GameManager.Instance.LoadScene(SceneNames.TempleA, LoadSceneMode.Additive); + GameManager.Instance.LoadScene(SceneNames.TempleA, LoadSceneMode.Single); } } } diff --git a/Assets/Scripts/Utilities/TerrainTypeFinder.cs b/Assets/Scripts/Utilities/TerrainTypeFinder.cs index afa88bb..eb7f1f9 100644 --- a/Assets/Scripts/Utilities/TerrainTypeFinder.cs +++ b/Assets/Scripts/Utilities/TerrainTypeFinder.cs @@ -11,7 +11,7 @@ namespace Scampz.GameJam.Assets.Scripts { var sceneCount = SceneManager.sceneCount; var scenes = new List(); - + for (var i = 0; i < sceneCount; ++i) scenes.Add(SceneManager.GetSceneAt(i));