From bc2adce5b6cf0b644c4abe85057cf030e6445088 Mon Sep 17 00:00:00 2001 From: stelledge <1030110910@qq.com> Date: Wed, 24 Mar 2021 14:47:25 +0800 Subject: [PATCH] v0.1.3 Android support! --- Assembly-CSharp-Editor.csproj | 729 ++++++++++++++ Assembly-CSharp.csproj | 19 +- ...ifest.xml => AndroidManifest.xml.DISABLED} | 0 Assets/Scenes/gameplay.unity | 895 ++++++++++-------- Assets/SongListScrollbar.cs | 17 + Assets/scripts/AudioPlayer.cs | 26 + Assets/scripts/AudioSpectrum.cs | 146 +++ Assets/scripts/MusicData.cs | 37 +- Assets/scripts/MusicPlayer.cs | 30 +- Assets/scripts/MusicWheelItem.cs | 44 +- Assets/scripts/NReplayGain/AlbumGain.cs | 47 + Assets/scripts/NReplayGain/CPtr.cs | 51 + Assets/scripts/NReplayGain/Extensions.cs | 33 + Assets/scripts/NReplayGain/FrequencyInfo.cs | 23 + Assets/scripts/NReplayGain/GainData.cs | 16 + Assets/scripts/NReplayGain/ReplayGain.cs | 157 +++ Assets/scripts/NReplayGain/TrackGain.cs | 333 +++++++ Assets/scripts/RandomNext.cs | 7 +- Assets/scripts/Spectrum.cs | 4 - ProjectSettings/GraphicsSettings.asset | 1 - ProjectSettings/ProjectSettings.asset | 7 +- ProjectSettings/TagManager.asset | 2 +- 22 files changed, 2156 insertions(+), 468 deletions(-) create mode 100644 Assembly-CSharp-Editor.csproj rename Assets/Plugins/Android/{AndroidManifest.xml => AndroidManifest.xml.DISABLED} (100%) create mode 100644 Assets/scripts/AudioPlayer.cs create mode 100644 Assets/scripts/AudioSpectrum.cs create mode 100644 Assets/scripts/NReplayGain/AlbumGain.cs create mode 100644 Assets/scripts/NReplayGain/CPtr.cs create mode 100644 Assets/scripts/NReplayGain/Extensions.cs create mode 100644 Assets/scripts/NReplayGain/FrequencyInfo.cs create mode 100644 Assets/scripts/NReplayGain/GainData.cs create mode 100644 Assets/scripts/NReplayGain/ReplayGain.cs create mode 100644 Assets/scripts/NReplayGain/TrackGain.cs diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj new file mode 100644 index 0000000..45056d8 --- /dev/null +++ b/Assembly-CSharp-Editor.csproj @@ -0,0 +1,729 @@ + + + + latest + + + Debug + AnyCPU + 10.0.20506 + 2.0 + + {024164CD-4768-1F55-C24C-D312176A2662} + Library + Properties + Assembly-CSharp-Editor + v4.7.1 + 512 + . + + + true + full + false + Temp\bin\Debug\ + DEBUG;TRACE;UNITY_2019_4_20;UNITY_2019_4;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER + prompt + 4 + 0169 + False + + + pdbonly + true + Temp\bin\Release\ + prompt + 4 + 0169 + False + + + true + true + false + false + false + + + {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Unity/VSTU + 4.9.1.0 + Editor:5 + Android:13 + 2019.4.20f1c1 + + + + + + + C:\Program Files\Unity\Hub\Editor\2019.4.20f1c1\Editor\Data\Managed/UnityEngine/UnityEngine.dll + + + C:\Program Files\Unity\Hub\Editor\2019.4.20f1c1\Editor\Data\Managed/UnityEditor.dll + + + + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEditor.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEditor.Graphs.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + + + C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll + + + D:/Unitykit/Nijigen Music Master/Assets/Plugins/NAudio.dll + + + D:/Unitykit/Nijigen Music Master/Library/PackageCache/com.unity.analytics@3.3.5/Unity.Analytics.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/PackageCache/com.unity.analytics@3.3.5/Unity.Analytics.Tracker.dll + + + D:/Unitykit/Nijigen Music Master/Library/PackageCache/com.unity.analytics@3.3.5/AnalyticsStandardEvents/Unity.Analytics.StandardEvents.dll + + + D:/Unitykit/Nijigen Music Master/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.Lang.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.Monetization.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.Advertisements.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.Purchasing.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEditor.Purchasing.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.UI.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.Timeline.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/com.unity.multiplayer-weaver.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.Rider.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEngine.Advertisements.Editor.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.TextMeshPro.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/UnityEditor.UI.dll + + + D:/Unitykit/Nijigen Music Master/Library/ScriptAssemblies/com.unity.multiplayer-hlapi.Runtime.dll + + + + + {18409F7F-C2AD-273E-0F2B-3A396B91A3DC} + Assembly-CSharp + + + + + + \ No newline at end of file diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index e8d4aae..5fcce26 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -22,7 +22,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_2019_4_20;UNITY_2019_4;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;PLATFORM_SUPPORTS_ADS_ID;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;UNITY_ASTC_ONLY_DECOMPRESS;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER + DEBUG;TRACE;UNITY_2019_4_20;UNITY_2019_4;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 0169 @@ -49,7 +49,7 @@ Unity/VSTU 4.9.1.0 Game:1 - Android:13 + StandaloneWindows64:19 2019.4.20f1c1 @@ -65,6 +65,8 @@ + + @@ -73,6 +75,13 @@ + + + + + + + @@ -112,6 +121,12 @@ C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + C:/Program Files/Unity/Hub/Editor/2019.4.20f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED similarity index 100% rename from Assets/Plugins/Android/AndroidManifest.xml rename to Assets/Plugins/Android/AndroidManifest.xml.DISABLED diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index ffdeae8..93d02ef 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -132,7 +132,7 @@ GameObject: - component: {fileID: 85128991} - component: {fileID: 85128993} - component: {fileID: 85128992} - m_Layer: 5 + m_Layer: 0 m_Name: SongTitleConsole m_TagString: Untagged m_Icon: {fileID: 0} @@ -159,7 +159,7 @@ RectTransform: - {fileID: 1052748394} - {fileID: 1329624221} m_Father: {fileID: 195393353} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -214,7 +214,7 @@ GameObject: - component: {fileID: 162652243} - component: {fileID: 162652245} - component: {fileID: 162652244} - m_Layer: 5 + m_Layer: 0 m_Name: SongImageCover m_TagString: Untagged m_Icon: {fileID: 0} @@ -233,7 +233,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -286,7 +286,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 188110674} - m_Layer: 5 + m_Layer: 0 m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -377,7 +377,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &195393349 GameObject: @@ -391,7 +391,7 @@ GameObject: - component: {fileID: 195393352} - component: {fileID: 195393351} - component: {fileID: 195393350} - m_Layer: 5 + m_Layer: 0 m_Name: MusicCanvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -469,6 +469,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1592405805} - {fileID: 1214107196} - {fileID: 1332371260} - {fileID: 215633822} @@ -496,7 +497,7 @@ GameObject: - component: {fileID: 199041650} - component: {fileID: 199041652} - component: {fileID: 199041651} - m_Layer: 5 + m_Layer: 0 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -570,7 +571,7 @@ GameObject: - component: {fileID: 215633822} - component: {fileID: 215633824} - component: {fileID: 215633823} - m_Layer: 5 + m_Layer: 0 m_Name: SongList m_TagString: Untagged m_Icon: {fileID: 0} @@ -593,7 +594,7 @@ RectTransform: - {fileID: 1610823697} - {fileID: 1412832945} m_Father: {fileID: 195393353} - m_RootOrder: 2 + 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} @@ -648,7 +649,7 @@ GameObject: - component: {fileID: 361610385} - component: {fileID: 361610387} - component: {fileID: 361610386} - m_Layer: 5 + m_Layer: 0 m_Name: SongProgressBack m_TagString: Untagged m_Icon: {fileID: 0} @@ -711,6 +712,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361610384} m_CullTransparentMesh: 0 +--- !u!1 &400042500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 400042503} + - component: {fileID: 400042501} + - component: {fileID: 400042502} + m_Layer: 5 + m_Name: Spectrum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &400042501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400042500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f623c5fd10c88594e80e841513bf1cc7, type: 3} + m_Name: + m_EditorClassIdentifier: + numberOfSamples: 1024 + bandType: 4 + fallSpeed: 0.08 + sensibility: 8 +--- !u!120 &400042502 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400042500} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + 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_Positions: + - {x: -7.63, y: -2.77, z: 0} + - {x: 0, y: -2.77, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.0041503906 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 0} + key1: {r: 0, g: 1, b: 1, a: 1} + key2: {r: 1, g: 1, b: 1, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32189 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 31997 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 3 + m_NumAlphaKeys: 3 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!224 &400042503 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400042500} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 5} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + 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: -8.9, y: -3.86} + m_SizeDelta: {x: 85.209274, y: 12.134659} + m_Pivot: {x: 0, y: 0.5} --- !u!1 &413832997 GameObject: m_ObjectHideFlags: 0 @@ -723,7 +874,7 @@ GameObject: - component: {fileID: 413833000} - component: {fileID: 413832999} - component: {fileID: 413833001} - m_Layer: 5 + m_Layer: 0 m_Name: SongTitleText m_TagString: Untagged m_Icon: {fileID: 0} @@ -814,7 +965,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 446225461} - m_Layer: 5 + m_Layer: 0 m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -853,7 +1004,7 @@ GameObject: - component: {fileID: 458455756} - component: {fileID: 458455755} - component: {fileID: 458455757} - m_Layer: 5 + m_Layer: 0 m_Name: SongAnimeText m_TagString: Untagged m_Icon: {fileID: 0} @@ -971,7 +1122,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0, g: 0.062368974, b: 0.16037738, a: 0} + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -1031,7 +1182,7 @@ GameObject: - component: {fileID: 527138619} - component: {fileID: 527138618} - component: {fileID: 527138617} - m_Layer: 5 + m_Layer: 0 m_Name: SongProgressBar m_TagString: SongListScroll m_Icon: {fileID: 0} @@ -1254,7 +1405,7 @@ GameObject: - component: {fileID: 676209739} - component: {fileID: 676209738} - component: {fileID: 676209740} - m_Layer: 5 + m_Layer: 0 m_Name: CurrentPacks m_TagString: Untagged m_Icon: {fileID: 0} @@ -1273,7 +1424,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1344,7 +1495,7 @@ GameObject: - component: {fileID: 717504026} - component: {fileID: 717504028} - component: {fileID: 717504027} - m_Layer: 5 + m_Layer: 0 m_Name: Image (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1418,7 +1569,7 @@ GameObject: - component: {fileID: 739849727} - component: {fileID: 739849729} - component: {fileID: 739849728} - m_Layer: 5 + m_Layer: 0 m_Name: ImageCoverR m_TagString: Untagged m_Icon: {fileID: 0} @@ -1494,7 +1645,7 @@ GameObject: - component: {fileID: 764225842} - component: {fileID: 764225841} - component: {fileID: 764225840} - m_Layer: 5 + m_Layer: 0 m_Name: SongVolumeBar m_TagString: SongListScroll m_Icon: {fileID: 0} @@ -1642,7 +1793,7 @@ GameObject: - component: {fileID: 775839462} - component: {fileID: 775839461} - component: {fileID: 775839460} - m_Layer: 5 + m_Layer: 0 m_Name: ReshuffleButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -1661,7 +1812,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1783,7 +1934,7 @@ GameObject: - component: {fileID: 821048343} - component: {fileID: 821048345} - component: {fileID: 821048344} - m_Layer: 5 + m_Layer: 0 m_Name: SongListViewport m_TagString: Untagged m_Icon: {fileID: 0} @@ -1858,7 +2009,7 @@ GameObject: - component: {fileID: 958417785} - component: {fileID: 958417787} - component: {fileID: 958417786} - m_Layer: 5 + m_Layer: 0 m_Name: ListContent m_TagString: SongList m_Icon: {fileID: 0} @@ -2008,7 +2159,7 @@ GameObject: - component: {fileID: 1052748396} - component: {fileID: 1052748395} - component: {fileID: 1052748398} - m_Layer: 5 + m_Layer: 0 m_Name: PlayButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -2137,7 +2288,7 @@ GameObject: - component: {fileID: 1097725191} - component: {fileID: 1097725193} - component: {fileID: 1097725192} - m_Layer: 5 + m_Layer: 0 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -2212,7 +2363,7 @@ GameObject: - component: {fileID: 1214107198} - component: {fileID: 1214107197} - component: {fileID: 1214107199} - m_Layer: 5 + m_Layer: 0 m_Name: SongImage m_TagString: Untagged m_Icon: {fileID: 0} @@ -2233,7 +2384,7 @@ RectTransform: - {fileID: 739849727} - {fileID: 2115507994} m_Father: {fileID: 195393353} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 12} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2382,7 +2533,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1307926492 GameObject: @@ -2395,7 +2546,7 @@ GameObject: - component: {fileID: 1307926493} - component: {fileID: 1307926495} - component: {fileID: 1307926494} - m_Layer: 5 + m_Layer: 0 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -2471,7 +2622,7 @@ GameObject: - component: {fileID: 1329624224} - component: {fileID: 1329624223} - component: {fileID: 1329624222} - m_Layer: 5 + m_Layer: 0 m_Name: RandomNextButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -2602,7 +2753,7 @@ GameObject: - component: {fileID: 1332371258} - component: {fileID: 1332371257} - component: {fileID: 1332371256} - m_Layer: 5 + m_Layer: 0 m_Name: HexLine (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2695,7 +2846,7 @@ Transform: m_LocalScale: {x: 1274.3757, y: 155.41173, z: 57.559887} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10} --- !u!1 &1412832944 GameObject: @@ -2710,7 +2861,7 @@ GameObject: - component: {fileID: 1412832947} - component: {fileID: 1412832946} - component: {fileID: 1412832949} - m_Layer: 5 + m_Layer: 0 m_Name: Scrollbar m_TagString: SongListScroll m_Icon: {fileID: 0} @@ -2858,7 +3009,7 @@ GameObject: - component: {fileID: 1425796441} - component: {fileID: 1425796443} - component: {fileID: 1425796442} - m_Layer: 5 + m_Layer: 0 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -3103,7 +3254,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: quadGameObject: {fileID: 0} ---- !u!1 &1584246054 +--- !u!1 &1516556324 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3111,85 +3262,299 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1584246055} - - component: {fileID: 1584246057} - - component: {fileID: 1584246056} - m_Layer: 5 - m_Name: Handle + - component: {fileID: 1516556326} + - component: {fileID: 1516556325} + - component: {fileID: 1516556327} + m_Layer: 0 + m_Name: AudioPlayer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1584246055 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584246054} - 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_Children: [] - m_Father: {fileID: 1904467807} - 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: -2} - m_SizeDelta: {x: 12.362789, y: 13.589354} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1584246056 -MonoBehaviour: +--- !u!82 &1516556325 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584246054} + m_GameObject: {fileID: 1516556324} 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_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c28a8540a3be4440bf6a09335de8a1e, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1584246057 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1584246054} - m_CullTransparentMesh: 0 ---- !u!1 &1610823696 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1610823697} - - component: {fileID: 1610823699} - - component: {fileID: 1610823698} - m_Layer: 5 - m_Name: BottomMask + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1516556326 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516556324} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1516556327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516556324} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b623fed9edf687944a1f9da67b2dcb93, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1584246054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584246055} + - component: {fileID: 1584246057} + - component: {fileID: 1584246056} + m_Layer: 0 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1584246055 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584246054} + 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_Children: [] + m_Father: {fileID: 1904467807} + 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: -2} + m_SizeDelta: {x: 12.362789, y: 13.589354} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1584246056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584246054} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1c28a8540a3be4440bf6a09335de8a1e, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1584246057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584246054} + m_CullTransparentMesh: 0 +--- !u!1 &1592405804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1592405805} + - component: {fileID: 1592405807} + - component: {fileID: 1592405806} + m_Layer: 0 + m_Name: CurSongLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1592405805 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592405804} + 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_Children: [] + m_Father: {fileID: 195393353} + m_RootOrder: 0 + 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: -38.24, y: 0} + m_SizeDelta: {x: 343.14423, y: 32.02545} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1592405806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592405804} + 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.15686275} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4e51d0e5e51d28d43b63efcbec1d310c, type: 3} + m_Type: 2 + 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 &1592405807 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592405804} + m_CullTransparentMesh: 0 +--- !u!1 &1610823696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1610823697} + - component: {fileID: 1610823699} + - component: {fileID: 1610823698} + m_Layer: 0 + m_Name: BottomMask m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3264,7 +3629,7 @@ GameObject: - component: {fileID: 1610915247} - component: {fileID: 1610915246} - component: {fileID: 1610915249} - m_Layer: 5 + m_Layer: 0 m_Name: SongTimeText m_TagString: Untagged m_Icon: {fileID: 0} @@ -3412,7 +3777,7 @@ GameObject: - component: {fileID: 1784020937} - component: {fileID: 1784020939} - component: {fileID: 1784020938} - m_Layer: 5 + m_Layer: 0 m_Name: TopMask m_TagString: Untagged m_Icon: {fileID: 0} @@ -3475,310 +3840,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1784020936} m_CullTransparentMesh: 0 ---- !u!1 &1784338455 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1784338457} - - component: {fileID: 1784338456} - - component: {fileID: 1784338459} - - component: {fileID: 1784338458} - m_Layer: 5 - m_Name: Spectrum - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1784338456 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1784338455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2787552e9018bad47ac181aad3482adc, type: 3} - m_Name: - m_EditorClassIdentifier: - samples: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - cube: {fileID: 0} ---- !u!4 &1784338457 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1784338455} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.34949428, y: 0, z: 346.57715} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!120 &1784338458 -LineRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1784338455} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - 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_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 1} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 1 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 0 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 1 - m_Loop: 0 ---- !u!82 &1784338459 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1784338455} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &1884089168 GameObject: m_ObjectHideFlags: 0 @@ -3889,7 +3950,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1904467807} - m_Layer: 5 + m_Layer: 0 m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -3927,7 +3988,7 @@ GameObject: - component: {fileID: 1919517977} - component: {fileID: 1919517979} - component: {fileID: 1919517978} - m_Layer: 5 + m_Layer: 0 m_Name: Image (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4002,7 +4063,7 @@ GameObject: - component: {fileID: 2000048562} - component: {fileID: 2000048561} - component: {fileID: 2000048560} - m_Layer: 5 + m_Layer: 0 m_Name: DebugText m_TagString: Untagged m_Icon: {fileID: 0} @@ -4021,7 +4082,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 195393353} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4167,7 +4228,7 @@ GameObject: - component: {fileID: 2115507994} - component: {fileID: 2115507996} - component: {fileID: 2115507995} - m_Layer: 5 + m_Layer: 0 m_Name: ImageCoverL m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/SongListScrollbar.cs b/Assets/SongListScrollbar.cs index ffb145f..a3f7168 100644 --- a/Assets/SongListScrollbar.cs +++ b/Assets/SongListScrollbar.cs @@ -7,6 +7,7 @@ public class SongListScrollbar : MonoBehaviour { // Update is called once per frame private bool HasFocus; + private Vector2 m_screenpos = new Vector2(); void Update() { if(HasFocus && Input.GetAxis("Mouse ScrollWheel") > 0 && m_Scrollbar.value<1) @@ -17,6 +18,22 @@ void Update() { m_Scrollbar.value -= 0.02f; } + + if (HasFocus && Input.touchCount == 1) + { + + if (Input.touches[0].phase == TouchPhase.Began) + { + // 记录手指触屏的位置 + m_screenpos = Input.touches[0].position; + + } + // 手指移动 + else if (Input.touches[0].phase == TouchPhase.Moved) + { + m_Scrollbar.value -= Input.touches[0].deltaPosition.y/50 * Time.deltaTime; + } + } } private Scrollbar m_Scrollbar; void Start() diff --git a/Assets/scripts/AudioPlayer.cs b/Assets/scripts/AudioPlayer.cs new file mode 100644 index 0000000..0774193 --- /dev/null +++ b/Assets/scripts/AudioPlayer.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AudioPlayer : MonoBehaviour +{ + private AudioSource aSource; + void Awake() + { + //Get and store a reference to the following attached components: + //AudioSource + this.aSource = GetComponent(); + MusicPlayer.InitMusicPlayer(aSource); + } + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/scripts/AudioSpectrum.cs b/Assets/scripts/AudioSpectrum.cs new file mode 100644 index 0000000..164e2c6 --- /dev/null +++ b/Assets/scripts/AudioSpectrum.cs @@ -0,0 +1,146 @@ +// Audio spectrum component +// By Keijiro Takahashi, 2013 +// https://github.com/keijiro/unity-audio-spectrum +using UnityEngine; +using System.Collections; +using UnityEngine.UI; +public class AudioSpectrum : MonoBehaviour +{ + #region Band type definition + public enum BandType + { + FourBand, + FourBandVisual, + EightBand, + TenBand, + TwentySixBand, + ThirtyOneBand + }; + + static float[][] middleFrequenciesForBands = { + new float[]{ 125.0f, 500, 1000, 2000 }, + new float[]{ 250.0f, 400, 600, 800 }, + new float[]{ 63.0f, 125, 500, 1000, 2000, 4000, 6000, 8000 }, + new float[]{ 31.5f, 63, 125, 250, 500, 1000, 2000, 4000, 8000, 16000 }, + new float[]{ 25.0f, 31.5f, 40, 50, 63, 80, 100, 125, 160, 200, 250, 315, 400, 500, 630, 800, 1000, 1250, 1600, 2000, 2500, 3150, 4000, 5000, 6300, 8000 }, + new float[]{ 20.0f, 25, 31.5f, 40, 50, 63, 80, 100, 125, 160, 200, 250, 315, 400, 500, 630, 800, 1000, 1250, 1600, 2000, 2500, 3150, 4000, 5000, 6300, 8000, 10000, 12500, 16000, 20000 }, + }; + static float[] bandwidthForBands = { + 1.414f, // 2^(1/2) + 1.260f, // 2^(1/3) + 1.414f, // 2^(1/2) + 1.414f, // 2^(1/2) + 1.122f, // 2^(1/6) + 1.122f // 2^(1/6) + }; + #endregion + + #region Public variables + public int numberOfSamples = 1024; + public BandType bandType = BandType.TwentySixBand; + public float fallSpeed = 0.08f; + public float sensibility = 8.0f; + #endregion + + #region Private variables + LineRenderer lineRenderer; + float width = 0.08f; + float height = 0.3f; + float[] rawSpectrum; + float[] levels; + float[] peakLevels; + float[] meanLevels; + #endregion + + #region Public property + public float[] Levels + { + get { return levels; } + } + + public float[] PeakLevels + { + get { return peakLevels; } + } + + public float[] MeanLevels + { + get { return meanLevels; } + } + #endregion + + #region Private functions + void CheckBuffers() + { + if (rawSpectrum == null || rawSpectrum.Length != numberOfSamples) + { + rawSpectrum = new float[numberOfSamples]; + } + var bandCount = middleFrequenciesForBands[(int)bandType].Length; + if (levels == null || levels.Length != bandCount) + { + levels = new float[bandCount]; + peakLevels = new float[bandCount]; + meanLevels = new float[bandCount]; + } + } + + int FrequencyToSpectrumIndex(float f) + { + var i = Mathf.FloorToInt(f / AudioSettings.outputSampleRate * 2.0f * rawSpectrum.Length); + return Mathf.Clamp(i, 0, rawSpectrum.Length - 1); + } + #endregion + + void Awake() + { + CheckBuffers(); + + lineRenderer = gameObject.GetComponent(); + //lineRenderer.material = new Material(Shader.Find("Particles/Additive")); + //设置颜色 + //lineRenderer.SetColors(Color.red, Color.yellow); + //设置宽度 + lineRenderer.SetWidth(0.06f, 0.06f); + } + + void Update() + { + CheckBuffers(); + + AudioListener.GetSpectrumData(rawSpectrum, 0, FFTWindow.BlackmanHarris); + + float[] middlefrequencies = middleFrequenciesForBands[(int)bandType]; + var bandwidth = bandwidthForBands[(int)bandType]; + + var falldown = fallSpeed * Time.deltaTime; + var filter = Mathf.Exp(-sensibility * Time.deltaTime); + + for (var bi = 0; bi < levels.Length; bi++) + { + int imin = FrequencyToSpectrumIndex(middlefrequencies[bi] / bandwidth); + int imax = FrequencyToSpectrumIndex(middlefrequencies[bi] * bandwidth); + + var bandMax = 0.0f; + for (var fi = imin; fi <= imax; fi++) + { + bandMax = Mathf.Max(bandMax, rawSpectrum[fi]); + } + + levels[bi] = bandMax; + peakLevels[bi] = Mathf.Max(peakLevels[bi] - falldown, bandMax); + meanLevels[bi] = bandMax - (bandMax - meanLevels[bi]) * filter; + } + + //Update Curve + int widthPixels = (int)(Screen.width * width *0.1f); + int heightPixels = (int)(Screen.height * height * 0.1f); + lineRenderer.SetVertexCount(levels.Length); + + Vector3 cur_pos = this.transform.localPosition; + for (var bi = 0; bi < levels.Length; bi++) + { + lineRenderer.SetPosition(bi, new Vector3(cur_pos[0] + 1.0f / levels.Length * bi * widthPixels, cur_pos[1]+ levels[bi]* heightPixels, cur_pos[2]) ); + } + } +} \ No newline at end of file diff --git a/Assets/scripts/MusicData.cs b/Assets/scripts/MusicData.cs index 3e25baf..7fe3388 100644 --- a/Assets/scripts/MusicData.cs +++ b/Assets/scripts/MusicData.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; using System.Text; - +using System.IO; public class LanguageManager { public static string UTF8String(string input) @@ -47,6 +47,7 @@ public class MusicDataPath { public static string MUSICPATH_DEBUG = "D:/Unitykit/MusicData/"; public static string MUSICPATH_ANDROID = Application.persistentDataPath+ "/MusicData/"; + //public static string MUSICPATH_ANDROID = "/storage/emulated/0/NijigenMusicMaster/MusicData/"; public static string MUSICPATH = System.Environment.CurrentDirectory+"/MusicData/"; //result: X:\xxx\xxx(.exe文件所在的目录) } @@ -86,11 +87,39 @@ public MusicFolder(){ public static class FileManager { - public static byte[] ReadBytes(string path) + public static byte[] ReadBytesSystemIO(string path) { - byte[] bytes = new byte[0]; //在这里做文件读取 - + FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read); + fileStream.Seek(0, SeekOrigin.Begin); + //创建文件长度缓冲区 + byte[] bytes = new byte[fileStream.Length]; + //读取文件 + fileStream.Read(bytes, 0, (int)fileStream.Length); + //释放文件读取流 + fileStream.Close(); + fileStream.Dispose(); + fileStream = null; return bytes; } + public static byte[] ReadBytesWWW(string _path) + { + #if UNITY_EDITOR || UNITY_IOS || UNITY_ANDROID + _path = "file:///" + _path; + #endif + Debug.Log("FileManager:Reading "+ _path); + WWW www = new WWW(_path); + while (!www.isDone); + return www.bytes; + } + public static AudioClip ReadMp3WWW(string _path) + { + #if UNITY_EDITOR || UNITY_IOS || UNITY_ANDROID + _path = "file:///" + _path; + #endif + Debug.Log("FileManager:Reading " + _path); + WWW www = new WWW(_path); + while (!www.isDone) ; + return www.GetAudioClip(true, false, AudioType.MPEG); + } } \ No newline at end of file diff --git a/Assets/scripts/MusicPlayer.cs b/Assets/scripts/MusicPlayer.cs index 3560aa4..ee7a303 100644 --- a/Assets/scripts/MusicPlayer.cs +++ b/Assets/scripts/MusicPlayer.cs @@ -5,6 +5,7 @@ using NAudio.Wave; using System.IO; using System.Threading; + public static class MusicPlayer { private const string cLocalPath = "file:///"; @@ -83,30 +84,11 @@ public static void LoadAudio(string audioName, string path) } AudioClip clip; - FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read); - debugtext.Add("Music Loading",path); - fileStream.Seek(0, SeekOrigin.Begin); - //创建文件长度缓冲区 - byte[] bytes = new byte[fileStream.Length]; - //读取文件 - fileStream.Read(bytes, 0, (int)fileStream.Length); - //释放文件读取流 - fileStream.Close(); - fileStream.Dispose(); - fileStream = null; - /* - if (bytes.Length != 0) - { - //WWW www = new WWW(musicfilepath); - clip = NAudioPlayer.FromMp3Data(bytes); - - } - else - { - clip = null; - debugtext.Add("MyDebug", "Load " + audioName + "failed"); - }*/ - clip = NAudioPlayer.FromMp3Data(bytes); + //byte[] bytes = FileManager.ReadBytesSystemIO(path); + //byte[] bytes = FileManager.ReadBytesWWW(path); + + //clip = NAudioPlayer.FromMp3Data(bytes); + clip = FileManager.ReadMp3WWW(path); audioDic.Add(audioName, clip); Debug.Log("Load " + audioName); } diff --git a/Assets/scripts/MusicWheelItem.cs b/Assets/scripts/MusicWheelItem.cs index 8b22ce0..f8ea5b7 100644 --- a/Assets/scripts/MusicWheelItem.cs +++ b/Assets/scripts/MusicWheelItem.cs @@ -75,7 +75,7 @@ void Start() // Update is called once per frame void Update() { - gameObject.transform.localPosition = new Vector3(-160, -20 + index * 50 - MusicWheelBase.GetWheelPos()*MusicWheelBase.GetWheelItemCount()*50, -1); + gameObject.transform.localPosition = new Vector3(-160, index * 50 - MusicWheelBase.GetWheelPos()*(MusicWheelBase.GetWheelItemCount()-1)*50, -1); } public void SetTextColor(Color c) { @@ -110,17 +110,15 @@ public void ButtonClicked() //image.color = new Color(0 / 255f, 0 / 255f, 0 / 255f, 125 / 255f); MusicPlayer.LoadAudio(MusicLoader.SongList[index].title, MusicLoader.SongList[index].music); MusicPlayer.PlayAudio(MusicLoader.SongList[index].title); + + //StartCoroutine(LoadImage(MusicLoader.SongList[index].image)); + Image img = GameObject.Find("SongImage").GetComponent(); - FileStream fileStream = new FileStream(MusicLoader.SongList[index].image, FileMode.Open, FileAccess.Read); - fileStream.Seek(0, SeekOrigin.Begin); - //创建文件长度缓冲区 - byte[] bytes = new byte[fileStream.Length]; - //读取文件 - fileStream.Read(bytes, 0, (int)fileStream.Length); - //释放文件读取流 - fileStream.Close(); - fileStream.Dispose(); - fileStream = null; + + //byte[] bytes = FileManager.ReadBytesSystemIO(MusicLoader.SongList[index].image); + + byte[] bytes = FileManager.ReadBytesWWW(MusicLoader.SongList[index].image); + //创建Texture //int width = 570; //int height = 880; @@ -137,4 +135,28 @@ public void ButtonClicked() } + private IEnumerator LoadImage(string imgUrl) + { + #if UNITY_EDITOR || UNITY_IOS + imgUrl = "file://" + imgUrl; + #endif + // 根据连接下载 + Image img = GameObject.Find("SongImage").GetComponent(); + WWW www = new WWW(imgUrl); + // 等待WWW代码执行完毕之后后面的代码才会执行。 + yield return www; + //创建Texture + //int width = 570; + //int height = 880; + Texture2D texture = new Texture2D(0, 0); + texture.LoadImage(www.bytes); + + //创建Sprite + int area = texture.width * texture.height; + int max_area = 570 * 880; + float ratio = (float)(System.Math.Sqrt(max_area * 1.0f / area)); + Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); + img.sprite = sprite; + img.GetComponent().sizeDelta = new Vector2(texture.width * ratio, texture.height * ratio); + } } diff --git a/Assets/scripts/NReplayGain/AlbumGain.cs b/Assets/scripts/NReplayGain/AlbumGain.cs new file mode 100644 index 0000000..9844206 --- /dev/null +++ b/Assets/scripts/NReplayGain/AlbumGain.cs @@ -0,0 +1,47 @@ +using System; +using System.Linq; + +namespace NReplayGain +{ + /// + /// Contains ReplayGain data for an album. + /// + public class AlbumGain + { + private GainData albumData; + + public AlbumGain() + { + this.albumData = new GainData(); + } + + /// + /// After calculating the ReplayGain data for an album, call this to append the data to the album. + /// + public void AppendTrackData(TrackGain trackGain) + { + int[] sourceAccum = trackGain.gainData.Accum; + for (int i = 0; i < sourceAccum.Length; ++i) + { + this.albumData.Accum[i] += sourceAccum[i]; + } + this.albumData.PeakSample = Math.Max(this.albumData.PeakSample, trackGain.gainData.PeakSample); + } + + /// + /// Returns the normalization gain for the entire album in decibels. + /// + public double GetGain() + { + return ReplayGain.AnalyzeResult(this.albumData.Accum); + } + + /// + /// Returns the peak album value, normalized to the [0,1] interval. + /// + public double GetPeak() + { + return this.albumData.PeakSample / ReplayGain.MAX_SAMPLE_VALUE; + } + } +} diff --git a/Assets/scripts/NReplayGain/CPtr.cs b/Assets/scripts/NReplayGain/CPtr.cs new file mode 100644 index 0000000..ef6b6c3 --- /dev/null +++ b/Assets/scripts/NReplayGain/CPtr.cs @@ -0,0 +1,51 @@ +using System; +using System.Linq; + +namespace NReplayGain +{ + struct CPtr + { + public T[] Array; + public int Index; + + public CPtr(T[] array, int index = 0) + { + this.Array = array; + this.Index = index; + } + + public T this[int index] + { + get + { + return this.Array[this.Index + index]; + } + set + { + this.Array[this.Index + index] = value; + } + } + + public int Length + { + get + { + return this.Array.Length - this.Index; + } + } + + public static CPtr operator +(CPtr pointer, long offset) + { + if (offset > int.MaxValue) + { + throw new ArgumentException("Offset is too big!"); + } + return new CPtr(pointer.Array, pointer.Index + (int)offset); + } + + public static CPtr operator ++(CPtr pointer) + { + return pointer + 1; + } + } +} diff --git a/Assets/scripts/NReplayGain/Extensions.cs b/Assets/scripts/NReplayGain/Extensions.cs new file mode 100644 index 0000000..65e4549 --- /dev/null +++ b/Assets/scripts/NReplayGain/Extensions.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace NReplayGain +{ + public static class Extensions + { + public static int IndexOf(this IEnumerable source, Func predicate) + { + int index = 0; + foreach (T item in source) + { + if (predicate(item)) + { + return index; + } + ++index; + } + return -1; + } + + public static int Sum(this IEnumerable source) + { + int total = 0; + foreach (int item in source) + { + total += item; + } + return total; + } + } +} diff --git a/Assets/scripts/NReplayGain/FrequencyInfo.cs b/Assets/scripts/NReplayGain/FrequencyInfo.cs new file mode 100644 index 0000000..8e7b785 --- /dev/null +++ b/Assets/scripts/NReplayGain/FrequencyInfo.cs @@ -0,0 +1,23 @@ +using System; +using System.Linq; + +namespace NReplayGain +{ + class FrequencyInfo + { + public uint SampleRate { get; private set; } + public double[] BYule { get; private set; } + public double[] AYule { get; private set; } + public double[] BButter { get; private set; } + public double[] AButter { get; private set; } + + public FrequencyInfo(uint sampleRate, double[] bYule, double[] aYule, double[] bButter, double[] aButter) + { + this.SampleRate = sampleRate; + this.BYule = bYule; + this.AYule = aYule; + this.BButter = bButter; + this.AButter = aButter; + } + } +} diff --git a/Assets/scripts/NReplayGain/GainData.cs b/Assets/scripts/NReplayGain/GainData.cs new file mode 100644 index 0000000..da9ecb0 --- /dev/null +++ b/Assets/scripts/NReplayGain/GainData.cs @@ -0,0 +1,16 @@ +using System; +using System.Linq; + +namespace NReplayGain +{ + class GainData + { + public int[] Accum { get; private set; } + public double PeakSample { get; set; } + + public GainData() + { + this.Accum = new int[ReplayGain.STEPS_PER_DB * ReplayGain.MAX_DB]; + } + } +} diff --git a/Assets/scripts/NReplayGain/ReplayGain.cs b/Assets/scripts/NReplayGain/ReplayGain.cs new file mode 100644 index 0000000..c37f296 --- /dev/null +++ b/Assets/scripts/NReplayGain/ReplayGain.cs @@ -0,0 +1,157 @@ +using System; +using System.Linq; + +namespace NReplayGain +{ + public class ReplayGain + { + internal const int STEPS_PER_DB = 100; + internal const int MAX_DB = 120; + internal const int MAX_SAMPLE_VALUE = 32768; + internal static double FACTOR_24BIT = ((double)MAX_SAMPLE_VALUE / 0x800000); + + internal const int YULE_ORDER = 10; + internal const int BUTTER_ORDER = 2; + internal const int MAX_ORDER = YULE_ORDER > BUTTER_ORDER ? YULE_ORDER : BUTTER_ORDER; + + internal const double PINK_REF = 64.82; + internal const double RMS_WINDOW_TIME = 0.050; + internal const double RMS_PERCENTILE = 0.95; + internal const int MAX_SAMP_FREQ = 48000; + internal const int MAX_SAMPLES_PER_WINDOW = (int)(MAX_SAMP_FREQ * RMS_WINDOW_TIME + 1); + + internal static FrequencyInfo[] FreqInfos = new FrequencyInfo[] { +#region Frequency Infos + new FrequencyInfo( + 8000, + new double[]{ 0.53648789255105, -0.42163034350696, -0.00275953611929, 0.04267842219415, -0.10214864179676, 0.14590772289388, -0.02459864859345, -0.11202315195388, -0.04060034127000, 0.04788665548180, -0.02217936801134 }, + new double[]{ 1, -0.25049871956020, -0.43193942311114, -0.03424681017675, -0.04678328784242, 0.26408300200955, 0.15113130533216, -0.17556493366449, -0.18823009262115, 0.05477720428674, 0.04704409688120 }, + new double[]{ 0.94597685600279, -1.89195371200558, 0.94597685600279 }, + new double[]{ 1, -1.88903307939452, 0.89487434461664 } + ), + + new FrequencyInfo( + 11025, + new double[]{ 0.58100494960553, -0.53174909058578, -0.14289799034253, 0.17520704835522, 0.02377945217615, 0.15558449135573, -0.25344790059353, 0.01628462406333, 0.06920467763959, -0.03721611395801, -0.00749618797172 }, + new double[]{ 1, -0.51035327095184, -0.31863563325245, -0.20256413484477, 0.14728154134330, 0.38952639978999, -0.23313271880868, -0.05246019024463, -0.02505961724053, 0.02442357316099, 0.01818801111503 }, + new double[]{ 0.95856916599601, -1.91713833199203, 0.95856916599601 }, + new double[]{ 1, -1.91542108074780, 0.91885558323625 } + ), + + new FrequencyInfo( + 12000, + new double[]{ 0.56619470757641, -0.75464456939302, 0.16242137742230, 0.16744243493672, -0.18901604199609, 0.30931782841830, -0.27562961986224, 0.00647310677246, 0.08647503780351, -0.03788984554840, -0.00588215443421 }, + new double[]{ 1, -1.04800335126349, 0.29156311971249, -0.26806001042947, 0.00819999645858, 0.45054734505008, -0.33032403314006, 0.06739368333110, -0.04784254229033, 0.01639907836189, 0.01807364323573 }, + new double[]{ 0.96009142950541, -1.92018285901082, 0.96009142950541 }, + new double[]{ 1, -1.91858953033784, 0.92177618768381 } + ), + + new FrequencyInfo( + 16000, + new double[]{ 0.44915256608450, -0.14351757464547, -0.22784394429749, -0.01419140100551, 0.04078262797139, -0.12398163381748, 0.04097565135648, 0.10478503600251, -0.01863887810927, -0.03193428438915, 0.00541907748707 }, + new double[]{ 1, -0.62820619233671, 0.29661783706366, -0.37256372942400, 0.00213767857124, -0.42029820170918, 0.22199650564824, 0.00613424350682, 0.06747620744683, 0.05784820375801, 0.03222754072173 }, + new double[]{ 0.96454515552826, -1.92909031105652, 0.96454515552826 }, + new double[]{ 1, -1.92783286977036, 0.93034775234268 } + ), + + new FrequencyInfo( + 18900, + new double[]{0.38524531015142, -0.27682212062067, -0.09980181488805, 0.09951486755646, -0.08934020156622, -0.00322369330199, -0.00110329090689, 0.03784509844682, 0.01683906213303, -0.01147039862572, -0.01941767987192 }, + new double[]{1.00000000000000, -1.29708918404534, 0.90399339674203, -0.29613799017877, -0.42326645916207, 0.37934887402200, -0.37919795944938, 0.23410283284785, -0.03892971758879, 0.00403009552351, 0.03640166626278 }, + new double[]{0.96535326815829, -1.93070653631658, 0.96535326815829 }, + new double[]{1.00000000000000, -1.92950577983524, 0.93190729279793 } + ), + + new FrequencyInfo( + 22050, + new double[]{ 0.33642304856132, -0.25572241425570, -0.11828570177555, 0.11921148675203, -0.07834489609479, -0.00469977914380, -0.00589500224440, 0.05724228140351, 0.00832043980773, -0.01635381384540, -0.01760176568150 }, + new double[]{ 1, -1.49858979367799, 0.87350271418188, 0.12205022308084, -0.80774944671438, 0.47854794562326, -0.12453458140019, -0.04067510197014, 0.08333755284107, -0.04237348025746, 0.02977207319925 }, + new double[]{ 0.97316523498161, -1.94633046996323, 0.97316523498161 }, + new double[]{ 1, -1.94561023566527, 0.94705070426118 } + ), + + new FrequencyInfo( + 24000, + new double[]{ 0.30296907319327, -0.22613988682123, -0.08587323730772, 0.03282930172664, -0.00915702933434, -0.02364141202522, -0.00584456039913, 0.06276101321749, -0.00000828086748, 0.00205861885564, -0.02950134983287 }, + new double[]{ 1, -1.61273165137247, 1.07977492259970, -0.25656257754070, -0.16276719120440, -0.22638893773906, 0.39120800788284, -0.22138138954925, 0.04500235387352, 0.02005851806501, 0.00302439095741 }, + new double[]{ 0.97531843204928, -1.95063686409857, 0.97531843204928 }, + new double[]{ 1, -1.95002759149878, 0.95124613669835 } + ), + + new FrequencyInfo( + 28000, + new double[]{ 0.23544170728267, -0.24752593505499, -0.02357512726922, 0.04300581921555, -0.00436328684724, -0.01223745945148, 0.01264711473636, 0.03748020293506, -0.03351377648226, 0.02481670382392, -0.02181613007838 }, + new double[]{ 1, -2.22622382338735, 2.15684658231271, -1.28156172224940, 0.78149824150575, -0.95424812536282, 0.92686669115303, -0.45189545196455, 0.01130093451234, 0.10071250641644, -0.03589496549521 }, + new double[]{ 0.97803047920656, -1.95606095841312, 0.97803047920656 }, + new double[]{ 1, -1.95557824031504, 0.95654367651120 } + ), + + new FrequencyInfo( + 32000, + new double[]{ 0.15457299681924, -0.09331049056315, -0.06247880153653, 0.02163541888798, -0.05588393329856, 0.04781476674921, 0.00222312597743, 0.03174092540049, -0.01390589421898, 0.00651420667831, -0.00881362733839 }, + new double[]{ 1, -2.37898834973084, 2.84868151156327, -2.64577170229825, 2.23697657451713, -1.67148153367602, 1.00595954808547, -0.45953458054983, 0.16378164858596, -0.05032077717131, 0.02347897407020 }, + new double[]{ 0.97938932735214, -1.95877865470428, 0.97938932735214 }, + new double[]{ 1, -1.95835380975398, 0.95920349965459 } + ), + + new FrequencyInfo( + 37800, + new double[]{0.08717879977844, -0.01000374016172, -0.06265852122368, -0.01119328800950, -0.00114279372960, 0.02081333954769, -0.01603261863207, 0.01936763028546, 0.00760044736442, -0.00303979112271, -0.00075088605788 }, + new double[]{1.00000000000000, -2.62816311472146, 3.53734535817992, -3.81003448678921, 3.91291636730132, -3.53518605896288, 2.71356866157873, -1.86723311846592, 1.12075382367659, -0.48574086886890, 0.11330544663849 }, + new double[]{0.98252400815195, -1.96504801630391, 0.98252400815195 }, + new double[]{1.00000000000000, -1.96474258269041, 0.96535344991740 } + ), + + new FrequencyInfo( + 44100, + new double[]{ 0.05418656406430, -0.02911007808948, -0.00848709379851, -0.00851165645469, -0.00834990904936, 0.02245293253339, -0.02596338512915, 0.01624864962975, -0.00240879051584, 0.00674613682247, -0.00187763777362 }, + new double[]{ 1, -3.47845948550071, 6.36317777566148, -8.54751527471874, 9.47693607801280, -8.81498681370155, 6.85401540936998, -4.39470996079559, 2.19611684890774, -0.75104302451432, 0.13149317958808 }, + new double[]{ 0.98500175787242, -1.97000351574484, 0.98500175787242 }, + new double[]{ 1, -1.96977855582618, 0.97022847566350 } + ), + + new FrequencyInfo( + 48000, + new double[]{ 0.03857599435200, -0.02160367184185, -0.00123395316851, -0.00009291677959, -0.01655260341619, 0.02161526843274, -0.02074045215285, 0.00594298065125, 0.00306428023191, 0.00012025322027, 0.00288463683916 }, + new double[]{ 1, -3.84664617118067, 7.81501653005538,-11.34170355132042, 13.05504219327545,-12.28759895145294, 9.48293806319790, -5.87257861775999, 2.75465861874613, -0.86984376593551, 0.13919314567432 }, + new double[]{ 0.98621192462708, -1.97242384925416, 0.98621192462708 }, + new double[]{ 1, -1.97223372919527, 0.97261396931306 } + ) +#endregion + }; + + internal static double AnalyzeResult(int[] array) + { + int elems = array.Sum(); + if (elems == 0) + { + throw new Exception("Not enough samples!"); + } + + int upper = (int)Math.Ceiling(elems * (1.0 - ReplayGain.RMS_PERCENTILE)); + int i = array.Length; + while (i-- > 0) + { + if ((upper -= array[i]) <= 0) + break; + } + + return ReplayGain.PINK_REF - (double)i / (double)ReplayGain.STEPS_PER_DB; + } + + public static bool IsSupportedFormat(int sampleRate, int sampleSize) + { + if (sampleSize != 16 && sampleSize != 24) + { + return false; + } + + if (!FreqInfos.Any(i => i.SampleRate == sampleRate)) + { + return false; + } + + return true; + } + } +} diff --git a/Assets/scripts/NReplayGain/TrackGain.cs b/Assets/scripts/NReplayGain/TrackGain.cs new file mode 100644 index 0000000..442c80a --- /dev/null +++ b/Assets/scripts/NReplayGain/TrackGain.cs @@ -0,0 +1,333 @@ +using System; +using System.Linq; + +namespace NReplayGain +{ + /// + /// Contains ReplayGain data for a track. + /// + public class TrackGain : IDisposable + { + private int sampleSize; + internal GainData gainData; + + private double[] lInPreBuf; + private CPtr lInPre; + private double[] lStepBuf; + private CPtr lStep; + private double[] lOutBuf; + private CPtr lOut; + + private double[] rInPreBuf; + private CPtr rInPre; + private double[] rStepBuf; + private CPtr rStep; + private double[] rOutBuf; + private CPtr rOut; + + private long sampleWindow; + private long totSamp; + private double lSum; + private double rSum; + private int freqIndex; + + public TrackGain(int sampleRate, int sampleSize) + { + if(!ReplayGain.IsSupportedFormat(sampleRate, sampleSize)) { + throw new NotSupportedException("Unsupported format. Supported sample sizes are 16, 24."); + } + + this.freqIndex = ReplayGain.FreqInfos.IndexOf(i => i.SampleRate == sampleRate); + + this.sampleSize = sampleSize; + this.gainData = new GainData(); + + this.lInPreBuf = new double[ReplayGain.MAX_ORDER * 2]; + this.lStepBuf = new double[ReplayGain.MAX_SAMPLES_PER_WINDOW + ReplayGain.MAX_ORDER]; + this.lOutBuf = new double[ReplayGain.MAX_SAMPLES_PER_WINDOW + ReplayGain.MAX_ORDER]; + this.rInPreBuf = new double[ReplayGain.MAX_ORDER * 2]; + this.rStepBuf = new double[ReplayGain.MAX_SAMPLES_PER_WINDOW + ReplayGain.MAX_ORDER]; + this.rOutBuf = new double[ReplayGain.MAX_SAMPLES_PER_WINDOW + ReplayGain.MAX_ORDER]; + + this.sampleWindow = (int)Math.Ceiling(sampleRate * ReplayGain.RMS_WINDOW_TIME); + + this.lInPre = new CPtr(lInPreBuf, ReplayGain.MAX_ORDER); + this.lStep = new CPtr(lStepBuf, ReplayGain.MAX_ORDER); + this.lOut = new CPtr(lOutBuf, ReplayGain.MAX_ORDER); + this.rInPre = new CPtr(rInPreBuf, ReplayGain.MAX_ORDER); + this.rStep = new CPtr(rStepBuf, ReplayGain.MAX_ORDER); + this.rOut = new CPtr(rOutBuf, ReplayGain.MAX_ORDER); + } + + public void AnalyzeSamples(int[] leftSamples, int[] rightSamples) + { + if (leftSamples.Length != rightSamples.Length) + { + throw new ArgumentException("leftSamples must be as big as rightSamples"); + } + + int numSamples = leftSamples.Length; + + double[] leftDouble = new double[numSamples]; + double[] rightDouble = new double[numSamples]; + + if (this.sampleSize == 16) + { + for (int i = 0; i < numSamples; ++i) + { + leftDouble[i] = leftSamples[i]; + rightDouble[i] = rightSamples[i]; + } + } + else if (this.sampleSize == 24) + { + for (int i = 0; i < numSamples; ++i) + { + leftDouble[i] = leftSamples[i] * ReplayGain.FACTOR_24BIT; + rightDouble[i] = rightSamples[i] * ReplayGain.FACTOR_24BIT; + } + } + else + { + throw new InvalidOperationException(); + } + + double tmpPeak; + for (int i = 0; i < numSamples; ++i) + { + tmpPeak = leftDouble[i] >= 0 ? leftDouble[i] : -leftDouble[i]; + if (tmpPeak > this.gainData.PeakSample) this.gainData.PeakSample = tmpPeak; + + tmpPeak = rightDouble[i] >= 0 ? rightDouble[i] : -rightDouble[i]; + if (tmpPeak > this.gainData.PeakSample) this.gainData.PeakSample = tmpPeak; + } + + this.AnalyzeSamples(new CPtr(leftDouble), new CPtr(rightDouble)); + } + + private static double Sqr(double d) + { + return d * d; + } + + private void FilterYule(CPtr input, CPtr output, long nSamples, double[] aKernel, double[] bKernel) + { + while (nSamples-- != 0) + { + output[0] = 1e-10 /* 1e-10 is a hack to avoid slowdown because of denormals */ + + input[0] * bKernel[0] + - output[-1] * aKernel[1] + + input[-1] * bKernel[1] + - output[-2] * aKernel[2] + + input[-2] * bKernel[2] + - output[-3] * aKernel[3] + + input[-3] * bKernel[3] + - output[-4] * aKernel[4] + + input[-4] * bKernel[4] + - output[-5] * aKernel[5] + + input[-5] * bKernel[5] + - output[-6] * aKernel[6] + + input[-6] * bKernel[6] + - output[-7] * aKernel[7] + + input[-7] * bKernel[7] + - output[-8] * aKernel[8] + + input[-8] * bKernel[8] + - output[-9] * aKernel[9] + + input[-9] * bKernel[9] + - output[-10] * aKernel[10] + + input[-10] * bKernel[10]; + ++output; + ++input; + } + } + + private void FilterButter(CPtr input, CPtr output, long nSamples, double[] aKernel, double[] bKernel) + { + while (nSamples-- != 0) + { + output[0] = + input[0] * bKernel[0] + - output[-1] * aKernel[1] + + input[-1] * bKernel[1] + - output[-2] * aKernel[2] + + input[-2] * bKernel[2]; + ++output; + ++input; + } + } + + private void AnalyzeSamples(CPtr leftSamples, CPtr rightSamples) + { + int numSamples = leftSamples.Length; + + CPtr curLeft; + CPtr curRight; + long batchSamples = numSamples; + long curSamples; + long curSamplePos = 0; + + if (numSamples < ReplayGain.MAX_ORDER) + { + Array.Copy(leftSamples.Array, 0, this.lInPreBuf, ReplayGain.MAX_ORDER, numSamples); + Array.Copy(rightSamples.Array, 0, this.rInPreBuf, ReplayGain.MAX_ORDER, numSamples); + } + else + { + Array.Copy(leftSamples.Array, 0, this.lInPreBuf, ReplayGain.MAX_ORDER, ReplayGain.MAX_ORDER); + Array.Copy(rightSamples.Array, 0, this.rInPreBuf, ReplayGain.MAX_ORDER, ReplayGain.MAX_ORDER); + } + + while (batchSamples > 0) + { + curSamples = batchSamples > this.sampleWindow - this.totSamp ? this.sampleWindow - this.totSamp : batchSamples; + if (curSamplePos < ReplayGain.MAX_ORDER) + { + curLeft = this.lInPre + curSamplePos; + curRight = this.rInPre + curSamplePos; + if (curSamples > ReplayGain.MAX_ORDER - curSamplePos) + curSamples = ReplayGain.MAX_ORDER - curSamplePos; + } + else + { + curLeft = leftSamples + curSamplePos; + curRight = rightSamples + curSamplePos; + } + + FilterYule(curLeft, this.lStep + this.totSamp, curSamples, ReplayGain.FreqInfos[this.freqIndex].AYule, ReplayGain.FreqInfos[this.freqIndex].BYule); + FilterYule(curRight, this.rStep + this.totSamp, curSamples, ReplayGain.FreqInfos[this.freqIndex].AYule, ReplayGain.FreqInfos[this.freqIndex].BYule); + + FilterButter(this.lStep + this.totSamp, this.lOut + this.totSamp, curSamples, ReplayGain.FreqInfos[this.freqIndex].AButter, ReplayGain.FreqInfos[this.freqIndex].BButter); + FilterButter(this.rStep + this.totSamp, this.rOut + this.totSamp, curSamples, ReplayGain.FreqInfos[this.freqIndex].AButter, ReplayGain.FreqInfos[this.freqIndex].BButter); + + curLeft = this.lOut + this.totSamp; // Get the squared values + curRight = this.rOut + this.totSamp; + + for (long i = curSamples % 16; i-- != 0; ) + { + this.lSum += Sqr(curLeft[0]); + ++curLeft; + this.rSum += Sqr(curRight[0]); + ++curRight; + } + + for (long i = curSamples / 16; i-- != 0; ) + { + this.lSum += Sqr(curLeft[0]) + + Sqr(curLeft[1]) + + Sqr(curLeft[2]) + + Sqr(curLeft[3]) + + Sqr(curLeft[4]) + + Sqr(curLeft[5]) + + Sqr(curLeft[6]) + + Sqr(curLeft[7]) + + Sqr(curLeft[8]) + + Sqr(curLeft[9]) + + Sqr(curLeft[10]) + + Sqr(curLeft[11]) + + Sqr(curLeft[12]) + + Sqr(curLeft[13]) + + Sqr(curLeft[14]) + + Sqr(curLeft[15]); + curLeft += 16; + this.rSum += Sqr(curRight[0]) + + Sqr(curRight[1]) + + Sqr(curRight[2]) + + Sqr(curRight[3]) + + Sqr(curRight[4]) + + Sqr(curRight[5]) + + Sqr(curRight[6]) + + Sqr(curRight[7]) + + Sqr(curRight[8]) + + Sqr(curRight[9]) + + Sqr(curRight[10]) + + Sqr(curRight[11]) + + Sqr(curRight[12]) + + Sqr(curRight[13]) + + Sqr(curRight[14]) + + Sqr(curRight[15]); + curRight += 16; + } + + batchSamples -= curSamples; + curSamplePos += curSamples; + this.totSamp += curSamples; + if (this.totSamp == this.sampleWindow) + { + // Get the Root Mean Square (RMS) for this set of samples + double val = ReplayGain.STEPS_PER_DB * 10.0 * Math.Log10((this.lSum + this.rSum) / this.totSamp * 0.5 + 1.0e-37); + int ival = (int)val; + if (ival < 0) ival = 0; + if (ival >= this.gainData.Accum.Length) ival = this.gainData.Accum.Length - 1; + this.gainData.Accum[ival]++; + this.lSum = this.rSum = 0.0; + + if (this.totSamp > int.MaxValue) + { + throw new OverflowException("Too many samples! Change to long and recompile!"); + } + + Array.Copy(this.lOutBuf, (int)this.totSamp, this.lOutBuf, 0, ReplayGain.MAX_ORDER); + Array.Copy(this.rOutBuf, (int)this.totSamp, this.rOutBuf, 0, ReplayGain.MAX_ORDER); + Array.Copy(this.lStepBuf, (int)this.totSamp, this.lStepBuf, 0, ReplayGain.MAX_ORDER); + Array.Copy(this.rStepBuf, (int)this.totSamp, this.rStepBuf, 0, ReplayGain.MAX_ORDER); + + this.totSamp = 0; + } + if (this.totSamp > this.sampleWindow) + { + // somehow I really screwed up: Error in programming! Contact author about totsamp > sampleWindow + throw new Exception("Gain analysis error!"); + } + } + + if (numSamples < ReplayGain.MAX_ORDER) + { + Array.Copy(this.lInPreBuf, numSamples, this.lInPreBuf, 0, ReplayGain.MAX_ORDER - numSamples); + Array.Copy(this.rInPreBuf, numSamples, this.rInPreBuf, 0, ReplayGain.MAX_ORDER - numSamples); + Array.Copy(leftSamples.Array, leftSamples.Index, this.lInPreBuf, ReplayGain.MAX_ORDER - numSamples, numSamples); + Array.Copy(rightSamples.Array, rightSamples.Index, this.rInPreBuf, ReplayGain.MAX_ORDER - numSamples, numSamples); + } + else + { + Array.Copy(leftSamples.Array, leftSamples.Index + numSamples - ReplayGain.MAX_ORDER, this.lInPreBuf, 0, ReplayGain.MAX_ORDER); + Array.Copy(rightSamples.Array, rightSamples.Index + numSamples - ReplayGain.MAX_ORDER, this.rInPreBuf, 0, ReplayGain.MAX_ORDER); + } + } + + /// + /// Returns the normalization gain for the track in decibels. + /// + public double GetGain() + { + return ReplayGain.AnalyzeResult(this.gainData.Accum); + } + + /// + /// Returns the peak title value, normalized to the [0,1] interval. + /// + public double GetPeak() + { + return this.gainData.PeakSample / ReplayGain.MAX_SAMPLE_VALUE; + } + + /// + /// Disposes the resources used to calculate ReplayGain, but doesn't clear the result of the analysis. + /// + public void Dispose() + { + this.lInPreBuf = null; + this.lStepBuf = null; + this.lOutBuf = null; + this.rInPreBuf = null; + this.rStepBuf = null; + this.rOutBuf = null; + + this.lInPre = new CPtr(); + this.lStep = new CPtr(); + this.lOut = new CPtr(); + this.rInPre = new CPtr(); + this.rStep = new CPtr(); + this.rOut = new CPtr(); + } + } +} \ No newline at end of file diff --git a/Assets/scripts/RandomNext.cs b/Assets/scripts/RandomNext.cs index 38549b7..053f89f 100644 --- a/Assets/scripts/RandomNext.cs +++ b/Assets/scripts/RandomNext.cs @@ -31,9 +31,14 @@ public void ButtonOnClickEvent() itemlist.Add(i); } } - + //Random.InitState(1); int index = Random.Range(0,itemlist.Count); MusicWheelItem item = GameObject.Find("WheelItem"+string.Format("{0}",itemlist[index])).GetComponent(); + + float t = itemlist[index] * 1.0f / (MusicWheelBase.GetWheelItemCount() - 1); + MusicWheelBase.UpdateWheelPos(t); + Scrollbar m_Scrollbar = GameObject.Find("Scrollbar").GetComponent(); + m_Scrollbar.value = t; item.ButtonClicked(); float pos = Random.Range(0f, 0.8f); diff --git a/Assets/scripts/Spectrum.cs b/Assets/scripts/Spectrum.cs index c1d6986..2054eea 100644 --- a/Assets/scripts/Spectrum.cs +++ b/Assets/scripts/Spectrum.cs @@ -27,10 +27,6 @@ void Awake() //Get and store a reference to the following attached components: //AudioSource this.aSource = GetComponent(); - //LineRenderer - this.lRenderer = GetComponent(); - //Transform - this.goTransform = GetComponent(); MusicPlayer.InitMusicPlayer(aSource); } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b0ec2cf..0dca0e0 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -35,7 +35,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 401f95a..3d0c79e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -178,8 +178,8 @@ PlayerSettings: Standalone: com.Company.ProductName buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 26 - AndroidTargetSdkVersion: 0 + AndroidMinSdkVersion: 19 + AndroidTargetSdkVersion: 29 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -664,7 +664,8 @@ PlayerSettings: gcIncremental: 0 assemblyVersionValidation: 1 gcWBarrierValidation: 0 - apiCompatibilityLevelPerPlatform: {} + apiCompatibilityLevelPerPlatform: + Android: 3 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Template_2D diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1818024..1d6c597 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -17,7 +17,7 @@ TagManager: - - - Background - - + - Sprectrum - - -