From 8de8301205142210898f73092eeece62da912014 Mon Sep 17 00:00:00 2001 From: milan Date: Sun, 14 May 2023 21:22:58 +0200 Subject: [PATCH] station 46 audio and animation --- Assets/Engine/Runtime/Intro.cs | 10 +- Assets/Engine/Runtime/UI/GameControl.cs | 1 - Assets/Engine/Runtime/UI/PauseButton.cs | 2 +- Assets/Engine/Runtime/UI/PuzzlePlan.cs | 2 +- Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs | 2 +- Assets/Scenes/PuzzleTest.unity | 13 +- .../Environments/Intro Room/Animations.meta | 8 + .../Intro Room/Animations/Intro.anim | 1264 +++++++++++++++++ .../Intro Room/Animations/Intro.anim.meta | 8 + .../Intro Room/Animations/Intro.controller | 72 + .../Animations/Intro.controller.meta | 8 + .../Environments/Intro Room/Audio.meta | 2 +- .../Intro Room/Audio/ambience.wav | 3 + .../Intro Room/Audio/ambience.wav.meta | 23 + .../Environments/Intro Room/Intro Room.prefab | 395 +++++- .../Environments/Intro Sphere/Audio.meta | 8 + .../Audio/intro edit.wav} | 0 .../Audio/intro edit.wav.meta} | 0 .../Intro Sphere/Audio/sphere hum edit.wav | 3 + .../Audio/sphere hum edit.wav.meta | 23 + .../Intro Sphere/Intro Sphere.prefab | 138 +- .../Intro Sphere/Scripts/FollowSphere.cs | 7 +- Assets/Station46/Station 46 Mixer.mixer | 104 ++ Assets/Station46/Station 46 Mixer.mixer.meta | 8 + 24 files changed, 2072 insertions(+), 32 deletions(-) create mode 100644 Assets/Station46/Environments/Intro Room/Animations.meta create mode 100644 Assets/Station46/Environments/Intro Room/Animations/Intro.anim create mode 100644 Assets/Station46/Environments/Intro Room/Animations/Intro.anim.meta create mode 100644 Assets/Station46/Environments/Intro Room/Animations/Intro.controller create mode 100644 Assets/Station46/Environments/Intro Room/Animations/Intro.controller.meta create mode 100644 Assets/Station46/Environments/Intro Room/Audio/ambience.wav create mode 100644 Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta create mode 100644 Assets/Station46/Environments/Intro Sphere/Audio.meta rename Assets/Station46/Environments/{Intro Room/Audio/intro-edit.wav => Intro Sphere/Audio/intro edit.wav} (100%) rename Assets/Station46/Environments/{Intro Room/Audio/intro-edit.wav.meta => Intro Sphere/Audio/intro edit.wav.meta} (100%) create mode 100644 Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav create mode 100644 Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav.meta create mode 100644 Assets/Station46/Station 46 Mixer.mixer create mode 100644 Assets/Station46/Station 46 Mixer.mixer.meta diff --git a/Assets/Engine/Runtime/Intro.cs b/Assets/Engine/Runtime/Intro.cs index 32e9f05..3b950b2 100644 --- a/Assets/Engine/Runtime/Intro.cs +++ b/Assets/Engine/Runtime/Intro.cs @@ -1,14 +1,22 @@ -using UnityEngine; +using NaughtyAttributes; +using UnityEngine; namespace EscapeRoomEngine.Engine.Runtime { public class Intro : MonoBehaviour { + [BoxGroup("Internal")] [SerializeField] private AudioSource _sphereAudio; + public void Place(Transform placement) { var t = transform; t.position = placement.position; t.rotation = placement.rotation; } + + public void StartTalking() + { + _sphereAudio.Play(); + } } } \ No newline at end of file diff --git a/Assets/Engine/Runtime/UI/GameControl.cs b/Assets/Engine/Runtime/UI/GameControl.cs index 4b64584..2a70346 100644 --- a/Assets/Engine/Runtime/UI/GameControl.cs +++ b/Assets/Engine/Runtime/UI/GameControl.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using EscapeRoomEngine.Engine.Runtime.Measurements; using EscapeRoomEngine.Engine.Runtime.Modules.Description; -using EscapeRoomEngine.Engine.Runtime.UI.Elements; using EscapeRoomEngine.Engine.Runtime.Utilities; using NaughtyAttributes; using UnityEngine; diff --git a/Assets/Engine/Runtime/UI/PauseButton.cs b/Assets/Engine/Runtime/UI/PauseButton.cs index 952942a..040424b 100644 --- a/Assets/Engine/Runtime/UI/PauseButton.cs +++ b/Assets/Engine/Runtime/UI/PauseButton.cs @@ -2,7 +2,7 @@ using NaughtyAttributes; using UnityEngine; using UnityEngine.UI; -namespace EscapeRoomEngine.Engine.Runtime.UI.Elements +namespace EscapeRoomEngine.Engine.Runtime.UI { /// /// This component is responsible to change the icon of the pause button depending on the game state. diff --git a/Assets/Engine/Runtime/UI/PuzzlePlan.cs b/Assets/Engine/Runtime/UI/PuzzlePlan.cs index 1fdce69..267e5a1 100644 --- a/Assets/Engine/Runtime/UI/PuzzlePlan.cs +++ b/Assets/Engine/Runtime/UI/PuzzlePlan.cs @@ -3,7 +3,7 @@ using EscapeRoomEngine.Engine.Runtime.Modules.Description; using NaughtyAttributes; using UnityEngine; -namespace EscapeRoomEngine.Engine.Runtime.UI.Elements +namespace EscapeRoomEngine.Engine.Runtime.UI { /// /// The puzzle plan UI component that displays the current puzzle plan in the game master window. diff --git a/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs b/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs index 5d8711f..eb0aa3f 100644 --- a/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs +++ b/Assets/Engine/Runtime/UI/PuzzlePlanEntry.cs @@ -5,7 +5,7 @@ using NaughtyAttributes; using UnityEngine; using UnityEngine.UI; -namespace EscapeRoomEngine.Engine.Runtime.UI.Elements +namespace EscapeRoomEngine.Engine.Runtime.UI { /// /// An entry in the UI component that displays the name and estimated time for a puzzle. diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index ffd044c..a71cb34 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -3515,12 +3515,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1380219441} m_PrefabAsset: {fileID: 0} ---- !u!4 &1429679620 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5693385846897636622, guid: ecbf9ce952d5f38458b8237a4483c562, - type: 3} - m_PrefabInstance: {fileID: 348369381} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1437568076 PrefabInstance: m_ObjectHideFlags: 0 @@ -5143,11 +5137,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6527336161650890507, guid: 1358b4ef564c4704682417dff526766a, - type: 3} - propertyPath: target - value: - objectReference: {fileID: 1429679620} - target: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_Name @@ -5156,7 +5145,7 @@ PrefabInstance: - target: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Station46/Environments/Intro Room/Animations.meta b/Assets/Station46/Environments/Intro Room/Animations.meta new file mode 100644 index 0000000..c549152 --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20b4bfe11a23967428a31c34490b46b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Animations/Intro.anim b/Assets/Station46/Environments/Intro Room/Animations/Intro.anim new file mode 100644 index 0000000..10c406f --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Animations/Intro.anim @@ -0,0 +1,1264 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Intro + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0, y: 23.09, z: -31.04} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 4 + value: {x: 0, y: 13.73, z: -30.73} + inSlope: {x: 0, y: -2.0666664, z: 0.20666757} + outSlope: {x: 0, y: -2.0666664, z: 0.20666757} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 6 + value: {x: 0, y: 10.63, z: -27.08} + inSlope: {x: 0, y: -1.3574998, z: 1.6700001} + outSlope: {x: 0, y: -1.3574998, z: 1.6700001} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 8 + value: {x: -0.78, y: 8.3, z: -24.05} + inSlope: {x: -0.5525, y: -1.0600001, z: 1.5675001} + outSlope: {x: -0.5525, y: -1.0600001, z: 1.5675001} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 10 + value: {x: -2.21, y: 6.39, z: -20.81} + inSlope: {x: 0, y: -1.0979253, z: 1.5485476} + outSlope: {x: 0, y: -1.0979253, z: 1.5485476} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 12.016666 + value: {x: -0.62, y: 3.89, z: -17.83} + inSlope: {x: 0.5525, y: 0, z: 1.7524998} + outSlope: {x: 0.5525, y: 0, z: 1.7524998} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 14 + value: {x: 0, y: 3.94, z: -13.8} + inSlope: {x: 0, y: 0, z: 1.8301255} + outSlope: {x: 0, y: 0, z: 1.8301255} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 16 + value: {x: -2.41, y: 3.49, z: -10.54} + inSlope: {x: 0, y: -0.45000005, z: 1.7925} + outSlope: {x: 0, y: -0.45000005, z: 1.7925} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 18 + value: {x: -1.51, y: 1.73, z: -6.63} + inSlope: {x: 0, y: 0, z: 2.025} + outSlope: {x: 0, y: 0, z: 2.025} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 20 + value: {x: -1.765, y: 1.8, z: -2.44} + inSlope: {x: 0, y: 0, z: 0.88992244} + outSlope: {x: 0, y: 0, z: 0.88992244} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 24.45 + value: {x: -0.995, y: 1.779, z: -0.89} + inSlope: {x: 0, y: -0.011914843, z: 0} + outSlope: {x: 0, y: -0.011914843, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 27.05 + value: {x: -1.184, y: 1.69, z: -0.89} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 29.05 + value: {x: -1.169, y: 1.735, z: -0.89} + inSlope: {x: 0, y: 0.00885909, z: 0} + outSlope: {x: 0, y: 0.00885909, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 32.016666 + value: {x: -1.497, y: 1.746, z: -0.89} + inSlope: {x: -0.26669854, y: 0.01263162, z: 0} + outSlope: {x: -0.26669854, y: 0.01263162, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 32.533333 + value: {x: -2.098, y: 2.153, z: -0.003} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 36 + value: {x: -2.098, y: 2.053, z: -0.003} + inSlope: {x: 0, y: -0.024100345, z: 0} + outSlope: {x: 0, y: -0.024100345, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 36.516666 + value: {x: -2.098, y: 2.029, z: -0.003} + inSlope: {x: 0, y: -0.085312545, z: 0} + outSlope: {x: 0, y: -0.085312545, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 37.066666 + value: {x: -1.873, y: 1.962, z: -0.003} + inSlope: {x: 0.06520221, y: -0.051067427, z: 0} + outSlope: {x: 0.06520221, y: -0.051067427, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 38.316666 + value: {x: -1.843659, y: 1.9370787, z: -0.003} + inSlope: {x: 0, y: -0.0069706407, z: 0} + outSlope: {x: 0, y: -0.0069706407, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 38.833332 + value: {x: -1.862, y: 1.934, z: -0.003} + inSlope: {x: -0.03667626, y: 0, z: 0} + outSlope: {x: -0.03667626, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 39.116665 + value: {x: -1.873, y: 2.032, z: -0.003} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 39.433334 + value: {x: -1.873, y: 1.983, z: -0.003} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 40.083332 + value: {x: -1.873, y: 1.983, z: -0.003} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 41.483334 + value: {x: -1.873, y: 1.866, z: -1.632} + inSlope: {x: 0, y: 0, z: -0.36315787} + outSlope: {x: 0, y: 0, z: -0.36315787} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 47.05 + value: {x: -1.756, y: 1.895, z: -2.533} + inSlope: {x: 0, y: 0.010378359, z: -0.58443236} + outSlope: {x: 0, y: 0.010378359, z: -0.58443236} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 47.65 + value: {x: -1.76, y: 1.93, z: -5.7} + inSlope: {x: 0, y: 0.05769238, z: -6.1361575} + outSlope: {x: 0, y: 0.05769238, z: -6.1361575} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 48.35 + value: {x: -1.76, y: 1.97, z: -10.51} + inSlope: {x: 0, y: 0.11428613, z: -7.3357267} + outSlope: {x: 0, y: 0.11428613, z: -7.3357267} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 49.05 + value: {x: -1.76, y: 3.86, z: -15.97} + inSlope: {x: 0, y: 3.7411733, z: -8.287051} + outSlope: {x: 0, y: 3.7411733, z: -8.287051} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 49.766666 + value: {x: -1.76, y: 7.27, z: -22.25} + inSlope: {x: 0, y: 5.7999935, z: -8.378563} + outSlope: {x: 0, y: 5.7999935, z: -8.378563} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 50.45 + value: {x: -1.76, y: 11.98, z: -27.7} + inSlope: {x: 0, y: 7.4810185, z: -6.66836} + outSlope: {x: 0, y: 7.4810185, z: -6.66836} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 51.083332 + value: {x: -1.76, y: 17.12, z: -31.03} + inSlope: {x: 0, y: 8.338251, z: 0} + outSlope: {x: 0, y: 8.338251, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 51.583332 + value: {x: -1.76, y: 21.43, z: -29.23} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Origin/Sphere Position + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1755401833 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 51.583332 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: -0.78 + inSlope: -0.5525 + outSlope: -0.5525 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 10 + value: -2.21 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.016666 + value: -0.62 + inSlope: 0.5525 + outSlope: 0.5525 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 14 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 16 + value: -2.41 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18 + value: -1.51 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20 + value: -1.765 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24.45 + value: -0.995 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 27.05 + value: -1.184 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 29.05 + value: -1.169 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32.016666 + value: -1.497 + inSlope: -0.26669854 + outSlope: -0.26669854 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32.533333 + value: -2.098 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36 + value: -2.098 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36.516666 + value: -2.098 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 37.066666 + value: -1.873 + inSlope: 0.06520221 + outSlope: 0.06520221 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38.316666 + value: -1.843659 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38.833332 + value: -1.862 + inSlope: -0.03667626 + outSlope: -0.03667626 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39.116665 + value: -1.873 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39.433334 + value: -1.873 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 40.083332 + value: -1.873 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 41.483334 + value: -1.873 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47.05 + value: -1.756 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47.65 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 48.35 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49.05 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49.766666 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 50.45 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51.083332 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51.583332 + value: -1.76 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Origin/Sphere Position + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 23.09 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 13.73 + inSlope: -2.0666664 + outSlope: -2.0666664 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: 10.63 + inSlope: -1.3574998 + outSlope: -1.3574998 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: 8.3 + inSlope: -1.0600001 + outSlope: -1.0600001 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 10 + value: 6.39 + inSlope: -1.0979253 + outSlope: -1.0979253 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.016666 + value: 3.89 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 14 + value: 3.94 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 16 + value: 3.49 + inSlope: -0.45000005 + outSlope: -0.45000005 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18 + value: 1.73 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20 + value: 1.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24.45 + value: 1.779 + inSlope: -0.011914843 + outSlope: -0.011914843 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 27.05 + value: 1.69 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 29.05 + value: 1.735 + inSlope: 0.00885909 + outSlope: 0.00885909 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32.016666 + value: 1.746 + inSlope: 0.01263162 + outSlope: 0.01263162 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32.533333 + value: 2.153 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36 + value: 2.053 + inSlope: -0.024100345 + outSlope: -0.024100345 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36.516666 + value: 2.029 + inSlope: -0.085312545 + outSlope: -0.085312545 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 37.066666 + value: 1.962 + inSlope: -0.051067427 + outSlope: -0.051067427 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38.316666 + value: 1.9370787 + inSlope: -0.0069706407 + outSlope: -0.0069706407 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38.833332 + value: 1.934 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39.116665 + value: 2.032 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39.433334 + value: 1.983 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 40.083332 + value: 1.983 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 41.483334 + value: 1.866 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47.05 + value: 1.895 + inSlope: 0.010378359 + outSlope: 0.010378359 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47.65 + value: 1.93 + inSlope: 0.05769238 + outSlope: 0.05769238 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 48.35 + value: 1.97 + inSlope: 0.11428613 + outSlope: 0.11428613 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49.05 + value: 3.86 + inSlope: 3.7411733 + outSlope: 3.7411733 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49.766666 + value: 7.27 + inSlope: 5.7999935 + outSlope: 5.7999935 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 50.45 + value: 11.98 + inSlope: 7.4810185 + outSlope: 7.4810185 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51.083332 + value: 17.12 + inSlope: 8.338251 + outSlope: 8.338251 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51.583332 + value: 21.43 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Origin/Sphere Position + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -31.04 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: -30.73 + inSlope: 0.20666757 + outSlope: 0.20666757 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 6 + value: -27.08 + inSlope: 1.6700001 + outSlope: 1.6700001 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8 + value: -24.05 + inSlope: 1.5675001 + outSlope: 1.5675001 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 10 + value: -20.81 + inSlope: 1.5485476 + outSlope: 1.5485476 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 12.016666 + value: -17.83 + inSlope: 1.7524998 + outSlope: 1.7524998 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 14 + value: -13.8 + inSlope: 1.8301255 + outSlope: 1.8301255 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 16 + value: -10.54 + inSlope: 1.7925 + outSlope: 1.7925 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 18 + value: -6.63 + inSlope: 2.025 + outSlope: 2.025 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 20 + value: -2.44 + inSlope: 0.88992244 + outSlope: 0.88992244 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 24.45 + value: -0.89 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 27.05 + value: -0.89 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 29.05 + value: -0.89 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32.016666 + value: -0.89 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 32.533333 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 36.516666 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 37.066666 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38.316666 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 38.833332 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39.116665 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 39.433334 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 40.083332 + value: -0.003 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 41.483334 + value: -1.632 + inSlope: -0.36315787 + outSlope: -0.36315787 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47.05 + value: -2.533 + inSlope: -0.58443236 + outSlope: -0.58443236 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 47.65 + value: -5.7 + inSlope: -6.1361575 + outSlope: -6.1361575 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 48.35 + value: -10.51 + inSlope: -7.3357267 + outSlope: -7.3357267 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49.05 + value: -15.97 + inSlope: -8.287051 + outSlope: -8.287051 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 49.766666 + value: -22.25 + inSlope: -8.378563 + outSlope: -8.378563 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 50.45 + value: -27.7 + inSlope: -6.66836 + outSlope: -6.66836 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51.083332 + value: -31.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 51.583332 + value: -29.23 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Origin/Sphere Position + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 23 + functionName: StartTalking + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Station46/Environments/Intro Room/Animations/Intro.anim.meta b/Assets/Station46/Environments/Intro Room/Animations/Intro.anim.meta new file mode 100644 index 0000000..796db7a --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Animations/Intro.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 520dafaa12b68d64385036cb0eb67794 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Animations/Intro.controller b/Assets/Station46/Environments/Intro Room/Animations/Intro.controller new file mode 100644 index 0000000..27de5af --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Animations/Intro.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Intro + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7569543474730790096} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1051559380943010962 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Intro + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 520dafaa12b68d64385036cb0eb67794, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &7569543474730790096 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1051559380943010962} + m_Position: {x: 400, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1051559380943010962} diff --git a/Assets/Station46/Environments/Intro Room/Animations/Intro.controller.meta b/Assets/Station46/Environments/Intro Room/Animations/Intro.controller.meta new file mode 100644 index 0000000..730f5cf --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Animations/Intro.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54a25452b3acb9d4598ef89f8973247a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Audio.meta b/Assets/Station46/Environments/Intro Room/Audio.meta index a543514..3ec047f 100644 --- a/Assets/Station46/Environments/Intro Room/Audio.meta +++ b/Assets/Station46/Environments/Intro Room/Audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e8577966b449a834aa0ccc54d45991ee +guid: 6ce14501dba5abe4da19e2d83c6acc93 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Station46/Environments/Intro Room/Audio/ambience.wav b/Assets/Station46/Environments/Intro Room/Audio/ambience.wav new file mode 100644 index 0000000..57a1e1f --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio/ambience.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58c2ec4d96afba2e8d9773908149000f96878c9c307099365fbe7295d7dc0a44 +size 23154718 diff --git a/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta b/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta new file mode 100644 index 0000000..1b677b2 --- /dev/null +++ b/Assets/Station46/Environments/Intro Room/Audio/ambience.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e1795aaf3baaa734d9e3334fa230d12b +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Intro Room.prefab b/Assets/Station46/Environments/Intro Room/Intro Room.prefab index f5675fe..dc93b18 100644 --- a/Assets/Station46/Environments/Intro Room/Intro Room.prefab +++ b/Assets/Station46/Environments/Intro Room/Intro Room.prefab @@ -1077,6 +1077,7 @@ Transform: m_Children: - {fileID: 6179995914325846554} - {fileID: 2222967524522708063} + - {fileID: 3740673368301220231} m_Father: {fileID: 5968074272560806773} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} @@ -1379,7 +1380,7 @@ Transform: m_GameObject: {fileID: 5772859839507566610} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 30, y: 35, z: 70} + m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6179995914325846554} @@ -1518,6 +1519,124 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6061098291720375774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3732707905301448511} + - component: {fileID: 1705951487344687168} + - component: {fileID: 962962221838384994} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3732707905301448511 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6061098291720375774} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.84, y: 2.844, z: 2.507} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6179995914325846554} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &1705951487344687168 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6061098291720375774} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 0.5 + m_Range: 4.44 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.0444 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!114 &962962221838384994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6061098291720375774} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 --- !u!1 &6779139061471556033 GameObject: m_ObjectHideFlags: 0 @@ -2030,6 +2149,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6179995914325846554} + - component: {fileID: 7741367069378330848} m_Layer: 0 m_Name: Scenery m_TagString: Untagged @@ -2053,9 +2173,107 @@ Transform: - {fileID: 9187355934463472165} - {fileID: 6026454149042564578} - {fileID: 3957837619321901491} + - {fileID: 3732707905301448511} + - {fileID: 3440656460864188199} 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 @@ -2066,6 +2284,7 @@ GameObject: m_Component: - component: {fileID: 5968074272560806773} - component: {fileID: 6790828229373266063} + - component: {fileID: 3534129676407067837} m_Layer: 0 m_Name: Intro Room m_TagString: Untagged @@ -2101,6 +2320,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2e3fc71dc4142888bad2313cbf1bea9, type: 3} m_Name: m_EditorClassIdentifier: + _sphereAudio: {fileID: 1313072068579538865} +--- !u!95 &3534129676407067837 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8137769401290482906} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 54a25452b3acb9d4598ef89f8973247a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8141187399824475193 GameObject: m_ObjectHideFlags: 0 @@ -2207,6 +2448,113 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!1 &8230291094167664855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3440656460864188199} + - component: {fileID: 1404098354469303483} + - component: {fileID: 5575936447862699380} + - component: {fileID: 5796037147141890057} + m_Layer: 0 + m_Name: Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3440656460864188199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230291094167664855} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.84, y: 2.929, z: 2.507} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6179995914325846554} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1404098354469303483 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230291094167664855} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5575936447862699380 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230291094167664855} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 81aae5f0e867adf4fb272cbce67973db, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &5796037147141890057 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8230291094167664855} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &9009715001565140767 GameObject: m_ObjectHideFlags: 0 @@ -2377,6 +2725,37 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 2572875250017459057, guid: 01072a575732cd34bb6ed5d5a43f3068, type: 3} +--- !u!1 &9073699659160403653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3740673368301220231} + m_Layer: 0 + m_Name: Sphere Position + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3740673368301220231 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9073699659160403653} + 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: 7106282615239758844} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &72445934563422397 PrefabInstance: m_ObjectHideFlags: 0 @@ -5144,17 +5523,17 @@ PrefabInstance: - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, type: 3} propertyPath: m_LocalPosition.x - value: -2 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, type: 3} propertyPath: m_LocalPosition.y - value: 2 + value: 18.66 objectReference: {fileID: 0} - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -31.7 objectReference: {fileID: 0} - target: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, type: 3} @@ -5200,12 +5579,18 @@ PrefabInstance: type: 3} propertyPath: target value: - objectReference: {fileID: 0} + objectReference: {fileID: 3740673368301220231} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 884a61055675a5a4c825fba3863c8011, type: 3} +--- !u!82 &1313072068579538865 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2877895139439227182, guid: 884a61055675a5a4c825fba3863c8011, + type: 3} + m_PrefabInstance: {fileID: 3875539306738255519} + m_PrefabAsset: {fileID: 0} --- !u!4 &2222967524522708063 stripped Transform: m_CorrespondingSourceObject: {fileID: 3103331268735355584, guid: 884a61055675a5a4c825fba3863c8011, diff --git a/Assets/Station46/Environments/Intro Sphere/Audio.meta b/Assets/Station46/Environments/Intro Sphere/Audio.meta new file mode 100644 index 0000000..a543514 --- /dev/null +++ b/Assets/Station46/Environments/Intro Sphere/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8577966b449a834aa0ccc54d45991ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav b/Assets/Station46/Environments/Intro Sphere/Audio/intro edit.wav similarity index 100% rename from Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav rename to Assets/Station46/Environments/Intro Sphere/Audio/intro edit.wav diff --git a/Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav.meta b/Assets/Station46/Environments/Intro Sphere/Audio/intro edit.wav.meta similarity index 100% rename from Assets/Station46/Environments/Intro Room/Audio/intro-edit.wav.meta rename to Assets/Station46/Environments/Intro Sphere/Audio/intro edit.wav.meta diff --git a/Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav b/Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav new file mode 100644 index 0000000..f5b349b --- /dev/null +++ b/Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa797610c1b229b7f7a15ea9a952e4f984d7d3e33ca91f11d26cdadcd1a13044 +size 4137272 diff --git a/Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav.meta b/Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav.meta new file mode 100644 index 0000000..54bd31c --- /dev/null +++ b/Assets/Station46/Environments/Intro Sphere/Audio/sphere hum edit.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 982da16887a17bd4caa0cb208448d118 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab b/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab index ffdb1dd..853de79 100644 --- a/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab +++ b/Assets/Station46/Environments/Intro Sphere/Intro Sphere.prefab @@ -9611,6 +9611,7 @@ Transform: - {fileID: 6097846054405412592} - {fileID: 1776039877960258817} - {fileID: 1772644945931633228} + - {fileID: 1420653324193739710} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -14949,8 +14950,8 @@ MonoBehaviour: m_EditorClassIdentifier: minDistance: 0.01 speed: 100 - sizeFactor: 4 - brightnessFactor: 12 + sizeFactor: 5 + brightnessFactor: 15 target: {fileID: 0} audioSource: {fileID: 2877895139439227182} centerTransform: {fileID: 6097717622075189454} @@ -14966,7 +14967,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: e9879de5b83a4547be8ec1c406fb0556, type: 3} - m_PlayOnAwake: 1 + m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 Loop: 0 @@ -14976,7 +14977,136 @@ AudioSource: Priority: 128 DopplerLevel: 1 MinDistance: 1 - MaxDistance: 500 + MaxDistance: 50 + 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: 1 + 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 &7744297492910143281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1420653324193739710} + - component: {fileID: 2024116610163629255} + m_Layer: 0 + m_Name: Humming + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1420653324193739710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7744297492910143281} + 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: 3103331268735355584} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2024116610163629255 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7744297492910143281} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 1557019650265238377, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 982da16887a17bd4caa0cb208448d118, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 3 + MaxDistance: 20 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 diff --git a/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs b/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs index e5c97f5..4325567 100644 --- a/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs +++ b/Assets/Station46/Environments/Intro Sphere/Scripts/FollowSphere.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using EscapeRoomEngine.VR.Runtime; +using System.Linq; using NaughtyAttributes; using UnityEngine; @@ -22,7 +20,7 @@ namespace Station46.Environments.Intro_Sphere.Scripts [BoxGroup("Internal")] [SerializeField] private MeshRenderer sphereRenderer; private float[] _audioSamples; - private float[] _samplesAverage = new float[AverageLength]; + private readonly float[] _samplesAverage = new float[AverageLength]; private int averageIndex; private float _initialBrightness; private Material _sphereMaterial; @@ -37,7 +35,6 @@ namespace Station46.Environments.Intro_Sphere.Scripts _sphereMaterial = sphereRenderer.material; _initialBrightness = _sphereMaterial.GetFloat(FresnelPower); _rigidbody = GetComponent(); - target = Player.Instance.sphereFollow; } private void FixedUpdate() diff --git a/Assets/Station46/Station 46 Mixer.mixer b/Assets/Station46/Station 46 Mixer.mixer new file mode 100644 index 0000000..af59fbe --- /dev/null +++ b/Assets/Station46/Station 46 Mixer.mixer @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!244 &-3177590470062305910 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + 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 +--- !u!241 &24100000 +AudioMixerController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Station 46 Mixer + m_OutputGroup: {fileID: 0} + m_MasterGroup: {fileID: 24300002} + m_Snapshots: + - {fileID: 24500006} + m_StartSnapshot: {fileID: 24500006} + m_SuspendThreshold: -80 + m_EnableSuspend: 1 + m_UpdateMode: 0 + m_ExposedParameters: [] + m_AudioMixerGroupViews: + - guids: + - c6c68d14b3bd5ec46821abb2bb75a905 + - faca15d1d05c6754c8156c3167b12b96 + name: View + m_CurrentViewIndex: 0 + m_TargetSnapshot: {fileID: 24500006} +--- !u!243 &24300002 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Master + m_AudioMixer: {fileID: 24100000} + m_GroupID: c6c68d14b3bd5ec46821abb2bb75a905 + m_Children: + - {fileID: 1557019650265238377} + m_Volume: 222e79f4ebd0cb440a0becb553fc856e + m_Pitch: bac2becc12cab4b4b9b4f393fff60435 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 24400004} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &24400004 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 4d1e20055917a3e4f8bbbfcee1589b8d + m_EffectName: Attenuation + m_MixLevel: 7ccec07ce72d8af41b884bb138c0822d + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!245 &24500006 +AudioMixerSnapshotController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snapshot + m_AudioMixer: {fileID: 24100000} + m_SnapshotID: 74856e1237e507a4ba3a8f4f45e3d1da + m_FloatValues: + eb52958945419734c8816aa2a9d477d9: 9.925883 + m_TransitionOverrides: {} +--- !u!243 &1557019650265238377 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + 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 diff --git a/Assets/Station46/Station 46 Mixer.mixer.meta b/Assets/Station46/Station 46 Mixer.mixer.meta new file mode 100644 index 0000000..acae771 --- /dev/null +++ b/Assets/Station46/Station 46 Mixer.mixer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20d4bd74d308d434bbe4ed0adcd3ed7a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 24100000 + userData: + assetBundleName: + assetBundleVariant: