diff --git a/game/Assets/Scripts/Flow/BootstrapConfig.cs b/game/Assets/Scripts/Flow/BootstrapConfig.cs index 3f2b483..621acc4 100644 --- a/game/Assets/Scripts/Flow/BootstrapConfig.cs +++ b/game/Assets/Scripts/Flow/BootstrapConfig.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using NaughtyAttributes; using NaughtyAttributes.Test; using UnityEngine; +using UnityEngine.Serialization; [CreateAssetMenu(fileName = "BootstrapConfig.asset", menuName = "KernelPanic/Boot/Config")] public class BootstrapConfig : ScriptableObject @@ -20,11 +21,14 @@ public class BootstrapConfig : ScriptableObject [SerializeField] [Scene] private string GameplayScene; + public LevelDescriptor StartLevel => _startLevel; [SerializeField] - public LevelDescriptor StartLevel; + private LevelDescriptor _startLevel; + public float TransitionDuration => _transitionDuration; [Header( "Transition" )] - public float TransitionDuration; + [SerializeField] [FormerlySerializedAs("TransitionDuration")] + private float _transitionDuration; public string GetScene( SceneType sceneType ) { diff --git a/game/Assets/Scripts/Flow/Cutscene.cs b/game/Assets/Scripts/Flow/Cutscene.cs deleted file mode 100644 index 3639232..0000000 --- a/game/Assets/Scripts/Flow/Cutscene.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Cutscene : MonoBehaviour -{ - public enum Stage - { - Loading, - InProgress, - Complete, - } - - private Stage _stage; - public Stage LoadStage => _stage; -} diff --git a/game/Assets/Scripts/Flow/Cutscene.cs.meta b/game/Assets/Scripts/Flow/Cutscene.cs.meta deleted file mode 100644 index a76ce19..0000000 --- a/game/Assets/Scripts/Flow/Cutscene.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4eb06267885558c42939f85fd909ebc0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/game/Assets/Scripts/Flow/LevelDescriptor.cs b/game/Assets/Scripts/Flow/LevelDescriptor.cs index 46a7068..23d5810 100644 --- a/game/Assets/Scripts/Flow/LevelDescriptor.cs +++ b/game/Assets/Scripts/Flow/LevelDescriptor.cs @@ -2,10 +2,12 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using NaughtyAttributes; +using UnityEngine.Serialization; [CreateAssetMenu(fileName = "LevelDescriptor.asset", menuName = "KernelPanic/Boot/LevelDescriptor")] public class LevelDescriptor : ScriptableObject { - [SerializeField] [Scene] - public string LevelScene; + public string LevelScene => _levelScene; + [FormerlySerializedAs("LevelScene")][SerializeField][Scene] + private string _levelScene; } diff --git a/game/Assets/Settings/BootConfig.asset b/game/Assets/Settings/BootConfig.asset index 9f1aec9..c48f1ab 100644 --- a/game/Assets/Settings/BootConfig.asset +++ b/game/Assets/Settings/BootConfig.asset @@ -16,5 +16,5 @@ MonoBehaviour: MainMenuScene: MainMenu CreditsScene: Credits GameplayScene: Main - StartLevel: {fileID: 11400000, guid: 914bdd40f2fe0d1488c4999c4320b423, type: 2} - TransitionDuration: 1 + _startLevel: {fileID: 11400000, guid: 914bdd40f2fe0d1488c4999c4320b423, type: 2} + _transitionDuration: 1