diff --git a/Assets/Assets/Sounds/AudioMixer.mixer b/Assets/Assets/Sounds/AudioMixer.mixer deleted file mode 100644 index e34d1d7..0000000 --- a/Assets/Assets/Sounds/AudioMixer.mixer +++ /dev/null @@ -1,68 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!241 &24100000 -AudioMixerController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AudioMixer - 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: - - 15d65003fd749a84b908734b8907110e - 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: 15d65003fd749a84b908734b8907110e - m_Children: [] - m_Volume: 2b55ba9891e9ab044bc04c994f23daad - m_Pitch: f0604e2bd9386d64482be113dac4fcaf - 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: 6d67b0877fb516a45bf5571dfce9f92b - m_EffectName: Attenuation - m_MixLevel: 1691e51e100aae4419247778c5adf5e0 - 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: 1f128e92624225e499cf5960f32afa14 - m_FloatValues: {} - m_TransitionOverrides: {} diff --git a/Assets/Assets/Sounds/Main.mixer b/Assets/Assets/Sounds/Main.mixer new file mode 100644 index 0000000..372adc1 --- /dev/null +++ b/Assets/Assets/Sounds/Main.mixer @@ -0,0 +1,147 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!243 &-8278190956376925970 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Music + m_AudioMixer: {fileID: 24100000} + m_GroupID: bb6595b6ed279ee4d9d32d814a5de07d + m_Children: [] + m_Volume: a6c678bb6e7ed8c4a9e8ed2de1b57121 + m_Pitch: 75d6991556b34e344a343d76210738b1 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 8179030316469016573} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!243 &-7755842500057852920 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sfx + m_AudioMixer: {fileID: 24100000} + m_GroupID: c35f361e0924baa42b9bc02d6dd2a18d + m_Children: [] + m_Volume: 31bc5c8920a5e084bb8ac13ce5116a50 + m_Pitch: c39d8e0beab9ae64c8ee9a4461f50ae9 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -7227639147278616804} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &-7227639147278616804 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 7cb225636800245498242022b6304aab + m_EffectName: Attenuation + m_MixLevel: 44713661e2bc63c4c8925ecc5cb97d2e + 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: Main + 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: + - guid: c27725ff676d7f24dbd1f3c226a595c9 + name: Master + - guid: a6c678bb6e7ed8c4a9e8ed2de1b57121 + name: Music + - guid: 31bc5c8920a5e084bb8ac13ce5116a50 + name: Sfx + m_AudioMixerGroupViews: + - guids: + - d297857404e191f458a5e8c271c53a13 + - bb6595b6ed279ee4d9d32d814a5de07d + - c35f361e0924baa42b9bc02d6dd2a18d + 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: d297857404e191f458a5e8c271c53a13 + m_Children: + - {fileID: -8278190956376925970} + - {fileID: -7755842500057852920} + m_Volume: c27725ff676d7f24dbd1f3c226a595c9 + m_Pitch: 40b76980f0abe8f4da7d859596d64181 + 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: e376c615d038fc74492eef278995aa9e + m_EffectName: Attenuation + m_MixLevel: 33f84a3c9d2de6a4093ad1fbba4f638f + 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: 3a37b8bb5e255d248acceb2000138ffd + m_FloatValues: + 31bc5c8920a5e084bb8ac13ce5116a50: 0 + a6c678bb6e7ed8c4a9e8ed2de1b57121: 0 + c27725ff676d7f24dbd1f3c226a595c9: 0 + m_TransitionOverrides: {} +--- !u!244 &8179030316469016573 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: b8aa68d2ca5a93849beea6e92af8d466 + m_EffectName: Attenuation + m_MixLevel: c319a6d2cc8a5d447929c64ddd4c8e85 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 diff --git a/Assets/Assets/Sounds/AudioMixer.mixer.meta b/Assets/Assets/Sounds/Main.mixer.meta similarity index 79% rename from Assets/Assets/Sounds/AudioMixer.mixer.meta rename to Assets/Assets/Sounds/Main.mixer.meta index ea4dbc7..cfc149d 100644 --- a/Assets/Assets/Sounds/AudioMixer.mixer.meta +++ b/Assets/Assets/Sounds/Main.mixer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 51c64cacaf839554a9fe53aa54ff048f +guid: 833dc20f7f9e5b244a756827a43d874d NativeFormatImporter: externalObjects: {} mainObjectFileID: 24100000 diff --git a/Assets/Scenes/Jatek.unity b/Assets/Scenes/Jatek.unity index 2a1bbc5..cc8ec14 100644 --- a/Assets/Scenes/Jatek.unity +++ b/Assets/Scenes/Jatek.unity @@ -8697,7 +8697,7 @@ AudioSource: m_GameObject: {fileID: 519420028} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 24300002, guid: 51c64cacaf839554a9fe53aa54ff048f, type: 2} + OutputAudioMixerGroup: {fileID: -8278190956376925970, guid: 833dc20f7f9e5b244a756827a43d874d, type: 2} m_audioClip: {fileID: 8300000, guid: 0b3a32694c5ed5f4fad733a3945a4249, type: 3} m_PlayOnAwake: 1 m_Volume: 1 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 0270d04..202a0c7 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -780,82 +780,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137976613} m_CullTransparentMesh: 1 ---- !u!1 &224971595 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 224971596} - - component: {fileID: 224971598} - - component: {fileID: 224971597} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &224971596 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224971595} - 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: 1324811439} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &224971597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224971595} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &224971598 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 224971595} - m_CullTransparentMesh: 1 --- !u!1 &265052142 GameObject: m_ObjectHideFlags: 0 @@ -890,7 +814,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1138,7 +1062,6 @@ RectTransform: - {fileID: 415922101} - {fileID: 267579258} - {fileID: 1834896933} - - {fileID: 1834452397} m_Father: {fileID: 500113176} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1800,82 +1723,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 500113175} m_CullTransparentMesh: 1 ---- !u!1 &543496617 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 543496618} - - component: {fileID: 543496620} - - component: {fileID: 543496619} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &543496618 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 543496617} - 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: 723630300} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &543496619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 543496617} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &543496620 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 543496617} - m_CullTransparentMesh: 1 --- !u!1 &613901734 GameObject: m_ObjectHideFlags: 0 @@ -1910,7 +1757,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2453,43 +2300,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 707380878} m_CullTransparentMesh: 1 ---- !u!1 &723630299 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 723630300} - m_Layer: 5 - m_Name: Handle Slide Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &723630300 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 723630299} - 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: - - {fileID: 543496618} - m_Father: {fileID: 1834452397} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &756044080 GameObject: m_ObjectHideFlags: 0 @@ -3287,82 +3097,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1077206447} m_CullTransparentMesh: 1 ---- !u!1 &1091704717 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1091704718} - - component: {fileID: 1091704720} - - component: {fileID: 1091704719} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &1091704718 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091704717} - 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: 1834452397} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1091704719 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091704717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.84313726} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1091704720 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091704717} - m_CullTransparentMesh: 1 --- !u!1 &1092561535 GameObject: m_ObjectHideFlags: 0 @@ -3667,7 +3401,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -4100,7 +3834,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1274410648 RectTransform: m_ObjectHideFlags: 0 @@ -4280,43 +4014,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1306183014} m_CullTransparentMesh: 1 ---- !u!1 &1324811438 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1324811439} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &1324811439 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1324811438} - 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: - - {fileID: 224971596} - m_Father: {fileID: 1834452397} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5.000046, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1386328416 GameObject: m_ObjectHideFlags: 0 @@ -4346,7 +4043,7 @@ AudioListener: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1386328416} - m_Enabled: 0 + m_Enabled: 1 --- !u!20 &1386328418 Camera: m_ObjectHideFlags: 0 @@ -4451,6 +4148,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: resolutionDropdown: {fileID: 415922102} + mixer: {fileID: 24100000, guid: 833dc20f7f9e5b244a756827a43d874d, type: 2} --- !u!114 &1386328424 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5077,7 +4775,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1386328423} m_TargetAssemblyTypeName: OptionMenu, Assembly-CSharp m_MethodName: SetSfxVolume m_Mode: 0 @@ -5241,141 +4939,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1742719428} m_CullTransparentMesh: 1 ---- !u!1 &1798077009 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1798077010} - - component: {fileID: 1798077012} - - component: {fileID: 1798077011} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &1798077010 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1798077009} - 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: 1834452397} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -842.99994, y: 2} - m_SizeDelta: {x: -343.1281, y: 17.340027} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1798077011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1798077009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Max Fps - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - topRight: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - bottomLeft: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - bottomRight: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1} - m_fontColorGradientPreset: {fileID: 11400000, guid: 3993022102250764cb128dc715602c65, type: 2} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 60 - m_fontSizeBase: 48 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 20 - m_fontSizeMax: 60 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -164.56479, y: 16.456486, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1798077012 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1798077009} - m_CullTransparentMesh: 1 --- !u!1 &1804663944 GameObject: m_ObjectHideFlags: 0 @@ -5542,110 +5105,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1831593193} m_CullTransparentMesh: 1 ---- !u!1 &1834452396 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1834452397} - - component: {fileID: 1834452398} - m_Layer: 5 - m_Name: MaxFpsLimiter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!224 &1834452397 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1834452396} - 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: - - {fileID: 1798077010} - - {fileID: 1091704718} - - {fileID: 1324811439} - - {fileID: 723630300} - m_Father: {fileID: 345853270} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 413, y: -311} - m_SizeDelta: {x: 491.9, y: 109.423} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1834452398 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1834452396} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 224971596} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: -80 - m_MaxValue: 0 - m_WholeNumbers: 0 - m_Value: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: OptionMenu, Assembly-CSharp - m_MethodName: SetMainVolume - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!1 &1834896932 GameObject: m_ObjectHideFlags: 0 @@ -6088,7 +5547,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1386328423} m_TargetAssemblyTypeName: OptionMenu, Assembly-CSharp m_MethodName: SetMusicVolume m_Mode: 0 @@ -6192,7 +5651,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1386328423} m_TargetAssemblyTypeName: OptionMenu, Assembly-CSharp m_MethodName: SetMainVolume m_Mode: 0 diff --git a/Assets/Scripts/menu/OptionMenu.cs b/Assets/Scripts/menu/OptionMenu.cs index 6b02729..110b97d 100644 --- a/Assets/Scripts/menu/OptionMenu.cs +++ b/Assets/Scripts/menu/OptionMenu.cs @@ -38,17 +38,17 @@ public class OptionMenu : MonoBehaviour } //Audio - //public AudioMixer mixer; + public AudioMixer mixer; - /*public void SetMainVolume(float mainVolume) { - mixer.SetFloat("mainVolume", mainVolume); + public void SetMainVolume(float mainVolume) { + mixer.SetFloat("Master", mainVolume); } public void SetMusicVolume(float musicVolume) { - mixer.SetFloat("musicVolume", musicVolume); + mixer.SetFloat("Music", musicVolume); } public void SetSfxVolume(float sfxVolume) { - mixer.SetFloat("sfxVolume", sfxVolume); - }*/ + mixer.SetFloat("Sfx", sfxVolume); + } //Quality public void setQuality(int qualityIndex) { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 24130c3..99c2241 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-1: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 57500d5456505f0b5d085f2714255944104f1d797d717e3278711f61b3e6626d flags: 0 UnityRemoteCompression: value: 337f73 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index b81e862..01fd81a 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,17 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 14} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1366 - height: 635 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 108 + controlID: 515 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 231 - y: 73 - width: 807 - height: 358 + x: 319 + y: 19 + width: 1107 + height: 544 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 807, y: 337} + m_TargetSize: {x: 1107, y: 523} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -403.5 - m_HBaseRangeMax: 403.5 - m_VBaseRangeMin: -168.5 - m_VBaseRangeMax: 168.5 + m_HBaseRangeMin: -553.5 + m_HBaseRangeMax: 553.5 + m_VBaseRangeMin: -261.5 + m_VBaseRangeMax: 261.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 807 - height: 337 + width: 1107 + height: 523 m_Scale: {x: 1, y: 1} - m_Translation: {x: 403.5, y: 168.5} + m_Translation: {x: 553.5, y: 261.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -403.5 - y: -168.5 - width: 807 - height: 337 + x: -553.5 + y: -261.5 + width: 1107 + height: 523 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 807, y: 358} + m_LastWindowPixelSize: {x: 1107, y: 544} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1040 - height: 635 + width: 1427 + height: 947 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 109 + controlID: 516 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1040 - height: 379 + width: 1427 + height: 565 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 37 + controlID: 444 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,8 +184,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 231 - height: 379 + width: 318 + height: 565 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 230 - height: 358 + width: 317 + height: 544 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,7 +226,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 1afbffff + m_ExpandedIDs: 56f7ffff1cfbffffa4770000de780000167900002e79000050790000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 231 + x: 318 y: 0 - width: 809 - height: 379 + width: 1109 + height: 565 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 231 + x: 318 y: 73 - width: 807 - height: 358 + width: 1107 + height: 544 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -557,9 +557,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.5111804, y: -0.88972795, z: 0.084217325} + m_Target: {x: 537.12775, y: 224.99623, z: -0.40955842} speed: 2 - m_Value: {x: -4.5111804, y: -0.88972795, z: 0.084217325} + m_Value: {x: 537.12775, y: 224.99623, z: -0.40955842} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -610,9 +610,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 13.015009 + m_Target: 255.19865 speed: 2 - m_Value: 13.015009 + m_Value: 255.19865 m_Ortho: m_Target: 1 speed: 2 @@ -651,17 +651,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 10} - - {fileID: 12} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 - y: 379 - width: 1040 - height: 256 + y: 565 + width: 1427 + height: 382 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 110 + controlID: 517 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -672,21 +672,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: AudioMixerWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 549 - height: 256 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_ActualView: {fileID: 11} + width: 752 + height: 382 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 11} - m_Selected: 0 + - {fileID: 12} + m_Selected: 1 m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: @@ -709,9 +710,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 452 - width: 548 - height: 235 + y: 638 + width: 751 + height: 361 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -737,14 +738,14 @@ MonoBehaviour: m_LastFolders: - Assets m_LastFoldersGridSize: 55 - m_LastProjectPath: C:\dev\find the source + m_LastProjectPath: C:\dev\find the source\projekt\FindTheSource m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 42770000 - m_LastClickedID: 30530 - m_ExpandedIDs: 000000004277000000ca9a3bffffff7f + m_SelectedIDs: 56770000 + m_LastClickedID: 30550 + m_ExpandedIDs: 0000000056770000587700005a770000767700007a770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -772,7 +773,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000042770000 + m_ExpandedIDs: 0000000056770000587700005a770000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -797,9 +798,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: eae8ffff + m_LastClickedInstanceID: -5910 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -829,6 +830,182 @@ MonoBehaviour: m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 164 --- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12373, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Audio Mixer + m_Image: {fileID: 2344599766593239149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 638 + width: 751 + height: 361 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_MixersTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 34ecffff + m_LastClickedID: -5068 + m_ExpandedIDs: 12eb343c + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_LayoutStripsOnTop: + m_VerticalSplitter: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: + - 65 + - 35 + relativeSizes: + - 0.65 + - 0.35000002 + minSizes: + - 85 + - 105 + maxSizes: + - 0 + - 0 + lastTotalSize: 0 + splitSize: 6 + xOffset: 0 + m_Version: 1 + oldRealSizes: + oldMinSizes: + oldMaxSizes: + oldSplitSize: 0 + m_HorizontalSplitter: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: + - 60 + - 60 + - 60 + - 60 + relativeSizes: + - 0.25 + - 0.25 + - 0.25 + - 0.25 + minSizes: + - 85 + - 85 + - 85 + - 85 + maxSizes: + - 0 + - 0 + - 0 + - 0 + lastTotalSize: 0 + splitSize: 6 + xOffset: 0 + m_Version: 1 + oldRealSizes: + oldMinSizes: + oldMaxSizes: + oldSplitSize: 0 + m_LayoutStripsOnRight: + m_VerticalSplitter: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: + - 60 + - 60 + - 60 + - 60 + relativeSizes: + - 0.25 + - 0.25 + - 0.25 + - 0.25 + minSizes: + - 100 + - 85 + - 85 + - 85 + maxSizes: + - 0 + - 0 + - 0 + - 0 + lastTotalSize: 0 + splitSize: 6 + xOffset: 0 + m_Version: 1 + oldRealSizes: + oldMinSizes: + oldMaxSizes: + oldSplitSize: 0 + m_HorizontalSplitter: + ID: 1253 + splitterInitialOffset: 299 + currentActiveSplitter: -1 + realSizes: + - 302 + - 449 + relativeSizes: + - 0.40213048 + - 0.5978695 + minSizes: + - 160 + - 160 + maxSizes: + - 0 + - 0 + lastTotalSize: 751 + splitSize: 6 + xOffset: 0 + m_Version: 1 + oldRealSizes: + oldMinSizes: + oldMaxSizes: + oldSplitSize: 0 + m_SectionOrder: 00000000030000000100000002000000 + m_LayoutMode: 1 + m_SortGroupsAlphabetically: 0 + m_ShowReferencedBuses: 1 + m_ShowBusConnections: 0 + m_ShowBusConnectionsOfSelection: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -843,18 +1020,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 549 + x: 752 y: 0 - width: 491 - height: 256 + width: 675 + height: 382 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -874,15 +1051,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 549 - y: 452 - width: 489 - height: 235 + x: 752 + y: 638 + width: 673 + height: 361 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -897,18 +1074,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1040 + x: 1427 y: 0 - width: 326 - height: 635 + width: 493 + height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -928,10 +1105,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1040 + x: 1427 y: 73 - width: 325 - height: 614 + width: 492 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -942,8 +1119,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 31110 + m_LastVerticalScrollValue: 151 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: