diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 11c8cc05..46fc90ba 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 index 4a4dc0d7..93454978 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -264,10 +264,10 @@ C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll - C:/UnityDev/rimworld-animation-studio/Assets/Plugins/Ookii.Dialogs.dll + C:/UnityDev/rimworld-animation-studio/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll - C:/UnityDev/rimworld-animation-studio/Assets/Plugins/System.Windows.Forms.dll + C:/UnityDev/rimworld-animation-studio/Assets/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 diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index a5a50ec6..0c7d8f24 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -120,16 +120,16 @@ - - - - - - + + + + + + @@ -317,10 +317,10 @@ C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEditor.dll - C:/UnityDev/rimworld-animation-studio/Assets/Plugins/Ookii.Dialogs.dll + C:/UnityDev/rimworld-animation-studio/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll - C:/UnityDev/rimworld-animation-studio/Assets/Plugins/System.Windows.Forms.dll + C:/UnityDev/rimworld-animation-studio/Assets/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/Assets/Plugins/Ookii.Dialogs.dll b/Assets/Plugins/Ookii.Dialogs.dll deleted file mode 100644 index a5164a5f..00000000 Binary files a/Assets/Plugins/Ookii.Dialogs.dll and /dev/null differ diff --git a/Assets/Plugins/Ookii.Dialogs.dll.meta b/Assets/Plugins/Ookii.Dialogs.dll.meta deleted file mode 100644 index 51fb98c3..00000000 --- a/Assets/Plugins/Ookii.Dialogs.dll.meta +++ /dev/null @@ -1,137 +0,0 @@ -fileFormatVersion: 2 -guid: e60958662eed5413d86143a0a69b731e -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 0 - Exclude Win64: 0 - Exclude WindowsStoreApps: 1 - Exclude iOS: 1 - - first: - : Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - OS: AnyOS - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: Windows - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: false - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle.meta b/Assets/Plugins/StandaloneFileBrowser.bundle.meta deleted file mode 100644 index 0be037ab..00000000 --- a/Assets/Plugins/StandaloneFileBrowser.bundle.meta +++ /dev/null @@ -1,92 +0,0 @@ -fileFormatVersion: 2 -guid: 110fdfb459db4fc448a2ccd37e200fa4 -folderAsset: yes -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 0 - Exclude Win: 1 - Exclude Win64: 1 - Exclude WindowsStoreApps: 1 - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel - second: - enabled: 1 - settings: {} - - first: - Standalone: OSXIntel64 - second: - enabled: 1 - settings: {} - - first: - Standalone: OSXUniversal - second: - enabled: 1 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: x86_64 - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: false - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser b/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser deleted file mode 100644 index f503cd98..00000000 Binary files a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser and /dev/null differ diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature.meta b/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature.meta deleted file mode 100644 index 5903b21b..00000000 --- a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7f3dc666a273b4a958e72a8b117c80ed -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature/CodeResources b/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature/CodeResources deleted file mode 100644 index d5d0fd74..00000000 --- a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature/CodeResources +++ /dev/null @@ -1,115 +0,0 @@ - - - - - files - - files2 - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature/CodeResources.meta b/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature/CodeResources.meta deleted file mode 100644 index 1a7c0904..00000000 --- a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/_CodeSignature/CodeResources.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4923ca71ad53a4a7586e9fbe4f5ff18b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/System.Windows.Forms.dll.meta b/Assets/Plugins/System.Windows.Forms.dll.meta deleted file mode 100644 index 107345b4..00000000 --- a/Assets/Plugins/System.Windows.Forms.dll.meta +++ /dev/null @@ -1,137 +0,0 @@ -fileFormatVersion: 2 -guid: 7d459a96865cc4aaab657012c6dc4833 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 0 - Exclude Linux: 1 - Exclude Linux64: 1 - Exclude LinuxUniversal: 1 - Exclude OSXIntel: 1 - Exclude OSXIntel64: 1 - Exclude OSXUniversal: 1 - Exclude WebGL: 1 - Exclude Win: 0 - Exclude Win64: 0 - Exclude WindowsStoreApps: 1 - Exclude iOS: 1 - - first: - : Editor - second: - enabled: 0 - settings: - CPU: AnyCPU - OS: AnyOS - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: ARMv7 - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: Windows - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 1 - settings: - CPU: x86 - - first: - Standalone: Win64 - second: - enabled: 1 - settings: - CPU: x86_64 - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - DontProcess: false - PlaceholderPath: - SDK: AnySDK - ScriptingBackend: AnyScriptingBackend - - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/KeyframeSlider.prefab b/Assets/Resources/Prefabs/KeyframeSlider.prefab index fd081f6b..ef4fd057 100644 --- a/Assets/Resources/Prefabs/KeyframeSlider.prefab +++ b/Assets/Resources/Prefabs/KeyframeSlider.prefab @@ -221,7 +221,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 1 + m_Interactable: 0 m_TargetGraphic: {fileID: 0} m_FillRect: {fileID: 0} m_HandleRect: {fileID: 4629009613275671144} diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs b/Assets/Scripts/GUI/AnimationTimeline.cs index ca393dfe..562fb0e0 100644 --- a/Assets/Scripts/GUI/AnimationTimeline.cs +++ b/Assets/Scripts/GUI/AnimationTimeline.cs @@ -77,14 +77,16 @@ namespace RimWorldAnimationStudio if (siblingIndex != null && siblingCount != null && MoveAnimationTimeline(siblingIndex.Value, delta)) { //siblingIndex = Mathf.Clamp(siblingCount.Value + delta, 0, siblingCount.Value - 1); - transform.SetSiblingIndex(transform.GetSiblingIndex() + delta); + //transform.SetSiblingIndex(transform.GetSiblingIndex() + delta); + AnimationController.Instance.ResetAnimationTimeline(); + AnimationController.Instance.InitializeAnimationTimeline(); } } public bool MoveAnimationTimeline(int startIndex, int delta) { if (startIndex + delta < 0 || startIndex + delta >= Workspace.animationDef.animationStages[Workspace.stageID].animationClips.Count) - { return false; } + { Debug.Log("Cannot move animation timeline - movement would exceed bounds"); return false; } Actor actor = Workspace.animationDef.actors[startIndex]; Workspace.animationDef.actors[startIndex] = Workspace.animationDef.actors[startIndex + delta]; diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs index 4d48d837..edaf7a1e 100644 --- a/Assets/Scripts/GUI/KeyframeSlider.cs +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -23,6 +23,7 @@ namespace RimWorldAnimationStudio private PawnAnimationClip clip; private PawnKeyframe keyframe; + private float dragTimeStart = -1f; public void Initialize(AnimationTimeline timeline, int actorID, int keyframeID) { @@ -47,7 +48,7 @@ namespace RimWorldAnimationStudio keyframe.atTick = (int)value; clip.BuildSimpleCurves(); - AnimationController.Instance.stageTick = keyframe.atTick.Value; + //AnimationController.Instance.stageTick = keyframe.atTick.Value; timeline.InitiateUpdateOfGhostFrames(); } @@ -104,9 +105,11 @@ namespace RimWorldAnimationStudio public void OnBeginDrag(PointerEventData eventData) { - AnimationController.Instance.stageTick = keyframe.atTick.Value; + //AnimationController.Instance.stageTick = keyframe.atTick.Value; Workspace.actorID = actorID; Workspace.keyframeID = keyframeID; + + dragTimeStart = Time.unscaledTime; } public override void OnDrag(PointerEventData eventData) @@ -114,9 +117,12 @@ namespace RimWorldAnimationStudio if (keyframe.atTick == 1) { value = 1; return; } + if (Time.unscaledTime - dragTimeStart < 0.05f) return; + + interactable = true; base.OnDrag(eventData); - AnimationController.Instance.stageTick = keyframe.atTick.Value; + //AnimationController.Instance.stageTick = keyframe.atTick.Value; Workspace.actorID = actorID; } @@ -125,6 +131,7 @@ namespace RimWorldAnimationStudio if (keyframe.atTick == 1) { value = 1; return; } + interactable = false; Workspace.Instance.RecordEvent("Keyframe tick"); } diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index f1213a5c..7bde06f9 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -459,7 +459,10 @@ namespace RimWorldAnimationStudio } animationClipLengthField.text = newStageWindowSize.ToString(); + Workspace.animationDef.animationStages[Workspace.stageID].stageWindowSize = newStageWindowSize; + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks = newStageWindowSize * int.Parse(cyclesNormalField.text); + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick = newStageWindowSize * int.Parse(cyclesFastField.text); Workspace.Instance.RecordEvent("Stage length"); } @@ -487,6 +490,7 @@ namespace RimWorldAnimationStudio if (int.TryParse(cyclesNormalField.text, out int cycles)) { cycles = cycles <= 0 ? 1 : cycles; + cyclesNormalField.text = cycles.ToString(); Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks = cycles * Workspace.StageWindowSize; Workspace.animationDef.animationStages[Workspace.stageID].isLooping = cycles > 1; diff --git a/Assets/Scripts/Utilities/XmlUtility.cs b/Assets/Scripts/Utilities/XmlUtility.cs index cacdf226..e991c5b6 100644 --- a/Assets/Scripts/Utilities/XmlUtility.cs +++ b/Assets/Scripts/Utilities/XmlUtility.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.IO; using System.Xml.Serialization; +using UnityEngine; namespace RimWorldAnimationStudio { @@ -12,11 +13,15 @@ namespace RimWorldAnimationStudio { public static T ReadXML(string path) { + Debug.Log("Reading data from " + path); + using (StreamReader stringReader = new StreamReader(path)) { XmlSerializer serializer = new XmlSerializer(typeof(T)); + var data = (T)serializer.Deserialize(stringReader); - return (T)serializer.Deserialize(stringReader); + Debug.Log("Read successful"); + return data; } } @@ -25,6 +30,8 @@ namespace RimWorldAnimationStudio if (obj == null || path == null || path == "") { return; } + Debug.Log("Saving data to " + path); + XmlSerializer writer = new XmlSerializer(typeof(T)); XmlSerializerNamespaces nameSpaces = new XmlSerializerNamespaces(); nameSpaces.Add("", ""); @@ -32,6 +39,8 @@ namespace RimWorldAnimationStudio FileStream file = File.Create(path); writer.Serialize(file, obj, nameSpaces); file.Close(); + + Debug.Log("Saving successful"); } } } diff --git a/Assets/Scripts/StandaloneFileBrowser.meta b/Assets/StandaloneFileBrowser.meta similarity index 77% rename from Assets/Scripts/StandaloneFileBrowser.meta rename to Assets/StandaloneFileBrowser.meta index 277ee44a..fbb92ac9 100644 --- a/Assets/Scripts/StandaloneFileBrowser.meta +++ b/Assets/StandaloneFileBrowser.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5992c02152ca3114bb1120d7350ac998 +guid: 57e25b4a578dba94c9353f4633b20549 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/StandaloneFileBrowser/IStandaloneFileBrowser.cs b/Assets/StandaloneFileBrowser/IStandaloneFileBrowser.cs similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/IStandaloneFileBrowser.cs rename to Assets/StandaloneFileBrowser/IStandaloneFileBrowser.cs diff --git a/Assets/Scripts/StandaloneFileBrowser/IStandaloneFileBrowser.cs.meta b/Assets/StandaloneFileBrowser/IStandaloneFileBrowser.cs.meta similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/IStandaloneFileBrowser.cs.meta rename to Assets/StandaloneFileBrowser/IStandaloneFileBrowser.cs.meta diff --git a/Assets/Plugins.meta b/Assets/StandaloneFileBrowser/Plugins.meta similarity index 100% rename from Assets/Plugins.meta rename to Assets/StandaloneFileBrowser/Plugins.meta diff --git a/Assets/Plugins/Linux.meta b/Assets/StandaloneFileBrowser/Plugins/Linux.meta similarity index 100% rename from Assets/Plugins/Linux.meta rename to Assets/StandaloneFileBrowser/Plugins/Linux.meta diff --git a/Assets/Plugins/Linux/x86_64.meta b/Assets/StandaloneFileBrowser/Plugins/Linux/x86_64.meta similarity index 100% rename from Assets/Plugins/Linux/x86_64.meta rename to Assets/StandaloneFileBrowser/Plugins/Linux/x86_64.meta diff --git a/Assets/Plugins/Linux/x86_64/libStandaloneFileBrowser.so b/Assets/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so similarity index 100% rename from Assets/Plugins/Linux/x86_64/libStandaloneFileBrowser.so rename to Assets/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so diff --git a/Assets/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta b/Assets/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta similarity index 100% rename from Assets/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta rename to Assets/StandaloneFileBrowser/Plugins/Linux/x86_64/libStandaloneFileBrowser.so.meta diff --git a/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll b/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll new file mode 100644 index 00000000..5c6bcfa1 Binary files /dev/null and b/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll differ diff --git a/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta b/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta new file mode 100644 index 00000000..e880bc50 --- /dev/null +++ b/Assets/StandaloneFileBrowser/Plugins/Ookii.Dialogs.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 1710e05d60f3e6b479beb0882481be3d +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta new file mode 100644 index 00000000..c7bdac63 --- /dev/null +++ b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle.meta @@ -0,0 +1,40 @@ +fileFormatVersion: 2 +guid: 110fdfb459db4fc448a2ccd37e200fa4 +folderAsset: yes +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Standalone: OSXIntel + second: + enabled: 1 + settings: {} + - first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: {} + - first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents.meta b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents.meta similarity index 100% rename from Assets/Plugins/StandaloneFileBrowser.bundle/Contents.meta rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents.meta diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist similarity index 76% rename from Assets/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist index caac85e4..52c479cc 100644 --- a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist +++ b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist @@ -3,13 +3,13 @@ BuildMachineOSBuild - 21A559 + 18A391 CFBundleDevelopmentRegion English CFBundleExecutable StandaloneFileBrowser CFBundleIdentifier - com.finoldigital.sfb + com.gkngkc.sfb CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -31,20 +31,16 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 13A1030d - DTPlatformName - macosx + 10A255 DTPlatformVersion - 12.0 + GM DTSDKBuild - 21A344 + 18A384 DTSDKName - macosx12.0 + macosx10.14 DTXcode - 1310 + 1000 DTXcodeBuild - 13A1030d - LSMinimumSystemVersion - 12.0 + 10A255 diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist.meta b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist.meta similarity index 76% rename from Assets/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist.meta rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist.meta index 89e7c7df..22c9f907 100644 --- a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist.meta +++ b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/Info.plist.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: ce685769797f44046afa3e567860c94c +timeCreated: 1505756861 +licenseType: Pro DefaultImporter: - externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS.meta b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS.meta similarity index 100% rename from Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS.meta rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS.meta diff --git a/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser new file mode 100644 index 00000000..caf2b686 Binary files /dev/null and b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser differ diff --git a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta similarity index 76% rename from Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta index 9c3a6009..a298a74a 100644 --- a/Assets/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta +++ b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.bundle/Contents/MacOS/StandaloneFileBrowser.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: ddf122e0e89124ce78aacfeecb3ec554 +timeCreated: 1508179371 +licenseType: Pro DefaultImporter: - externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/StandaloneFileBrowser.jslib b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib similarity index 100% rename from Assets/Plugins/StandaloneFileBrowser.jslib rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib diff --git a/Assets/Plugins/StandaloneFileBrowser.jslib.meta b/Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib.meta similarity index 100% rename from Assets/Plugins/StandaloneFileBrowser.jslib.meta rename to Assets/StandaloneFileBrowser/Plugins/StandaloneFileBrowser.jslib.meta diff --git a/Assets/Plugins/System.Windows.Forms.dll b/Assets/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll similarity index 100% rename from Assets/Plugins/System.Windows.Forms.dll rename to Assets/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll diff --git a/Assets/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta b/Assets/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta new file mode 100644 index 00000000..f757441d --- /dev/null +++ b/Assets/StandaloneFileBrowser/Plugins/System.Windows.Forms.dll.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: 7d459a96865cc4aaab657012c6dc4833 +timeCreated: 1491979494 +licenseType: Pro +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude WebGL: 1 + Exclude Win: 0 + Exclude Win64: 0 + Exclude iOS: 1 + data: + first: + '': Editor + second: + enabled: 0 + settings: + CPU: AnyCPU + OS: AnyOS + data: + first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: LinuxUniversal + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + data: + first: + iPhone: iOS + second: + enabled: 0 + settings: + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowser.cs b/Assets/StandaloneFileBrowser/StandaloneFileBrowser.cs similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowser.cs rename to Assets/StandaloneFileBrowser/StandaloneFileBrowser.cs diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowser.cs.meta b/Assets/StandaloneFileBrowser/StandaloneFileBrowser.cs.meta similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowser.cs.meta rename to Assets/StandaloneFileBrowser/StandaloneFileBrowser.cs.meta diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs b/Assets/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs.meta b/Assets/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs.meta similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs.meta rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserEditor.cs.meta diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs b/Assets/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta b/Assets/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserLinux.cs.meta diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserMac.cs b/Assets/StandaloneFileBrowser/StandaloneFileBrowserMac.cs similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserMac.cs rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserMac.cs diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta b/Assets/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserMac.cs.meta diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs b/Assets/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs diff --git a/Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs.meta b/Assets/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs.meta similarity index 100% rename from Assets/Scripts/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs.meta rename to Assets/StandaloneFileBrowser/StandaloneFileBrowserWindows.cs.meta diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 6d639629..e00dad4e 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Ookii.Dialogs.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Ookii.Dialogs.dll index a5164a5f..5c6bcfa1 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Ookii.Dialogs.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Ookii.Dialogs.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll index 46e23b08..44ba7ac6 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll index 013732c5..f0e6dcf3 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll index bfb2bd01..cdc4b9d4 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll index 2b76d7eb..78b47471 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll index 5e9f6883..93408458 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll index 2b2373ac..a2c6ef0c 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll index d6c62f16..d3cc4747 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll index 5cf0ac08..cac35165 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll index fa3b8b49..35675fcb 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll index 07194bf6..f0aded45 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers index 4fd32a24..ef341e76 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers differ diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index 19c5884d..c52443a0 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ diff --git a/Library/APIUpdater/project-dependencies.graph b/Library/APIUpdater/project-dependencies.graph index c464f224..24c57fc9 100644 Binary files a/Library/APIUpdater/project-dependencies.graph and b/Library/APIUpdater/project-dependencies.graph differ diff --git a/Library/ArtifactDB b/Library/ArtifactDB index cefde1c1..a3fa44c2 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/05/05cdb1340af7a5e268c69556c47bda59 b/Library/Artifacts/05/05cdb1340af7a5e268c69556c47bda59 new file mode 100644 index 00000000..177686e7 Binary files /dev/null and b/Library/Artifacts/05/05cdb1340af7a5e268c69556c47bda59 differ diff --git a/Library/Artifacts/17/170c15708822cac649ff5d850b5c7a6d b/Library/Artifacts/17/170c15708822cac649ff5d850b5c7a6d new file mode 100644 index 00000000..fb99d837 Binary files /dev/null and b/Library/Artifacts/17/170c15708822cac649ff5d850b5c7a6d differ diff --git a/Library/Artifacts/2f/2fb69d773badf21abbabe061baf68856 b/Library/Artifacts/2f/2fb69d773badf21abbabe061baf68856 new file mode 100644 index 00000000..589cea95 Binary files /dev/null and b/Library/Artifacts/2f/2fb69d773badf21abbabe061baf68856 differ diff --git a/Library/Artifacts/39/395660f8f3bc99f24ad57d88e8aa01fc b/Library/Artifacts/39/395660f8f3bc99f24ad57d88e8aa01fc new file mode 100644 index 00000000..db10e04a Binary files /dev/null and b/Library/Artifacts/39/395660f8f3bc99f24ad57d88e8aa01fc differ diff --git a/Library/Artifacts/3d/3d0d47805a6e66a116ed61e0c9c0d654 b/Library/Artifacts/3d/3d0d47805a6e66a116ed61e0c9c0d654 deleted file mode 100644 index f4ac4e04..00000000 Binary files a/Library/Artifacts/3d/3d0d47805a6e66a116ed61e0c9c0d654 and /dev/null differ diff --git a/Library/Artifacts/3e/3e14b4b5062b2e8c5a654764e7793804 b/Library/Artifacts/3e/3e14b4b5062b2e8c5a654764e7793804 new file mode 100644 index 00000000..3466b7a6 Binary files /dev/null and b/Library/Artifacts/3e/3e14b4b5062b2e8c5a654764e7793804 differ diff --git a/Library/Artifacts/47/47433e95164175e033cea242de128baa b/Library/Artifacts/47/47433e95164175e033cea242de128baa new file mode 100644 index 00000000..a0cd1ffe Binary files /dev/null and b/Library/Artifacts/47/47433e95164175e033cea242de128baa differ diff --git a/Library/Artifacts/4c/4c59e80f2143445de36d24f17651c260 b/Library/Artifacts/4c/4c59e80f2143445de36d24f17651c260 new file mode 100644 index 00000000..76a547cb Binary files /dev/null and b/Library/Artifacts/4c/4c59e80f2143445de36d24f17651c260 differ diff --git a/Library/Artifacts/4e/4e6ae4f8752a2e97fd5ac90edd4be66a b/Library/Artifacts/4e/4e6ae4f8752a2e97fd5ac90edd4be66a new file mode 100644 index 00000000..85ee2836 Binary files /dev/null and b/Library/Artifacts/4e/4e6ae4f8752a2e97fd5ac90edd4be66a differ diff --git a/Library/Artifacts/4e/4ec6f0c095e4d419a7660342fd0f489b b/Library/Artifacts/4e/4ec6f0c095e4d419a7660342fd0f489b new file mode 100644 index 00000000..eb35cac2 Binary files /dev/null and b/Library/Artifacts/4e/4ec6f0c095e4d419a7660342fd0f489b differ diff --git a/Library/Artifacts/50/5019082ec3c8c265f082a862699a3475 b/Library/Artifacts/50/5019082ec3c8c265f082a862699a3475 deleted file mode 100644 index cb19f451..00000000 Binary files a/Library/Artifacts/50/5019082ec3c8c265f082a862699a3475 and /dev/null differ diff --git a/Library/Artifacts/5a/5aba07c5f99eede664cc6968a5c1a600 b/Library/Artifacts/5a/5aba07c5f99eede664cc6968a5c1a600 new file mode 100644 index 00000000..85fc8490 Binary files /dev/null and b/Library/Artifacts/5a/5aba07c5f99eede664cc6968a5c1a600 differ diff --git a/Library/Artifacts/62/62cfba73a40324317eb9faeb8320d050 b/Library/Artifacts/62/62cfba73a40324317eb9faeb8320d050 new file mode 100644 index 00000000..a8b7a3b3 Binary files /dev/null and b/Library/Artifacts/62/62cfba73a40324317eb9faeb8320d050 differ diff --git a/Library/Artifacts/64/64894f1a76e346849d5e7b67577241fb b/Library/Artifacts/64/64894f1a76e346849d5e7b67577241fb deleted file mode 100644 index 26b2dc71..00000000 Binary files a/Library/Artifacts/64/64894f1a76e346849d5e7b67577241fb and /dev/null differ diff --git a/Library/Artifacts/67/67bbee597a074ff56fad8fe3556dc5a8 b/Library/Artifacts/67/67bbee597a074ff56fad8fe3556dc5a8 new file mode 100644 index 00000000..a4a93969 Binary files /dev/null and b/Library/Artifacts/67/67bbee597a074ff56fad8fe3556dc5a8 differ diff --git a/Library/Artifacts/76/76fa528d43dc8e6487d0360c5dd99ce3 b/Library/Artifacts/76/76fa528d43dc8e6487d0360c5dd99ce3 new file mode 100644 index 00000000..2d461eca Binary files /dev/null and b/Library/Artifacts/76/76fa528d43dc8e6487d0360c5dd99ce3 differ diff --git a/Library/Artifacts/78/78e7c344ce6230cfa28433b383f41dee b/Library/Artifacts/78/78e7c344ce6230cfa28433b383f41dee new file mode 100644 index 00000000..1b131ce9 Binary files /dev/null and b/Library/Artifacts/78/78e7c344ce6230cfa28433b383f41dee differ diff --git a/Library/Artifacts/86/863306785f83f3673f959a95ff73ff1c b/Library/Artifacts/86/863306785f83f3673f959a95ff73ff1c new file mode 100644 index 00000000..fcfb8413 Binary files /dev/null and b/Library/Artifacts/86/863306785f83f3673f959a95ff73ff1c differ diff --git a/Library/Artifacts/8c/8c9a76c4b9ed0149cbf22e72004b53c8 b/Library/Artifacts/8c/8c9a76c4b9ed0149cbf22e72004b53c8 new file mode 100644 index 00000000..7e5c310b Binary files /dev/null and b/Library/Artifacts/8c/8c9a76c4b9ed0149cbf22e72004b53c8 differ diff --git a/Library/Artifacts/9b/9bcf2ced00f3698e17cc489beaf0574f b/Library/Artifacts/9b/9bcf2ced00f3698e17cc489beaf0574f new file mode 100644 index 00000000..05711333 Binary files /dev/null and b/Library/Artifacts/9b/9bcf2ced00f3698e17cc489beaf0574f differ diff --git a/Library/Artifacts/ae/ae273eaea99a1f626f5acab6247f3214 b/Library/Artifacts/ae/ae273eaea99a1f626f5acab6247f3214 new file mode 100644 index 00000000..2fc0d9cf Binary files /dev/null and b/Library/Artifacts/ae/ae273eaea99a1f626f5acab6247f3214 differ diff --git a/Library/Artifacts/b2/b23621ca1d34476f39c1ef9fd4684077 b/Library/Artifacts/b2/b23621ca1d34476f39c1ef9fd4684077 new file mode 100644 index 00000000..d2aa21e7 Binary files /dev/null and b/Library/Artifacts/b2/b23621ca1d34476f39c1ef9fd4684077 differ diff --git a/Library/Artifacts/b5/b5d2103f32e185dc619cfb42bc4ec733 b/Library/Artifacts/b5/b5d2103f32e185dc619cfb42bc4ec733 deleted file mode 100644 index 80c16b5c..00000000 Binary files a/Library/Artifacts/b5/b5d2103f32e185dc619cfb42bc4ec733 and /dev/null differ diff --git a/Library/Artifacts/f0/f01e335b4c9d6bd69544adee7efa86cb b/Library/Artifacts/f0/f01e335b4c9d6bd69544adee7efa86cb new file mode 100644 index 00000000..af3ecd1b Binary files /dev/null and b/Library/Artifacts/f0/f01e335b4c9d6bd69544adee7efa86cb differ diff --git a/Library/Artifacts/f3/f3c468be4ccf2072686a94eba206e4cc b/Library/Artifacts/f3/f3c468be4ccf2072686a94eba206e4cc deleted file mode 100644 index 0c7e4c29..00000000 Binary files a/Library/Artifacts/f3/f3c468be4ccf2072686a94eba206e4cc and /dev/null differ diff --git a/Library/Artifacts/f9/f9b834c00b287e793f80707b129161d7 b/Library/Artifacts/f9/f9b834c00b287e793f80707b129161d7 new file mode 100644 index 00000000..e274c236 Binary files /dev/null and b/Library/Artifacts/f9/f9b834c00b287e793f80707b129161d7 differ diff --git a/Library/Artifacts/fa/faa498ec907a440ec9502ed8032ef611 b/Library/Artifacts/fa/faa498ec907a440ec9502ed8032ef611 deleted file mode 100644 index 0a4cda93..00000000 Binary files a/Library/Artifacts/fa/faa498ec907a440ec9502ed8032ef611 and /dev/null differ diff --git a/Library/Artifacts/fc/fc3fc8759c257b5aeda34ccd758214ba b/Library/Artifacts/fc/fc3fc8759c257b5aeda34ccd758214ba new file mode 100644 index 00000000..08350431 Binary files /dev/null and b/Library/Artifacts/fc/fc3fc8759c257b5aeda34ccd758214ba differ diff --git a/Library/Artifacts/fe/feca31394b05ca84358a110a622628a9 b/Library/Artifacts/fe/feca31394b05ca84358a110a622628a9 new file mode 100644 index 00000000..96932b46 Binary files /dev/null and b/Library/Artifacts/fe/feca31394b05ca84358a110a622628a9 differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 60fd34eb..f79b529b 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 542} + m_MinSize: {x: 875, y: 521} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -46,7 +46,7 @@ MonoBehaviour: y: 0 width: 1920 height: 997 - m_MinSize: {x: 875, y: 542} + m_MinSize: {x: 875, y: 521} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 492} - m_MaxSize: {x: 14001, y: 14042} + m_MinSize: {x: 678, y: 471} + m_MaxSize: {x: 14000, y: 14021} vertical: 0 - controlID: 1911 + controlID: 6558 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1524 height: 947 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 403, y: 471} + m_MaxSize: {x: 10000, y: 14021} vertical: 1 - controlID: 1912 + controlID: 6559 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,7 +165,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 1913 + controlID: 6560 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 4694ffff5a94fffff894ffff4cfbffff123d00003a3d0000a63d0000fa3e0000703f0000e43f00003e40000054450000 + m_ExpandedIDs: ec32feff0033feffa633feff668afeff888afeffb68afeffc4cbfeffdacbfeff84ccfeffd6d6ffffead6ffff8cd7ffffe6d9fffffad9ffff98daffff5ae9ffff6ee9ffff0ceaffff62fbffffb2be0000a2c20000940a0100620c010052100100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 22480000 - m_LastClickedID: 18466 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c4800001a48000000ca9a3b + m_SelectedIDs: 20480000 + m_LastClickedID: 18464 + m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c48000000ca9a3b + m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1200,7 +1200,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 67 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 190 + m_DirectoriesAreaWidth: 379 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1295,4 +1295,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 100 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 18dc2039..6b71655e 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: 492} - m_MaxSize: {x: 14001, y: 14042} + m_MinSize: {x: 678, y: 471} + m_MaxSize: {x: 14000, y: 14021} vertical: 0 - controlID: 1750 + controlID: 6238 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1524 height: 947 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 403, y: 471} + m_MaxSize: {x: 10000, y: 14021} vertical: 1 - controlID: 1751 + controlID: 6239 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 1752 + controlID: 6240 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 4cfbffff123d00003a3d0000a63d0000fa3e0000703f0000e43f00003e40000054450000 + m_ExpandedIDs: 668afeff888afeffb68afeffc4cbfeffdacbfeff84ccfeffd6d6ffffead6ffff8cd7ffffe6d9fffffad9ffff98daffff5ae9ffff6ee9ffff0ceaffff62fbffffb2be0000a2c20000940a0100620c010052100100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -939,8 +939,8 @@ MonoBehaviour: y: 648 width: 1524 height: 299 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -998,9 +998,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 22480000 - m_LastClickedID: 18466 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c4800001a48000000ca9a3b + m_SelectedIDs: 20480000 + m_LastClickedID: 18464 + m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000000448000006480000084800000a4800000c48000000ca9a3b + m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 52460000 + m_LastClickedInstanceID: 18002 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000 m_RenameOverlay: @@ -1083,7 +1083,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 67 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 190 + m_DirectoriesAreaWidth: 379 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 18002 + m_LastVerticalScrollValue: 100 diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index 095cc024..fc545419 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 78f2f651..78862720 100644 Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll index 6d639629..e00dad4e 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Ookii.Dialogs.dll b/Library/PlayerDataCache/Win/Data/Managed/Ookii.Dialogs.dll index a5164a5f..5c6bcfa1 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Ookii.Dialogs.dll and b/Library/PlayerDataCache/Win/Data/Managed/Ookii.Dialogs.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll index 46e23b08..44ba7ac6 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll index 013732c5..f0e6dcf3 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll index bfb2bd01..cdc4b9d4 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll index 2b76d7eb..78b47471 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll index 5e9f6883..93408458 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll index 2b2373ac..a2c6ef0c 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll index d6c62f16..d3cc4747 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll index 5cf0ac08..cac35165 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll index fa3b8b49..35675fcb 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll differ diff --git a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll index 07194bf6..f0aded45 100644 Binary files a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll and b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll differ diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Library/PlayerDataCache/Win/Data/globalgamemanagers index 4fd32a24..ef341e76 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index 19c5884d..c52443a0 100644 Binary files a/Library/PlayerDataCache/Win/Data/sharedassets0.assets and b/Library/PlayerDataCache/Win/Data/sharedassets0.assets differ diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index 5737dfe1..21f4db24 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -37,6 +37,7 @@ ScriptsOnlyBuild: - UnityEditor.U2D.Animation.BoneGizmo Unity.2D.Tilemap.Editor.dll: - UnityEditor.Tilemaps.GridBrush + - UnityEditor.Tilemaps.GridBrushEditor - UnityEditor.Tilemaps.GridPaintPaletteClipboard - UnityEditor.Tilemaps.GridPaintPaletteWindow - UnityEditor.Tilemaps.GridPaintingState @@ -109,99 +110,99 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11262} - Class: 114 - Script: {instanceID: 11290} + Script: {instanceID: 11288} - Class: 114 - Script: {instanceID: 11450} + Script: {instanceID: 11448} - Class: 114 - Script: {instanceID: 11502} + Script: {instanceID: 11500} + - Class: 114 + Script: {instanceID: 11596} - Class: 114 Script: {instanceID: 11598} - Class: 114 - Script: {instanceID: 11600} + Script: {instanceID: 11652} - Class: 114 - Script: {instanceID: 11654} + Script: {instanceID: 11728} - Class: 114 - Script: {instanceID: 11730} + Script: {instanceID: 11752} - Class: 114 - Script: {instanceID: 11754} + Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 11766} + Script: {instanceID: 11774} - Class: 114 - Script: {instanceID: 11776} + Script: {instanceID: 11796} - Class: 114 - Script: {instanceID: 11798} + Script: {instanceID: 11858} - Class: 114 - Script: {instanceID: 11860} + Script: {instanceID: 12128} - Class: 114 - Script: {instanceID: 12130} + Script: {instanceID: 12164} - Class: 114 - Script: {instanceID: 12166} + Script: {instanceID: 12330} - Class: 114 - Script: {instanceID: 12332} + Script: {instanceID: 12344} - Class: 114 - Script: {instanceID: 12346} + Script: {instanceID: 12592} - Class: 114 - Script: {instanceID: 12594} + Script: {instanceID: 12708} - Class: 114 - Script: {instanceID: 12710} + Script: {instanceID: 12732} - Class: 114 - Script: {instanceID: 12734} + Script: {instanceID: 12896} - Class: 114 - Script: {instanceID: 12898} + Script: {instanceID: 13142} - Class: 114 - Script: {instanceID: 13144} + Script: {instanceID: 13166} - Class: 114 - Script: {instanceID: 13168} + Script: {instanceID: 13206} - Class: 114 - Script: {instanceID: 13208} + Script: {instanceID: 13224} - Class: 114 - Script: {instanceID: 13226} + Script: {instanceID: 13234} - Class: 114 - Script: {instanceID: 13236} + Script: {instanceID: 13352} - Class: 114 - Script: {instanceID: 13354} + Script: {instanceID: 13384} - Class: 114 - Script: {instanceID: 13386} + Script: {instanceID: 13422} - Class: 114 - Script: {instanceID: 13424} + Script: {instanceID: 13440} - Class: 114 - Script: {instanceID: 13442} + Script: {instanceID: 13456} - Class: 114 - Script: {instanceID: 13458} + Script: {instanceID: 13468} - Class: 114 - Script: {instanceID: 13470} + Script: {instanceID: 13472} - Class: 114 - Script: {instanceID: 13474} + Script: {instanceID: 13506} - Class: 114 - Script: {instanceID: 13508} + Script: {instanceID: 13624} - Class: 114 - Script: {instanceID: 13626} + Script: {instanceID: 13638} - Class: 114 - Script: {instanceID: 13640} + Script: {instanceID: 13664} - Class: 114 - Script: {instanceID: 13666} + Script: {instanceID: 13866} - Class: 114 - Script: {instanceID: 13868} + Script: {instanceID: 14060} - Class: 114 - Script: {instanceID: 14062} + Script: {instanceID: 14140} - Class: 114 - Script: {instanceID: 14142} + Script: {instanceID: 14154} - Class: 114 - Script: {instanceID: 14156} + Script: {instanceID: 14302} - Class: 114 - Script: {instanceID: 14304} + Script: {instanceID: 14474} - Class: 114 - Script: {instanceID: 14476} + Script: {instanceID: 14506} - Class: 114 - Script: {instanceID: 14508} + Script: {instanceID: 14528} - Class: 114 Script: {instanceID: 14530} - Class: 114 - Script: {instanceID: 14532} + Script: {instanceID: 14570} - Class: 114 - Script: {instanceID: 14572} - - Class: 114 - Script: {instanceID: 14578} + Script: {instanceID: 14576} - Class: 115 Script: {instanceID: 0} - Class: 128 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 4fb921b8..437c14e8 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 82a1a3b6..d121c94b 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 97e930ec..7b7c9194 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 08dddf34..4692c000 100644 Binary files a/Library/ScriptAssemblies/PsdPlugin.dll and b/Library/ScriptAssemblies/PsdPlugin.dll differ diff --git a/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Animation.Editor.dll index 59b1ff47..03854971 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.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.Animation.Runtime.dll index 880596a5..fba6db24 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.Triangle.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.Animation.Triangle.Runtime.dll index 54796969..9052c66b 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.Common.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Common.Editor.dll index be6faed4..7597da53 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.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.Common.Runtime.dll index 883d5a1e..64540db6 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 d8b153d5..c2b9045c 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.PixelPerfect.Editor.dll b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.Editor.dll index f10b623a..4a3b73cb 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.dll b/Library/ScriptAssemblies/Unity.2D.PixelPerfect.dll index 87fe27db..c36adf8f 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.Psdimporter.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Psdimporter.Editor.dll index 9c6a9d5e..cf94eb15 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.Sprite.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll index 135d2513..f12dbd10 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 0ac7d479..3ef9fba0 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.Runtime.dll b/Library/ScriptAssemblies/Unity.2D.SpriteShape.Runtime.dll index 319dcd5c..6ee8d25a 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.Tilemap.Editor.dll b/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll index 4d19ddb1..debe9b66 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 1e4a7065..ab30fbb3 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.InternalAPIEditorBridge.001.dll b/Library/ScriptAssemblies/Unity.InternalAPIEditorBridge.001.dll index 3c25b7d3..32ba08f3 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.InternalAPIEngineBridge.001.dll b/Library/ScriptAssemblies/Unity.InternalAPIEngineBridge.001.dll index 289fbf01..5ed8ce65 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.Mathematics.Editor.dll b/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll index c8b64fb8..04b94706 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.dll b/Library/ScriptAssemblies/Unity.Mathematics.dll index 9ac0702e..e16a7285 100644 Binary files a/Library/ScriptAssemblies/Unity.Mathematics.dll and b/Library/ScriptAssemblies/Unity.Mathematics.dll differ diff --git a/Library/ScriptAssemblies/Unity.Rider.Editor.dll b/Library/ScriptAssemblies/Unity.Rider.Editor.dll index d376ac37..414e7852 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.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index c936b415..0f961ff8 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.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll index 6c316ed7..7d2a8c50 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index 7d50bde0..d89d807e 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.dll b/Library/ScriptAssemblies/Unity.Timeline.dll index b96d0aa2..62190b4c 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.dll and b/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll index edb367a1..656bb497 100644 Binary files a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll and b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll index 88709da1..54104d0c 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll and b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.UI.dll b/Library/ScriptAssemblies/UnityEditor.UI.dll index 9e8f557f..e4afb0cc 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 d0be554e..b6a84271 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll and b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.UI.dll b/Library/ScriptAssemblies/UnityEngine.UI.dll index 6a92632f..39577f69 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 65b8f8ba..4092ae21 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/expandedItems b/Library/expandedItems index 9b1e26fd..e932b3b1 100644 Binary files a/Library/expandedItems and b/Library/expandedItems differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe10.log b/Library/shadercompiler-UnityShaderCompiler.exe10.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Library/shadercompiler-UnityShaderCompiler.exe2.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe3.log b/Library/shadercompiler-UnityShaderCompiler.exe3.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe3.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Library/shadercompiler-UnityShaderCompiler.exe5.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe6.log b/Library/shadercompiler-UnityShaderCompiler.exe6.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe7.log b/Library/shadercompiler-UnityShaderCompiler.exe7.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe7.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe7.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe8.log b/Library/shadercompiler-UnityShaderCompiler.exe8.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe8.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe8.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe9.log b/Library/shadercompiler-UnityShaderCompiler.exe9.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe9.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe9.log @@ -1,4 +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 - -Quitting shader compiler process diff --git a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache index f5c682dc..c8ae8dcb 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache 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 a28789eb..a9f80ddd 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 921bdd55..f82af9c5 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ