From d486a1cf6e58b51b2db2f4393a758bce3a1683a8 Mon Sep 17 00:00:00 2001 From: milan Date: Mon, 15 May 2023 14:04:09 +0200 Subject: [PATCH] environment management --- Assets/Engine/Runtime/Engine.cs | 35 ++- Assets/Engine/Runtime/EngineTheme.cs | 5 +- Assets/Engine/Runtime/Environment.meta | 3 + .../Runtime/Environment/AmbienceAudio.cs | 85 ++++++ .../Runtime/Environment/AmbienceAudio.cs.meta | 3 + .../Runtime/Environment/AmbienceClip.cs | 12 + .../Runtime/Environment/AmbienceClip.cs.meta | 3 + .../Runtime/Environment/RoomEnvironment.cs | 12 + .../Environment/RoomEnvironment.cs.meta | 3 + Assets/Engine/Runtime/Intro.cs | 9 +- Assets/Engine/Runtime/Room.cs | 23 +- Assets/Engine/Runtime/UI/GameControl.cs | 2 + Assets/Scenes/PuzzleTest.unity | 117 +------- .../Environments/Desert Environment.asset | 17 ++ .../Desert Environment.asset.meta} | 2 +- .../Station46/Environments/Desert/Audio.meta | 8 + .../Desert/Audio/Desert Ambience.asset | 16 + .../Desert/Audio/Desert Ambience.asset.meta | 8 + .../Environments/Desert/Audio/desert.wav | 3 + .../Environments/Desert/Audio/desert.wav.meta | 23 ++ .../Desert/Materials/Desert Floor.mat | 3 +- .../Desert Floor_DefaultMaterial_Height.png | 3 - ...sert Floor_DefaultMaterial_Height.png.meta | 124 -------- .../Environments/Intro Environment.asset | 17 ++ .../Environments/Intro Environment.asset.meta | 8 + .../Intro Room/Audio/Intro Ambience.asset | 16 + .../Audio/Intro Ambience.asset.meta | 8 + .../Intro Room/Audio/ambience.wav.meta | 2 +- .../Environments/Intro Room/Intro Room.prefab | 100 +----- .../Intro Sphere/Intro Sphere.prefab | 13 +- .../Station46/Environments/Space Tiles.meta | 8 + .../Environments/Space Tiles/Materials.meta | 8 + .../Materials/Space Floor.mat | 0 .../Materials/Space Floor.mat.meta | 0 .../Space Tiles/Materials/Textures.meta | 8 + ...loor_pewter_striped_AlbedoTransparency.png | 0 ...pewter_striped_AlbedoTransparency.png.meta | 0 .../Space Floor_pewter_striped_Height.png | 0 ...Space Floor_pewter_striped_Height.png.meta | 0 ...loor_pewter_striped_MetallicSmoothness.png | 0 ...pewter_striped_MetallicSmoothness.png.meta | 0 .../Space Floor_pewter_striped_Normal.png | 0 ...Space Floor_pewter_striped_Normal.png.meta | 0 .../Space Floor_pewter_striped_Occlusion.png | 0 ...ce Floor_pewter_striped_Occlusion.png.meta | 0 .../Environments/Space Tiles/Models.meta | 8 + .../Models/Space Floor.blend | 0 .../Models/Space Floor.blend.meta | 0 .../Models/Space Floor.blend1 | Bin .../Models/Space Floor.blend1.meta | 0 .../Models/Space Floor.fbx | 0 .../Models/Space Floor.fbx.meta | 0 .../Space Tile.prefab} | 2 +- .../Space Tile.prefab.meta} | 0 .../Player/Station 46 XR Origin.prefab | 284 ++++++++++++++++++ Assets/Station46/Station 46 Mixer.mixer | 60 ++-- Assets/Station46/Station 46.asset | 4 +- Assets/Test Assets/Test Theme.asset | 44 --- 58 files changed, 674 insertions(+), 435 deletions(-) create mode 100644 Assets/Engine/Runtime/Environment.meta create mode 100644 Assets/Engine/Runtime/Environment/AmbienceAudio.cs create mode 100644 Assets/Engine/Runtime/Environment/AmbienceAudio.cs.meta create mode 100644 Assets/Engine/Runtime/Environment/AmbienceClip.cs create mode 100644 Assets/Engine/Runtime/Environment/AmbienceClip.cs.meta create mode 100644 Assets/Engine/Runtime/Environment/RoomEnvironment.cs create mode 100644 Assets/Engine/Runtime/Environment/RoomEnvironment.cs.meta create mode 100644 Assets/Station46/Environments/Desert Environment.asset rename Assets/{Test Assets/Test Theme.asset.meta => Station46/Environments/Desert Environment.asset.meta} (79%) create mode 100644 Assets/Station46/Environments/Desert/Audio.meta create mode 100644 Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset create mode 100644 Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset.meta create mode 100644 Assets/Station46/Environments/Desert/Audio/desert.wav create mode 100644 Assets/Station46/Environments/Desert/Audio/desert.wav.meta delete mode 100644 Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png delete mode 100644 Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png.meta create mode 100644 Assets/Station46/Environments/Intro Environment.asset create mode 100644 Assets/Station46/Environments/Intro Environment.asset.meta create mode 100644 Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset create mode 100644 Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset.meta create mode 100644 Assets/Station46/Environments/Space Tiles.meta create mode 100644 Assets/Station46/Environments/Space Tiles/Materials.meta rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Space Floor.mat (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Space Floor.mat.meta (100%) create mode 100644 Assets/Station46/Environments/Space Tiles/Materials/Textures.meta rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_Height.png (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_Height.png.meta (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_Normal.png (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_Occlusion.png (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta (100%) create mode 100644 Assets/Station46/Environments/Space Tiles/Models.meta rename Assets/Station46/Environments/{Desert => Space Tiles}/Models/Space Floor.blend (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Models/Space Floor.blend.meta (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Models/Space Floor.blend1 (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Models/Space Floor.blend1.meta (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Models/Space Floor.fbx (100%) rename Assets/Station46/Environments/{Desert => Space Tiles}/Models/Space Floor.fbx.meta (100%) rename Assets/Station46/Environments/{Desert/Desert Space Tile.prefab => Space Tiles/Space Tile.prefab} (99%) rename Assets/Station46/Environments/{Desert/Desert Space Tile.prefab.meta => Space Tiles/Space Tile.prefab.meta} (100%) delete mode 100644 Assets/Test Assets/Test Theme.asset diff --git a/Assets/Engine/Runtime/Engine.cs b/Assets/Engine/Runtime/Engine.cs index da8d2c7..47ecacb 100644 --- a/Assets/Engine/Runtime/Engine.cs +++ b/Assets/Engine/Runtime/Engine.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using EscapeRoomEngine.Engine.Runtime.Environment; using EscapeRoomEngine.Engine.Runtime.Measurements; using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.Description; @@ -48,6 +49,7 @@ namespace EscapeRoomEngine.Engine.Runtime private readonly List _rooms = new(); private List _availablePuzzles, _plannedPuzzles; + private List _availableEnvironments; private GameObject _playSpaceOrigin; private void Awake() @@ -58,6 +60,7 @@ namespace EscapeRoomEngine.Engine.Runtime _availablePuzzles = new List(theme.puzzleTypes); _plannedPuzzles = new List(_availablePuzzles); + ResetAvailableEnvironments(); } private void Start() @@ -67,6 +70,11 @@ namespace EscapeRoomEngine.Engine.Runtime _playSpaceOrigin.transform.localPosition = new Vector3(-GameControl.Instance.RoomSize.x / 2f, 0, -GameControl.Instance.RoomSize.y / 2f); } + private void ResetAvailableEnvironments() + { + _availableEnvironments = new List(theme.environments); + } + #region Generation public void GenerateRoom() @@ -75,10 +83,23 @@ namespace EscapeRoomEngine.Engine.Runtime var intro = NumberOfRooms == 0; - // get the last entrance from the newest room or create a spawn passage with no entrance door for where the player will start - var entrance = intro ? new Passage(new DoorModule(null, theme.spawnDoor)) : _rooms.Last().exit; - - var room = new Room(entrance); + Passage entrance; + RoomEnvironment environment; + if (intro) + { + entrance = new Passage(new DoorModule(null, theme.spawnDoor)); + environment = theme.intro.introEnvironment; + } + else + { + entrance = _rooms.Last().exit; + if (_availableEnvironments.Count == 0) + { + ResetAvailableEnvironments(); + } + environment = _availableEnvironments.PopRandomElement(); + } + var room = new Room(entrance, environment); _rooms.Add(room); if (intro) @@ -98,15 +119,11 @@ namespace EscapeRoomEngine.Engine.Runtime var roomId = _rooms.Count - 1; room.InstantiateRoom(_playSpaceOrigin.transform, roomId * roomOffset, roomId.ToString()); + Instantiate(room.environment.environment, room.roomObject.transform, false); if (intro) { - Instantiate(theme.intro, room.roomObject.transform, false); FindObjectOfType().Place(room.exit.fromOut.DoorState.transform); } - else if (theme.environment) - { - Instantiate(theme.environment, room.roomObject.transform, false); - } GameControl.Instance.TimeInRoom = 0; UpdateUI(); diff --git a/Assets/Engine/Runtime/EngineTheme.cs b/Assets/Engine/Runtime/EngineTheme.cs index 62fe1aa..78b007d 100644 --- a/Assets/Engine/Runtime/EngineTheme.cs +++ b/Assets/Engine/Runtime/EngineTheme.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using EscapeRoomEngine.Engine.Runtime.Environment; using EscapeRoomEngine.Engine.Runtime.Modules.Description; using EscapeRoomEngine.Engine.Runtime.Utilities; using JetBrains.Annotations; @@ -23,8 +24,8 @@ namespace EscapeRoomEngine.Engine.Runtime public SpaceTile spaceTile; [BoxGroup("Theme")] - [Tooltip("The environment that is placed around every generated room.")] - public GameObject environment; + [Tooltip("The environments that are placed around generated rooms.")] + public List environments; [BoxGroup("Theme")] public DynamicColor puzzleColor, solvedColor, activeColor; diff --git a/Assets/Engine/Runtime/Environment.meta b/Assets/Engine/Runtime/Environment.meta new file mode 100644 index 0000000..dabb566 --- /dev/null +++ b/Assets/Engine/Runtime/Environment.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f07b7a9e0ae34430999958d61ecc7e2c +timeCreated: 1684146335 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Environment/AmbienceAudio.cs b/Assets/Engine/Runtime/Environment/AmbienceAudio.cs new file mode 100644 index 0000000..a62543e --- /dev/null +++ b/Assets/Engine/Runtime/Environment/AmbienceAudio.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections; +using NaughtyAttributes; +using UnityEngine; + +namespace EscapeRoomEngine.Engine.Runtime.Environment +{ + [RequireComponent(typeof(AudioSource))] + public class AmbienceAudio : MonoBehaviour + { + public static AmbienceAudio Instance { get; private set; } + + public float fadeDuration = 0.5f; + public AmbienceClip initialAmbience; + [BoxGroup("Internal")] [SerializeField] private AudioSource[] sources; + + private AudioSource CurrentSource => sources[currentSource]; + private AudioSource OtherSource => sources[(currentSource + 1) % 2]; + + private int currentSource; + private readonly Coroutine[] _activeFades = new Coroutine[2]; // the indices in these fades do not necessarily correspond to the sources + + private void Awake() + { + Instance = this; + + if (sources.Length != 2) + { + throw new Exception("There must be two sources."); + } + if (CurrentSource == OtherSource) + { + throw new Exception("Current source must be different from other source."); + } + + foreach (var source in sources) + { + source.loop = true; + } + } + + public void StartAmbience() + { + CrossFadeTo(initialAmbience); + } + + public void CrossFadeTo(AmbienceClip ambience) + { + // prepare fade source + var fadeSource = OtherSource; + fadeSource.clip = ambience.audio; + fadeSource.Play(); + + // stop any running fades + foreach (var fade in _activeFades) + { + if (fade != null) + { + StopCoroutine(fade); + } + } + + // start new fades + _activeFades[0] = StartCoroutine(Fade(CurrentSource, CurrentSource.volume, 0)); + _activeFades[1] = StartCoroutine(Fade(fadeSource, fadeSource.volume, ambience.volume)); + + // switch current source + currentSource = (currentSource + 1) % 2; + } + + private IEnumerator Fade(AudioSource source, float from, float to) + { + var startTime = Time.time; + + while (Math.Abs(source.volume - to) > 0.0001f) + { + source.volume = Mathf.Clamp01(Mathf.Lerp( + from, + to, + (Time.time - startTime) / fadeDuration)); + yield return null; + } + } + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Environment/AmbienceAudio.cs.meta b/Assets/Engine/Runtime/Environment/AmbienceAudio.cs.meta new file mode 100644 index 0000000..ce21caf --- /dev/null +++ b/Assets/Engine/Runtime/Environment/AmbienceAudio.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: affaa904605c46dca7162e99fd363b5a +timeCreated: 1684143627 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Environment/AmbienceClip.cs b/Assets/Engine/Runtime/Environment/AmbienceClip.cs new file mode 100644 index 0000000..ac066af --- /dev/null +++ b/Assets/Engine/Runtime/Environment/AmbienceClip.cs @@ -0,0 +1,12 @@ +using NaughtyAttributes; +using UnityEngine; + +namespace EscapeRoomEngine.Engine.Runtime.Environment +{ + [CreateAssetMenu(menuName = "Environment/Ambience Clip")] + public class AmbienceClip : ScriptableObject + { + [Required] public AudioClip audio; + public float volume = 1; + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Environment/AmbienceClip.cs.meta b/Assets/Engine/Runtime/Environment/AmbienceClip.cs.meta new file mode 100644 index 0000000..87b813a --- /dev/null +++ b/Assets/Engine/Runtime/Environment/AmbienceClip.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3d36d46846cd41019647bae00e4b0f17 +timeCreated: 1684145618 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Environment/RoomEnvironment.cs b/Assets/Engine/Runtime/Environment/RoomEnvironment.cs new file mode 100644 index 0000000..8bd7e5e --- /dev/null +++ b/Assets/Engine/Runtime/Environment/RoomEnvironment.cs @@ -0,0 +1,12 @@ +using NaughtyAttributes; +using UnityEngine; + +namespace EscapeRoomEngine.Engine.Runtime.Environment +{ + [CreateAssetMenu(menuName = "Environment/Room", order = 0)] + public class RoomEnvironment : ScriptableObject + { + [Required] public AmbienceClip ambience; + [Required] public GameObject environment; + } +} \ No newline at end of file diff --git a/Assets/Engine/Runtime/Environment/RoomEnvironment.cs.meta b/Assets/Engine/Runtime/Environment/RoomEnvironment.cs.meta new file mode 100644 index 0000000..70b01ee --- /dev/null +++ b/Assets/Engine/Runtime/Environment/RoomEnvironment.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3b7d4fea984e4fff841ac107b6896270 +timeCreated: 1684146291 \ No newline at end of file diff --git a/Assets/Engine/Runtime/Intro.cs b/Assets/Engine/Runtime/Intro.cs index 3b950b2..0e7f52b 100644 --- a/Assets/Engine/Runtime/Intro.cs +++ b/Assets/Engine/Runtime/Intro.cs @@ -1,11 +1,14 @@ -using NaughtyAttributes; +using EscapeRoomEngine.Engine.Runtime.Environment; +using NaughtyAttributes; using UnityEngine; +using UnityEngine.Serialization; namespace EscapeRoomEngine.Engine.Runtime { public class Intro : MonoBehaviour { - [BoxGroup("Internal")] [SerializeField] private AudioSource _sphereAudio; + public RoomEnvironment introEnvironment; + [FormerlySerializedAs("_sphereAudio")] [BoxGroup("Internal")] [SerializeField] private AudioSource sphereAudio; public void Place(Transform placement) { @@ -16,7 +19,7 @@ namespace EscapeRoomEngine.Engine.Runtime public void StartTalking() { - _sphereAudio.Play(); + sphereAudio.Play(); } } } \ No newline at end of file diff --git a/Assets/Engine/Runtime/Room.cs b/Assets/Engine/Runtime/Room.cs index d401f40..ec14ead 100644 --- a/Assets/Engine/Runtime/Room.cs +++ b/Assets/Engine/Runtime/Room.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using EscapeRoomEngine.Engine.Runtime.Environment; using EscapeRoomEngine.Engine.Runtime.Measurements; using EscapeRoomEngine.Engine.Runtime.Modules; using EscapeRoomEngine.Engine.Runtime.Modules.Description; @@ -16,6 +17,7 @@ namespace EscapeRoomEngine.Engine.Runtime public class Room { internal Passage entrance, exit; + internal RoomEnvironment environment; internal GameObject roomObject; internal readonly List puzzles = new(); @@ -26,10 +28,12 @@ namespace EscapeRoomEngine.Engine.Runtime private readonly List _spaces = new(); private readonly List _doors = new(); + private bool startedMeasuring; - internal Room(Passage entrance) + internal Room(Passage entrance, RoomEnvironment environment) { this.entrance = entrance; + this.environment = environment; } internal void AddSpace(Space space, Passage spaceExit) @@ -84,20 +88,29 @@ namespace EscapeRoomEngine.Engine.Runtime // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault switch (type) { - // generate a new room as soon as the player completes all puzzles in this one + // generate a new room as soon as the player completes all puzzles in this room case DoorEventType.Unlocked when !LastRoom && door.Equals(exit.fromOut): Engine.Instance.GenerateRoom(); break; - // start measurements on every puzzle as soon as the player enters the last room case DoorEventType.ExitedFrom when door.Equals(entrance.toIn) && Engine.Instance.CurrentRoom.Contains(this): - puzzles.ForEach(puzzle => Measure.StartMeasuring((PuzzleModuleDescription)puzzle.description)); + // start measurements on every puzzle as soon as the player enters this room the first time + if (!startedMeasuring) + { + startedMeasuring = true; + puzzles.ForEach(puzzle => Measure.StartMeasuring((PuzzleModuleDescription)puzzle.description)); + } + // hide the intro room if (Engine.Instance.NumberOfRooms == 2) { - // hide the intro room when exiting the first portal Engine.Instance.HidePreviousRoom(false); } break; } + + if (type == DoorEventType.ExitedFrom) + { + AmbienceAudio.Instance.CrossFadeTo(environment.ambience); + } }; } diff --git a/Assets/Engine/Runtime/UI/GameControl.cs b/Assets/Engine/Runtime/UI/GameControl.cs index 2a70346..3c5f70d 100644 --- a/Assets/Engine/Runtime/UI/GameControl.cs +++ b/Assets/Engine/Runtime/UI/GameControl.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using EscapeRoomEngine.Engine.Runtime.Environment; using EscapeRoomEngine.Engine.Runtime.Measurements; using EscapeRoomEngine.Engine.Runtime.Modules.Description; using EscapeRoomEngine.Engine.Runtime.Utilities; @@ -129,6 +130,7 @@ namespace EscapeRoomEngine.Engine.Runtime.UI public void StartGame() { gameState = GameState.Running; + AmbienceAudio.Instance.StartAmbience(); PauseGame(); // the time is not running during the intro TimeElapsed = 0; diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 7bc25eb..cef5021 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -1730,6 +1730,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 498175374} m_PrefabAsset: {fileID: 0} +--- !u!4 &532218422 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, + type: 3} + m_PrefabInstance: {fileID: 1868894024770084192} + m_PrefabAsset: {fileID: 0} --- !u!1001 &533925774 PrefabInstance: m_ObjectHideFlags: 0 @@ -3147,90 +3153,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1244783266} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1246816896 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1340421038} - m_Modifications: - - target: {fileID: 2956742473242309810, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_Name - value: Station 46 Portal Exit - objectReference: {fileID: 0} - - target: {fileID: 2956742473242309810, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 07cea580d9888d24c84d8d62747839ad, type: 3} ---- !u!4 &1246816897 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9212560043793041154, guid: 07cea580d9888d24c84d8d62747839ad, - type: 3} - m_PrefabInstance: {fileID: 1246816896} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1305634225 PrefabInstance: m_ObjectHideFlags: 0 @@ -3343,7 +3265,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1246816897} - {fileID: 411421604} m_Father: {fileID: 0} m_RootOrder: 4 @@ -3999,12 +3920,6 @@ PrefabInstance: propertyPath: m_Name value: Station 46 Engine objectReference: {fileID: 0} - - target: {fileID: 6460498825794401144, guid: 13ff3d1ea55bdb34a94e5700498c78fb, - type: 3} - propertyPath: theme - value: - objectReference: {fileID: 11400000, guid: ac11abaacb19cac4f9f43fc3d82883fe, - type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4333,6 +4248,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 532218422} - {fileID: 1860072080} - {fileID: 1730358900} m_Father: {fileID: 0} @@ -5165,17 +5081,17 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1851812988} m_Modifications: - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_RootOrder - value: 6 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} @@ -5185,7 +5101,7 @@ PrefabInstance: - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} @@ -5195,17 +5111,17 @@ PrefabInstance: - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5968074272560806773, guid: 1358b4ef564c4704682417dff526766a, type: 3} @@ -5227,11 +5143,6 @@ PrefabInstance: propertyPath: m_Name value: Intro Room objectReference: {fileID: 0} - - target: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Station46/Environments/Desert Environment.asset b/Assets/Station46/Environments/Desert Environment.asset new file mode 100644 index 0000000..0be93b2 --- /dev/null +++ b/Assets/Station46/Environments/Desert Environment.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b7d4fea984e4fff841ac107b6896270, type: 3} + m_Name: Desert Environment + m_EditorClassIdentifier: + ambience: {fileID: 11400000, guid: f0ea5b8ce4569154fb237f3477a16f02, type: 2} + environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, + type: 3} diff --git a/Assets/Test Assets/Test Theme.asset.meta b/Assets/Station46/Environments/Desert Environment.asset.meta similarity index 79% rename from Assets/Test Assets/Test Theme.asset.meta rename to Assets/Station46/Environments/Desert Environment.asset.meta index 1c3d7f2..4771afa 100644 --- a/Assets/Test Assets/Test Theme.asset.meta +++ b/Assets/Station46/Environments/Desert Environment.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac11abaacb19cac4f9f43fc3d82883fe +guid: 1ad6920bb411d8f4c9e022beb133946f NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Station46/Environments/Desert/Audio.meta b/Assets/Station46/Environments/Desert/Audio.meta new file mode 100644 index 0000000..ef571a7 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ecdb2d855d019c4cab607afee8295f9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset b/Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset new file mode 100644 index 0000000..5e26317 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d36d46846cd41019647bae00e4b0f17, type: 3} + m_Name: Desert Ambience + m_EditorClassIdentifier: + audio: {fileID: 8300000, guid: 8feab6046eea9654ab43922374417dc7, type: 3} + volume: 0.2 diff --git a/Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset.meta b/Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset.meta new file mode 100644 index 0000000..c2c3719 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/Desert Ambience.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0ea5b8ce4569154fb237f3477a16f02 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Audio/desert.wav b/Assets/Station46/Environments/Desert/Audio/desert.wav new file mode 100644 index 0000000..4b655b9 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/desert.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:064731e8e7bc95bdd0ea50ff292e046cbb85d9bcd479044cc47291402951401a +size 25266420 diff --git a/Assets/Station46/Environments/Desert/Audio/desert.wav.meta b/Assets/Station46/Environments/Desert/Audio/desert.wav.meta new file mode 100644 index 0000000..88fd762 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/desert.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8feab6046eea9654ab43922374417dc7 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Materials/Desert Floor.mat b/Assets/Station46/Environments/Desert/Materials/Desert Floor.mat index a25fd21..1160776 100644 --- a/Assets/Station46/Environments/Desert/Materials/Desert Floor.mat +++ b/Assets/Station46/Environments/Desert/Materials/Desert Floor.mat @@ -14,7 +14,6 @@ Material: m_ValidKeywords: - _METALLICSPECGLOSSMAP - _NORMALMAP - - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -64,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 2800000, guid: 135f6728588b0c442b730bb9b1c52321, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png deleted file mode 100644 index 75432cd..0000000 --- a/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1a96135573b1f81d3eb9ff51ff7cda8bc3cbe8fc95fab80b2b9c4359793971a -size 3785157 diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png.meta b/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png.meta deleted file mode 100644 index 158566b..0000000 --- a/Assets/Station46/Environments/Desert/Materials/Textures/Desert Floor_DefaultMaterial_Height.png.meta +++ /dev/null @@ -1,124 +0,0 @@ -fileFormatVersion: 2 -guid: 135f6728588b0c442b730bb9b1c52321 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Environment.asset b/Assets/Station46/Environments/Intro Environment.asset new file mode 100644 index 0000000..eaed259 --- /dev/null +++ b/Assets/Station46/Environments/Intro Environment.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b7d4fea984e4fff841ac107b6896270, type: 3} + m_Name: Intro Environment + m_EditorClassIdentifier: + ambience: {fileID: 11400000, guid: e0ec5d12d60e92e4db0ca92279facd1d, type: 2} + environment: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, + type: 3} diff --git a/Assets/Station46/Environments/Intro Environment.asset.meta b/Assets/Station46/Environments/Intro Environment.asset.meta new file mode 100644 index 0000000..2c612a4 --- /dev/null +++ b/Assets/Station46/Environments/Intro Environment.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b7737df8acafcb41a2ae625a2c76ad3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset b/Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset new file mode 100644 index 0000000..7acfd33 --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d36d46846cd41019647bae00e4b0f17, type: 3} + m_Name: Intro Ambience + m_EditorClassIdentifier: + audio: {fileID: 8300000, guid: e1795aaf3baaa734d9e3334fa230d12b, type: 3} + volume: 1 diff --git a/Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset.meta b/Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset.meta new file mode 100644 index 0000000..4affdef --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio/Intro Ambience.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0ec5d12d60e92e4db0ca92279facd1d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta b/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta index 1b677b2..7d90386 100644 --- a/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta +++ b/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta @@ -11,7 +11,7 @@ AudioImporter: compressionFormat: 1 quality: 1 conversionMode: 0 - preloadAudioData: 0 + preloadAudioData: 1 platformSettingOverrides: {} forceToMono: 0 normalize: 1 diff --git a/Assets/Station46/Environments/Intro Room/Intro Room.prefab b/Assets/Station46/Environments/Intro Room/Intro Room.prefab index dc93b18..d0301c9 100644 --- a/Assets/Station46/Environments/Intro Room/Intro Room.prefab +++ b/Assets/Station46/Environments/Intro Room/Intro Room.prefab @@ -2149,7 +2149,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6179995914325846554} - - component: {fileID: 7741367069378330848} m_Layer: 0 m_Name: Scenery m_TagString: Untagged @@ -2178,102 +2177,6 @@ Transform: m_Father: {fileID: 7106282615239758844} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &7741367069378330848 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7884981278512205473} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: e1795aaf3baaa734d9e3334fa230d12b, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &8137769401290482906 GameObject: m_ObjectHideFlags: 0 @@ -2320,7 +2223,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2e3fc71dc4142888bad2313cbf1bea9, type: 3} m_Name: m_EditorClassIdentifier: - _sphereAudio: {fileID: 1313072068579538865} + introEnvironment: {fileID: 11400000, guid: 4b7737df8acafcb41a2ae625a2c76ad3, type: 2} + sphereAudio: {fileID: 1313072068579538865} --- !u!95 &3534129676407067837 Animator: serializedVersion: 5 diff --git a/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab b/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab index 853de79..fadd61c 100644 --- a/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab +++ b/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab @@ -9613,7 +9613,7 @@ Transform: - {fileID: 1772644945931633228} - {fileID: 1420653324193739710} m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &4758909792356742116 Rigidbody: @@ -14950,8 +14950,8 @@ MonoBehaviour: m_EditorClassIdentifier: minDistance: 0.01 speed: 100 - sizeFactor: 5 - brightnessFactor: 15 + sizeFactor: 10 + brightnessFactor: 25 target: {fileID: 0} audioSource: {fileID: 2877895139439227182} centerTransform: {fileID: 6097717622075189454} @@ -14976,8 +14976,8 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 50 + MinDistance: 5 + MaxDistance: 500 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -15093,8 +15093,7 @@ AudioSource: m_GameObject: {fileID: 7744297492910143281} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 1557019650265238377, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, - type: 2} + OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 982da16887a17bd4caa0cb208448d118, type: 3} m_PlayOnAwake: 1 m_Volume: 1 diff --git a/Assets/Station46/Environments/Space Tiles.meta b/Assets/Station46/Environments/Space Tiles.meta new file mode 100644 index 0000000..921b2a2 --- /dev/null +++ b/Assets/Station46/Environments/Space Tiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 29c047ecafeecc84d93535b051eea7e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Space Tiles/Materials.meta b/Assets/Station46/Environments/Space Tiles/Materials.meta new file mode 100644 index 0000000..6e45165 --- /dev/null +++ b/Assets/Station46/Environments/Space Tiles/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f42869b959c3fb4a851d68424cf04c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Materials/Space Floor.mat b/Assets/Station46/Environments/Space Tiles/Materials/Space Floor.mat similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Space Floor.mat rename to Assets/Station46/Environments/Space Tiles/Materials/Space Floor.mat diff --git a/Assets/Station46/Environments/Desert/Materials/Space Floor.mat.meta b/Assets/Station46/Environments/Space Tiles/Materials/Space Floor.mat.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Space Floor.mat.meta rename to Assets/Station46/Environments/Space Tiles/Materials/Space Floor.mat.meta diff --git a/Assets/Station46/Environments/Space Tiles/Materials/Textures.meta b/Assets/Station46/Environments/Space Tiles/Materials/Textures.meta new file mode 100644 index 0000000..48c4f05 --- /dev/null +++ b/Assets/Station46/Environments/Space Tiles/Materials/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5b2b121c30560a45b6693b35f7c9a7a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_AlbedoTransparency.png.meta diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Height.png similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Height.png diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png.meta b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Height.png.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Height.png.meta rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Height.png.meta diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_MetallicSmoothness.png.meta diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Normal.png similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Normal.png diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Normal.png.meta diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Occlusion.png similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Occlusion.png diff --git a/Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta b/Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta rename to Assets/Station46/Environments/Space Tiles/Materials/Textures/Space Floor_pewter_striped_Occlusion.png.meta diff --git a/Assets/Station46/Environments/Space Tiles/Models.meta b/Assets/Station46/Environments/Space Tiles/Models.meta new file mode 100644 index 0000000..1ef194a --- /dev/null +++ b/Assets/Station46/Environments/Space Tiles/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10f3c9073accd4142a8f32c88749b150 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Models/Space Floor.blend b/Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend similarity index 100% rename from Assets/Station46/Environments/Desert/Models/Space Floor.blend rename to Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend diff --git a/Assets/Station46/Environments/Desert/Models/Space Floor.blend.meta b/Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Models/Space Floor.blend.meta rename to Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend.meta diff --git a/Assets/Station46/Environments/Desert/Models/Space Floor.blend1 b/Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend1 similarity index 100% rename from Assets/Station46/Environments/Desert/Models/Space Floor.blend1 rename to Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend1 diff --git a/Assets/Station46/Environments/Desert/Models/Space Floor.blend1.meta b/Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend1.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Models/Space Floor.blend1.meta rename to Assets/Station46/Environments/Space Tiles/Models/Space Floor.blend1.meta diff --git a/Assets/Station46/Environments/Desert/Models/Space Floor.fbx b/Assets/Station46/Environments/Space Tiles/Models/Space Floor.fbx similarity index 100% rename from Assets/Station46/Environments/Desert/Models/Space Floor.fbx rename to Assets/Station46/Environments/Space Tiles/Models/Space Floor.fbx diff --git a/Assets/Station46/Environments/Desert/Models/Space Floor.fbx.meta b/Assets/Station46/Environments/Space Tiles/Models/Space Floor.fbx.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Models/Space Floor.fbx.meta rename to Assets/Station46/Environments/Space Tiles/Models/Space Floor.fbx.meta diff --git a/Assets/Station46/Environments/Desert/Desert Space Tile.prefab b/Assets/Station46/Environments/Space Tiles/Space Tile.prefab similarity index 99% rename from Assets/Station46/Environments/Desert/Desert Space Tile.prefab rename to Assets/Station46/Environments/Space Tiles/Space Tile.prefab index be0ce5d..e9c50bd 100644 --- a/Assets/Station46/Environments/Desert/Desert Space Tile.prefab +++ b/Assets/Station46/Environments/Space Tiles/Space Tile.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 3229991053255736984} - component: {fileID: 7880032434625960893} m_Layer: 0 - m_Name: Desert Space Tile + m_Name: Space Tile m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Station46/Environments/Desert/Desert Space Tile.prefab.meta b/Assets/Station46/Environments/Space Tiles/Space Tile.prefab.meta similarity index 100% rename from Assets/Station46/Environments/Desert/Desert Space Tile.prefab.meta rename to Assets/Station46/Environments/Space Tiles/Space Tile.prefab.meta diff --git a/Assets/Station46/Player/Station 46 XR Origin.prefab b/Assets/Station46/Player/Station 46 XR Origin.prefab index 52dd0bd..899d49f 100644 --- a/Assets/Station46/Player/Station 46 XR Origin.prefab +++ b/Assets/Station46/Player/Station 46 XR Origin.prefab @@ -31,6 +31,251 @@ Transform: m_Father: {fileID: 6854256365856247458} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8545968501958811281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8643666386276474196} + - component: {fileID: 8063598728574227441} + - component: {fileID: 4008045411746788414} + - component: {fileID: 5053611728701243679} + m_Layer: 0 + m_Name: Ambience + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8643666386276474196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8545968501958811281} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6854256365856247458} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8063598728574227441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8545968501958811281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: affaa904605c46dca7162e99fd363b5a, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeDuration: 0.5 + initialAmbience: {fileID: 11400000, guid: e0ec5d12d60e92e4db0ca92279facd1d, type: 2} + sources: + - {fileID: 4008045411746788414} + - {fileID: 5053611728701243679} +--- !u!82 &4008045411746788414 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8545968501958811281} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -3450431789256482734, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 0 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &5053611728701243679 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8545968501958811281} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -3450431789256482734, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 0 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &6542684658370590840 PrefabInstance: m_ObjectHideFlags: 0 @@ -151,14 +396,53 @@ PrefabInstance: value: objectReference: {fileID: 3680365890358827431, guid: 7bb2b5aee7d244943b4f1bb2f6606ac2, type: 3} + - target: {fileID: 450922049184059039, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 450922049184059039, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 450922049184059039, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4030784069082873397, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7423186386015115176, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} propertyPath: sphereFollow value: objectReference: {fileID: 5693385846897636622} + - target: {fileID: 8790639548517127135, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9173203979188240829, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9173203979188240829, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 419816428804372186, guid: c84e0198f66a41b4294f6e8e585192a4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8643666386276474196} - targetCorrespondingSourceObject: {fileID: 419816428804372186, guid: c84e0198f66a41b4294f6e8e585192a4, type: 3} insertIndex: -1 diff --git a/Assets/Station46/Station 46 Mixer.mixer b/Assets/Station46/Station 46 Mixer.mixer index af59fbe..b8a1288 100644 --- a/Assets/Station46/Station 46 Mixer.mixer +++ b/Assets/Station46/Station 46 Mixer.mixer @@ -1,19 +1,24 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!244 &-3177590470062305910 -AudioMixerEffectController: - m_ObjectHideFlags: 3 +--- !u!243 &-3450431789256482734 +AudioMixerGroupController: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: - m_EffectID: c5188d2cb4eba0c4f9eeb9862089728d - m_EffectName: Attenuation - m_MixLevel: 814e98bd0adc3fa4fb9cf557ccf29884 - m_Parameters: [] - m_SendTarget: {fileID: 0} - m_EnableWetMix: 0 - m_Bypass: 0 + m_Name: Ambience + m_AudioMixer: {fileID: 24100000} + m_GroupID: 1e7f1e3ba567b5045834c97c64035a41 + m_Children: [] + m_Volume: 0c698be1b4181f84b8b2abc5b2af74ab + m_Pitch: 405a87789c873804aa8884309217eb84 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 2627071185790799152} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!241 &24100000 AudioMixerController: m_ObjectHideFlags: 0 @@ -33,7 +38,7 @@ AudioMixerController: m_AudioMixerGroupViews: - guids: - c6c68d14b3bd5ec46821abb2bb75a905 - - faca15d1d05c6754c8156c3167b12b96 + - 1e7f1e3ba567b5045834c97c64035a41 name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -47,7 +52,7 @@ AudioMixerGroupController: m_AudioMixer: {fileID: 24100000} m_GroupID: c6c68d14b3bd5ec46821abb2bb75a905 m_Children: - - {fileID: 1557019650265238377} + - {fileID: -3450431789256482734} m_Volume: 222e79f4ebd0cb440a0becb553fc856e m_Pitch: bac2becc12cab4b4b9b4f393fff60435 m_Send: 00000000000000000000000000000000 @@ -81,24 +86,19 @@ AudioMixerSnapshotController: m_AudioMixer: {fileID: 24100000} m_SnapshotID: 74856e1237e507a4ba3a8f4f45e3d1da m_FloatValues: - eb52958945419734c8816aa2a9d477d9: 9.925883 + eb52958945419734c8816aa2a9d477d9: 0.04171297 m_TransitionOverrides: {} ---- !u!243 &1557019650265238377 -AudioMixerGroupController: - m_ObjectHideFlags: 0 +--- !u!244 &2627071185790799152 +AudioMixerEffectController: + m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Humming - m_AudioMixer: {fileID: 24100000} - m_GroupID: faca15d1d05c6754c8156c3167b12b96 - m_Children: [] - m_Volume: eb52958945419734c8816aa2a9d477d9 - m_Pitch: a9a1bae89cea0c64ba41c18376fe81b7 - m_Send: 00000000000000000000000000000000 - m_Effects: - - {fileID: -3177590470062305910} - m_UserColorIndex: 0 - m_Mute: 0 - m_Solo: 0 - m_BypassEffects: 0 + m_Name: + m_EffectID: 070f00694d265ac418d4dfc2444ba6f1 + m_EffectName: Attenuation + m_MixLevel: 715d28bfae6a6af469308fe369fa0af6 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 diff --git a/Assets/Station46/Station 46.asset b/Assets/Station46/Station 46.asset index 0f66f55..e6e12cf 100644 --- a/Assets/Station46/Station 46.asset +++ b/Assets/Station46/Station 46.asset @@ -15,8 +15,8 @@ MonoBehaviour: intro: {fileID: 6790828229373266063, guid: 1358b4ef564c4704682417dff526766a, type: 3} spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, type: 3} - environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, - type: 3} + environments: + - {fileID: 11400000, guid: 1ad6920bb411d8f4c9e022beb133946f, type: 2} puzzleColor: hdr: {r: 8, g: 3.5137255, b: 0, a: 1} ldr: {r: 1, g: 0.44059038, b: 0, a: 1} diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset deleted file mode 100644 index 730a022..0000000 --- a/Assets/Test Assets/Test Theme.asset +++ /dev/null @@ -1,44 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 28d04249c1c4438da94b524e7d4afff2, type: 3} - m_Name: Test Theme - m_EditorClassIdentifier: - intro: {fileID: 6790828229373266063, guid: 1358b4ef564c4704682417dff526766a, type: 3} - spaceTile: {fileID: 3229991053255736984, guid: b8f192f7cebe686468af6b1a71c4605b, - type: 3} - environment: {fileID: 5743657079028767629, guid: 17ecdbaca50efaa4ab503614dfec54a8, - type: 3} - puzzleColor: - hdr: {r: 8, g: 3.5137255, b: 0, a: 1} - ldr: {r: 1, g: 0.44059038, b: 0, a: 1} - solvedColor: - hdr: {r: 0.53333336, g: 7.5607843, b: 0, a: 1} - ldr: {r: 0.42315578, g: 1, b: 0, a: 1} - activeColor: - hdr: {r: 0, g: 4.329412, b: 8, a: 1} - ldr: {r: 0, g: 0.5401311, b: 1, a: 1} - spawnDoor: {fileID: 11400000, guid: f862612dd70c369448b18bbd8094cb38, type: 2} - introExitDoor: {fileID: 11400000, guid: 0103271741231674884edcd62f8b89bc, type: 2} - exitDoorTypes: - - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} - puzzleCount: {x: 1, y: 1} - puzzleTypes: - - {fileID: 11400000, guid: ecc412010abd45a4aaa7d364b6c3789c, type: 2} - - {fileID: 11400000, guid: 8707242279bb6c541a12dc4491388c42, type: 2} - - {fileID: 11400000, guid: 15dcebb677f5df940839eaaa50274294, type: 2} - - {fileID: 11400000, guid: 3f79d37154e44ca47b54bb43bbe8d9aa, type: 2} - - {fileID: 11400000, guid: ee5a44432e80cd64689be3ff34750339, type: 2} - - {fileID: 11400000, guid: 1b21332d2a4da2d4d9f8a105d1e24980, type: 2} - - {fileID: 11400000, guid: 6ea70b544b4cffb4ca12286c749da98d, type: 2} - - {fileID: 11400000, guid: 010a967ecaf566041a0e12459806bd04, type: 2} - - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2} - - {fileID: 11400000, guid: 9d56e3bfca17b264e9f04bd8242030f8, type: 2}