diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 5c026253..84a48d92 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj new file mode 100644 index 00000000..05fc098a --- /dev/null +++ b/Assembly-CSharp-Editor.csproj @@ -0,0 +1,731 @@ + + + + latest + + + Debug + AnyCPU + 10.0.20506 + 2.0 + + {145533E2-396A-951C-BF8B-97B735C73A5A} + 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_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_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 + Editor:5 + StandaloneWindows:5 + 2019.4.20f1 + + + + + + + C:\Program Files\Unity\Hub\Editor\2019.4.20f1\Editor\Data\Managed/UnityEngine/UnityEngine.dll + + + C:\Program Files\Unity\Hub\Editor\2019.4.20f1\Editor\Data\Managed/UnityEditor.dll + + + + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEditor.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEditor.Graphs.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/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 + + + C:/UnityDev/rimworld-animation-studio/Assets/Scripts/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll + + + C:/UnityDev/rimworld-animation-studio/Assets/Scripts/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll + + + C:/UnityDev/rimworld-animation-studio/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.Lang.dll + + + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/UnityEngine.UI.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.Timeline.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/PsdPlugin.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.Rider.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.Mathematics.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.TextMeshPro.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll + + + C:/UnityDev/rimworld-animation-studio/Library/ScriptAssemblies/UnityEditor.UI.dll + + + + + {DE362359-44D0-09FA-2268-B3965C19E49B} + Assembly-CSharp + + + + + + \ No newline at end of file diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index b6a74c5e..8598a012 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -91,6 +91,8 @@ + + diff --git a/Assets/Editor.meta b/Assets/Editor.meta new file mode 100644 index 00000000..0142fd6c --- /dev/null +++ b/Assets/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a33f8a3e007672d48bad06a5220f7944 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/KeyframeSliderEditor.cs b/Assets/Editor/KeyframeSliderEditor.cs new file mode 100644 index 00000000..4d0ba52f --- /dev/null +++ b/Assets/Editor/KeyframeSliderEditor.cs @@ -0,0 +1,32 @@ +using UnityEngine; +using UnityEditor; + +namespace RimWorldAnimationStudio +{ + [CustomEditor(typeof(KeyframeSlider))] + [CanEditMultipleObjects] + public class MenuButtonEditor : UnityEditor.UI.SliderEditor + { + SerializedProperty ghostSlidersProp; + SerializedProperty ghostSliderPrefabProp; + SerializedProperty maxGhostsProp; + + protected override void OnEnable() + { + base.OnEnable(); + ghostSlidersProp = serializedObject.FindProperty("ghostSliders"); + ghostSliderPrefabProp = serializedObject.FindProperty("ghostSliderPrefab"); + maxGhostsProp = serializedObject.FindProperty("maxGhosts"); + } + + public override void OnInspectorGUI() + { + EditorGUILayout.PropertyField(ghostSlidersProp, new GUIContent("Ghost Sliders")); + EditorGUILayout.PropertyField(ghostSliderPrefabProp, new GUIContent("Ghost Slider Prefab")); + EditorGUILayout.PropertyField(maxGhostsProp, new GUIContent("Max Ghosts")); + + serializedObject.ApplyModifiedProperties(); + base.OnInspectorGUI(); + } + } +} diff --git a/Assets/Editor/KeyframeSliderEditor.cs.meta b/Assets/Editor/KeyframeSliderEditor.cs.meta new file mode 100644 index 00000000..08c81fcd --- /dev/null +++ b/Assets/Editor/KeyframeSliderEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8889fe610d7bdb743954a89d88ab5718 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/AnimationTimeline.prefab b/Assets/Resources/Prefabs/AnimationTimeline.prefab new file mode 100644 index 00000000..e60d0335 --- /dev/null +++ b/Assets/Resources/Prefabs/AnimationTimeline.prefab @@ -0,0 +1,91 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3541467645058788217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1744744219600391858} + - component: {fileID: 3898010824893398760} + - component: {fileID: 8674836203144049456} + - component: {fileID: -2766969839996019941} + m_Layer: 5 + m_Name: AnimationTimeline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1744744219600391858 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541467645058788217} + 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: 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: 0, y: 0} + m_SizeDelta: {x: 1200, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3898010824893398760 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541467645058788217} + m_CullTransparentMesh: 0 +--- !u!114 &8674836203144049456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541467645058788217} + 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.5, g: 0.5, b: 0.5, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &-2766969839996019941 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3541467645058788217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3dd6b099b5c67744b84a5ec7283277b, type: 3} + m_Name: + m_EditorClassIdentifier: + keyframeSliderPrefab: {fileID: 7758949423219383195, guid: 2482d1331163f49448eea3e9be15324b, + type: 3} diff --git a/Assets/Resources/Prefabs/AnimationTimeline.prefab.meta b/Assets/Resources/Prefabs/AnimationTimeline.prefab.meta new file mode 100644 index 00000000..a3e91fb2 --- /dev/null +++ b/Assets/Resources/Prefabs/AnimationTimeline.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eac2d5e7275f9064facfeb818ee30308 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/GhostSlider.prefab b/Assets/Resources/Prefabs/GhostSlider.prefab new file mode 100644 index 00000000..438a4178 --- /dev/null +++ b/Assets/Resources/Prefabs/GhostSlider.prefab @@ -0,0 +1,199 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2751111744579094145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4629009613275671144} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4629009613275671144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2751111744579094145} + 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: + - {fileID: 5757681650493455882} + m_Father: {fileID: 3922218029245345} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4658118913435815158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3922218029245345} + - component: {fileID: 3581489635090573721} + m_Layer: 5 + m_Name: GhostSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3922218029245345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658118913435815158} + 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: + - {fileID: 4629009613275671144} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3581489635090573721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658118913435815158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 4629009613275671144} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8359461402257861397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5757681650493455882} + - component: {fileID: 4736752906210224906} + - component: {fileID: 1135382459109805448} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5757681650493455882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + 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: 4629009613275671144} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4736752906210224906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + m_CullTransparentMesh: 0 +--- !u!114 &1135382459109805448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + 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: 1, b: 0.9510727, a: 0.5019608} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 13ff19710b03cf94ea7262c0841746e2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Resources/Prefabs/GhostSlider.prefab.meta b/Assets/Resources/Prefabs/GhostSlider.prefab.meta new file mode 100644 index 00000000..35ac03a2 --- /dev/null +++ b/Assets/Resources/Prefabs/GhostSlider.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 890d76c226858de4fa96adfe7cc85383 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/KeyframeSlider.prefab b/Assets/Resources/Prefabs/KeyframeSlider.prefab new file mode 100644 index 00000000..062dd149 --- /dev/null +++ b/Assets/Resources/Prefabs/KeyframeSlider.prefab @@ -0,0 +1,240 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2556463067826145453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2175275438354546744} + m_Layer: 5 + m_Name: GhostSliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2175275438354546744 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2556463067826145453} + 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: 3922218029245345} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2751111744579094145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4629009613275671144} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4629009613275671144 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2751111744579094145} + 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: + - {fileID: 5757681650493455882} + m_Father: {fileID: 3922218029245345} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4658118913435815158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3922218029245345} + - component: {fileID: 7758949423219383195} + m_Layer: 5 + m_Name: KeyframeSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3922218029245345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658118913435815158} + 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: + - {fileID: 4629009613275671144} + - {fileID: 2175275438354546744} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7758949423219383195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4658118913435815158} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9c733f5218a2b4a449e3115b2bef26f2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 0} + m_HandleRect: {fileID: 4629009613275671144} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + timeline: {fileID: 0} + ghostSliders: {fileID: 2175275438354546744} + ghostSliderPrefab: {fileID: 3581489635090573721, guid: 890d76c226858de4fa96adfe7cc85383, + type: 3} + maxGhosts: 0 +--- !u!1 &8359461402257861397 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5757681650493455882} + - component: {fileID: 4736752906210224906} + - component: {fileID: 1135382459109805448} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5757681650493455882 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + 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: 4629009613275671144} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4736752906210224906 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + m_CullTransparentMesh: 0 +--- !u!114 &1135382459109805448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + 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: 13ff19710b03cf94ea7262c0841746e2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Resources/Prefabs/KeyframeSlider.prefab.meta b/Assets/Resources/Prefabs/KeyframeSlider.prefab.meta new file mode 100644 index 00000000..a402394a --- /dev/null +++ b/Assets/Resources/Prefabs/KeyframeSlider.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2482d1331163f49448eea3e9be15324b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/UI/block.png b/Assets/Resources/Textures/UI/block.png new file mode 100644 index 00000000..5a42cd5f Binary files /dev/null and b/Assets/Resources/Textures/UI/block.png differ diff --git a/Assets/Resources/Textures/UI/block.png.meta b/Assets/Resources/Textures/UI/block.png.meta new file mode 100644 index 00000000..8d535c94 --- /dev/null +++ b/Assets/Resources/Textures/UI/block.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 13ff19710b03cf94ea7262c0841746e2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index f3021913..2829eab2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -244,7 +244,7 @@ RectTransform: - {fileID: 1302075273} - {fileID: 1849536740} m_Father: {fileID: 1335076903} - m_RootOrder: 14 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -854,6 +854,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145864295} m_CullTransparentMesh: 0 +--- !u!1 &219230437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 219230438} + - component: {fileID: 219230439} + m_Layer: 5 + m_Name: AnimationTimelines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &219230438 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219230437} + 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: 1335076903} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -600, y: 76} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &219230439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219230437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &239634963 GameObject: m_ObjectHideFlags: 0 @@ -1688,7 +1749,7 @@ GameObject: - component: {fileID: 364433432} - component: {fileID: 364433431} m_Layer: 5 - m_Name: Button + m_Name: ResetCameraButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1707,7 +1768,7 @@ RectTransform: m_Children: - {fileID: 239634964} m_Father: {fileID: 1335076903} - m_RootOrder: 20 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -2788,7 +2849,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 100} + m_AnchoredPosition: {x: 695, y: 78} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &539052778 @@ -3123,7 +3184,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 32} + m_AnchoredPosition: {x: 695, y: 48} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &585946795 @@ -3691,7 +3752,7 @@ RectTransform: - {fileID: 371198550} - {fileID: 77649836} m_Father: {fileID: 1335076903} - m_RootOrder: 16 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5596,7 +5657,7 @@ RectTransform: - {fileID: 347034222} - {fileID: 932977622} m_Father: {fileID: 1335076903} - m_RootOrder: 17 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5689,7 +5750,7 @@ RectTransform: - {fileID: 1898380637} - {fileID: 1966925531} m_Father: {fileID: 1335076903} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6417,8 +6478,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 64} - m_SizeDelta: {x: 160, y: 20} + m_AnchoredPosition: {x: 0, y: 88} + m_SizeDelta: {x: 1200, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1289465655 MonoBehaviour: @@ -6600,6 +6661,9 @@ MonoBehaviour: type: 3} stageLoopDropdown: {fileID: 429161118} stageIDField: {fileID: 1889402642} + animationTimelines: {fileID: 219230438} + animationTimelinePrefab: {fileID: -2766969839996019941, guid: eac2d5e7275f9064facfeb818ee30308, + type: 3} --- !u!4 &1323324191 Transform: m_ObjectHideFlags: 0 @@ -6716,6 +6780,8 @@ RectTransform: - {fileID: 429161117} - {fileID: 1446119118} - {fileID: 842870043} + - {fileID: 364433430} + - {fileID: 219230438} - {fileID: 1626372651} - {fileID: 1588340713} - {fileID: 56207931} @@ -6724,7 +6790,6 @@ RectTransform: - {fileID: 1092950201} - {fileID: 1914421494} - {fileID: 1121706670} - - {fileID: 364433430} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9244,7 +9309,7 @@ RectTransform: - {fileID: 1395818346} - {fileID: 1798757604} m_Father: {fileID: 1335076903} - m_RootOrder: 13 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9418,7 +9483,7 @@ RectTransform: - {fileID: 1092312354} - {fileID: 891468915} m_Father: {fileID: 1335076903} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -11167,7 +11232,7 @@ RectTransform: - {fileID: 1543793723} - {fileID: 1344070788} m_Father: {fileID: 1335076903} - m_RootOrder: 18 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11468,7 +11533,7 @@ RectTransform: - {fileID: 1481521047} - {fileID: 1261535758} m_Father: {fileID: 1335076903} - m_RootOrder: 15 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs index 96326571..73904791 100644 --- a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Xml; using System.Xml.Serialization; +using UnityEngine; namespace RimWorldAnimationStudio { @@ -21,58 +22,81 @@ namespace RimWorldAnimationStudio public override void BuildSimpleCurves() { + BodyAngle.Clear(); + HeadAngle.Clear(); + BodyOffsetX.Clear(); + BodyOffsetZ.Clear(); + HeadFacing.Clear(); + BodyFacing.Clear(); + HeadBob.Clear(); + GenitalAngle.Clear(); + SoundEffects.Clear(); + int duration = 0; foreach (PawnKeyframe frame in keyframes) { duration += frame.tickDuration; } this.duration = duration; - int keyframePosition = 0; - foreach (PawnKeyframe frame in keyframes) + + for (int i = 0; i < keyframes.Count; i++) { - if (frame.atTick.HasValue) + PawnKeyframe keyframe = keyframes[i]; + + if (keyframe.atTick.HasValue) { - BodyAngle.Add((float)frame.atTick / (float)duration, frame.bodyAngle, true); - HeadAngle.Add((float)frame.atTick / (float)duration, frame.headAngle, true); - BodyOffsetX.Add((float)frame.atTick / (float)duration, frame.bodyOffsetX, true); - BodyOffsetZ.Add((float)frame.atTick / (float)duration, frame.bodyOffsetZ, true); - HeadFacing.Add((float)frame.atTick / (float)duration, frame.headFacing, true); - BodyFacing.Add((float)frame.atTick / (float)duration, frame.bodyFacing, true); - HeadBob.Add((float)frame.atTick / (float)duration, frame.headBob, true); + if (keyframe.HasValidKeyframeID() == false) + { keyframe.GenerateKeyframeID(); } - if (frame.genitalAngle.HasValue) - { GenitalAngle.Add((float)frame.atTick / (float)duration, frame.genitalAngle.Value, true); } + Debug.Log(keyframe.atTick.Value); - if (frame.soundEffect != null) - { SoundEffects.Add((int)frame.atTick, frame.soundEffect); } + BodyAngle.Add((float)keyframe.atTick / (float)duration, keyframe.bodyAngle, true); + HeadAngle.Add((float)keyframe.atTick / (float)duration, keyframe.headAngle, true); + BodyOffsetX.Add((float)keyframe.atTick / (float)duration, keyframe.bodyOffsetX, true); + BodyOffsetZ.Add((float)keyframe.atTick / (float)duration, keyframe.bodyOffsetZ, true); + HeadFacing.Add((float)keyframe.atTick / (float)duration, keyframe.headFacing, true); + BodyFacing.Add((float)keyframe.atTick / (float)duration, keyframe.bodyFacing, true); + HeadBob.Add((float)keyframe.atTick / (float)duration, keyframe.headBob, true); + + if (keyframe.genitalAngle.HasValue) + { GenitalAngle.Add((float)keyframe.atTick / (float)duration, keyframe.genitalAngle.Value, true); } + + if (keyframe.soundEffect != null) + { SoundEffects.Add((int)keyframe.atTick, keyframe.soundEffect); } + + if (i + 1 < keyframes.Count) + { keyframes[i].tickDuration = keyframes[i + 1].atTick.Value - keyframes[i].atTick.Value; } } else { - BodyAngle.Add((float)keyframePosition / (float)duration, frame.bodyAngle, true); - HeadAngle.Add((float)keyframePosition / (float)duration, frame.headAngle, true); - BodyOffsetX.Add((float)keyframePosition / (float)duration, frame.bodyOffsetX, true); - BodyOffsetZ.Add((float)keyframePosition / (float)duration, frame.bodyOffsetZ, true); - HeadFacing.Add((float)keyframePosition / (float)duration, frame.headFacing, true); - BodyFacing.Add((float)keyframePosition / (float)duration, frame.bodyFacing, true); - HeadBob.Add((float)keyframePosition / (float)duration, frame.headBob, true); + BodyAngle.Add((float)keyframePosition / (float)duration, keyframe.bodyAngle, true); + HeadAngle.Add((float)keyframePosition / (float)duration, keyframe.headAngle, true); + BodyOffsetX.Add((float)keyframePosition / (float)duration, keyframe.bodyOffsetX, true); + BodyOffsetZ.Add((float)keyframePosition / (float)duration, keyframe.bodyOffsetZ, true); + HeadFacing.Add((float)keyframePosition / (float)duration, keyframe.headFacing, true); + BodyFacing.Add((float)keyframePosition / (float)duration, keyframe.bodyFacing, true); + HeadBob.Add((float)keyframePosition / (float)duration, keyframe.headBob, true); - if (frame.genitalAngle.HasValue) - GenitalAngle.Add((float)keyframePosition / (float)duration, frame.genitalAngle.Value, true); + if (keyframe.genitalAngle.HasValue) + GenitalAngle.Add((float)keyframePosition / (float)duration, keyframe.genitalAngle.Value, true); - if (frame.soundEffect != null) - { SoundEffects.Add(keyframePosition, frame.soundEffect); } + if (keyframe.soundEffect != null) + { SoundEffects.Add(keyframePosition, keyframe.soundEffect); } - if (frame.tickDuration != 1 && frame.quiver.HasValue) + if (keyframe.tickDuration != 1 && keyframe.quiver.HasValue) { quiver.Add(keyframePosition, true); - quiver.Add(keyframePosition + frame.tickDuration - 1, false); + quiver.Add(keyframePosition + keyframe.tickDuration - 1, false); } - keyframePosition += frame.tickDuration; + keyframe.atTick = keyframePosition + 1; + keyframePosition += keyframe.tickDuration; } } + + keyframes[keyframes.Count - 1].tickDuration = 1; } } } diff --git a/Assets/Scripts/AnimationComponents/KeyFrames/Keyframe.cs b/Assets/Scripts/AnimationComponents/KeyFrames/Keyframe.cs index ab4efdfd..e80a903c 100644 --- a/Assets/Scripts/AnimationComponents/KeyFrames/Keyframe.cs +++ b/Assets/Scripts/AnimationComponents/KeyFrames/Keyframe.cs @@ -6,7 +6,7 @@ namespace RimWorldAnimationStudio { public class Keyframe { - public float? atTick; + public int? atTick; public int tickDuration = 1; public string soundEffect; diff --git a/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs b/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs index c4443de2..b511c82f 100644 --- a/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs +++ b/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Xml; using System.Xml.Serialization; +using UnityEngine; namespace RimWorldAnimationStudio { @@ -19,5 +20,16 @@ namespace RimWorldAnimationStudio public bool ShouldSerializegenitalAngle() { return genitalAngle != null; } public bool ShouldSerializequiver() { return quiver != null; } + + [XmlIgnore] public int keyframeID; + + public void GenerateKeyframeID() + { + keyframeID = Random.Range(100000, 1000000); + Debug.Log("Generated ID: " + keyframeID); + } + + public bool HasValidKeyframeID() + { return keyframeID >= 100000 && keyframeID < 1000000; } } } diff --git a/Assets/Scripts/AnimationController.cs b/Assets/Scripts/AnimationController.cs index 0fdb941c..995163d2 100644 --- a/Assets/Scripts/AnimationController.cs +++ b/Assets/Scripts/AnimationController.cs @@ -32,6 +32,9 @@ namespace RimWorldAnimationStudio public Dropdown stageLoopDropdown; public InputField stageIDField; + public Transform animationTimelines; + public AnimationTimeline animationTimelinePrefab; + private float currentTime = 0; public void Update() @@ -158,6 +161,9 @@ namespace RimWorldAnimationStudio GameObject actorCardObject = Instantiate(actorCardPrefab, actorCards); actorCardObject.GetComponent().Initialize(Workspace.animationDef.actors[actorID]); + + AnimationTimeline animationTimeline = Instantiate(animationTimelinePrefab, animationTimelines); + animationTimeline.Initialize(actorID); } Workspace.isDirty = false; @@ -177,6 +183,9 @@ namespace RimWorldAnimationStudio foreach (Transform actorCard in actorCards) { Destroy(actorCard.gameObject); } + foreach (Transform animationTimeline in animationTimelines) + { Destroy(animationTimeline.gameObject); } + actorBodies.Clear(); } diff --git a/Assets/Scripts/ApplicationManager.cs b/Assets/Scripts/ApplicationManager.cs index b0bc3847..e02fad33 100644 --- a/Assets/Scripts/ApplicationManager.cs +++ b/Assets/Scripts/ApplicationManager.cs @@ -53,7 +53,7 @@ namespace RimWorldAnimationStudio Workspace.isDirty = true; var animationDefCards = Resources.FindObjectsOfTypeAll(typeof(AnimationDefCard)) as AnimationDefCard[]; - Debug.Log(animationDefCards); + if (animationDefCards != null) { animationDefCards[0].Initialize(); diff --git a/Assets/Scripts/GUI.meta b/Assets/Scripts/GUI.meta new file mode 100644 index 00000000..1dc4b14e --- /dev/null +++ b/Assets/Scripts/GUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e344d7c1fea27134ca49b05d9cac249c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs b/Assets/Scripts/GUI/AnimationTimeline.cs new file mode 100644 index 00000000..e631a3cd --- /dev/null +++ b/Assets/Scripts/GUI/AnimationTimeline.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.UI; + +namespace RimWorldAnimationStudio +{ + public class AnimationTimeline : MonoBehaviour + { + public int actorID; + public KeyframeSlider keyframeSliderPrefab; + + public void Initialize(int actorID) + { + this.actorID = actorID; + + PawnAnimationClip clip = Workspace.Instance.GetPawnAnimationClip(actorID); + + if (clip == null || clip.keyframes.NullOrEmpty()) + { + Debug.Log("Clip was empty"); + + clip = new PawnAnimationClip(); + clip.keyframes.Add(new PawnKeyframe()); + clip.BuildSimpleCurves(); + } + + foreach (PawnKeyframe keyframe in clip.keyframes) + { + KeyframeSlider keyframeSlider = Instantiate(keyframeSliderPrefab, transform); + keyframeSlider.Initialize(this, actorID, keyframe.keyframeID); + } + } + + public void AddKeyFrame(int atTick) + { + + } + + public bool CanAddKeyFrameAtTick(int atTick) + { + foreach (Transform child in transform) + { + KeyframeSlider keyframeSlider = child.GetComponent(); + + if (keyframeSlider != null && Workspace.Instance.GetPawnKeyframe(keyframeSlider.actorID, keyframeSlider.keyframeID).atTick == atTick) + { return false; } + } + + return true; + } + } +} diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs.meta b/Assets/Scripts/GUI/AnimationTimeline.cs.meta new file mode 100644 index 00000000..e3e527c3 --- /dev/null +++ b/Assets/Scripts/GUI/AnimationTimeline.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b3dd6b099b5c67744b84a5ec7283277b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs new file mode 100644 index 00000000..9bb02cc5 --- /dev/null +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.UI; + +namespace RimWorldAnimationStudio +{ + public class KeyframeSlider : Slider + { + public AnimationTimeline timeline; + //public AnimationClip clip; + //public Keyframe keyframe; + + public Transform ghostSliders; + public Slider ghostSliderPrefab; + public int maxGhosts = 4; + + public int actorID; + public int keyframeID; + + public void Initialize(AnimationTimeline timeline, int actorID, int keyframeID) + { + this.timeline = timeline; + //this.clip = clip; + //this.keyframe = keyframe; + + this.actorID = actorID; + this.keyframeID = keyframeID; + + PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(actorID, keyframeID); + Debug.Log(keyframe); + + value = (float)keyframe.atTick / Workspace.Instance.GetCurrentStageLength(); + OnValueChanged(); + + onValueChanged.AddListener(delegate (float value) { OnValueChanged(); }); + } + + public void OnValueChanged() + { + PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(actorID, keyframeID); + PawnAnimationClip clip = Workspace.Instance.GetPawnAnimationClip(actorID); + + int stageLength = Workspace.Instance.GetCurrentStageLength(); + int newTick = Mathf.RoundToInt(value * stageLength); + + /*if (timeline.CanAddKeyFrameAtTick(newTick) == false) + { + int delta = keyframe.atTick > newTick ? 1 : -1; + + while (timeline.CanAddKeyFrameAtTick(newTick) == false) + { + newTick += delta; + + if (newTick == 1 || newTick == stageLength) { break; } + } + + if (timeline.CanAddKeyFrameAtTick(newTick) == false) + { value = (float)keyframe.atTick / stageLength; return; } + }*/ + + keyframe.atTick = newTick; + + Debug.Log("Value changed: " + newTick); + //value = (float)keyframe.atTick / stageLength; + + UpdateGhostFrames(); + + clip.BuildSimpleCurves(); + } + + // Ghost sliders are non-interactable slider handle + public void UpdateGhostFrames() + { + PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(actorID, keyframeID); + PawnAnimationClip clip = Workspace.Instance.GetPawnAnimationClip(actorID); + + if (maxGhosts == 0) + { return; } + + int stageLength = Workspace.Instance.GetCurrentStageLength(); + int nGhosts = GetGhostFramesRequired(); + + for (int i = 0; i < Mathf.Max(nGhosts, ghostSliders.childCount); i++) + { + if ((i - 1) * clip.duration + keyframe.atTick <= stageLength) + { + if (ghostSliders.childCount <= i) + { Instantiate(ghostSliderPrefab, ghostSliders); } + + GameObject ghostSliderObject = ghostSliders.GetChild(i).gameObject; + Debug.Log(ghostSliderObject); + ghostSliderObject.SetActive(true); + + Slider ghostSlider = ghostSliderObject.GetComponent(); + Debug.Log(ghostSlider); + ghostSlider.value = (float)((i + 1) * clip.duration + keyframe.atTick) / stageLength; + + float mult = 1f - Mathf.Pow((float)i / maxGhosts, 2); + ghostSlider.transform.FindDeepChild("Handle").GetComponent().color = new Color(0, 0.5f, 0.5f, 0.5f * mult); + } + + if (i >= nGhosts) + { transform.GetChild(i).gameObject.SetActive(false); } + } + } + + public int GetGhostFramesRequired() + { + PawnAnimationClip clip = Workspace.Instance.GetPawnAnimationClip(actorID); + + if (Workspace.animationDef.animationStages[Workspace.stageID].isLooping == false) + { return 0; } + + if (clip.duration <= 1) + { return 0; } + + return Math.Min(Mathf.CeilToInt((float)Workspace.Instance.GetCurrentStageLength() / clip.duration), maxGhosts); + } + } +} diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs.meta b/Assets/Scripts/GUI/KeyframeSlider.cs.meta new file mode 100644 index 00000000..5125b126 --- /dev/null +++ b/Assets/Scripts/GUI/KeyframeSlider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9c733f5218a2b4a449e3115b2bef26f2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SimpleCurve.cs b/Assets/Scripts/SimpleCurve.cs index cf329ebc..a814bffe 100644 --- a/Assets/Scripts/SimpleCurve.cs +++ b/Assets/Scripts/SimpleCurve.cs @@ -7,6 +7,11 @@ namespace RimWorldAnimationStudio { public class SimpleCurve : IEnumerable, IEnumerable { + public void Clear() + { + this.points.Clear(); + } + public int PointsCount { get diff --git a/Assets/Scripts/Workspace.cs b/Assets/Scripts/Workspace.cs index b485ca5e..bb9a6255 100644 --- a/Assets/Scripts/Workspace.cs +++ b/Assets/Scripts/Workspace.cs @@ -23,6 +23,24 @@ namespace RimWorldAnimationStudio private static int maxHistoryDepth = 100; private static int historyIndex = 0; + public int GetCurrentStageLength() + { + if (stageID < 0 || stageID >= animationDef.animationStages.Count) + { return 0; } + + return animationDef.animationStages[stageID].playTimeTicks; + } + + public PawnAnimationClip GetPawnAnimationClip(int actorID) + { + return animationDef.animationStages[stageID].animationClips[actorID]; + } + + public PawnKeyframe GetPawnKeyframe(int actorID, int keyframeID) + { + return animationDef.animationStages[stageID].animationClips[actorID].keyframes.FirstOrDefault(x => x.keyframeID == keyframeID); + } + public void TrackChanges() { if (historyIndex < workspaceHistory.Count - 1) diff --git a/Library/ArtifactDB b/Library/ArtifactDB index d54fcc4c..5f6d55a5 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/01/01b7c6f3ee5c466a70ccb3e2f6398a12 b/Library/Artifacts/01/01b7c6f3ee5c466a70ccb3e2f6398a12 deleted file mode 100644 index a2af4c11..00000000 Binary files a/Library/Artifacts/01/01b7c6f3ee5c466a70ccb3e2f6398a12 and /dev/null differ diff --git a/Library/Artifacts/03/03279f5f9c4cf2765c0ff25fe74c1fcf b/Library/Artifacts/03/03279f5f9c4cf2765c0ff25fe74c1fcf deleted file mode 100644 index 0b826640..00000000 Binary files a/Library/Artifacts/03/03279f5f9c4cf2765c0ff25fe74c1fcf and /dev/null differ diff --git a/Library/Artifacts/08/0843a24a3a355dc5c5b7e84b363146e2 b/Library/Artifacts/08/0843a24a3a355dc5c5b7e84b363146e2 deleted file mode 100644 index a8a52706..00000000 Binary files a/Library/Artifacts/08/0843a24a3a355dc5c5b7e84b363146e2 and /dev/null differ diff --git a/Library/Artifacts/08/08b9fd59727726d22bf072fce2c325eb b/Library/Artifacts/08/08b9fd59727726d22bf072fce2c325eb deleted file mode 100644 index 590f1d42..00000000 Binary files a/Library/Artifacts/08/08b9fd59727726d22bf072fce2c325eb and /dev/null differ diff --git a/Library/Artifacts/0a/0ac4e9121df41e80ad58ee97fd3b716f b/Library/Artifacts/0a/0ac4e9121df41e80ad58ee97fd3b716f deleted file mode 100644 index 82d0002b..00000000 Binary files a/Library/Artifacts/0a/0ac4e9121df41e80ad58ee97fd3b716f and /dev/null differ diff --git a/Library/Artifacts/0c/0c58bab30a57eb71b81ed146a4e879ab b/Library/Artifacts/0c/0c58bab30a57eb71b81ed146a4e879ab deleted file mode 100644 index 819f8428..00000000 Binary files a/Library/Artifacts/0c/0c58bab30a57eb71b81ed146a4e879ab and /dev/null differ diff --git a/Library/Artifacts/0d/0df39df17122369a0d0d8860de2e0bc0 b/Library/Artifacts/0d/0df39df17122369a0d0d8860de2e0bc0 deleted file mode 100644 index b716735a..00000000 Binary files a/Library/Artifacts/0d/0df39df17122369a0d0d8860de2e0bc0 and /dev/null differ diff --git a/Library/Artifacts/0f/0fc7db7a7d6b67f3db919d37b26ce25a b/Library/Artifacts/0f/0fc7db7a7d6b67f3db919d37b26ce25a deleted file mode 100644 index 87c0ebd6..00000000 Binary files a/Library/Artifacts/0f/0fc7db7a7d6b67f3db919d37b26ce25a and /dev/null differ diff --git a/Library/Artifacts/10/10d3c7767b69cdba294ac999a92072e8 b/Library/Artifacts/10/10d3c7767b69cdba294ac999a92072e8 deleted file mode 100644 index 07c1f1bc..00000000 Binary files a/Library/Artifacts/10/10d3c7767b69cdba294ac999a92072e8 and /dev/null differ diff --git a/Library/Artifacts/10/10fbb6178ebc9b919012469e0d33b1a0 b/Library/Artifacts/10/10fbb6178ebc9b919012469e0d33b1a0 deleted file mode 100644 index 1b4dba82..00000000 Binary files a/Library/Artifacts/10/10fbb6178ebc9b919012469e0d33b1a0 and /dev/null differ diff --git a/Library/Artifacts/15/1572cca97387524d7946847701cbd1bf b/Library/Artifacts/15/1572cca97387524d7946847701cbd1bf deleted file mode 100644 index de223f04..00000000 Binary files a/Library/Artifacts/15/1572cca97387524d7946847701cbd1bf and /dev/null differ diff --git a/Library/Artifacts/16/167e9474bbc7858031162bd66ae3a31a b/Library/Artifacts/16/167e9474bbc7858031162bd66ae3a31a deleted file mode 100644 index 3e75aee7..00000000 Binary files a/Library/Artifacts/16/167e9474bbc7858031162bd66ae3a31a and /dev/null differ diff --git a/Library/Artifacts/17/17a6d091a1af6c5fe3de1ebc5b2b6259 b/Library/Artifacts/17/17a6d091a1af6c5fe3de1ebc5b2b6259 deleted file mode 100644 index b3174eb9..00000000 Binary files a/Library/Artifacts/17/17a6d091a1af6c5fe3de1ebc5b2b6259 and /dev/null differ diff --git a/Library/Artifacts/1a/1a24ff83f3ebd793c041b870e401ea65 b/Library/Artifacts/1a/1a24ff83f3ebd793c041b870e401ea65 deleted file mode 100644 index 2a438551..00000000 Binary files a/Library/Artifacts/1a/1a24ff83f3ebd793c041b870e401ea65 and /dev/null differ diff --git a/Library/Artifacts/1c/1ceba6a3858f0b40743b16ed4e606220 b/Library/Artifacts/1c/1ceba6a3858f0b40743b16ed4e606220 deleted file mode 100644 index 71feb9e8..00000000 Binary files a/Library/Artifacts/1c/1ceba6a3858f0b40743b16ed4e606220 and /dev/null differ diff --git a/Library/Artifacts/1e/1e2ebd150253adcf338c65f8fac77614 b/Library/Artifacts/1e/1e2ebd150253adcf338c65f8fac77614 deleted file mode 100644 index 24e0fec3..00000000 Binary files a/Library/Artifacts/1e/1e2ebd150253adcf338c65f8fac77614 and /dev/null differ diff --git a/Library/Artifacts/1f/1fc1e036f1e1e7a97eda1086be47f8d6 b/Library/Artifacts/1f/1fc1e036f1e1e7a97eda1086be47f8d6 deleted file mode 100644 index a009e32a..00000000 Binary files a/Library/Artifacts/1f/1fc1e036f1e1e7a97eda1086be47f8d6 and /dev/null differ diff --git a/Library/Artifacts/21/2173578bb5ce1d60b72324d4509aee0f b/Library/Artifacts/21/2173578bb5ce1d60b72324d4509aee0f deleted file mode 100644 index abe31b45..00000000 Binary files a/Library/Artifacts/21/2173578bb5ce1d60b72324d4509aee0f and /dev/null differ diff --git a/Library/Artifacts/21/21a7224d6d313683fea64768dcfdd109 b/Library/Artifacts/21/21a7224d6d313683fea64768dcfdd109 deleted file mode 100644 index ba71872d..00000000 Binary files a/Library/Artifacts/21/21a7224d6d313683fea64768dcfdd109 and /dev/null differ diff --git a/Library/Artifacts/a9/a91bf944b058345f0f6553009b3c6aef b/Library/Artifacts/21/21f8eb4c4547a91efb4ce747690d9d9e similarity index 86% rename from Library/Artifacts/a9/a91bf944b058345f0f6553009b3c6aef rename to Library/Artifacts/21/21f8eb4c4547a91efb4ce747690d9d9e index 645347fa..d58bd97c 100644 Binary files a/Library/Artifacts/a9/a91bf944b058345f0f6553009b3c6aef and b/Library/Artifacts/21/21f8eb4c4547a91efb4ce747690d9d9e differ diff --git a/Library/Artifacts/23/2363883dce9180f59887d2c75201ffeb b/Library/Artifacts/23/2363883dce9180f59887d2c75201ffeb deleted file mode 100644 index 4bcf5158..00000000 Binary files a/Library/Artifacts/23/2363883dce9180f59887d2c75201ffeb and /dev/null differ diff --git a/Library/Artifacts/24/2439383f0c317d7e797e5c67e23d04c5 b/Library/Artifacts/24/2439383f0c317d7e797e5c67e23d04c5 deleted file mode 100644 index 5afbf565..00000000 Binary files a/Library/Artifacts/24/2439383f0c317d7e797e5c67e23d04c5 and /dev/null differ diff --git a/Library/Artifacts/28/287be9c22c822810cbaea97a80c4f4b0 b/Library/Artifacts/28/287be9c22c822810cbaea97a80c4f4b0 deleted file mode 100644 index 928c258c..00000000 Binary files a/Library/Artifacts/28/287be9c22c822810cbaea97a80c4f4b0 and /dev/null differ diff --git a/Library/Artifacts/29/291dc0b55347b7c44bf239ac6054fa27 b/Library/Artifacts/29/291dc0b55347b7c44bf239ac6054fa27 deleted file mode 100644 index 2322de4d..00000000 Binary files a/Library/Artifacts/29/291dc0b55347b7c44bf239ac6054fa27 and /dev/null differ diff --git a/Library/Artifacts/2a/2a38733a784966c691506fa2aec88455 b/Library/Artifacts/2a/2a38733a784966c691506fa2aec88455 deleted file mode 100644 index 02fce56d..00000000 Binary files a/Library/Artifacts/2a/2a38733a784966c691506fa2aec88455 and /dev/null differ diff --git a/Library/Artifacts/45/4555dba4ca1c2fb7aba22b3335a5a576 b/Library/Artifacts/2d/2d1acb7da7817d7faaaafd2cf405e14a similarity index 97% rename from Library/Artifacts/45/4555dba4ca1c2fb7aba22b3335a5a576 rename to Library/Artifacts/2d/2d1acb7da7817d7faaaafd2cf405e14a index 97b52798..0d82eeca 100644 Binary files a/Library/Artifacts/45/4555dba4ca1c2fb7aba22b3335a5a576 and b/Library/Artifacts/2d/2d1acb7da7817d7faaaafd2cf405e14a differ diff --git a/Library/Artifacts/2e/2e113536d0b1a08abb23177ea6ef79c6 b/Library/Artifacts/2e/2e113536d0b1a08abb23177ea6ef79c6 deleted file mode 100644 index de37f72d..00000000 Binary files a/Library/Artifacts/2e/2e113536d0b1a08abb23177ea6ef79c6 and /dev/null differ diff --git a/Library/Artifacts/30/306d74a3204cd80aadeaf750d0adcd90 b/Library/Artifacts/30/306d74a3204cd80aadeaf750d0adcd90 deleted file mode 100644 index 1ea1018c..00000000 Binary files a/Library/Artifacts/30/306d74a3204cd80aadeaf750d0adcd90 and /dev/null differ diff --git a/Library/Artifacts/31/316a3ba45faf0922f53e815cf0bef5ca b/Library/Artifacts/31/316a3ba45faf0922f53e815cf0bef5ca deleted file mode 100644 index 18520905..00000000 Binary files a/Library/Artifacts/31/316a3ba45faf0922f53e815cf0bef5ca and /dev/null differ diff --git a/Library/Artifacts/31/319d3a61111cf2fd6a1c4537d2c0de3e b/Library/Artifacts/31/319d3a61111cf2fd6a1c4537d2c0de3e deleted file mode 100644 index 929a9f8c..00000000 Binary files a/Library/Artifacts/31/319d3a61111cf2fd6a1c4537d2c0de3e and /dev/null differ diff --git a/Library/Artifacts/31/31a8a49d3b5df06d3d6dee9d8cc271d3 b/Library/Artifacts/31/31a8a49d3b5df06d3d6dee9d8cc271d3 new file mode 100644 index 00000000..c69f16b3 Binary files /dev/null and b/Library/Artifacts/31/31a8a49d3b5df06d3d6dee9d8cc271d3 differ diff --git a/Library/Artifacts/95/95696f1c4602342a9d9c02a2ff53254e b/Library/Artifacts/32/32839a498d752b68207ad5d16b11cf47 similarity index 67% rename from Library/Artifacts/95/95696f1c4602342a9d9c02a2ff53254e rename to Library/Artifacts/32/32839a498d752b68207ad5d16b11cf47 index bb2b0e82..5413b258 100644 Binary files a/Library/Artifacts/95/95696f1c4602342a9d9c02a2ff53254e and b/Library/Artifacts/32/32839a498d752b68207ad5d16b11cf47 differ diff --git a/Library/Artifacts/be/beabbea89b69b6ec5a52ee5b96aa4ad6 b/Library/Artifacts/35/351b9edc4c37a9737ef5787c8ca981f2 similarity index 93% rename from Library/Artifacts/be/beabbea89b69b6ec5a52ee5b96aa4ad6 rename to Library/Artifacts/35/351b9edc4c37a9737ef5787c8ca981f2 index f39c5414..257ad40b 100644 Binary files a/Library/Artifacts/be/beabbea89b69b6ec5a52ee5b96aa4ad6 and b/Library/Artifacts/35/351b9edc4c37a9737ef5787c8ca981f2 differ diff --git a/Library/Artifacts/35/3532696351acf9918dcb9d31da6541f3 b/Library/Artifacts/35/3532696351acf9918dcb9d31da6541f3 deleted file mode 100644 index 5f4ca903..00000000 Binary files a/Library/Artifacts/35/3532696351acf9918dcb9d31da6541f3 and /dev/null differ diff --git a/Library/Artifacts/38/38c2251b739d17bac6452854efeebf43 b/Library/Artifacts/38/38c2251b739d17bac6452854efeebf43 deleted file mode 100644 index 903248a3..00000000 Binary files a/Library/Artifacts/38/38c2251b739d17bac6452854efeebf43 and /dev/null differ diff --git a/Library/Artifacts/43/43a78df5d69487210b8f01a05629cb05 b/Library/Artifacts/38/38ec42da933d1148e40e73112aec842d similarity index 71% rename from Library/Artifacts/43/43a78df5d69487210b8f01a05629cb05 rename to Library/Artifacts/38/38ec42da933d1148e40e73112aec842d index b9ffcb83..8e278b24 100644 Binary files a/Library/Artifacts/43/43a78df5d69487210b8f01a05629cb05 and b/Library/Artifacts/38/38ec42da933d1148e40e73112aec842d differ diff --git a/Library/Artifacts/39/39f5cbc985f6d5330c16bca985063811 b/Library/Artifacts/39/39f5cbc985f6d5330c16bca985063811 deleted file mode 100644 index d0d05320..00000000 Binary files a/Library/Artifacts/39/39f5cbc985f6d5330c16bca985063811 and /dev/null differ diff --git a/Library/Artifacts/39/39fe82de0ad136faee7afda6e5134188 b/Library/Artifacts/39/39fe82de0ad136faee7afda6e5134188 deleted file mode 100644 index bb51e4b2..00000000 Binary files a/Library/Artifacts/39/39fe82de0ad136faee7afda6e5134188 and /dev/null differ diff --git a/Library/Artifacts/3a/3a0f8ea4ddf9a5c213ff518c05b5a92e b/Library/Artifacts/3a/3a0f8ea4ddf9a5c213ff518c05b5a92e deleted file mode 100644 index 332eeec0..00000000 Binary files a/Library/Artifacts/3a/3a0f8ea4ddf9a5c213ff518c05b5a92e and /dev/null differ diff --git a/Library/Artifacts/3b/3b226e02f30e9310bbe3f575934268f3 b/Library/Artifacts/3b/3b226e02f30e9310bbe3f575934268f3 deleted file mode 100644 index cc5a6405..00000000 Binary files a/Library/Artifacts/3b/3b226e02f30e9310bbe3f575934268f3 and /dev/null differ diff --git a/Library/Artifacts/3b/3b6f223e832527e96ca90e227a736590 b/Library/Artifacts/3b/3b6f223e832527e96ca90e227a736590 new file mode 100644 index 00000000..9e233b5d Binary files /dev/null and b/Library/Artifacts/3b/3b6f223e832527e96ca90e227a736590 differ diff --git a/Library/Artifacts/3f/3f2ff2d1d0b316ab82404c4c37f1f592 b/Library/Artifacts/3f/3f2ff2d1d0b316ab82404c4c37f1f592 deleted file mode 100644 index 36143024..00000000 Binary files a/Library/Artifacts/3f/3f2ff2d1d0b316ab82404c4c37f1f592 and /dev/null differ diff --git a/Library/Artifacts/42/42ad527af62632eafaf5b007a218457a b/Library/Artifacts/42/42ad527af62632eafaf5b007a218457a deleted file mode 100644 index adef465c..00000000 Binary files a/Library/Artifacts/42/42ad527af62632eafaf5b007a218457a and /dev/null differ diff --git a/Library/Artifacts/44/44156cc69c05a4751e3c49721fcb7f18 b/Library/Artifacts/44/44156cc69c05a4751e3c49721fcb7f18 deleted file mode 100644 index d14522f9..00000000 Binary files a/Library/Artifacts/44/44156cc69c05a4751e3c49721fcb7f18 and /dev/null differ diff --git a/Library/Artifacts/46/4677005b35b3e85a382dd272bc5fe30c b/Library/Artifacts/46/4677005b35b3e85a382dd272bc5fe30c deleted file mode 100644 index 01e00a14..00000000 Binary files a/Library/Artifacts/46/4677005b35b3e85a382dd272bc5fe30c and /dev/null differ diff --git a/Library/Artifacts/47/47c4ad38e6a0334cf525e954d101fb3a b/Library/Artifacts/47/47c4ad38e6a0334cf525e954d101fb3a deleted file mode 100644 index 5d1e35b0..00000000 Binary files a/Library/Artifacts/47/47c4ad38e6a0334cf525e954d101fb3a and /dev/null differ diff --git a/Library/Artifacts/48/481602f3db4dee3d875643405f5edb71 b/Library/Artifacts/48/481602f3db4dee3d875643405f5edb71 deleted file mode 100644 index ac5fd945..00000000 Binary files a/Library/Artifacts/48/481602f3db4dee3d875643405f5edb71 and /dev/null differ diff --git a/Library/Artifacts/4b/4bf1d80c9daf6e14bb7c787bc70ad16b b/Library/Artifacts/4b/4bf1d80c9daf6e14bb7c787bc70ad16b deleted file mode 100644 index d6aace19..00000000 Binary files a/Library/Artifacts/4b/4bf1d80c9daf6e14bb7c787bc70ad16b and /dev/null differ diff --git a/Library/Artifacts/51/51671c0d8e6e9759babfef7843407e5e b/Library/Artifacts/51/51671c0d8e6e9759babfef7843407e5e deleted file mode 100644 index ab55e439..00000000 Binary files a/Library/Artifacts/51/51671c0d8e6e9759babfef7843407e5e and /dev/null differ diff --git a/Library/Artifacts/51/51850975c8a9937325cd0b16ce5061ec b/Library/Artifacts/51/51850975c8a9937325cd0b16ce5061ec deleted file mode 100644 index 2afbaded..00000000 Binary files a/Library/Artifacts/51/51850975c8a9937325cd0b16ce5061ec and /dev/null differ diff --git a/Library/Artifacts/51/51a8513ee8d9b768652f9035fb406a71 b/Library/Artifacts/51/51a8513ee8d9b768652f9035fb406a71 deleted file mode 100644 index 351c00e0..00000000 Binary files a/Library/Artifacts/51/51a8513ee8d9b768652f9035fb406a71 and /dev/null differ diff --git a/Library/Artifacts/51/51cc94130f79363c04f06dc2deaa5aa4 b/Library/Artifacts/51/51cc94130f79363c04f06dc2deaa5aa4 deleted file mode 100644 index 70ee14ee..00000000 Binary files a/Library/Artifacts/51/51cc94130f79363c04f06dc2deaa5aa4 and /dev/null differ diff --git a/Library/Artifacts/53/532e06f1919e3e8d287e863686dbaa07 b/Library/Artifacts/53/532e06f1919e3e8d287e863686dbaa07 deleted file mode 100644 index 0002b3a0..00000000 Binary files a/Library/Artifacts/53/532e06f1919e3e8d287e863686dbaa07 and /dev/null differ diff --git a/Library/Artifacts/5d/5d0d07468cdb538bad2b6389a7dadd11 b/Library/Artifacts/5d/5d0d07468cdb538bad2b6389a7dadd11 deleted file mode 100644 index 6b31d5ee..00000000 Binary files a/Library/Artifacts/5d/5d0d07468cdb538bad2b6389a7dadd11 and /dev/null differ diff --git a/Library/Artifacts/5d/5d0fda662e125217916163be4ee9eb88 b/Library/Artifacts/5d/5d0fda662e125217916163be4ee9eb88 deleted file mode 100644 index 6047f5d4..00000000 Binary files a/Library/Artifacts/5d/5d0fda662e125217916163be4ee9eb88 and /dev/null differ diff --git a/Library/Artifacts/5e/5e3433cef4a98d67a2cbb5a2c74b0a24 b/Library/Artifacts/5e/5e3433cef4a98d67a2cbb5a2c74b0a24 deleted file mode 100644 index 64605d95..00000000 Binary files a/Library/Artifacts/5e/5e3433cef4a98d67a2cbb5a2c74b0a24 and /dev/null differ diff --git a/Library/Artifacts/61/61b5b00e2d06e48e2c62063420e24175 b/Library/Artifacts/61/61b5b00e2d06e48e2c62063420e24175 deleted file mode 100644 index 8cf192a8..00000000 Binary files a/Library/Artifacts/61/61b5b00e2d06e48e2c62063420e24175 and /dev/null differ diff --git a/Library/Artifacts/62/62782cdbac2813b1533cb86b0b45154d b/Library/Artifacts/62/62782cdbac2813b1533cb86b0b45154d deleted file mode 100644 index 91fb2006..00000000 Binary files a/Library/Artifacts/62/62782cdbac2813b1533cb86b0b45154d and /dev/null differ diff --git a/Library/Artifacts/62/62e71b95ba76173ae80b42bf885858c1 b/Library/Artifacts/62/62e71b95ba76173ae80b42bf885858c1 deleted file mode 100644 index ed9e35dd..00000000 Binary files a/Library/Artifacts/62/62e71b95ba76173ae80b42bf885858c1 and /dev/null differ diff --git a/Library/Artifacts/64/64d37b73c41a4fd9fec814eab17c53ed b/Library/Artifacts/64/64d37b73c41a4fd9fec814eab17c53ed deleted file mode 100644 index dc3fa131..00000000 Binary files a/Library/Artifacts/64/64d37b73c41a4fd9fec814eab17c53ed and /dev/null differ diff --git a/Library/Artifacts/6c/6c8fbc5d118a35f504d6cf5c7ce332d2 b/Library/Artifacts/6c/6c8fbc5d118a35f504d6cf5c7ce332d2 new file mode 100644 index 00000000..3d88ee5a Binary files /dev/null and b/Library/Artifacts/6c/6c8fbc5d118a35f504d6cf5c7ce332d2 differ diff --git a/Library/Artifacts/6d/6d5fb62ac39f09b0d28e6334d5c0f94c b/Library/Artifacts/6d/6d5fb62ac39f09b0d28e6334d5c0f94c deleted file mode 100644 index 73f7fcee..00000000 Binary files a/Library/Artifacts/6d/6d5fb62ac39f09b0d28e6334d5c0f94c and /dev/null differ diff --git a/Library/Artifacts/13/13aaacbf9c49fbb8428f475e337292a4 b/Library/Artifacts/6d/6d9d6de9100fee9b3c95ab27573078b3 similarity index 74% rename from Library/Artifacts/13/13aaacbf9c49fbb8428f475e337292a4 rename to Library/Artifacts/6d/6d9d6de9100fee9b3c95ab27573078b3 index 903bfc17..018ef422 100644 Binary files a/Library/Artifacts/13/13aaacbf9c49fbb8428f475e337292a4 and b/Library/Artifacts/6d/6d9d6de9100fee9b3c95ab27573078b3 differ diff --git a/Library/Artifacts/6f/6f98020403dc1061570eca17321ba04a b/Library/Artifacts/6f/6f98020403dc1061570eca17321ba04a new file mode 100644 index 00000000..233d9601 Binary files /dev/null and b/Library/Artifacts/6f/6f98020403dc1061570eca17321ba04a differ diff --git a/Library/Artifacts/72/729c3baea7ad3eb8f38bad350ed4457b b/Library/Artifacts/72/729c3baea7ad3eb8f38bad350ed4457b deleted file mode 100644 index af0842ef..00000000 Binary files a/Library/Artifacts/72/729c3baea7ad3eb8f38bad350ed4457b and /dev/null differ diff --git a/Library/Artifacts/cd/cd52f0de86ee1b3391798849ac0fc6c6 b/Library/Artifacts/73/733fd457cdf748e7764eee5cb69dbb42 similarity index 53% rename from Library/Artifacts/cd/cd52f0de86ee1b3391798849ac0fc6c6 rename to Library/Artifacts/73/733fd457cdf748e7764eee5cb69dbb42 index cff6ef7c..90d4168f 100644 Binary files a/Library/Artifacts/cd/cd52f0de86ee1b3391798849ac0fc6c6 and b/Library/Artifacts/73/733fd457cdf748e7764eee5cb69dbb42 differ diff --git a/Library/Artifacts/77/77a41747339aea9892e23cfec0a30021 b/Library/Artifacts/77/77a41747339aea9892e23cfec0a30021 deleted file mode 100644 index 4f4596bb..00000000 Binary files a/Library/Artifacts/77/77a41747339aea9892e23cfec0a30021 and /dev/null differ diff --git a/Library/Artifacts/7b/7b60aa0aa27c104db9318c0d8bbbae44 b/Library/Artifacts/7b/7b60aa0aa27c104db9318c0d8bbbae44 deleted file mode 100644 index d1b97c6b..00000000 Binary files a/Library/Artifacts/7b/7b60aa0aa27c104db9318c0d8bbbae44 and /dev/null differ diff --git a/Library/Artifacts/10/10d432acdc3aaf9bb4ff2a1b13c84653 b/Library/Artifacts/7b/7b84e21f9fe092cb397970d3503cbd68 similarity index 91% rename from Library/Artifacts/10/10d432acdc3aaf9bb4ff2a1b13c84653 rename to Library/Artifacts/7b/7b84e21f9fe092cb397970d3503cbd68 index 293fb27e..5d52fb48 100644 Binary files a/Library/Artifacts/10/10d432acdc3aaf9bb4ff2a1b13c84653 and b/Library/Artifacts/7b/7b84e21f9fe092cb397970d3503cbd68 differ diff --git a/Library/Artifacts/7e/7ebba85662bd572ea53683aa379d33dd b/Library/Artifacts/7e/7ebba85662bd572ea53683aa379d33dd deleted file mode 100644 index 0c98fad9..00000000 Binary files a/Library/Artifacts/7e/7ebba85662bd572ea53683aa379d33dd and /dev/null differ diff --git a/Library/Artifacts/7f/7f8aa166ef7a2f8eecf4159c1f38a93e b/Library/Artifacts/7f/7f8aa166ef7a2f8eecf4159c1f38a93e deleted file mode 100644 index 64f71827..00000000 Binary files a/Library/Artifacts/7f/7f8aa166ef7a2f8eecf4159c1f38a93e and /dev/null differ diff --git a/Library/Artifacts/83/83f7bca97ad2af6aaeb902c5f29bde2a b/Library/Artifacts/83/83f7bca97ad2af6aaeb902c5f29bde2a deleted file mode 100644 index 21d70707..00000000 Binary files a/Library/Artifacts/83/83f7bca97ad2af6aaeb902c5f29bde2a and /dev/null differ diff --git a/Library/Artifacts/85/85c1fcd64c9b8eba7006170b2d0945f6 b/Library/Artifacts/85/85c1fcd64c9b8eba7006170b2d0945f6 deleted file mode 100644 index 435bc911..00000000 Binary files a/Library/Artifacts/85/85c1fcd64c9b8eba7006170b2d0945f6 and /dev/null differ diff --git a/Library/Artifacts/87/874105594c2d0bd661078b7aabce70cd b/Library/Artifacts/87/874105594c2d0bd661078b7aabce70cd deleted file mode 100644 index 229ce652..00000000 Binary files a/Library/Artifacts/87/874105594c2d0bd661078b7aabce70cd and /dev/null differ diff --git a/Library/Artifacts/8a/8a6bfd248535e59a80497423558dbbe4 b/Library/Artifacts/8a/8a6bfd248535e59a80497423558dbbe4 deleted file mode 100644 index 2d62f830..00000000 Binary files a/Library/Artifacts/8a/8a6bfd248535e59a80497423558dbbe4 and /dev/null differ diff --git a/Library/Artifacts/8a/8a9504de1bacad4ea9587eeb5ea02e7d b/Library/Artifacts/8a/8a9504de1bacad4ea9587eeb5ea02e7d deleted file mode 100644 index f2b3b1c9..00000000 Binary files a/Library/Artifacts/8a/8a9504de1bacad4ea9587eeb5ea02e7d and /dev/null differ diff --git a/Library/Artifacts/8a/8af47596ff307a31a18e6f465cff3df4 b/Library/Artifacts/8a/8af47596ff307a31a18e6f465cff3df4 deleted file mode 100644 index 319824be..00000000 Binary files a/Library/Artifacts/8a/8af47596ff307a31a18e6f465cff3df4 and /dev/null differ diff --git a/Library/Artifacts/8c/8c423f0bf0f4135b8dc57f207b7f02b3 b/Library/Artifacts/8c/8c423f0bf0f4135b8dc57f207b7f02b3 new file mode 100644 index 00000000..ce113736 Binary files /dev/null and b/Library/Artifacts/8c/8c423f0bf0f4135b8dc57f207b7f02b3 differ diff --git a/Library/Artifacts/52/52d54dfc0a379ffb7669da61c4cfa1cb b/Library/Artifacts/90/90c6d082811a199601c987936f7bf9b7 similarity index 93% rename from Library/Artifacts/52/52d54dfc0a379ffb7669da61c4cfa1cb rename to Library/Artifacts/90/90c6d082811a199601c987936f7bf9b7 index 431e3b70..e5b2e082 100644 Binary files a/Library/Artifacts/52/52d54dfc0a379ffb7669da61c4cfa1cb and b/Library/Artifacts/90/90c6d082811a199601c987936f7bf9b7 differ diff --git a/Library/Artifacts/47/47db88c81c64f1b84729907d6bf78d1d b/Library/Artifacts/90/90cbecee7d72c107e727fc494a134c1c similarity index 70% rename from Library/Artifacts/47/47db88c81c64f1b84729907d6bf78d1d rename to Library/Artifacts/90/90cbecee7d72c107e727fc494a134c1c index b9d6c63c..66cd5fcc 100644 Binary files a/Library/Artifacts/47/47db88c81c64f1b84729907d6bf78d1d and b/Library/Artifacts/90/90cbecee7d72c107e727fc494a134c1c differ diff --git a/Library/Artifacts/92/927da265f527ab6fab7de4dfcd96ed50 b/Library/Artifacts/92/927da265f527ab6fab7de4dfcd96ed50 deleted file mode 100644 index 940ca1d6..00000000 Binary files a/Library/Artifacts/92/927da265f527ab6fab7de4dfcd96ed50 and /dev/null differ diff --git a/Library/Artifacts/94/9461fa068dcee3f11b83b15bc32bbd5f b/Library/Artifacts/94/9461fa068dcee3f11b83b15bc32bbd5f deleted file mode 100644 index c04a79b8..00000000 Binary files a/Library/Artifacts/94/9461fa068dcee3f11b83b15bc32bbd5f and /dev/null differ diff --git a/Library/Artifacts/94/94a3bf4fdcd2867feb3910beef444899 b/Library/Artifacts/94/94a3bf4fdcd2867feb3910beef444899 deleted file mode 100644 index f76d0eb0..00000000 Binary files a/Library/Artifacts/94/94a3bf4fdcd2867feb3910beef444899 and /dev/null differ diff --git a/Library/Artifacts/98/98530fa4c650d004a40688ecf6517523 b/Library/Artifacts/98/98530fa4c650d004a40688ecf6517523 deleted file mode 100644 index e8d192a3..00000000 Binary files a/Library/Artifacts/98/98530fa4c650d004a40688ecf6517523 and /dev/null differ diff --git a/Library/Artifacts/99/99900402acf99fa3ab56b1fe80b4e755 b/Library/Artifacts/99/99900402acf99fa3ab56b1fe80b4e755 deleted file mode 100644 index 0f86bb5e..00000000 Binary files a/Library/Artifacts/99/99900402acf99fa3ab56b1fe80b4e755 and /dev/null differ diff --git a/Library/Artifacts/9a/9a1aabd61ee7ec8481c6fc15ebe9a710 b/Library/Artifacts/9a/9a1aabd61ee7ec8481c6fc15ebe9a710 deleted file mode 100644 index ee901e93..00000000 Binary files a/Library/Artifacts/9a/9a1aabd61ee7ec8481c6fc15ebe9a710 and /dev/null differ diff --git a/Library/Artifacts/9a/9a8aa28b53ba3f4d7f1a4238c3c5b210 b/Library/Artifacts/9a/9a8aa28b53ba3f4d7f1a4238c3c5b210 deleted file mode 100644 index be108298..00000000 Binary files a/Library/Artifacts/9a/9a8aa28b53ba3f4d7f1a4238c3c5b210 and /dev/null differ diff --git a/Library/Artifacts/9b/9bcc6518cd96611647da20f52617034f b/Library/Artifacts/9b/9bcc6518cd96611647da20f52617034f new file mode 100644 index 00000000..025ad621 Binary files /dev/null and b/Library/Artifacts/9b/9bcc6518cd96611647da20f52617034f differ diff --git a/Library/Artifacts/9c/9c14a2cd73e66b61f468604b054e9786 b/Library/Artifacts/9c/9c14a2cd73e66b61f468604b054e9786 deleted file mode 100644 index 02c7a364..00000000 Binary files a/Library/Artifacts/9c/9c14a2cd73e66b61f468604b054e9786 and /dev/null differ diff --git a/Library/Artifacts/9e/9e4b03318effaadaa25b94d85ab85dd9 b/Library/Artifacts/9e/9e4b03318effaadaa25b94d85ab85dd9 deleted file mode 100644 index c8902452..00000000 Binary files a/Library/Artifacts/9e/9e4b03318effaadaa25b94d85ab85dd9 and /dev/null differ diff --git a/Library/Artifacts/a0/a04efc38f8ee49a0cbb84ee8a5be777b b/Library/Artifacts/a0/a04efc38f8ee49a0cbb84ee8a5be777b deleted file mode 100644 index 0d158c29..00000000 Binary files a/Library/Artifacts/a0/a04efc38f8ee49a0cbb84ee8a5be777b and /dev/null differ diff --git a/Library/Artifacts/ad/ad9691f41a6a93fad23ff527728dde05 b/Library/Artifacts/a1/a10218dd90f1852d4594424a5e3d8d53 similarity index 76% rename from Library/Artifacts/ad/ad9691f41a6a93fad23ff527728dde05 rename to Library/Artifacts/a1/a10218dd90f1852d4594424a5e3d8d53 index 3db08457..da827d42 100644 Binary files a/Library/Artifacts/ad/ad9691f41a6a93fad23ff527728dde05 and b/Library/Artifacts/a1/a10218dd90f1852d4594424a5e3d8d53 differ diff --git a/Library/Artifacts/a1/a1a103b45dc55e1038990c1628dec6d3 b/Library/Artifacts/a1/a1a103b45dc55e1038990c1628dec6d3 deleted file mode 100644 index b3190e30..00000000 Binary files a/Library/Artifacts/a1/a1a103b45dc55e1038990c1628dec6d3 and /dev/null differ diff --git a/Library/Artifacts/a2/a2a0e11c1e7d18760f2c4bc96e9164e6 b/Library/Artifacts/a2/a2a0e11c1e7d18760f2c4bc96e9164e6 deleted file mode 100644 index 266bbd7e..00000000 Binary files a/Library/Artifacts/a2/a2a0e11c1e7d18760f2c4bc96e9164e6 and /dev/null differ diff --git a/Library/Artifacts/a4/a4661116dd6d92e5882f437a1efb71c2 b/Library/Artifacts/a4/a4661116dd6d92e5882f437a1efb71c2 deleted file mode 100644 index 945657b7..00000000 Binary files a/Library/Artifacts/a4/a4661116dd6d92e5882f437a1efb71c2 and /dev/null differ diff --git a/Library/Artifacts/b9/b93f756b94a9a9d7f68ba19af1247a3a b/Library/Artifacts/a9/a964b5aa2b5cd451fe289cc7bda5f315 similarity index 50% rename from Library/Artifacts/b9/b93f756b94a9a9d7f68ba19af1247a3a rename to Library/Artifacts/a9/a964b5aa2b5cd451fe289cc7bda5f315 index 3b639060..16d89d33 100644 Binary files a/Library/Artifacts/b9/b93f756b94a9a9d7f68ba19af1247a3a and b/Library/Artifacts/a9/a964b5aa2b5cd451fe289cc7bda5f315 differ diff --git a/Library/Artifacts/ab/ab7897723e9e20fb67e86860fe1f5f4d b/Library/Artifacts/ab/ab7897723e9e20fb67e86860fe1f5f4d deleted file mode 100644 index f2b790b5..00000000 Binary files a/Library/Artifacts/ab/ab7897723e9e20fb67e86860fe1f5f4d and /dev/null differ diff --git a/Library/Artifacts/00/0082380ad370ef449e5d1ddd6b1ad4cd b/Library/Artifacts/ab/abb5253f6fc5e7647acfd8536936bcd8 similarity index 95% rename from Library/Artifacts/00/0082380ad370ef449e5d1ddd6b1ad4cd rename to Library/Artifacts/ab/abb5253f6fc5e7647acfd8536936bcd8 index 784785de..2b18a25d 100644 Binary files a/Library/Artifacts/00/0082380ad370ef449e5d1ddd6b1ad4cd and b/Library/Artifacts/ab/abb5253f6fc5e7647acfd8536936bcd8 differ diff --git a/Library/Artifacts/ac/ac8a83f842654f74796d65cbc9611a30 b/Library/Artifacts/ac/ac8a83f842654f74796d65cbc9611a30 deleted file mode 100644 index 96a2ea36..00000000 Binary files a/Library/Artifacts/ac/ac8a83f842654f74796d65cbc9611a30 and /dev/null differ diff --git a/Library/Artifacts/ad/ad2ac762e3d03a083094703e095411e0 b/Library/Artifacts/ad/ad2ac762e3d03a083094703e095411e0 deleted file mode 100644 index f2d9c93b..00000000 Binary files a/Library/Artifacts/ad/ad2ac762e3d03a083094703e095411e0 and /dev/null differ diff --git a/Library/Artifacts/fa/fa2600f91676c56c5960015283f99806 b/Library/Artifacts/ad/ad3fada03b812dd08c3da1709b341e68 similarity index 96% rename from Library/Artifacts/fa/fa2600f91676c56c5960015283f99806 rename to Library/Artifacts/ad/ad3fada03b812dd08c3da1709b341e68 index 6498ed3b..012bc0f8 100644 Binary files a/Library/Artifacts/fa/fa2600f91676c56c5960015283f99806 and b/Library/Artifacts/ad/ad3fada03b812dd08c3da1709b341e68 differ diff --git a/Library/Artifacts/ad/ad7ef32c4f7a8bdcfdc65909a145a9c4 b/Library/Artifacts/ad/ad7ef32c4f7a8bdcfdc65909a145a9c4 deleted file mode 100644 index c904ef2e..00000000 Binary files a/Library/Artifacts/ad/ad7ef32c4f7a8bdcfdc65909a145a9c4 and /dev/null differ diff --git a/Library/Artifacts/b1/b138ee12fb8ffb99321ce4b21eda8148 b/Library/Artifacts/b1/b138ee12fb8ffb99321ce4b21eda8148 new file mode 100644 index 00000000..98ce7f34 Binary files /dev/null and b/Library/Artifacts/b1/b138ee12fb8ffb99321ce4b21eda8148 differ diff --git a/Library/Artifacts/b1/b148bffc25de120948633d15f6baab30 b/Library/Artifacts/b1/b148bffc25de120948633d15f6baab30 deleted file mode 100644 index 280eaca4..00000000 Binary files a/Library/Artifacts/b1/b148bffc25de120948633d15f6baab30 and /dev/null differ diff --git a/Library/Artifacts/b1/b166ac04448690245c67aa3f5e11313b b/Library/Artifacts/b1/b166ac04448690245c67aa3f5e11313b deleted file mode 100644 index dcbcc7af..00000000 Binary files a/Library/Artifacts/b1/b166ac04448690245c67aa3f5e11313b and /dev/null differ diff --git a/Library/Artifacts/b1/b1de2f544a578c545bea8aab6c39cf2c b/Library/Artifacts/b1/b1de2f544a578c545bea8aab6c39cf2c deleted file mode 100644 index 7053488a..00000000 Binary files a/Library/Artifacts/b1/b1de2f544a578c545bea8aab6c39cf2c and /dev/null differ diff --git a/Library/Artifacts/b2/b25e03a7faf0aa3a01928de9a47359c9 b/Library/Artifacts/b2/b25e03a7faf0aa3a01928de9a47359c9 deleted file mode 100644 index fc31f7d8..00000000 Binary files a/Library/Artifacts/b2/b25e03a7faf0aa3a01928de9a47359c9 and /dev/null differ diff --git a/Library/Artifacts/b3/b34674fe46fd25587511b78041a3608e b/Library/Artifacts/b3/b34674fe46fd25587511b78041a3608e deleted file mode 100644 index 2745ca25..00000000 Binary files a/Library/Artifacts/b3/b34674fe46fd25587511b78041a3608e and /dev/null differ diff --git a/Library/Artifacts/b2/b256113bc97bfe0f36ed932ab91d09f9 b/Library/Artifacts/b4/b44abd2417f40d88a69b435250592ad6 similarity index 94% rename from Library/Artifacts/b2/b256113bc97bfe0f36ed932ab91d09f9 rename to Library/Artifacts/b4/b44abd2417f40d88a69b435250592ad6 index 1c474e1e..76eb9ea3 100644 Binary files a/Library/Artifacts/b2/b256113bc97bfe0f36ed932ab91d09f9 and b/Library/Artifacts/b4/b44abd2417f40d88a69b435250592ad6 differ diff --git a/Library/Artifacts/b7/b78d0894e28c262b30ae6f6b2de58fd1 b/Library/Artifacts/b7/b78d0894e28c262b30ae6f6b2de58fd1 deleted file mode 100644 index 765a3e1a..00000000 Binary files a/Library/Artifacts/b7/b78d0894e28c262b30ae6f6b2de58fd1 and /dev/null differ diff --git a/Library/Artifacts/bc/bc0b495216787be081eb6edb7de4fe1d b/Library/Artifacts/bc/bc0b495216787be081eb6edb7de4fe1d deleted file mode 100644 index a7ebcf19..00000000 Binary files a/Library/Artifacts/bc/bc0b495216787be081eb6edb7de4fe1d and /dev/null differ diff --git a/Library/Artifacts/be/bec161e05e196abdd3a707a92cb159e5 b/Library/Artifacts/be/bec161e05e196abdd3a707a92cb159e5 deleted file mode 100644 index 8c167b46..00000000 Binary files a/Library/Artifacts/be/bec161e05e196abdd3a707a92cb159e5 and /dev/null differ diff --git a/Library/Artifacts/60/6063362baad16e11699e2b3f204a89f2 b/Library/Artifacts/bf/bf6d33f2470f3937d015871e398ac6f8 similarity index 82% rename from Library/Artifacts/60/6063362baad16e11699e2b3f204a89f2 rename to Library/Artifacts/bf/bf6d33f2470f3937d015871e398ac6f8 index 23feb22d..abb56cb8 100644 Binary files a/Library/Artifacts/60/6063362baad16e11699e2b3f204a89f2 and b/Library/Artifacts/bf/bf6d33f2470f3937d015871e398ac6f8 differ diff --git a/Library/Artifacts/c2/c2abc37797ce7ac03a3885d768a671cc b/Library/Artifacts/c2/c2abc37797ce7ac03a3885d768a671cc deleted file mode 100644 index e00051af..00000000 Binary files a/Library/Artifacts/c2/c2abc37797ce7ac03a3885d768a671cc and /dev/null differ diff --git a/Library/Artifacts/c6/c600a40f70e3112e2068fe5fe20219ef b/Library/Artifacts/c6/c600a40f70e3112e2068fe5fe20219ef deleted file mode 100644 index 4a2260ed..00000000 Binary files a/Library/Artifacts/c6/c600a40f70e3112e2068fe5fe20219ef and /dev/null differ diff --git a/Library/Artifacts/50/509c26c5fa8917d85088f36c1baf2f64 b/Library/Artifacts/c8/c88c01e6b4903df79c1bb53535736965 similarity index 67% rename from Library/Artifacts/50/509c26c5fa8917d85088f36c1baf2f64 rename to Library/Artifacts/c8/c88c01e6b4903df79c1bb53535736965 index dc203969..720bc6d7 100644 Binary files a/Library/Artifacts/50/509c26c5fa8917d85088f36c1baf2f64 and b/Library/Artifacts/c8/c88c01e6b4903df79c1bb53535736965 differ diff --git a/Library/Artifacts/c9/c9544abcbea751dd2611b095f0b7e989 b/Library/Artifacts/c9/c9544abcbea751dd2611b095f0b7e989 deleted file mode 100644 index 765ff602..00000000 Binary files a/Library/Artifacts/c9/c9544abcbea751dd2611b095f0b7e989 and /dev/null differ diff --git a/Library/Artifacts/ca/ca4ef16483adeedb7aad727d771ec478 b/Library/Artifacts/ca/ca4ef16483adeedb7aad727d771ec478 deleted file mode 100644 index f42568cb..00000000 Binary files a/Library/Artifacts/ca/ca4ef16483adeedb7aad727d771ec478 and /dev/null differ diff --git a/Library/Artifacts/93/93a6d47c9abca8ab493744d309561da1 b/Library/Artifacts/cb/cb85a82dc85efb0d7873949598a47396 similarity index 82% rename from Library/Artifacts/93/93a6d47c9abca8ab493744d309561da1 rename to Library/Artifacts/cb/cb85a82dc85efb0d7873949598a47396 index c4ac7909..a939d50e 100644 Binary files a/Library/Artifacts/93/93a6d47c9abca8ab493744d309561da1 and b/Library/Artifacts/cb/cb85a82dc85efb0d7873949598a47396 differ diff --git a/Library/Artifacts/cf/cf20c15c8d1b86f687ba35b061e94c84 b/Library/Artifacts/cf/cf20c15c8d1b86f687ba35b061e94c84 new file mode 100644 index 00000000..535118bf Binary files /dev/null and b/Library/Artifacts/cf/cf20c15c8d1b86f687ba35b061e94c84 differ diff --git a/Library/Artifacts/cf/cf91de246413189a9ec455f427286f5b b/Library/Artifacts/cf/cf91de246413189a9ec455f427286f5b deleted file mode 100644 index 4d1797bd..00000000 Binary files a/Library/Artifacts/cf/cf91de246413189a9ec455f427286f5b and /dev/null differ diff --git a/Library/Artifacts/d0/d0a23de03d30bf567c59854c2e98041e b/Library/Artifacts/d0/d0a23de03d30bf567c59854c2e98041e deleted file mode 100644 index da59bc7b..00000000 Binary files a/Library/Artifacts/d0/d0a23de03d30bf567c59854c2e98041e and /dev/null differ diff --git a/Library/Artifacts/d2/d272e7d966aa10e494be5a629f64f37b b/Library/Artifacts/d2/d272e7d966aa10e494be5a629f64f37b deleted file mode 100644 index 29f6e135..00000000 Binary files a/Library/Artifacts/d2/d272e7d966aa10e494be5a629f64f37b and /dev/null differ diff --git a/Library/Artifacts/d2/d2c8427ac303f411292487ea102f1c5b b/Library/Artifacts/d2/d2c8427ac303f411292487ea102f1c5b deleted file mode 100644 index 872073f3..00000000 Binary files a/Library/Artifacts/d2/d2c8427ac303f411292487ea102f1c5b and /dev/null differ diff --git a/Library/Artifacts/d2/d2d6c30e75fdbc02255a14464b7e62ab b/Library/Artifacts/d2/d2d6c30e75fdbc02255a14464b7e62ab deleted file mode 100644 index 797b12de..00000000 Binary files a/Library/Artifacts/d2/d2d6c30e75fdbc02255a14464b7e62ab and /dev/null differ diff --git a/Library/Artifacts/d4/d41ab65d719a813d254d1e639eeefa07 b/Library/Artifacts/d4/d41ab65d719a813d254d1e639eeefa07 deleted file mode 100644 index 72456b0c..00000000 Binary files a/Library/Artifacts/d4/d41ab65d719a813d254d1e639eeefa07 and /dev/null differ diff --git a/Library/Artifacts/d7/d7f9f93d6a45806d728da150c8f72524 b/Library/Artifacts/d7/d7f9f93d6a45806d728da150c8f72524 deleted file mode 100644 index 938203fb..00000000 Binary files a/Library/Artifacts/d7/d7f9f93d6a45806d728da150c8f72524 and /dev/null differ diff --git a/Library/Artifacts/d8/d868360f44898060b6db82c6c266efec b/Library/Artifacts/d8/d868360f44898060b6db82c6c266efec deleted file mode 100644 index 1856ef0f..00000000 Binary files a/Library/Artifacts/d8/d868360f44898060b6db82c6c266efec and /dev/null differ diff --git a/Library/Artifacts/d8/d8e7fd1f8a748311fe8c1796aca46188 b/Library/Artifacts/d8/d8e7fd1f8a748311fe8c1796aca46188 deleted file mode 100644 index 2811ac50..00000000 Binary files a/Library/Artifacts/d8/d8e7fd1f8a748311fe8c1796aca46188 and /dev/null differ diff --git a/Library/Artifacts/d9/d9402c2ce05309f246b01391ffc860ca b/Library/Artifacts/d9/d9402c2ce05309f246b01391ffc860ca deleted file mode 100644 index b59aa81f..00000000 Binary files a/Library/Artifacts/d9/d9402c2ce05309f246b01391ffc860ca and /dev/null differ diff --git a/Library/Artifacts/db/db65a9328786c0b7eed1e6f239b4bad9 b/Library/Artifacts/db/db65a9328786c0b7eed1e6f239b4bad9 deleted file mode 100644 index eb3c944e..00000000 Binary files a/Library/Artifacts/db/db65a9328786c0b7eed1e6f239b4bad9 and /dev/null differ diff --git a/Library/Artifacts/dc/dca594611d265a18cf331bbdfcbf9fff b/Library/Artifacts/dc/dca594611d265a18cf331bbdfcbf9fff deleted file mode 100644 index 36dd3f16..00000000 Binary files a/Library/Artifacts/dc/dca594611d265a18cf331bbdfcbf9fff and /dev/null differ diff --git a/Library/Artifacts/e5/e57a22818ab6ff8c94e5757046bc2475 b/Library/Artifacts/e5/e57a22818ab6ff8c94e5757046bc2475 deleted file mode 100644 index 15c6e226..00000000 Binary files a/Library/Artifacts/e5/e57a22818ab6ff8c94e5757046bc2475 and /dev/null differ diff --git a/Library/Artifacts/eb/eb04f9568ecfa435e8d3f8c00ce5f2a2 b/Library/Artifacts/eb/eb04f9568ecfa435e8d3f8c00ce5f2a2 deleted file mode 100644 index 9bb0bad3..00000000 Binary files a/Library/Artifacts/eb/eb04f9568ecfa435e8d3f8c00ce5f2a2 and /dev/null differ diff --git a/Library/Artifacts/ed/eda52cfac38a5cc523d3547cd19fcacb b/Library/Artifacts/ed/eda52cfac38a5cc523d3547cd19fcacb deleted file mode 100644 index 00776473..00000000 Binary files a/Library/Artifacts/ed/eda52cfac38a5cc523d3547cd19fcacb and /dev/null differ diff --git a/Library/Artifacts/ed/eda9333aed6bb0a229ca46d0a42ca46e b/Library/Artifacts/ed/eda9333aed6bb0a229ca46d0a42ca46e deleted file mode 100644 index 52fef1e0..00000000 Binary files a/Library/Artifacts/ed/eda9333aed6bb0a229ca46d0a42ca46e and /dev/null differ diff --git a/Library/Artifacts/ef/ef936410bf9194d499736773d1853fb8 b/Library/Artifacts/ef/ef936410bf9194d499736773d1853fb8 deleted file mode 100644 index 27dd6520..00000000 Binary files a/Library/Artifacts/ef/ef936410bf9194d499736773d1853fb8 and /dev/null differ diff --git a/Library/Artifacts/f5/f513da86a4e240eab99a7335445c84fe b/Library/Artifacts/f5/f513da86a4e240eab99a7335445c84fe deleted file mode 100644 index b197808d..00000000 Binary files a/Library/Artifacts/f5/f513da86a4e240eab99a7335445c84fe and /dev/null differ diff --git a/Library/Artifacts/fa/fa1d70e1023a7a88ee11bcfbde2f1bec b/Library/Artifacts/fa/fa1d70e1023a7a88ee11bcfbde2f1bec deleted file mode 100644 index a5c420d2..00000000 Binary files a/Library/Artifacts/fa/fa1d70e1023a7a88ee11bcfbde2f1bec and /dev/null differ diff --git a/Library/Artifacts/fb/fbefca49b588f67d9276fdb02eb5b586 b/Library/Artifacts/fb/fbefca49b588f67d9276fdb02eb5b586 deleted file mode 100644 index ed6d612d..00000000 Binary files a/Library/Artifacts/fb/fbefca49b588f67d9276fdb02eb5b586 and /dev/null differ diff --git a/Library/Artifacts/fc/fc9ae2b95fd4e80110f9464b6635d8b1 b/Library/Artifacts/fc/fc9ae2b95fd4e80110f9464b6635d8b1 deleted file mode 100644 index bd59e921..00000000 Binary files a/Library/Artifacts/fc/fc9ae2b95fd4e80110f9464b6635d8b1 and /dev/null differ diff --git a/Library/Artifacts/40/40f56f93e693c68bfb85612a97a2a607 b/Library/Artifacts/fd/fd0a912267b0b54475415926eb845939 similarity index 72% rename from Library/Artifacts/40/40f56f93e693c68bfb85612a97a2a607 rename to Library/Artifacts/fd/fd0a912267b0b54475415926eb845939 index 544bb0b2..17938d67 100644 Binary files a/Library/Artifacts/40/40f56f93e693c68bfb85612a97a2a607 and b/Library/Artifacts/fd/fd0a912267b0b54475415926eb845939 differ diff --git a/Library/Artifacts/fd/fd6c4e8a93442733fc16e9769569c233 b/Library/Artifacts/fd/fd6c4e8a93442733fc16e9769569c233 deleted file mode 100644 index 260b042b..00000000 Binary files a/Library/Artifacts/fd/fd6c4e8a93442733fc16e9769569c233 and /dev/null differ diff --git a/Library/Artifacts/fd/fdb62a38f294621e589d5e1cb56724a4 b/Library/Artifacts/fd/fdb62a38f294621e589d5e1cb56724a4 deleted file mode 100644 index a1234723..00000000 Binary files a/Library/Artifacts/fd/fdb62a38f294621e589d5e1cb56724a4 and /dev/null differ diff --git a/Library/Artifacts/fd/fdeecc87a0ebfbe460715f6679fabc9a b/Library/Artifacts/fd/fdeecc87a0ebfbe460715f6679fabc9a deleted file mode 100644 index 261f8f01..00000000 Binary files a/Library/Artifacts/fd/fdeecc87a0ebfbe460715f6679fabc9a and /dev/null differ diff --git a/Library/Artifacts/fe/fe2a10d0a739e5942850dfa22b38f45d b/Library/Artifacts/fe/fe2a10d0a739e5942850dfa22b38f45d deleted file mode 100644 index f949225d..00000000 Binary files a/Library/Artifacts/fe/fe2a10d0a739e5942850dfa22b38f45d and /dev/null differ diff --git a/Library/Artifacts/ff/ff0c87cddd68a8f5ea281afc51ad75cb b/Library/Artifacts/ff/ff0c87cddd68a8f5ea281afc51ad75cb deleted file mode 100644 index f877ebaa..00000000 Binary files a/Library/Artifacts/ff/ff0c87cddd68a8f5ea281afc51ad75cb and /dev/null differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 9d5c22a8..654b8018 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 342} - m_MaxSize: {x: 12002, y: 8042} + m_MinSize: {x: 679, y: 342} + m_MaxSize: {x: 12004, y: 8042} vertical: 0 - controlID: 53710 + controlID: 738 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -135,12 +135,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1371 + width: 1374 height: 947 - m_MinSize: {x: 402, y: 342} - m_MaxSize: {x: 8002, y: 8042} + m_MinSize: {x: 403, y: 342} + m_MaxSize: {x: 8003, y: 8042} vertical: 1 - controlID: 53711 + controlID: 739 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -160,12 +160,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1371 + width: 1374 height: 595 - m_MinSize: {x: 402, y: 221} - m_MaxSize: {x: 8002, y: 4021} + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 53712 + controlID: 740 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,8 +185,8 @@ MonoBehaviour: y: 0 width: 295 height: 595 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -209,7 +209,7 @@ MonoBehaviour: serializedVersion: 2 x: 295 y: 0 - width: 1076 + width: 1079 height: 595 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -237,7 +237,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 595 - width: 1371 + width: 1374 height: 352 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} @@ -263,12 +263,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1371 + x: 1374 y: 0 - width: 549 + width: 546 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -297,7 +297,7 @@ MonoBehaviour: serializedVersion: 2 x: 296 y: 19 - width: 1074 + width: 1077 height: 574 m_ViewDataDictionary: {fileID: 0} m_SerializedViewNames: [] @@ -308,7 +308,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1074, y: 553} + m_TargetSize: {x: 1077, y: 553} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -323,10 +323,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -537 - m_HBaseRangeMax: 537 - m_VBaseRangeMin: -276.5 - m_VBaseRangeMax: 276.5 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -453.5 + m_VBaseRangeMax: 453.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -344,23 +344,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1074 - height: 553 + width: 1920 + height: 907 m_Scale: {x: 1, y: 1} - m_Translation: {x: 537, y: 276.5} + m_Translation: {x: 960, y: 453.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -537 - y: -276.5 - width: 1074 - height: 553 + x: -960 + y: -453.5 + width: 1920 + height: 907 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1074, y: 574} + m_LastWindowPixelSize: {x: 1920, y: 928} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -395,9 +395,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5c3b0000 - m_LastClickedID: 15196 - m_ExpandedIDs: 309afeffdaa4feffe40fffff5610ffff1432ffff3cd9ffff62fbffffb23a0000883b0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: e2fafffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -444,7 +444,7 @@ MonoBehaviour: serializedVersion: 2 x: 295 y: 73 - width: 1074 + width: 1077 height: 574 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 @@ -457,9 +457,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 641.0664, y: 228.73668, z: -21.788725} + m_Target: {x: 338.1779, y: 245.39705, z: -208.3125} speed: 2 - m_Value: {x: 641.0664, y: 228.73668, z: -21.788725} + m_Value: {x: 338.1779, y: 245.39705, z: -208.3125} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -509,9 +509,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 380.28433 + m_Target: 320.6586 speed: 2 - m_Value: 380.28433 + m_Value: 320.6586 m_Ortho: m_Target: 1 speed: 2 @@ -601,20 +601,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Textures/Humanlike/Heads + - Assets/Resources/Prefabs m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Textures/Humanlike/Heads + - Assets/Resources/Prefabs m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: da3e0000 - m_LastClickedID: 16090 - m_ExpandedIDs: 00000000503e0000623e00006a3e0000863e000000ca9a3b + m_SelectedIDs: c0400000 + m_LastClickedID: 16576 + m_ExpandedIDs: 00000000ae400000b040000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -642,7 +642,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000503e000000ca9a3b + m_ExpandedIDs: 00000000ae400000b040000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -667,9 +667,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 5c3b0000 - m_LastClickedInstanceID: 15196 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -721,7 +721,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 668 - width: 1370 + width: 1373 height: 331 m_ViewDataDictionary: {fileID: 0} --- !u!114 &18 @@ -776,9 +776,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1371 + x: 1374 y: 73 - width: 548 + width: 545 height: 926 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 @@ -792,4 +792,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 658 + m_LastVerticalScrollValue: 0 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index b12b1f02..23334909 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 471} - m_MaxSize: {x: 14000, y: 14021} + m_MinSize: {x: 679, y: 342} + m_MaxSize: {x: 12004, y: 8042} vertical: 0 - controlID: 53405 + controlID: 590 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1371 + width: 1374 height: 947 - m_MinSize: {x: 403, y: 471} - m_MaxSize: {x: 10000, y: 14021} + m_MinSize: {x: 403, y: 342} + m_MaxSize: {x: 8003, y: 8042} vertical: 1 - controlID: 53406 + controlID: 591 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,12 +161,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1371 + width: 1374 height: 595 m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 53407 + controlID: 566 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 309afeffdaa4feffe40fffff5610ffff1432ffff3cd9ffff62fbffffb23a0000883b0000 + m_ExpandedIDs: e2fafffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -265,7 +265,7 @@ MonoBehaviour: serializedVersion: 2 x: 295 y: 0 - width: 1076 + width: 1079 height: 595 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -299,7 +299,7 @@ MonoBehaviour: serializedVersion: 2 x: 295 y: 73 - width: 1074 + width: 1077 height: 574 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 @@ -312,9 +312,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 641.0664, y: 228.73668, z: -21.788725} + m_Target: {x: 338.1779, y: 245.39705, z: -208.3125} speed: 2 - m_Value: {x: 641.0664, y: 228.73668, z: -21.788725} + m_Value: {x: 338.1779, y: 245.39705, z: -208.3125} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -364,9 +364,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 380.28433 + m_Target: 320.6586 speed: 2 - m_Value: 380.28433 + m_Value: 320.6586 m_Ortho: m_Target: 1 speed: 2 @@ -427,24 +427,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 595 - width: 1371 + width: 1374 height: 352 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_ActualView: {fileID: 11} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -484,20 +484,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Textures/Humanlike/Heads + - Assets/Resources/Prefabs m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Textures/Humanlike/Heads + - Assets/Resources/Prefabs m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: da3e0000 - m_LastClickedID: 16090 - m_ExpandedIDs: 00000000503e0000623e00006a3e0000863e000000ca9a3b + m_SelectedIDs: c0400000 + m_LastClickedID: 16576 + m_ExpandedIDs: 00000000ae400000b040000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -525,7 +525,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000503e000000ca9a3b + m_ExpandedIDs: 00000000ae400000b040000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -550,8 +550,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 5c3b0000 - m_LastClickedInstanceID: 15196 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a000000000000 m_RenameOverlay: @@ -604,7 +604,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 668 - width: 1370 + width: 1373 height: 331 m_ViewDataDictionary: {fileID: 0} --- !u!114 &13 @@ -653,9 +653,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1371 + x: 1374 y: 0 - width: 549 + width: 546 height: 947 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -685,9 +685,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1371 + x: 1374 y: 73 - width: 548 + width: 545 height: 926 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 @@ -700,5 +700,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: 15196 - m_LastVerticalScrollValue: 658 + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index a5aacca7..902998ba 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll new file mode 100644 index 00000000..e7278f84 Binary files /dev/null and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb b/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb new file mode 100644 index 00000000..142e869e Binary files /dev/null and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index d1667515..6b5c483f 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index e2d51d6b..291a03ad 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/ScriptAssemblies/PsdPlugin.dll b/Library/ScriptAssemblies/PsdPlugin.dll index b09cc498..3404d07f 100644 Binary files a/Library/ScriptAssemblies/PsdPlugin.dll and b/Library/ScriptAssemblies/PsdPlugin.dll differ diff --git a/Library/ScriptAssemblies/PsdPlugin.pdb b/Library/ScriptAssemblies/PsdPlugin.pdb index 9e67b3a4..8ccc4667 100644 Binary files a/Library/ScriptAssemblies/PsdPlugin.pdb and b/Library/ScriptAssemblies/PsdPlugin.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll index 984d380d..da2ac6f8 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Editor.pdb b/Library/ScriptAssemblies/Unity.2D.Animation.Editor.pdb index e0c3c342..68500dfe 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Animation.Editor.pdb and b/Library/ScriptAssemblies/Unity.2D.Animation.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll index fd63e4a1..091a9f21 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll and b/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.pdb b/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.pdb index 6ca0960b..5cd880d0 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.pdb and b/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll index f4aadb4c..e90dc8b6 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll and b/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.pdb b/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.pdb index 241a2302..e231a8ca 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.pdb and b/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll index ecdc72f5..e7426c80 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Common.Editor.pdb b/Library/ScriptAssemblies/Unity.2D.Common.Editor.pdb index 15e35dc5..337ef8ec 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Common.Editor.pdb and b/Library/ScriptAssemblies/Unity.2D.Common.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll index c15d015b..5782ef83 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll and b/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll index 969e7559..54bb9cc5 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.Path.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Path.Editor.pdb b/Library/ScriptAssemblies/Unity.2D.Path.Editor.pdb index 2c3c6727..6b79058f 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Path.Editor.pdb and b/Library/ScriptAssemblies/Unity.2D.Path.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll index 71e842d1..0ba37698 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.pdb b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.pdb index d506b2a6..fc331a02 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.pdb and b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll index 1f6ff6e9..e7969a1c 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll and b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.pdb b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.pdb index 8e3a6043..4a64e4d0 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.PixelPerfect.pdb and b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll index d454cbbd..a455466e 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.pdb b/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.pdb index c5e5446f..1e35475f 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.pdb and b/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll index 852c3fd0..b948bd53 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll index 991c851b..0bc7ee5a 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.pdb b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.pdb index 004aa99b..e2a3464d 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.pdb and b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll index 6e827481..33407790 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll and b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.pdb b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.pdb index 12ce2e9b..0452657c 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.pdb and b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.pdb differ diff --git a/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll index d67f8824..40438086 100644 Binary files a/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll and b/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll index 4c510332..76669b46 100644 Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb index eb680de4..1fc3f2e0 100644 Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll b/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll index 2861a760..3ece0843 100644 Binary files a/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll and b/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll differ diff --git a/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.pdb b/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.pdb index 1b0deed3..91f5cc76 100644 Binary files a/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.pdb and b/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.pdb differ diff --git a/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll b/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll index 277c26c4..55c37f7f 100644 Binary files a/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll and b/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.pdb b/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.pdb index a06c6600..2aa40020 100644 Binary files a/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.pdb and b/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll b/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll index 77cf1374..bb3165cd 100644 Binary files a/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll and b/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Mathematics.Editor.pdb b/Library/ScriptAssemblies/Unity.Mathematics.Editor.pdb index 1a1cbf96..dc850aed 100644 Binary files a/Library/ScriptAssemblies/Unity.Mathematics.Editor.pdb and b/Library/ScriptAssemblies/Unity.Mathematics.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Mathematics.dll b/Library/ScriptAssemblies/Unity.Mathematics.dll index ece71096..3a95b5be 100644 Binary files a/Library/ScriptAssemblies/Unity.Mathematics.dll and b/Library/ScriptAssemblies/Unity.Mathematics.dll differ diff --git a/Library/ScriptAssemblies/Unity.Mathematics.pdb b/Library/ScriptAssemblies/Unity.Mathematics.pdb index 6a0e70f7..5e6a5c2b 100644 Binary files a/Library/ScriptAssemblies/Unity.Mathematics.pdb and b/Library/ScriptAssemblies/Unity.Mathematics.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Rider.Editor.dll b/Library/ScriptAssemblies/Unity.Rider.Editor.dll index aafedaea..6c495451 100644 Binary files a/Library/ScriptAssemblies/Unity.Rider.Editor.dll and b/Library/ScriptAssemblies/Unity.Rider.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Rider.Editor.pdb b/Library/ScriptAssemblies/Unity.Rider.Editor.pdb index 44defe1b..a060c4d6 100644 Binary files a/Library/ScriptAssemblies/Unity.Rider.Editor.pdb and b/Library/ScriptAssemblies/Unity.Rider.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index 0c99a574..2ebd100e 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb index 1c66f5c3..20cecd16 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll index 4d713310..6a42ad20 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.pdb b/Library/ScriptAssemblies/Unity.TextMeshPro.pdb index 67ba8083..681821bc 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.pdb and b/Library/ScriptAssemblies/Unity.TextMeshPro.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index 968b6492..716f4531 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll and b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb b/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb index aa14e395..c4be9adc 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb and b/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.dll b/Library/ScriptAssemblies/Unity.Timeline.dll index 87f66ea2..729e1526 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.dll and b/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.pdb b/Library/ScriptAssemblies/Unity.Timeline.pdb index 21df42ee..9616ebdf 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.pdb and b/Library/ScriptAssemblies/Unity.Timeline.pdb differ diff --git a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll index fb9fca38..ef309a9a 100644 Binary files a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll and b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb b/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb index cdc65a5b..f8612904 100644 Binary files a/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb and b/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb differ diff --git a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll index 531c5e36..a82b3f5e 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll and b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb b/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb index 8d53a64c..b91a6904 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb and b/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb differ diff --git a/Library/ScriptAssemblies/UnityEditor.UI.dll b/Library/ScriptAssemblies/UnityEditor.UI.dll index 693ee436..105c94c3 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.UI.dll and b/Library/ScriptAssemblies/UnityEditor.UI.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll index 3f34e6df..584c3bfd 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll and b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb b/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb index 8297d991..68e3577e 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb and b/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb differ diff --git a/Library/ScriptAssemblies/UnityEngine.UI.dll b/Library/ScriptAssemblies/UnityEngine.UI.dll index 48caebc7..e51279d0 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.UI.dll and b/Library/ScriptAssemblies/UnityEngine.UI.dll differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index b0ae4bb5..5a762a8f 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json b/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json new file mode 100644 index 00000000..7895757a --- /dev/null +++ b/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":8359461402257861397,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json b/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json new file mode 100644 index 00000000..ad77a441 --- /dev/null +++ b/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-2482d1331163f49448.json b/Library/StateCache/SceneView/352ee9-2482d1331163f49448.json new file mode 100644 index 00000000..5d319a1a --- /dev/null +++ b/Library/StateCache/SceneView/352ee9-2482d1331163f49448.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":537.0,"y":276.5,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":537.0930786132813,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-890d76c226858de4fa.json b/Library/StateCache/SceneView/352ee9-890d76c226858de4fa.json new file mode 100644 index 00000000..5d319a1a --- /dev/null +++ b/Library/StateCache/SceneView/352ee9-890d76c226858de4fa.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":537.0,"y":276.5,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":537.0930786132813,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-mainStage.json b/Library/StateCache/SceneView/352ee9-mainStage.json index 92e08303..468666e9 100644 --- a/Library/StateCache/SceneView/352ee9-mainStage.json +++ b/Library/StateCache/SceneView/352ee9-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":641.06640625,"y":228.73667907714845,"z":-21.788724899291993},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":380.2843322753906,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":338.1778869628906,"y":245.3970489501953,"z":-208.3125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":320.6585998535156,"orthographic":true} \ No newline at end of file diff --git a/Library/expandedItems b/Library/expandedItems index 39408981..a463cb70 100644 Binary files a/Library/expandedItems and b/Library/expandedItems differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log index 6ddd8b76..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,14 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler -Cmd: compileSnippet - api=4 type=0 insize=2355 outsize=790 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=2355 outsize=402 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=35398 outsize=2026 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=35398 outsize=1346 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=19154 outsize=1358 kw=UNITY_PASS_FORWARDADD DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=19154 outsize=1274 kw=UNITY_PASS_FORWARDADD DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 diff --git a/RimWorld-Animation-Studio.sln b/RimWorld-Animation-Studio.sln index e261d7b5..20aa4f92 100644 --- a/RimWorld-Animation-Studio.sln +++ b/RimWorld-Animation-Studio.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{DE362359-44D0-09FA-2268-B3965C19E49B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{145533E2-396A-951C-BF8B-97B735C73A5A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -13,6 +15,10 @@ Global {DE362359-44D0-09FA-2268-B3965C19E49B}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE362359-44D0-09FA-2268-B3965C19E49B}.Release|Any CPU.ActiveCfg = Release|Any CPU {DE362359-44D0-09FA-2268-B3965C19E49B}.Release|Any CPU.Build.0 = Release|Any CPU + {145533E2-396A-951C-BF8B-97B735C73A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {145533E2-396A-951C-BF8B-97B735C73A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {145533E2-396A-951C-BF8B-97B735C73A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {145533E2-396A-951C-BF8B-97B735C73A5A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache new file mode 100644 index 00000000..415ffc1c Binary files /dev/null and b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index 4c6a9a7c..cbe19412 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ