diff --git a/Assets/Audio/Ambiance.meta b/Assets/Audio/Ambiance.meta new file mode 100644 index 0000000..6270365 --- /dev/null +++ b/Assets/Audio/Ambiance.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 72e1eeb84cb347359c1874f510af5f07 +timeCreated: 1695581268 \ No newline at end of file diff --git a/Assets/Audio/Ambiance/AmbianceSetter.cs b/Assets/Audio/Ambiance/AmbianceSetter.cs new file mode 100644 index 0000000..4a02d35 --- /dev/null +++ b/Assets/Audio/Ambiance/AmbianceSetter.cs @@ -0,0 +1,12 @@ +using Framework; +using UnityEngine; + +namespace Audio.Ambiance { + public class AmbianceSetter : MonoBehaviour { + [SerializeField] private AmbianceType _ambianceType; + + private void Awake() { + App.Audio.SetAmbiance(_ambianceType); + } + } +} diff --git a/Assets/Audio/Ambiance/AmbianceSetter.cs.meta b/Assets/Audio/Ambiance/AmbianceSetter.cs.meta new file mode 100644 index 0000000..b05ac79 --- /dev/null +++ b/Assets/Audio/Ambiance/AmbianceSetter.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: dcfe8f8598994da18e22c540a13fe61d +timeCreated: 1695581323 \ No newline at end of file diff --git a/Assets/Audio/Ambiance/AmbianceType.cs b/Assets/Audio/Ambiance/AmbianceType.cs new file mode 100644 index 0000000..1095370 --- /dev/null +++ b/Assets/Audio/Ambiance/AmbianceType.cs @@ -0,0 +1,7 @@ +using UnityEngine; + +namespace Audio.Ambiance { + public class AmbianceType : ScriptableObject { + public int Value; + } +} diff --git a/Assets/Audio/Ambiance/AmbianceType.cs.meta b/Assets/Audio/Ambiance/AmbianceType.cs.meta new file mode 100644 index 0000000..7f3d4fa --- /dev/null +++ b/Assets/Audio/Ambiance/AmbianceType.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4e9a0503916e453ca5028b8145497212 +timeCreated: 1695581102 \ No newline at end of file diff --git a/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset b/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset new file mode 100644 index 0000000..c2c3a42 --- /dev/null +++ b/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset @@ -0,0 +1,15 @@ +%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: 4e9a0503916e453ca5028b8145497212, type: 3} + m_Name: LoadingDocsAmbiance + m_EditorClassIdentifier: + Value: 3 diff --git a/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset.meta b/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset.meta new file mode 100644 index 0000000..ee32ed8 --- /dev/null +++ b/Assets/Audio/Ambiance/LoadingDocsAmbiance.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23c9d479b30919c4db79ff38bf402663 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Ambiance/MainMenuAmbiance.asset b/Assets/Audio/Ambiance/MainMenuAmbiance.asset new file mode 100644 index 0000000..edabc2c --- /dev/null +++ b/Assets/Audio/Ambiance/MainMenuAmbiance.asset @@ -0,0 +1,15 @@ +%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: 4e9a0503916e453ca5028b8145497212, type: 3} + m_Name: MainMenuAmbiance + m_EditorClassIdentifier: + Value: 1 diff --git a/Assets/Audio/Ambiance/MainMenuAmbiance.asset.meta b/Assets/Audio/Ambiance/MainMenuAmbiance.asset.meta new file mode 100644 index 0000000..20642a6 --- /dev/null +++ b/Assets/Audio/Ambiance/MainMenuAmbiance.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f698fd90971c7fa499aeb8d3c59ca08e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/AudioManager.cs b/Assets/Audio/AudioManager.cs index 5b0cac4..ea72908 100644 --- a/Assets/Audio/AudioManager.cs +++ b/Assets/Audio/AudioManager.cs @@ -1,4 +1,5 @@ -using FMOD.Studio; +using Audio.Ambiance; +using FMOD.Studio; using FMODUnity; using Settings.Bundles; using UnityEngine; @@ -37,10 +38,9 @@ private void OnDisable() { _bundle.MusicVolume.Changed -= HandleMusicVolumeChanged; } - public void PlayAmbience() { + public void SetAmbiance(AmbianceType ambianceType) { if (_ambienceAudio.IsInitialized) { - _ambienceSceneParam.CurrentValue = - SceneManager.GetActiveScene().buildIndex; + _ambienceSceneParam.CurrentValue = ambianceType.Value; _ambienceAudio.Instance.getPlaybackState(out var state); if (state == PLAYBACK_STATE.STOPPED) { _ambienceAudio.Play(); diff --git a/Assets/Framework/StoryBundle.prefab b/Assets/Framework/StoryBundle.prefab index 69eb808..2219fba 100644 --- a/Assets/Framework/StoryBundle.prefab +++ b/Assets/Framework/StoryBundle.prefab @@ -471,6 +471,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2888997551274503474} + - component: {fileID: 1386345358296973798} m_Layer: 0 m_Name: StoryBundle m_TagString: Untagged @@ -509,6 +510,19 @@ Transform: - {fileID: 5189593381247620878} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1386345358296973798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343655413921635414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcfe8f8598994da18e22c540a13fe61d, type: 3} + m_Name: + m_EditorClassIdentifier: + _ambianceType: {fileID: 0} --- !u!1 &2365801536616246098 GameObject: m_ObjectHideFlags: 0 @@ -1081,8 +1095,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b2bd8c7472240e5b52fb4619c63bab4, type: 3} m_Name: m_EditorClassIdentifier: - HUD: {fileID: 3887099106951607860} - Dialogue: {fileID: 6294782551871750872} _camera: {fileID: 797737585370614369} _folder: {fileID: 726742277015538154} _backdrop: diff --git a/Assets/Framework/StoryState.cs b/Assets/Framework/StoryState.cs index 7177c26..cc6b190 100644 --- a/Assets/Framework/StoryState.cs +++ b/Assets/Framework/StoryState.cs @@ -52,7 +52,6 @@ public void Pause() { public void Resume() { Assert.IsTrue(IsActive); - App.Audio.PlayAmbience(); App.Input.SwitchToGameplay(); IsPaused = false; Time.timeScale = 1; diff --git a/Assets/Scenes/Intro/EntryGate.unity b/Assets/Scenes/Intro/EntryGate.unity index 8051490..9d42692 100644 --- a/Assets/Scenes/Intro/EntryGate.unity +++ b/Assets/Scenes/Intro/EntryGate.unity @@ -151,8 +151,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 @@ -336,8 +336,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &571759173 Transform: m_ObjectHideFlags: 0 @@ -383,8 +383,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8084cf3afdd848d38f2d36d54e7dd26c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _material: {fileID: 2100000, guid: 599736ef716593e4e9599f8a109b899f, type: 2} _interactable: {fileID: 592781869} _renderers: @@ -420,8 +420,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5586ceac2654ed88573dd8f8fb2861d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: Gizmo: {fileID: 993094069} Event: EventReference: @@ -472,8 +472,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1426fa33a92b460ab4724b0282e234b0, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _scenePath: Assets/Scenes/Intro/LoadingDocks.unity _event: InternalID: 1389397 @@ -506,8 +506,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8084cf3afdd848d38f2d36d54e7dd26c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _material: {fileID: 2100000, guid: 599736ef716593e4e9599f8a109b899f, type: 2} _interactable: {fileID: 649345888} _renderers: @@ -544,8 +544,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5586ceac2654ed88573dd8f8fb2861d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: Gizmo: {fileID: 1069914046} Event: EventReference: @@ -644,8 +644,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Size: {x: 4, y: 5.71, z: 46.29} m_Center: {x: 0, y: 1, z: 0} m_Area: 1 @@ -681,7 +681,7 @@ PrefabInstance: - target: {fileID: 2200932180627228171, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} propertyPath: _conversation - value: + value: objectReference: {fileID: 592781869} - target: {fileID: 2736293608084336562, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} @@ -785,8 +785,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &830425541 Transform: m_ObjectHideFlags: 0 @@ -829,8 +829,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Size: {x: 4, y: 6.69, z: 46.29} m_Center: {x: 0, y: 1, z: 0} m_Area: 1 @@ -945,8 +945,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &942423352 Transform: m_ObjectHideFlags: 0 @@ -972,8 +972,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b726c70262574368b736872d92dfcc8a, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &993094074 stripped Transform: m_CorrespondingSourceObject: {fileID: 3397334455388534160, guid: 8f75fded23ad17f4d91ba1386877096e, @@ -990,8 +990,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b726c70262574368b736872d92dfcc8a, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &1069914051 stripped Transform: m_CorrespondingSourceObject: {fileID: 3397334455388534160, guid: 8f75fded23ad17f4d91ba1386877096e, @@ -4023,6 +4023,12 @@ PrefabInstance: propertyPath: m_Name value: StoryBundle objectReference: {fileID: 0} + - target: {fileID: 1386345358296973798, guid: c1dfdad7307460e4c8857ce3d5c50c95, + type: 3} + propertyPath: _ambianceType + value: + objectReference: {fileID: 11400000, guid: 23c9d479b30919c4db79ff38bf402663, + type: 2} - target: {fileID: 1392038562825563043, guid: c1dfdad7307460e4c8857ce3d5c50c95, type: 3} propertyPath: m_AnchorMax.y @@ -4341,7 +4347,7 @@ PrefabInstance: - target: {fileID: 5164006571463039121, guid: c1dfdad7307460e4c8857ce3d5c50c95, type: 3} propertyPath: _table - value: + value: objectReference: {fileID: 11400000, guid: eecc874d96be21f41abcdb7adfee4c41, type: 2} - target: {fileID: 5164006571463039121, guid: c1dfdad7307460e4c8857ce3d5c50c95, @@ -4770,7 +4776,7 @@ LightingSettings: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 @@ -4992,8 +4998,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77870a28781a4d4b81619784c36df2b3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!136 &1304049363 CapsuleCollider: m_ObjectHideFlags: 0 @@ -5048,7 +5054,7 @@ PrefabInstance: - target: {fileID: 2200932180627228171, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} propertyPath: _conversation - value: + value: objectReference: {fileID: 649345888} - target: {fileID: 2736293608084336562, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} @@ -5158,8 +5164,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &1748375161 Transform: m_ObjectHideFlags: 0 @@ -5202,8 +5208,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Size: {x: 4, y: 5.39, z: 46.29} m_Center: {x: 0, y: 1, z: 0} m_Area: 1 @@ -5282,8 +5288,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77870a28781a4d4b81619784c36df2b3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!65 &2064129435 BoxCollider: m_ObjectHideFlags: 0 @@ -5331,7 +5337,7 @@ PrefabInstance: - target: {fileID: 678209152566858648, guid: 5f9dfe9ac8eb22e49bfd3bcc5a7dfda8, type: 3} propertyPath: m_NavMeshData - value: + value: objectReference: {fileID: 23800000, guid: 40a091b67ca91784b9b2bcdb927cd0fe, type: 2} - target: {fileID: 1677171056344123326, guid: 5f9dfe9ac8eb22e49bfd3bcc5a7dfda8, diff --git a/Assets/Scenes/Intro/LoadingDocks.unity b/Assets/Scenes/Intro/LoadingDocks.unity index 2407558..b7af803 100644 --- a/Assets/Scenes/Intro/LoadingDocks.unity +++ b/Assets/Scenes/Intro/LoadingDocks.unity @@ -168,8 +168,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &113777532 Transform: m_ObjectHideFlags: 0 @@ -212,8 +212,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &121284914 Transform: m_ObjectHideFlags: 0 @@ -257,8 +257,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Version: 3 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 @@ -375,8 +375,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77870a28781a4d4b81619784c36df2b3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!136 &325408061 CapsuleCollider: m_ObjectHideFlags: 0 @@ -456,8 +456,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8084cf3afdd848d38f2d36d54e7dd26c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _material: {fileID: 2100000, guid: 599736ef716593e4e9599f8a109b899f, type: 2} _interactable: {fileID: 499792037} _renderers: @@ -494,8 +494,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5586ceac2654ed88573dd8f8fb2861d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: Gizmo: {fileID: 1306817677} Event: EventReference: @@ -551,7 +551,7 @@ PrefabInstance: - target: {fileID: 2200932180627228171, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} propertyPath: _conversation - value: + value: objectReference: {fileID: 1309030242} - target: {fileID: 2736293608084336562, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} @@ -661,8 +661,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Size: {x: 2, y: 8, z: 8} m_Center: {x: 0, y: 0, z: 0} m_Area: 1 @@ -698,7 +698,7 @@ PrefabInstance: - target: {fileID: 2200932180627228171, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} propertyPath: _conversation - value: + value: objectReference: {fileID: 4398866771222208306} - target: {fileID: 2736293608084336562, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} @@ -791,7 +791,7 @@ PrefabInstance: - target: {fileID: 2200932180627228171, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} propertyPath: _conversation - value: + value: objectReference: {fileID: 499792037} - target: {fileID: 2736293608084336562, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} @@ -915,8 +915,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8084cf3afdd848d38f2d36d54e7dd26c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _material: {fileID: 2100000, guid: 599736ef716593e4e9599f8a109b899f, type: 2} _interactable: {fileID: 1022070888} _renderers: @@ -953,8 +953,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5586ceac2654ed88573dd8f8fb2861d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: Gizmo: {fileID: 1053821263} Event: EventReference: @@ -1021,8 +1021,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Size: {x: 1.22, y: 2, z: 1.22} m_Center: {x: 0, y: 0, z: 0} m_Area: 1 @@ -1052,8 +1052,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b726c70262574368b736872d92dfcc8a, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1087836024 GameObject: m_ObjectHideFlags: 0 @@ -1081,8 +1081,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &1087836026 Transform: m_ObjectHideFlags: 0 @@ -1125,8 +1125,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &1176210449 Transform: m_ObjectHideFlags: 0 @@ -1158,8 +1158,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b726c70262574368b736872d92dfcc8a, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1207257342 GameObject: m_ObjectHideFlags: 0 @@ -1188,8 +1188,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77870a28781a4d4b81619784c36df2b3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!65 &1207257344 BoxCollider: m_ObjectHideFlags: 0 @@ -1232,7 +1232,7 @@ LightingSettings: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 @@ -1300,8 +1300,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b726c70262574368b736872d92dfcc8a, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1 &1309030239 GameObject: m_ObjectHideFlags: 0 @@ -1354,8 +1354,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8084cf3afdd848d38f2d36d54e7dd26c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _material: {fileID: 2100000, guid: 599736ef716593e4e9599f8a109b899f, type: 2} _interactable: {fileID: 1309030242} _renderers: @@ -1370,8 +1370,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5586ceac2654ed88573dd8f8fb2861d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: Gizmo: {fileID: 1784340534} Event: EventReference: @@ -1444,8 +1444,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &1325191544 Transform: m_ObjectHideFlags: 0 @@ -1488,8 +1488,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 35e95dc5ff2b64380880dd7ac5922847, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_Size: {x: 2, y: 2, z: 2} m_Center: {x: 0, y: 0, z: 0} m_Area: 1 @@ -1579,8 +1579,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77870a28781a4d4b81619784c36df2b3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1400848187 PrefabInstance: m_ObjectHideFlags: 0 @@ -1597,12 +1597,12 @@ PrefabInstance: - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[0] - value: + value: objectReference: {fileID: 457414111} - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[1] - value: + value: objectReference: {fileID: 1970061092} - target: {fileID: 6178060888846861477, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} @@ -1675,12 +1675,12 @@ PrefabInstance: - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[0] - value: + value: objectReference: {fileID: 970650835} - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[1] - value: + value: objectReference: {fileID: 1387470310} - target: {fileID: 6178060888846861477, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} @@ -1758,12 +1758,12 @@ PrefabInstance: - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[0] - value: + value: objectReference: {fileID: 1634213437} - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[1] - value: + value: objectReference: {fileID: 924838209} - target: {fileID: 6178060888846861477, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} @@ -1852,8 +1852,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &1625339102 Transform: m_ObjectHideFlags: 0 @@ -4883,6 +4883,12 @@ PrefabInstance: propertyPath: m_Name value: StoryBundle objectReference: {fileID: 0} + - target: {fileID: 1386345358296973798, guid: c1dfdad7307460e4c8857ce3d5c50c95, + type: 3} + propertyPath: _ambianceType + value: + objectReference: {fileID: 11400000, guid: 23c9d479b30919c4db79ff38bf402663, + type: 2} - target: {fileID: 1392038562825563043, guid: c1dfdad7307460e4c8857ce3d5c50c95, type: 3} propertyPath: m_AnchorMax.y @@ -5211,7 +5217,7 @@ PrefabInstance: - target: {fileID: 5164006571463039121, guid: c1dfdad7307460e4c8857ce3d5c50c95, type: 3} propertyPath: _table - value: + value: objectReference: {fileID: 11400000, guid: 80e0d5ca2d53c354bb0fd7d4e23463f0, type: 2} - target: {fileID: 5164006571463039121, guid: c1dfdad7307460e4c8857ce3d5c50c95, @@ -5667,8 +5673,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 77870a28781a4d4b81619784c36df2b3, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!136 &1718209651 CapsuleCollider: m_ObjectHideFlags: 0 @@ -5717,8 +5723,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b726c70262574368b736872d92dfcc8a, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1890461821 PrefabInstance: m_ObjectHideFlags: 0 @@ -5827,7 +5833,7 @@ PrefabInstance: - target: {fileID: 2200932180627228171, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} propertyPath: _conversation - value: + value: objectReference: {fileID: 1022070888} - target: {fileID: 2736293608084336562, guid: 8f75fded23ad17f4d91ba1386877096e, type: 3} @@ -5931,8 +5937,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &2044325053 Transform: m_ObjectHideFlags: 0 @@ -5975,8 +5981,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &2077034585 Transform: m_ObjectHideFlags: 0 @@ -6014,12 +6020,12 @@ PrefabInstance: - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[0] - value: + value: objectReference: {fileID: 395874185} - target: {fileID: 5930890307880553635, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} propertyPath: _renderers.Array.data[1] - value: + value: objectReference: {fileID: 1919898408} - target: {fileID: 6178060888846861477, guid: 95a6b0b2e6ea13d46bcfba9f194cc598, type: 3} @@ -6108,8 +6114,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &2146358652 Transform: m_ObjectHideFlags: 0 @@ -6234,8 +6240,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f5586ceac2654ed88573dd8f8fb2861d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: Gizmo: {fileID: 1202019229} Event: EventReference: @@ -6266,8 +6272,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8084cf3afdd848d38f2d36d54e7dd26c, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: _material: {fileID: 2100000, guid: 599736ef716593e4e9599f8a109b899f, type: 2} _interactable: {fileID: 4398866771222208306} _renderers: @@ -6297,8 +6303,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7494188603436346535 PrefabInstance: m_ObjectHideFlags: 0 @@ -6377,8 +6383,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6f00f770dbcd4c59bdda8afe07b12938, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: --- !u!4 &8490207265622029128 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu/Office.unity b/Assets/Scenes/Menu/Office.unity index c071ba2..0e7947e 100644 --- a/Assets/Scenes/Menu/Office.unity +++ b/Assets/Scenes/Menu/Office.unity @@ -5414,6 +5414,7 @@ GameObject: - component: {fileID: 966745389} - component: {fileID: 966745390} - component: {fileID: 966745391} + - component: {fileID: 966745392} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -5539,6 +5540,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Camera: {fileID: 254826031} +--- !u!114 &966745392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966745383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcfe8f8598994da18e22c540a13fe61d, type: 3} + m_Name: + m_EditorClassIdentifier: + _ambianceType: {fileID: 11400000, guid: f698fd90971c7fa499aeb8d3c59ca08e, type: 2} --- !u!1 &1025657597 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: d4b4ea87132d72c4d9c06edb3f1e1be8,