diff --git a/Assets/Scenes/MDNA_DreamLiquid.unity b/Assets/Scenes/MDNA_DreamLiquid.unity index d39a4ac..6312e77 100644 --- a/Assets/Scenes/MDNA_DreamLiquid.unity +++ b/Assets/Scenes/MDNA_DreamLiquid.unity @@ -901,6 +901,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} + - target: {fileID: 4584006364056922639, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: SpectrumSize + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4584006364056922639, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: ScalingStrategy + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_Pivot.x value: 0 @@ -991,10 +999,21 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7200639167805561534, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} +--- !u!114 &657072715 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4584006364056922639, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + m_PrefabInstance: {fileID: 657072714} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66a6b9c6a6e18884ebeb1bf742e3be4d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &667181310 GameObject: m_ObjectHideFlags: 0 @@ -2279,7 +2298,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 957c1af5e7f10154487ed1389b1086e2, type: 3} m_Name: m_EditorClassIdentifier: - source: {fileID: 523739711} + source: {fileID: 657072715} material: {fileID: 2100000, guid: 56365338cdea2264fbef22a0d5d14a68, type: 2} Transformers: [] Preview: diff --git a/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat b/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat index 3ac02e2..775fe3c 100644 --- a/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat +++ b/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat @@ -235,7 +235,7 @@ Material: - _UVEmissive: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 - - _Wildness: 7.4285717 + - _Wildness: 6.3 - _Wow: 4 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 @@ -243,7 +243,7 @@ Material: - _ZWrite: 1 - _Zing: 0 - _Zip: 0.5 - - _Zoom: -0.005714178 + - _Zoom: -0.66285706 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Scenes/MDNA_GeneDrive.unity b/Assets/Scenes/MDNA_GeneDrive.unity index 2661ccd..ec5d5fb 100644 --- a/Assets/Scenes/MDNA_GeneDrive.unity +++ b/Assets/Scenes/MDNA_GeneDrive.unity @@ -225,7 +225,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &279714467 GameObject: @@ -353,7 +353,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &378214596 GameObject: @@ -537,63 +537,13 @@ RectTransform: - {fileID: 773926870} - {fileID: 2099950028} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 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: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &523739710 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 523739712} - - component: {fileID: 523739711} - m_Layer: 0 - m_Name: WasapiLoopback - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!114 &523739711 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 523739710} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120ca4c4f9442e14db8c72acac5da136, type: 3} - m_Name: - m_EditorClassIdentifier: - CaptureType: 0 - SpectrumSize: 4 - ScalingStrategy: 0 - MinFrequency: 80 - MaxFrequency: 20000 - Filters: [] ---- !u!4 &523739712 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 523739710} - 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: 667181311} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &650114445 GameObject: m_ObjectHideFlags: 0 @@ -730,6 +680,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} + - target: {fileID: 4584006364056922639, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: SpectrumSize + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4584006364056922639, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: ScalingStrategy + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_Pivot.x value: 0 @@ -740,7 +698,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_AnchorMax.x @@ -828,7 +786,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7200639167805561534, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7817393215567595311, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_Texture @@ -836,39 +794,17 @@ PrefabInstance: objectReference: {fileID: 2800000, guid: bcf19558d625cc1459278eea869f67c1, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} ---- !u!1 &667181310 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!114 &657072715 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4584006364056922639, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + m_PrefabInstance: {fileID: 657072714} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 667181311} - m_Layer: 0 - m_Name: ----- Audio ------ - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &667181311 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 667181310} - 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: 523739712} - - {fileID: 820074938} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66a6b9c6a6e18884ebeb1bf742e3be4d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &773926869 GameObject: m_ObjectHideFlags: 0 @@ -973,56 +909,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &820074937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 820074938} - - component: {fileID: 820074939} - m_Layer: 0 - m_Name: Microphone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &820074938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 820074937} - 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: 667181311} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &820074939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 820074937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120ca4c4f9442e14db8c72acac5da136, type: 3} - m_Name: - m_EditorClassIdentifier: - CaptureType: 1 - SpectrumSize: 128 - ScalingStrategy: 2 - MinFrequency: 80 - MaxFrequency: 20000 - Filters: [] --- !u!1 &903644251 GameObject: m_ObjectHideFlags: 0 @@ -1230,7 +1116,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1175658973 GameObject: @@ -1744,7 +1630,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1935674048 GameObject: @@ -1853,7 +1739,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2035115417 MonoBehaviour: @@ -1867,7 +1753,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 957c1af5e7f10154487ed1389b1086e2, type: 3} m_Name: m_EditorClassIdentifier: - source: {fileID: 523739711} + source: {fileID: 657072715} material: {fileID: 2100000, guid: 87966b5ef0f98a1449384bd255e71cd9, type: 2} Transformers: [] Preview: diff --git a/Assets/Util/SpectrumShaderBinder.cs b/Assets/Util/SpectrumShaderBinder.cs index be8e49e..f8b31b9 100644 --- a/Assets/Util/SpectrumShaderBinder.cs +++ b/Assets/Util/SpectrumShaderBinder.cs @@ -9,7 +9,7 @@ using Assets.WasapiAudio.Scripts.Unity; [RequireComponent(typeof(Material))] public class SpectrumShaderBinder : MonoBehaviour { - public WasapiAudioSource source; + public AudioSource source; public Material material; private Texture2D _texture; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 0d8e41d..db6f1dc 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5a04555f540c5f0a59575b7343705a44414e407f7a7174697e7d4d31e1b9326a - flags: 0 - RecentlyUsedSceneGuid-1: - value: 5a53035654070d0e095a5c7a11225a44404f4c78742c22357b2f1c31bae6626b - flags: 0 - RecentlyUsedSceneGuid-2: value: 5702040754575f0f595c5d7747270a44174e4f2b2d7a7735287f4e61b2e5326f flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-1: value: 50500c0301500c58590b557749720f4447161b7e2d2e22332f2b1c6ab5b0323d flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-2: value: 0652075151075003595f5f7746270a44434e4879782922602c701f37b7b56460 flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-3: value: 0105075f0405580b0c085d2648715c4413164b7b7c7e713229784862bbe66c6b flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-4: value: 5500520454045f0a0e0c5e214171094444164c2b787b7f69752f1931bbb63669 flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-5: value: 0703040550545c0d5e560f7b48220c44124f197b2e7920367c7e4b62bbb83061 flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-6: value: 5208575e55065e0c5e580d2747215b441315492b292e76647c7e1861e6e6376b flags: 0 - RecentlyUsedSceneGuid-9: + RecentlyUsedSceneGuid-7: value: 56535607550c5f5a5a5a097445755b44154f1e29787027357c7c4532e1b46668 flags: 0 + RecentlyUsedSceneGuid-8: + value: 550407570457580d5a0f0a7a13755c4417154b2b7a707369757f4a67b7e56368 + flags: 0 + RecentlyUsedSceneGuid-9: + value: 020405530005580d5e5b552616755b444e164e722e2d71607f794935b2b8353e + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c723e3b3b270b3e3a2729633c133af6f9 flags: 0