From 2df0f39f4c54ca83a2117563a425453e36a4769d Mon Sep 17 00:00:00 2001 From: spatialfree Date: Sun, 13 Dec 2020 20:08:30 -0800 Subject: [PATCH] broken but working~ --- Assets/Data.dat | Bin 0 -> 20721 bytes Assets/Data.dat.meta | 7 + Assets/Remember.asset | 2 +- Assets/Scenes/Main.unity | 7229 +------------------------- Assets/Scripts/Logic/World/World.cs | 3 + Assets/Scripts/Main.cs | 3 +- Assets/Scripts/Metro.cs | 7 +- Assets/Scripts/Monolith.cs | 7 + Assets/Scripts/Render/Sound/Music.cs | 62 +- 9 files changed, 72 insertions(+), 7248 deletions(-) create mode 100644 Assets/Data.dat create mode 100644 Assets/Data.dat.meta diff --git a/Assets/Data.dat b/Assets/Data.dat new file mode 100644 index 0000000000000000000000000000000000000000..2c66087cb27b4b5ddbcce236bf125293c0303e64 GIT binary patch literal 20721 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 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3821b3a54195a0844aaeb18b65cd5e63, type: 2} - m_sharedMaterial: {fileID: 21898195224422272, guid: 3821b3a54195a0844aaeb18b65cd5e63, - 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: 0 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 20 - m_fontSizeBase: 20 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 4098 - m_isAlignmentEnumConverted: 1 - m_characterSpacing: 5 - m_wordSpacing: 5 - m_lineSpacing: 80 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 1991466027} - characterCount: 3 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_havePropertiesChanged: 0 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 - m_inputSource: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 1991466030} - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_maskType: 0 ---- !u!222 &1991466028 -CanvasRenderer: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991466026} - m_CullTransparentMesh: 0 ---- !u!33 &1991466029 -MeshFilter: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991466026} - m_Mesh: {fileID: 0} ---- !u!23 &1991466030 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991466026} - m_Enabled: 0 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 21898195224422272, guid: 3821b3a54195a0844aaeb18b65cd5e63, 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!224 &1991466031 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1991466026} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 4.51} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1510915030} - m_RootOrder: 2 - 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: 0, y: 7} - m_SizeDelta: {x: 10, y: 5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2065174151 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2065174152} - - component: {fileID: 2065174156} - - component: {fileID: 2065174155} - - component: {fileID: 2065174154} - - component: {fileID: 2065174153} - m_Layer: 9 - m_Name: Text Priority - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2065174152 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065174151} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0.001} - m_LocalScale: {x: 1.2, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 965477373} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.04, y: 4.08} - m_SizeDelta: {x: 20, y: 5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2065174153 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065174151} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -806885394, guid: 89f0137620f6af44b9ba852b4190e64e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3821b3a54195a0844aaeb18b65cd5e63, type: 2} - m_sharedMaterial: {fileID: 21898195224422272, guid: 3821b3a54195a0844aaeb18b65cd5e63, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281215526 - m_fontColor: {r: 0.14901961, g: 0.16470589, b: 0.18039216, a: 1} - m_enableVertexGradient: 0 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 11.7 - m_fontSizeBase: 11.7 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_textAlignment: 4098 - m_isAlignmentEnumConverted: 1 - 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_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 0 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 2065174153} - characterCount: 0 - spriteCount: 0 - spaceCount: 0 - wordCount: 0 - linkCount: 0 - lineCount: 0 - pageCount: 0 - materialCount: 1 - m_havePropertiesChanged: 0 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_isInputParsingRequired: 0 - m_inputSource: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2065174156} - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_maskType: 0 ---- !u!222 &2065174154 -CanvasRenderer: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065174151} - m_CullTransparentMesh: 0 ---- !u!33 &2065174155 -MeshFilter: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065174151} - m_Mesh: {fileID: 0} ---- !u!23 &2065174156 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2065174151} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 21898195224422272, guid: 3821b3a54195a0844aaeb18b65cd5e63, 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!1 &2081994156 GameObject: m_ObjectHideFlags: 0 @@ -12036,7 +4879,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &2081994160 AudioSource: @@ -12134,39 +4977,3 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &2101684219 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2101684220} - m_Layer: 9 - m_Name: Menu Config - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2101684220 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2101684219} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1462420884} - - {fileID: 1603319127} - - {fileID: 462344509} - - {fileID: 315596728} - - {fileID: 766831860} - - {fileID: 706504449} - m_Father: {fileID: 1510915030} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/Logic/World/World.cs b/Assets/Scripts/Logic/World/World.cs index 52d3859..b5b5e0f 100644 --- a/Assets/Scripts/Logic/World/World.cs +++ b/Assets/Scripts/Logic/World/World.cs @@ -8,6 +8,9 @@ public class World public Logic logic; public Rig rig; + // public Bounds/Box + // public Snakes? + // public Music? public void Set(InspectorSetter setter) { diff --git a/Assets/Scripts/Main.cs b/Assets/Scripts/Main.cs index d33ac55..f388ec5 100644 --- a/Assets/Scripts/Main.cs +++ b/Assets/Scripts/Main.cs @@ -9,6 +9,8 @@ using TMPro; public class Main : MonoBehaviour { + // No need for these events + // given the new architecture of the project public delegate void GameStart(Main main); public static event GameStart OnGameStart; @@ -26,7 +28,6 @@ public class Main : MonoBehaviour public Rig rig; public AI ai = new AI(); public Game game = new Game(); - public BoxUI boxUI; public LineRenderer tongueLine; public GraphXData graphXData; diff --git a/Assets/Scripts/Metro.cs b/Assets/Scripts/Metro.cs index 2b936c6..ddbb61a 100644 --- a/Assets/Scripts/Metro.cs +++ b/Assets/Scripts/Metro.cs @@ -7,8 +7,7 @@ using System.Collections; [RequireComponent(typeof(AudioSource))] public class Metro : MonoBehaviour { - [Header("References")] - public Main main; + public Monolith mono; public bool tick; @@ -32,7 +31,7 @@ public class Metro : MonoBehaviour { if (beat) { - main.Beat(); + mono.Beat(); beat = false; } } @@ -44,7 +43,7 @@ public class Metro : MonoBehaviour gain = tick ? 0.25f : 0f; - double samplesPerTick = sampleRate * 60.0F / (double)main.BPM() * 4.0F / signatureLo; + double samplesPerTick = sampleRate * 60.0F / (double)mono.BPM * 4.0F / signatureLo; double sample = AudioSettings.dspTime * sampleRate; int dataLen = data.Length / channels; int n = 0; diff --git a/Assets/Scripts/Monolith.cs b/Assets/Scripts/Monolith.cs index 8287eaf..73a22d1 100644 --- a/Assets/Scripts/Monolith.cs +++ b/Assets/Scripts/Monolith.cs @@ -6,6 +6,8 @@ public class Monolith : MonoBehaviour public Logic logic; public Render render; + public int BPM = 80; + [Header("Design")] public float test; @@ -41,4 +43,9 @@ public class Monolith : MonoBehaviour logic.Update(); render.Update(); } + + public void Beat() + { + + } } diff --git a/Assets/Scripts/Render/Sound/Music.cs b/Assets/Scripts/Render/Sound/Music.cs index 7b1c772..1db6a2e 100644 --- a/Assets/Scripts/Render/Sound/Music.cs +++ b/Assets/Scripts/Render/Sound/Music.cs @@ -22,40 +22,40 @@ public class Music public void Fade(Main main) { - if (main.boxUI.active) - { - musicVolumeDelta = -1; - main.musicSource.Pause(); - main.musicSource.volume = 0; - } - else if (main.playing && !main.musicSource.isPlaying) - { - musicVolumeDelta = 1; - main.musicSource.Play(); - } + // if (main.boxUI.active) + // { + // musicVolumeDelta = -1; + // main.musicSource.Pause(); + // main.musicSource.volume = 0; + // } + // else if (main.playing && !main.musicSource.isPlaying) + // { + // musicVolumeDelta = 1; + // main.musicSource.Play(); + // } - if (main.boxUI.menuMain.activeInHierarchy || main.boxUI.menuConfig.activeInHierarchy) - { - loopVolumeDelta = 3; - } - else - { - loopVolumeDelta = -3; - } + // if (main.boxUI.menuMain.activeInHierarchy || main.boxUI.menuConfig.activeInHierarchy) + // { + // loopVolumeDelta = 3; + // } + // else + // { + // loopVolumeDelta = -3; + // } - loopVolume = Mathf.Clamp01(loopVolume + Time.deltaTime / loopVolumeDelta); - musicVolume = Mathf.Clamp01(musicVolume + Time.deltaTime / musicVolumeDelta); + // loopVolume = Mathf.Clamp01(loopVolume + Time.deltaTime / loopVolumeDelta); + // musicVolume = Mathf.Clamp01(musicVolume + Time.deltaTime / musicVolumeDelta); - main.loopSource.volume = loopVolume * data.musicVolume; - main.musicSource.volume = musicVolume * data.musicVolume; + // main.loopSource.volume = loopVolume * data.musicVolume; + // main.musicSource.volume = musicVolume * data.musicVolume; - if (main.fastQueue > 0) - { - main.loopSource.pitch = main.musicSource.pitch = 2; - } - else - { - main.loopSource.pitch = main.musicSource.pitch = 1; - } + // if (main.fastQueue > 0) + // { + // main.loopSource.pitch = main.musicSource.pitch = 2; + // } + // else + // { + // main.loopSource.pitch = main.musicSource.pitch = 1; + // } } } \ No newline at end of file