diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 4844192d..e9a35aa8 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 07b60506..b0be8a04 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -65,6 +65,7 @@ + C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/Managed/UnityEngine/UnityEngine.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index e81215b3..01e23ef5 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -87,12 +87,14 @@ + + @@ -101,6 +103,7 @@ + @@ -114,21 +117,19 @@ + + - - - - - - + + diff --git a/Assets/Editor/FindMissingScriptsRecursively.cs b/Assets/Editor/FindMissingScriptsRecursively.cs new file mode 100644 index 00000000..3103ebd1 --- /dev/null +++ b/Assets/Editor/FindMissingScriptsRecursively.cs @@ -0,0 +1,130 @@ +using UnityEditor; +using UnityEngine; + +namespace AndroidUltimatePlugin.Helpers.Editor +{ + public class FindMissingScriptsRecursively : EditorWindow + { + static int _goCount = 0, _componentsCount = 0, _missingCount = 0; + + [MenuItem("Window/FindMissingScriptsRecursively")] + public static void ShowWindow() + { + GetWindow(typeof(FindMissingScriptsRecursively)); + } + + public void OnGUI() + { + if (GUILayout.Button("Find Missing Scripts in selected GameObjects")) + { + FindInSelected(); + } + + if (GUILayout.Button("Find Missing Scripts")) + { + FindAll(); + } + EditorGUILayout.BeginHorizontal(); + { + EditorGUILayout.LabelField("Component Scanned:"); + EditorGUILayout.LabelField("" + (_componentsCount == -1 ? "---" : _componentsCount.ToString())); + } + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.BeginHorizontal(); + { + EditorGUILayout.LabelField("Object Scanned:"); + EditorGUILayout.LabelField("" + (_goCount == -1 ? "---" : _goCount.ToString())); + } + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.BeginHorizontal(); + { + EditorGUILayout.LabelField("Possible Missing Scripts:"); + EditorGUILayout.LabelField("" + (_missingCount == -1 ? "---" : _missingCount.ToString())); + } + EditorGUILayout.EndHorizontal(); + } + + private static void FindAll() + { + _componentsCount = 0; + _goCount = 0; + _missingCount = 0; + + string[] assetsPaths = AssetDatabase.GetAllAssetPaths(); + + foreach (string assetPath in assetsPaths) + { + Object[] data = LoadAllAssetsAtPath(assetPath); + foreach (Object o in data) + { + if (o != null) + { + if (o is GameObject) + { + FindInGO((GameObject) o); + } + } + } + } + + Debug.Log($"Searched {_goCount} GameObjects, {_componentsCount} components, found {_missingCount} missing"); + } + + public static Object[] LoadAllAssetsAtPath(string assetPath) + { + return typeof(SceneAsset).Equals(AssetDatabase.GetMainAssetTypeAtPath(assetPath)) + ? + // prevent error "Do not use readobjectthreaded on scene objects!" + new[] {AssetDatabase.LoadMainAssetAtPath(assetPath)} + : AssetDatabase.LoadAllAssetsAtPath(assetPath); + } + + private static void FindInSelected() + { + GameObject[] go = Selection.gameObjects; + _goCount = 0; + _componentsCount = 0; + _missingCount = 0; + foreach (GameObject g in go) + { + + FindInGO(g); + } + + Debug.Log($"Searched {_goCount} GameObjects, {_componentsCount} components, found {_missingCount} missing"); + } + + private static void FindInGO(GameObject g) + { + _goCount++; + Component[] components = g.GetComponents(); + for (int i = 0; i < components.Length; i++) + { + _componentsCount++; + if (components[i] == null) + { + _missingCount++; + string s = g.name; + Transform t = g.transform; + while (t.parent != null) + { + var parent = t.parent; + s = parent.name + "/" + s; + t = parent; + } + + Debug.Log(s + " has an empty script attached in position: " + i, g); + } + } + + // Now recurse through each child GO (if there are any): + foreach (Transform childT in g.transform) + { + //Debug.Log("Searching " + childT.name + " " ); + FindInGO(childT.gameObject); + } + } + } +} \ No newline at end of file diff --git a/Assets/Editor/FindMissingScriptsRecursively.cs.meta b/Assets/Editor/FindMissingScriptsRecursively.cs.meta new file mode 100644 index 00000000..b8bdbd8f --- /dev/null +++ b/Assets/Editor/FindMissingScriptsRecursively.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f991f27152653b841901199172a12809 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/ActorBody.prefab b/Assets/Resources/Prefabs/ActorBody.prefab index e3d5d314..fd7e3b98 100644 --- a/Assets/Resources/Prefabs/ActorBody.prefab +++ b/Assets/Resources/Prefabs/ActorBody.prefab @@ -1,344 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &111030959124096607 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 523924871185930481} - - component: {fileID: 3345967395353432914} - - component: {fileID: 7181959437973434010} - - component: {fileID: 8578366366517098866} - - component: {fileID: 2696481706634536602} - m_Layer: 0 - m_Name: ActorHandRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &523924871185930481 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111030959124096607} - 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: 7929422520673851209} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3345967395353432914 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111030959124096607} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -2115984483 - m_SortingLayer: 22 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 68b94fce550ad52498142c9433df954b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.3837838, y: 1.3837838} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!60 &7181959437973434010 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111030959124096607} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.0039216, y: 1.0039216} - newSize: {x: 1.3837838, y: 1.3837838} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.013513514, y: -0.035135135} - - {x: 0.029729731, y: -0.029729731} - - {x: 0.040540542, y: -0.0027027028} - - {x: 0.045945946, y: 0.12162162} - - {x: 0.013513514, y: 0.15945946} - - {x: -0.024324324, y: 0.14864865} - - {x: -0.040540542, y: 0.12162162} - - {x: -0.024324324, y: -0.029729731} - - - {x: -0.056756757, y: 0.008108108} - - {x: -0.051351354, y: 0.072972976} - - {x: -0.056756757, y: 0.029729731} - - - {x: 0.056756757, y: 0.008108108} - - {x: 0.056756757, y: 0.01891892} - - - {x: 0.056756757, y: 0.07837838} - - {x: 0.062162165, y: 0.1} - - {x: 0.056756757, y: 0.089189194} ---- !u!114 &8578366366517098866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111030959124096607} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8c55c83d4c4dd1145ad5fbbab3c3df36, type: 3} - m_Name: - m_EditorClassIdentifier: - AlphaTolerance: 50 - DistanceThreshold: 2 - Scale: 1 - Decompose: 0 - RunInPlayMode: 1 - UseCache: 0 - lastAlphaTolerance: 20 - lastScale: 1 - lastDistanceThreshold: 2 - lastDecompose: 0 - lastSprite: {fileID: 21300000, guid: 38c0bc38c0d71b04cb11a1eb610990e1, type: 3} - lastRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 256 - height: 256 - lastOffset: {x: 128, y: 128} - lastPixelsPerUnit: 185 - lastFlipX: 0 - lastFlipY: 0 - editorCache: [] ---- !u!114 &2696481706634536602 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111030959124096607} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b23e33f312d52c642b86f5f2138f4030, type: 3} - m_Name: - m_EditorClassIdentifier: - bodyPartRenderer: {fileID: 3345967395353432914} - parent: {fileID: -4411442180840688308} - bodyPart: right hand ---- !u!1 &2846713953308910856 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7268521810611446429} - - component: {fileID: 4070361490379091543} - - component: {fileID: 2766569757332877970} - - component: {fileID: 1056544768350913866} - - component: {fileID: 8546380208971044199} - m_Layer: 0 - m_Name: ActorHandLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7268521810611446429 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2846713953308910856} - 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: 7929422520673851209} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4070361490379091543 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2846713953308910856} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -2115984483 - m_SortingLayer: 22 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 68b94fce550ad52498142c9433df954b, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.3837838, y: 1.3837838} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!60 &2766569757332877970 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2846713953308910856} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.0039216, y: 1.0039216} - newSize: {x: 1.3837838, y: 1.3837838} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -0.013513514, y: -0.035135135} - - {x: 0.035135135, y: -0.01891892} - - {x: 0.040540542, y: 0.13243243} - - {x: 0.01891892, y: 0.15405406} - - {x: -0.013513514, y: 0.15405406} - - {x: -0.035135135, y: 0.13243243} - - {x: -0.024324324, y: -0.024324324} ---- !u!114 &1056544768350913866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2846713953308910856} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8c55c83d4c4dd1145ad5fbbab3c3df36, type: 3} - m_Name: - m_EditorClassIdentifier: - AlphaTolerance: 50 - DistanceThreshold: 2 - Scale: 1 - Decompose: 0 - RunInPlayMode: 1 - UseCache: 0 - lastAlphaTolerance: 50 - lastScale: 1 - lastDistanceThreshold: 2 - lastDecompose: 0 - lastSprite: {fileID: 21300000, guid: 38c0bc38c0d71b04cb11a1eb610990e1, type: 3} - lastRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 256 - height: 256 - lastOffset: {x: 128, y: 128} - lastPixelsPerUnit: 185 - lastFlipX: 0 - lastFlipY: 0 - editorCache: [] ---- !u!114 &8546380208971044199 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2846713953308910856} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b23e33f312d52c642b86f5f2138f4030, type: 3} - m_Name: - m_EditorClassIdentifier: - bodyPartRenderer: {fileID: 4070361490379091543} - parent: {fileID: -4411442180840688308} - bodyPart: left hand --- !u!1 &3158459618386162366 GameObject: m_ObjectHideFlags: 0 @@ -670,9 +331,6 @@ Transform: - {fileID: 7516402502875270591} - {fileID: 7929422519883802245} - {fileID: 4090857286061458930} - - {fileID: 366978152691480472} - - {fileID: 7268521810611446429} - - {fileID: 523924871185930481} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -690,6 +348,8 @@ MonoBehaviour: m_EditorClassIdentifier: actorID: 0 bodyRenderer: {fileID: 5996161745621340017} + actorBodyPartPrefab: {fileID: 6079743031150361545, guid: ffbd7531e8f98f94dba0fddefcae2441, + type: 3} --- !u!1 &9122292209377678227 GameObject: m_ObjectHideFlags: 0 @@ -864,114 +524,3 @@ MonoBehaviour: bodyPartRenderer: {fileID: 4251726083449519904} parent: {fileID: -4411442180840688308} bodyPart: appendage ---- !u!1001 &8747398589072214225 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7929422520673851209} - m_Modifications: - - target: {fileID: 2259458396607883071, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_Size.x - value: 1.5058824 - objectReference: {fileID: 0} - - target: {fileID: 2259458396607883071, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_Size.y - value: 1.5058824 - objectReference: {fileID: 0} - - target: {fileID: 2259458396607883071, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: c8db866783ad2a3498006437fd914bc4, - type: 3} - - target: {fileID: 2259458396607883071, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_WasSpriteAssigned - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3972152003096792844, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_Name - value: ActorSexToy - objectReference: {fileID: 0} - - target: {fileID: 4800170110735377442, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_SpriteTilingProperty.newSize.x - value: 1.5058824 - objectReference: {fileID: 0} - - target: {fileID: 4800170110735377442, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_SpriteTilingProperty.newSize.y - value: 1.5058824 - objectReference: {fileID: 0} - - target: {fileID: 6079743031150361545, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: parent - value: - objectReference: {fileID: -4411442180840688308} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ffbd7531e8f98f94dba0fddefcae2441, type: 3} ---- !u!4 &366978152691480472 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8967445332558757705, guid: ffbd7531e8f98f94dba0fddefcae2441, - type: 3} - m_PrefabInstance: {fileID: 8747398589072214225} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Prefabs/ActorBodyPArt.prefab b/Assets/Resources/Prefabs/ActorBodyPArt.prefab index 1367d43c..6966855e 100644 --- a/Assets/Resources/Prefabs/ActorBodyPArt.prefab +++ b/Assets/Resources/Prefabs/ActorBodyPArt.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 2544842580858030677} - component: {fileID: 6079743031150361545} m_Layer: 0 - m_Name: ActorSexToy + m_Name: ActorBodyPArt m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -173,4 +173,4 @@ MonoBehaviour: m_EditorClassIdentifier: bodyPartRenderer: {fileID: 2259458396607883071} parent: {fileID: 0} - bodyPart: dildo + bodyPart: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index b02a7594..e9c78fa7 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1696,8 +1696,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1179107127} + - {fileID: 681903173} m_Father: {fileID: 1552819969} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -12633,14 +12634,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1552819969} + m_Father: {fileID: 121643454} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 145.19, y: 0} - m_SizeDelta: {x: 30, y: 30} - m_Pivot: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &681903174 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17847,12 +17848,12 @@ RectTransform: - {fileID: 225041961} - {fileID: 593007063} m_Father: {fileID: 1216651060} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -60} - m_SizeDelta: {x: 120, y: 30} + m_AnchoredPosition: {x: -9, y: -60} + m_SizeDelta: {x: 145, y: 30} m_Pivot: {x: 1, y: 1} --- !u!114 &1001419736 MonoBehaviour: @@ -20173,8 +20174,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5, y: -0.5} - m_SizeDelta: {x: -35, y: -13} + m_AnchoredPosition: {x: 5.13, y: -0.5} + m_SizeDelta: {x: -60.255554, y: -13} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1151323894 MonoBehaviour: @@ -20298,7 +20299,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 922060210} m_HandleRect: {fileID: 922060209} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -21086,8 +21087,8 @@ RectTransform: 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_AnchoredPosition: {x: 16.48, y: 0} + m_SizeDelta: {x: -32.94964, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1179107128 MonoBehaviour: @@ -21115,7 +21116,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -21692,8 +21693,8 @@ RectTransform: - {fileID: 4300837137793644386} - {fileID: 4070467796814498374} - {fileID: 6085830301866471447} - - {fileID: 1470937577} - {fileID: 1001419735} + - {fileID: 1470937577} - {fileID: 935483303288600285} - {fileID: 1012383901} - {fileID: 11575766} @@ -22461,7 +22462,7 @@ PrefabInstance: - target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505, type: 3} @@ -23039,7 +23040,7 @@ MonoBehaviour: m_GameObject: {fileID: 1289465653} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9b19816966eab6a4eba748f04532fb61, type: 3} + m_Script: {fileID: 11500000, guid: 09b43781ddbab9c49b81b88c7a8b4076, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1293104865 @@ -27076,11 +27077,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1216651060} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -141, y: -63} + m_AnchoredPosition: {x: -137, y: -63} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1470937578 @@ -28694,7 +28695,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1190554011} - - {fileID: 681903173} - {fileID: 121643454} m_Father: {fileID: 1257725762} m_RootOrder: 0 @@ -30103,18 +30103,7 @@ MonoBehaviour: m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 629081417} - m_MethodName: OnValueChanged - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] m_OnValueChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/1_To_update.meta b/Assets/Scripts/1_To_update.meta deleted file mode 100644 index b2a4c8e9..00000000 --- a/Assets/Scripts/1_To_update.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ff71352a02fb53440a35dbeabb9ebc87 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/AnimationComponents/ActorAddon.cs b/Assets/Scripts/AnimationComponents/ActorAddon.cs index 67793aa0..abbebdc0 100644 --- a/Assets/Scripts/AnimationComponents/ActorAddon.cs +++ b/Assets/Scripts/AnimationComponents/ActorAddon.cs @@ -15,13 +15,12 @@ namespace RimWorldAnimationStudio public int? anchoringActor; public string anchorName; public string layer = "Pawn"; - public float? scale; + public GraphicData graphicData; public bool? render; // Data serialization control public bool ShouldSerializeanchorName() { return string.IsNullOrEmpty(anchorName) == false && anchorName.ToLower() != "none"; } public bool ShouldSerializeanchoringActor() { return anchoringActor.HasValue; } - public bool ShouldSerializescale() { return scale.HasValue; } public bool ShouldSerializerender() { return render == true; } // Data helper functions @@ -49,10 +48,11 @@ namespace RimWorldAnimationStudio set { layer = value; } } - [XmlIgnore] public float Scale + [XmlIgnore] + public GraphicData GraphicData { - get { return scale.HasValue ? scale.Value : 0f; } - set { scale = value; } + get { return graphicData; } + set { graphicData = value; } } [XmlIgnore] public bool Render @@ -69,10 +69,10 @@ namespace RimWorldAnimationStudio // Constructors public ActorAddon() { } - public ActorAddon(string addonName, float scale = 1f) + public ActorAddon(ActorAddonDef actorAddonDef) { - this.AddonName = addonName; - this.Scale = scale; + this.AddonName = actorAddonDef.addonName; + this.GraphicData = actorAddonDef.graphicData.Copy(); } } } diff --git a/Assets/Scripts/AnimationComponents/ActorAddonDef.cs b/Assets/Scripts/AnimationComponents/ActorAddonDef.cs index b0a37549..a64595ec 100644 --- a/Assets/Scripts/AnimationComponents/ActorAddonDef.cs +++ b/Assets/Scripts/AnimationComponents/ActorAddonDef.cs @@ -11,5 +11,7 @@ namespace RimWorldAnimationStudio public string addonName; public string label; public float scale = 1f; + + public GraphicData graphicData; } } diff --git a/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs index a3a80f0f..d17c7647 100644 --- a/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs @@ -62,6 +62,10 @@ namespace RimWorldAnimationStudio // Methods public void BuildSimpleCurves() { + // Add addon data (if missing) + foreach (ActorAddonDef actorAddonDef in ActorAddonDefs.allDefs) + { AddActorAddon(actorAddonDef); } + // Clear simple curve data BodyAngle.Clear(); HeadAngle.Clear(); @@ -72,10 +76,6 @@ namespace RimWorldAnimationStudio HeadBob.Clear(); GenitalAngle.Clear(); - AddActorAddon("left hand", 0.667f); - AddActorAddon("right hand", 0.667f); - AddActorAddon("dildo"); - foreach (ActorAddon addon in Addons) { addon.PosX.Clear(); @@ -83,7 +83,7 @@ namespace RimWorldAnimationStudio addon.Rotation.Clear(); } - // Start + // Start building simple curves int keyframePosition = 0; int duration = 0; @@ -151,17 +151,15 @@ namespace RimWorldAnimationStudio } } - public void AddActorAddon(string addonName, float scale = 1f) + public void AddActorAddon(ActorAddonDef actorAddonDef) { - if (Addons.Any(x => x.AddonName == addonName) == false) - { - Addons.Add(new ActorAddon(addonName, scale)); - } + if (Addons.Any(x => x.AddonName == actorAddonDef.addonName) == false) + { Addons.Add(new ActorAddon(actorAddonDef)); } foreach (PawnKeyframe keyframe in Keyframes) { - if (keyframe.AddonKeyframes.Any(x => x.AddonName == addonName) == false) - { keyframe.AddonKeyframes.Add(new AddonKeyframe(addonName)); } + if (keyframe.AddonKeyframes.Any(x => x.AddonName == actorAddonDef.addonName) == false) + { keyframe.AddonKeyframes.Add(new AddonKeyframe(actorAddonDef.addonName)); } } } diff --git a/Assets/Scripts/GUI/SelfContained/ActorManipulator.cs b/Assets/Scripts/GUI/ActorManipulator.cs similarity index 100% rename from Assets/Scripts/GUI/SelfContained/ActorManipulator.cs rename to Assets/Scripts/GUI/ActorManipulator.cs diff --git a/Assets/Scripts/GUI/SelfContained/ActorManipulator.cs.meta b/Assets/Scripts/GUI/ActorManipulator.cs.meta similarity index 100% rename from Assets/Scripts/GUI/SelfContained/ActorManipulator.cs.meta rename to Assets/Scripts/GUI/ActorManipulator.cs.meta diff --git a/Assets/Scripts/GUI/Actors/ActorBody.cs b/Assets/Scripts/GUI/Actors/ActorBody.cs index b472ee8d..def06e47 100644 --- a/Assets/Scripts/GUI/Actors/ActorBody.cs +++ b/Assets/Scripts/GUI/Actors/ActorBody.cs @@ -10,6 +10,7 @@ namespace RimWorldAnimationStudio { public int actorID; public SpriteRenderer bodyRenderer; + public ActorBodyPart actorBodyPartPrefab; private Vector3 dragDelta = new Vector3(); @@ -20,6 +21,12 @@ namespace RimWorldAnimationStudio if (Workspace.ActorID == actorID) { Activate(); } + + foreach (ActorAddonDef actorAddonDef in ActorAddonDefs.allDefs) + { + ActorBodyPart actorBodyPart = Instantiate(actorBodyPartPrefab, transform); + actorBodyPart.Initialize(this, actorAddonDef); + } } public void OnActorBodySelected(ActorBody actorBody) diff --git a/Assets/Scripts/GUI/Actors/ActorBodyPart.cs b/Assets/Scripts/GUI/Actors/ActorBodyPart.cs index f2576421..4a3d4bcb 100644 --- a/Assets/Scripts/GUI/Actors/ActorBodyPart.cs +++ b/Assets/Scripts/GUI/Actors/ActorBodyPart.cs @@ -14,8 +14,10 @@ namespace RimWorldAnimationStudio private Vector3 dragDelta = new Vector3(); - public void Start() + private void Start() { + if (parent == null) return; + EventsManager.onActorBodyPartSelected.AddListener(delegate (ActorBodyPart bodyPart) { OnActorBodyPartSelected(bodyPart); }); EventsManager.onActorBodySelected.AddListener(delegate (ActorBody actorBody) { OnActorBodySelected(actorBody); }); @@ -23,6 +25,17 @@ namespace RimWorldAnimationStudio { parent.Activate(); } } + public void Initialize(ActorBody parent, ActorAddonDef actorAddonDef) + { + this.parent = parent; + this.bodyPart = actorAddonDef.addonName; + + bodyPartRenderer.sprite = actorAddonDef.graphicData.GetSprite(); + bodyPartRenderer.transform.localScale = (Vector3)actorAddonDef.graphicData.GetDrawSize(); + + Start(); + } + public void OnActorAddonChange(ActorAddon actorAddon) { if (actorAddon.AddonName == bodyPart) diff --git a/Assets/Scripts/GUI/SelfContained/ButtonWithKeyCode.cs b/Assets/Scripts/GUI/ButtonWithKeyCode.cs similarity index 100% rename from Assets/Scripts/GUI/SelfContained/ButtonWithKeyCode.cs rename to Assets/Scripts/GUI/ButtonWithKeyCode.cs diff --git a/Assets/Scripts/GUI/SelfContained/ButtonWithKeyCode.cs.meta b/Assets/Scripts/GUI/ButtonWithKeyCode.cs.meta similarity index 100% rename from Assets/Scripts/GUI/SelfContained/ButtonWithKeyCode.cs.meta rename to Assets/Scripts/GUI/ButtonWithKeyCode.cs.meta diff --git a/Assets/Scripts/GUI/Cards/ActorAddonCard.cs b/Assets/Scripts/GUI/Cards/ActorAddonCard.cs index b3f3fb31..25fcf59c 100644 --- a/Assets/Scripts/GUI/Cards/ActorAddonCard.cs +++ b/Assets/Scripts/GUI/Cards/ActorAddonCard.cs @@ -52,6 +52,8 @@ namespace RimWorldAnimationStudio layerDropdown.SetValueWithoutNotify(layerDropdown.options.IndexOf(layerDropdown.options.First(x => x.text == clip.GetActorAddon(addonName).Layer))); anchoringPawnField.SetTextWithoutNotify(clip.GetActorAddon(addonName).AnchoringActor.ToString()); toggle.SetIsOnWithoutNotify(clip.IsActorAddonVisible(addonName)); + + anchoringPawnField.interactable = anchorDropdown.value != 0; } } diff --git a/Assets/Scripts/GUI/SelfContained/Chaser.cs b/Assets/Scripts/GUI/Chaser.cs similarity index 100% rename from Assets/Scripts/GUI/SelfContained/Chaser.cs rename to Assets/Scripts/GUI/Chaser.cs diff --git a/Assets/Scripts/GUI/SelfContained/Chaser.cs.meta b/Assets/Scripts/GUI/Chaser.cs.meta similarity index 100% rename from Assets/Scripts/GUI/SelfContained/Chaser.cs.meta rename to Assets/Scripts/GUI/Chaser.cs.meta diff --git a/Assets/Scripts/GUI/SelfContained/InactiveDuringAnimationPreview.cs b/Assets/Scripts/GUI/InactiveDuringAnimationPreview.cs similarity index 100% rename from Assets/Scripts/GUI/SelfContained/InactiveDuringAnimationPreview.cs rename to Assets/Scripts/GUI/InactiveDuringAnimationPreview.cs diff --git a/Assets/Scripts/GUI/SelfContained/InactiveDuringAnimationPreview.cs.meta b/Assets/Scripts/GUI/InactiveDuringAnimationPreview.cs.meta similarity index 100% rename from Assets/Scripts/GUI/SelfContained/InactiveDuringAnimationPreview.cs.meta rename to Assets/Scripts/GUI/InactiveDuringAnimationPreview.cs.meta diff --git a/Assets/Scripts/GUI/SelfContained/RequiresAnimationDef.cs b/Assets/Scripts/GUI/RequiresAnimationDef.cs similarity index 100% rename from Assets/Scripts/GUI/SelfContained/RequiresAnimationDef.cs rename to Assets/Scripts/GUI/RequiresAnimationDef.cs diff --git a/Assets/Scripts/GUI/SelfContained/RequiresAnimationDef.cs.meta b/Assets/Scripts/GUI/RequiresAnimationDef.cs.meta similarity index 100% rename from Assets/Scripts/GUI/SelfContained/RequiresAnimationDef.cs.meta rename to Assets/Scripts/GUI/RequiresAnimationDef.cs.meta diff --git a/Assets/Scripts/GUI/SelfContained.meta b/Assets/Scripts/GUI/SelfContained.meta deleted file mode 100644 index 16bc5399..00000000 --- a/Assets/Scripts/GUI/SelfContained.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 96cc86ae315a7c34c91b9af2499fa23c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/GUI/SelfContained/SnapToKeyframe.cs b/Assets/Scripts/GUI/SnapToKeyframe.cs similarity index 100% rename from Assets/Scripts/GUI/SelfContained/SnapToKeyframe.cs rename to Assets/Scripts/GUI/SnapToKeyframe.cs diff --git a/Assets/Scripts/GUI/SelfContained/SnapToKeyframe.cs.meta b/Assets/Scripts/GUI/SnapToKeyframe.cs.meta similarity index 83% rename from Assets/Scripts/GUI/SelfContained/SnapToKeyframe.cs.meta rename to Assets/Scripts/GUI/SnapToKeyframe.cs.meta index 5babfd19..ef76a25d 100644 --- a/Assets/Scripts/GUI/SelfContained/SnapToKeyframe.cs.meta +++ b/Assets/Scripts/GUI/SnapToKeyframe.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b19816966eab6a4eba748f04532fb61 +guid: 09b43781ddbab9c49b81b88c7a8b4076 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Graphics/GraphicData.cs b/Assets/Scripts/Graphics/GraphicData.cs new file mode 100644 index 00000000..026c81e6 --- /dev/null +++ b/Assets/Scripts/Graphics/GraphicData.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Reflection; +using System.IO; +using UnityEngine; + +namespace RimWorldAnimationStudio +{ + [Serializable] + public class GraphicData + { + public string texPath; + public string graphicClass; + public string shaderType; + public string drawSize; + + private Sprite sprite; + + public void SetDrawSize(Vector2 drawSize) + { + this.drawSize = "(" + drawSize.x + ", " + drawSize.y + ")"; + } + + public Vector3 GetDrawSize() + { + string drawSizeString = drawSize; + + drawSizeString = drawSizeString.Trim(); + drawSizeString = drawSizeString.Replace("(", ""); + drawSizeString = drawSizeString.Replace(")", ""); + var drawSizeStrings = drawSizeString.Split(','); + + return new Vector3(float.Parse(drawSizeStrings[0]), float.Parse(drawSizeStrings[1])); + } + + public Sprite GetSprite() + { + if (sprite != null) return sprite; + + if (string.IsNullOrEmpty(texPath)) return null; + + string fullPath = Path.GetFullPath(Path.Combine(Application.streamingAssetsPath, texPath)) + ".png"; + + if (File.Exists(fullPath) == false) return null; + + byte[] pngBytes = File.ReadAllBytes(fullPath); + + Texture2D texture = new Texture2D(2, 2); + texture.LoadImage(pngBytes); + + float scale = Mathf.Min(texture.width, texture.height) / 128f; + sprite = Sprite.Create(texture, new Rect(0.0f, 0.0f, texture.width, texture.height), new Vector2(0.5f, 0.5f), 85.0f * scale); + + return sprite; + } + } +} diff --git a/Assets/Scripts/Graphics/GraphicData.cs.meta b/Assets/Scripts/Graphics/GraphicData.cs.meta new file mode 100644 index 00000000..0c95ee6e --- /dev/null +++ b/Assets/Scripts/Graphics/GraphicData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e8b46532a4e0ce42b40b1a1fd03935a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/Humanlike/Hands.meta b/Assets/StreamingAssets/Textures/Humanlike/Hands.meta similarity index 100% rename from Assets/Resources/Textures/Humanlike/Hands.meta rename to Assets/StreamingAssets/Textures/Humanlike/Hands.meta diff --git a/Assets/Resources/Textures/Humanlike/Hands/HandClean.png b/Assets/StreamingAssets/Textures/Humanlike/Hands/HandClean.png similarity index 100% rename from Assets/Resources/Textures/Humanlike/Hands/HandClean.png rename to Assets/StreamingAssets/Textures/Humanlike/Hands/HandClean.png diff --git a/Assets/Resources/Textures/Humanlike/Hands/HandClean.png.meta b/Assets/StreamingAssets/Textures/Humanlike/Hands/HandClean.png.meta similarity index 99% rename from Assets/Resources/Textures/Humanlike/Hands/HandClean.png.meta rename to Assets/StreamingAssets/Textures/Humanlike/Hands/HandClean.png.meta index 07f73859..cd1fa983 100644 --- a/Assets/Resources/Textures/Humanlike/Hands/HandClean.png.meta +++ b/Assets/StreamingAssets/Textures/Humanlike/Hands/HandClean.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 510 + spritePixelsToUnits: 85 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Resources/Textures/Humanlike/SexToys.meta b/Assets/StreamingAssets/Textures/SexToys.meta similarity index 77% rename from Assets/Resources/Textures/Humanlike/SexToys.meta rename to Assets/StreamingAssets/Textures/SexToys.meta index a4d2d6f4..6ec89304 100644 --- a/Assets/Resources/Textures/Humanlike/SexToys.meta +++ b/Assets/StreamingAssets/Textures/SexToys.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e8128ddbd38f5c441b417b0318819eca +guid: 43f10c9566894a04d9e5774d580927d2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Textures/Humanlike/SexToys/dildo.png b/Assets/StreamingAssets/Textures/SexToys/Dildo.png similarity index 100% rename from Assets/Resources/Textures/Humanlike/SexToys/dildo.png rename to Assets/StreamingAssets/Textures/SexToys/Dildo.png diff --git a/Assets/Resources/Textures/Humanlike/SexToys/dildo.png.meta b/Assets/StreamingAssets/Textures/SexToys/Dildo.png.meta similarity index 99% rename from Assets/Resources/Textures/Humanlike/SexToys/dildo.png.meta rename to Assets/StreamingAssets/Textures/SexToys/Dildo.png.meta index f5aeb021..be6780cf 100644 --- a/Assets/Resources/Textures/Humanlike/SexToys/dildo.png.meta +++ b/Assets/StreamingAssets/Textures/SexToys/Dildo.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 170 + spritePixelsToUnits: 85 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/StreamingAssets/actorAddonDefs.xml b/Assets/StreamingAssets/actorAddonDefs.xml index f47aff6e..b960e477 100644 --- a/Assets/StreamingAssets/actorAddonDefs.xml +++ b/Assets/StreamingAssets/actorAddonDefs.xml @@ -4,19 +4,35 @@ left hand - 0.6667 + + Textures/Humanlike/Hands/HandClean + Graphic_Single + Cutout + (0.6,0.6) + + right hand - 0.6667 + + Textures/Humanlike/Hands/HandClean + Graphic_Single + Cutout + (0.6,0.6) + dildo - 1 + + Textures/SexToys/Dildo + Graphic_Single + Cutout + (1,1) + diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index bd644199..52f6dff3 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/Unity.2D.Animation.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll index f0387d5d..a5aa24c0 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 ad18466a..c0e75d9b 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 6751e7f0..281ccb02 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 5f7aa9c3..a899bd55 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 220629b1..0fcfda72 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 69912a75..937304fc 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 f78c2549..d0aad499 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 84dcc7df..1ce61772 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 5261b2ba..6cae95b3 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 2e83b222..35b4357d 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/StreamingAssets/Textures/Humanlike/Hands/HandClean.png b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/Textures/Humanlike/Hands/HandClean.png new file mode 100644 index 00000000..fe4f806b Binary files /dev/null and b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/Textures/Humanlike/Hands/HandClean.png differ diff --git a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/Textures/SexToys/Dildo.png b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/Textures/SexToys/Dildo.png new file mode 100644 index 00000000..2a5ce540 Binary files /dev/null and b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/Textures/SexToys/Dildo.png differ diff --git a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/actorAddonDefs.xml b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/actorAddonDefs.xml index f47aff6e..b960e477 100644 --- a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/actorAddonDefs.xml +++ b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/actorAddonDefs.xml @@ -4,19 +4,35 @@ left hand - 0.6667 + + Textures/Humanlike/Hands/HandClean + Graphic_Single + Cutout + (0.6,0.6) + + right hand - 0.6667 + + Textures/Humanlike/Hands/HandClean + Graphic_Single + Cutout + (0.6,0.6) + dildo - 1 + + Textures/SexToys/Dildo + Graphic_Single + Cutout + (1,1) + diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers index 204882b6..62080a07 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/globalgamemanagers.assets b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets index 4c97fe8f..fb8f4e5b 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets differ diff --git a/Build/RimWorld-Animation-Studio_Data/level0 b/Build/RimWorld-Animation-Studio_Data/level0 index 249a067a..88f09bda 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/level0 and b/Build/RimWorld-Animation-Studio_Data/level0 differ diff --git a/Build/RimWorld-Animation-Studio_Data/resources.assets b/Build/RimWorld-Animation-Studio_Data/resources.assets index a19592a6..3c97a8a4 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/resources.assets and b/Build/RimWorld-Animation-Studio_Data/resources.assets differ diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index a215e2c5..0225ecbc 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/ArtifactDB b/Library/ArtifactDB index 25efc636..41e9bc62 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/02/02a02b82fc64046a061ee49ee4c8543f b/Library/Artifacts/02/02a02b82fc64046a061ee49ee4c8543f deleted file mode 100644 index 063451c2..00000000 Binary files a/Library/Artifacts/02/02a02b82fc64046a061ee49ee4c8543f and /dev/null differ diff --git a/Library/Artifacts/03/03cdf570a5bc6a96cdabc1d6a0f57213 b/Library/Artifacts/03/03cdf570a5bc6a96cdabc1d6a0f57213 deleted file mode 100644 index 7f797814..00000000 Binary files a/Library/Artifacts/03/03cdf570a5bc6a96cdabc1d6a0f57213 and /dev/null differ diff --git a/Library/Artifacts/04/041bb041aa20f5aef1fa7bd3080ae9f7 b/Library/Artifacts/04/041bb041aa20f5aef1fa7bd3080ae9f7 deleted file mode 100644 index 3dd0bde9..00000000 Binary files a/Library/Artifacts/04/041bb041aa20f5aef1fa7bd3080ae9f7 and /dev/null differ diff --git a/Library/Artifacts/10/101fb2e067a39067146dbed2ae53903a b/Library/Artifacts/07/076b6e00d4eb4489c9ee9c37e6826ad0 similarity index 96% rename from Library/Artifacts/10/101fb2e067a39067146dbed2ae53903a rename to Library/Artifacts/07/076b6e00d4eb4489c9ee9c37e6826ad0 index fae6dfc6..8cb6904f 100644 Binary files a/Library/Artifacts/10/101fb2e067a39067146dbed2ae53903a and b/Library/Artifacts/07/076b6e00d4eb4489c9ee9c37e6826ad0 differ diff --git a/Library/Artifacts/07/0790717093f7fe22b2e268775232f350 b/Library/Artifacts/07/0790717093f7fe22b2e268775232f350 deleted file mode 100644 index de427f19..00000000 Binary files a/Library/Artifacts/07/0790717093f7fe22b2e268775232f350 and /dev/null differ diff --git a/Library/Artifacts/08/08fff1f363622481b239e36b2a0b4eae b/Library/Artifacts/08/08fff1f363622481b239e36b2a0b4eae deleted file mode 100644 index 60f4771a..00000000 Binary files a/Library/Artifacts/08/08fff1f363622481b239e36b2a0b4eae and /dev/null differ diff --git a/Library/Artifacts/e4/e4fc06a06f9b3a91e407e876ebb9eab5 b/Library/Artifacts/09/09f9b57fc44aa5c03954fb34245cca64 similarity index 95% rename from Library/Artifacts/e4/e4fc06a06f9b3a91e407e876ebb9eab5 rename to Library/Artifacts/09/09f9b57fc44aa5c03954fb34245cca64 index 274e6efd..3ff8c6b5 100644 Binary files a/Library/Artifacts/e4/e4fc06a06f9b3a91e407e876ebb9eab5 and b/Library/Artifacts/09/09f9b57fc44aa5c03954fb34245cca64 differ diff --git a/Library/Artifacts/0b/0b7bacbe83577b3c4b2f979f59f3c9c9 b/Library/Artifacts/0b/0b7bacbe83577b3c4b2f979f59f3c9c9 deleted file mode 100644 index 76e33fd8..00000000 Binary files a/Library/Artifacts/0b/0b7bacbe83577b3c4b2f979f59f3c9c9 and /dev/null differ diff --git a/Library/Artifacts/0d/0d8d5d6be5b1a41e26bbac7427a6727d b/Library/Artifacts/0d/0d8d5d6be5b1a41e26bbac7427a6727d deleted file mode 100644 index 52e8065f..00000000 Binary files a/Library/Artifacts/0d/0d8d5d6be5b1a41e26bbac7427a6727d and /dev/null differ diff --git a/Library/Artifacts/0e/0e1c5d257491cc215483e5424ef2fafb b/Library/Artifacts/0e/0e1c5d257491cc215483e5424ef2fafb deleted file mode 100644 index 229d51ac..00000000 Binary files a/Library/Artifacts/0e/0e1c5d257491cc215483e5424ef2fafb and /dev/null differ diff --git a/Library/Artifacts/03/03213d37c1473e2ea3757e8d34694ce7 b/Library/Artifacts/0e/0e537c8adc4ba6544b97757730c51400 similarity index 51% rename from Library/Artifacts/03/03213d37c1473e2ea3757e8d34694ce7 rename to Library/Artifacts/0e/0e537c8adc4ba6544b97757730c51400 index 4a025bc8..b36c3c42 100644 Binary files a/Library/Artifacts/03/03213d37c1473e2ea3757e8d34694ce7 and b/Library/Artifacts/0e/0e537c8adc4ba6544b97757730c51400 differ diff --git a/Library/Artifacts/0e/0ec409ff6565baa12500cb6f3faa7814 b/Library/Artifacts/0e/0ec409ff6565baa12500cb6f3faa7814 deleted file mode 100644 index aa1d60c1..00000000 Binary files a/Library/Artifacts/0e/0ec409ff6565baa12500cb6f3faa7814 and /dev/null differ diff --git a/Library/Artifacts/0f/0ff5eed96aef06fb7d9a65564423113d b/Library/Artifacts/0f/0ff5eed96aef06fb7d9a65564423113d deleted file mode 100644 index 27f3ad80..00000000 Binary files a/Library/Artifacts/0f/0ff5eed96aef06fb7d9a65564423113d and /dev/null differ diff --git a/Library/Artifacts/05/0553490f275f304500bdfb8534b29b87 b/Library/Artifacts/10/10a81ddd4937114006af8da429c61da5 similarity index 94% rename from Library/Artifacts/05/0553490f275f304500bdfb8534b29b87 rename to Library/Artifacts/10/10a81ddd4937114006af8da429c61da5 index a7413ac9..75a748be 100644 Binary files a/Library/Artifacts/05/0553490f275f304500bdfb8534b29b87 and b/Library/Artifacts/10/10a81ddd4937114006af8da429c61da5 differ diff --git a/Library/Artifacts/12/12aac834751c761ba247c74f74142b84 b/Library/Artifacts/12/12aac834751c761ba247c74f74142b84 deleted file mode 100644 index fe82e4bd..00000000 Binary files a/Library/Artifacts/12/12aac834751c761ba247c74f74142b84 and /dev/null differ diff --git a/Library/Artifacts/14/14c27a6d7c174792cec69fa566d6bc12 b/Library/Artifacts/14/14c27a6d7c174792cec69fa566d6bc12 deleted file mode 100644 index 5e20b67c..00000000 Binary files a/Library/Artifacts/14/14c27a6d7c174792cec69fa566d6bc12 and /dev/null differ diff --git a/Library/Artifacts/16/16bc7da332de513c2f45d16f4d437e66 b/Library/Artifacts/16/16bc7da332de513c2f45d16f4d437e66 deleted file mode 100644 index 7d080ea2..00000000 Binary files a/Library/Artifacts/16/16bc7da332de513c2f45d16f4d437e66 and /dev/null differ diff --git a/Library/Artifacts/17/170d078beebdb7027072a01a02910a02 b/Library/Artifacts/17/170d078beebdb7027072a01a02910a02 deleted file mode 100644 index 4a727db4..00000000 Binary files a/Library/Artifacts/17/170d078beebdb7027072a01a02910a02 and /dev/null differ diff --git a/Library/Artifacts/17/1750a87b237f0a062866e2c2add6ed76 b/Library/Artifacts/17/1750a87b237f0a062866e2c2add6ed76 deleted file mode 100644 index d8c773e6..00000000 Binary files a/Library/Artifacts/17/1750a87b237f0a062866e2c2add6ed76 and /dev/null differ diff --git a/Library/Artifacts/19/1942f54c56360f47634f12a235c14465 b/Library/Artifacts/19/1942f54c56360f47634f12a235c14465 deleted file mode 100644 index 1a2cd27d..00000000 Binary files a/Library/Artifacts/19/1942f54c56360f47634f12a235c14465 and /dev/null differ diff --git a/Library/Artifacts/19/19aa2057462d69dd5e1c72481e335190 b/Library/Artifacts/19/19aa2057462d69dd5e1c72481e335190 deleted file mode 100644 index bb86e4c2..00000000 Binary files a/Library/Artifacts/19/19aa2057462d69dd5e1c72481e335190 and /dev/null differ diff --git a/Library/Artifacts/19/19cad86dbe1f976f6299ee5fe689ccc4 b/Library/Artifacts/19/19cad86dbe1f976f6299ee5fe689ccc4 deleted file mode 100644 index 2c0176cc..00000000 Binary files a/Library/Artifacts/19/19cad86dbe1f976f6299ee5fe689ccc4 and /dev/null differ diff --git a/Library/Artifacts/1a/1a982f9f1023c3b88adde0dafcc83161 b/Library/Artifacts/1a/1a982f9f1023c3b88adde0dafcc83161 deleted file mode 100644 index fbfd9e87..00000000 Binary files a/Library/Artifacts/1a/1a982f9f1023c3b88adde0dafcc83161 and /dev/null differ diff --git a/Library/Artifacts/1d/1d7700f5aa44f5a6ae22ed36fceb4729 b/Library/Artifacts/1d/1d7700f5aa44f5a6ae22ed36fceb4729 deleted file mode 100644 index 05ba5f8e..00000000 Binary files a/Library/Artifacts/1d/1d7700f5aa44f5a6ae22ed36fceb4729 and /dev/null differ diff --git a/Library/Artifacts/28/28aa0ffed6278b2fa34bf6c89fa993c6 b/Library/Artifacts/1e/1e101936d77e910be4499d05a7a032ac similarity index 96% rename from Library/Artifacts/28/28aa0ffed6278b2fa34bf6c89fa993c6 rename to Library/Artifacts/1e/1e101936d77e910be4499d05a7a032ac index ad923f6e..1bf2e92b 100644 Binary files a/Library/Artifacts/28/28aa0ffed6278b2fa34bf6c89fa993c6 and b/Library/Artifacts/1e/1e101936d77e910be4499d05a7a032ac differ diff --git a/Library/Artifacts/1e/1ee37de0c33a6491746af096b60749d2 b/Library/Artifacts/1e/1ee37de0c33a6491746af096b60749d2 deleted file mode 100644 index b6cb3112..00000000 Binary files a/Library/Artifacts/1e/1ee37de0c33a6491746af096b60749d2 and /dev/null differ diff --git a/Library/Artifacts/23/23a069dc96d94266f2a45fdc8b4033af b/Library/Artifacts/23/23a069dc96d94266f2a45fdc8b4033af deleted file mode 100644 index 4026cc74..00000000 Binary files a/Library/Artifacts/23/23a069dc96d94266f2a45fdc8b4033af and /dev/null differ diff --git a/Library/Artifacts/fb/fb23450d2551262435f6eacb70868c6a b/Library/Artifacts/24/2447604627c66d0b7764a028f38d4226 similarity index 53% rename from Library/Artifacts/fb/fb23450d2551262435f6eacb70868c6a rename to Library/Artifacts/24/2447604627c66d0b7764a028f38d4226 index c132865e..9b11b35c 100644 Binary files a/Library/Artifacts/fb/fb23450d2551262435f6eacb70868c6a and b/Library/Artifacts/24/2447604627c66d0b7764a028f38d4226 differ diff --git a/Library/Artifacts/b6/b6f546df35b4ded7cf68a4bc8408285c b/Library/Artifacts/24/24e6b1a4e2d365b89d44fa4938afc40d similarity index 69% rename from Library/Artifacts/b6/b6f546df35b4ded7cf68a4bc8408285c rename to Library/Artifacts/24/24e6b1a4e2d365b89d44fa4938afc40d index 89dea527..67a8400a 100644 Binary files a/Library/Artifacts/b6/b6f546df35b4ded7cf68a4bc8408285c and b/Library/Artifacts/24/24e6b1a4e2d365b89d44fa4938afc40d differ diff --git a/Library/Artifacts/26/26051e68795be3b435009d77dc74ded8 b/Library/Artifacts/26/26051e68795be3b435009d77dc74ded8 deleted file mode 100644 index 1bc1fd9d..00000000 Binary files a/Library/Artifacts/26/26051e68795be3b435009d77dc74ded8 and /dev/null differ diff --git a/Library/Artifacts/81/811e697ed429caa69b4aae16d7b55d5a b/Library/Artifacts/26/2628c100aa87c90017df1f4abda6cb5a similarity index 69% rename from Library/Artifacts/81/811e697ed429caa69b4aae16d7b55d5a rename to Library/Artifacts/26/2628c100aa87c90017df1f4abda6cb5a index 9b2b5fe2..66fdb5e6 100644 Binary files a/Library/Artifacts/81/811e697ed429caa69b4aae16d7b55d5a and b/Library/Artifacts/26/2628c100aa87c90017df1f4abda6cb5a differ diff --git a/Library/Artifacts/26/266f94e7cd0daecdfdedaaf26baf87b8 b/Library/Artifacts/26/266f94e7cd0daecdfdedaaf26baf87b8 deleted file mode 100644 index 4253959e..00000000 Binary files a/Library/Artifacts/26/266f94e7cd0daecdfdedaaf26baf87b8 and /dev/null differ diff --git a/Library/Artifacts/27/278d09e16d12b559ea1b59855360aba8 b/Library/Artifacts/27/278d09e16d12b559ea1b59855360aba8 deleted file mode 100644 index 245a76e0..00000000 Binary files a/Library/Artifacts/27/278d09e16d12b559ea1b59855360aba8 and /dev/null differ diff --git a/Library/Artifacts/29/297ba028ac4c05012d9fce6b10ed091d b/Library/Artifacts/29/297ba028ac4c05012d9fce6b10ed091d deleted file mode 100644 index 7a5760f7..00000000 Binary files a/Library/Artifacts/29/297ba028ac4c05012d9fce6b10ed091d and /dev/null differ diff --git a/Library/Artifacts/2b/2b29fd2b532cd9602f059a742337098f b/Library/Artifacts/2b/2b29fd2b532cd9602f059a742337098f deleted file mode 100644 index b257392b..00000000 Binary files a/Library/Artifacts/2b/2b29fd2b532cd9602f059a742337098f and /dev/null differ diff --git a/Library/Artifacts/2c/2cf9505777e1b25de55862d7c1a596a5 b/Library/Artifacts/2c/2cf9505777e1b25de55862d7c1a596a5 deleted file mode 100644 index 77eea493..00000000 Binary files a/Library/Artifacts/2c/2cf9505777e1b25de55862d7c1a596a5 and /dev/null differ diff --git a/Library/Artifacts/2d/2d2cdafcb584ab988caeb8dc2caadab4 b/Library/Artifacts/2d/2d2cdafcb584ab988caeb8dc2caadab4 deleted file mode 100644 index 6b06736b..00000000 Binary files a/Library/Artifacts/2d/2d2cdafcb584ab988caeb8dc2caadab4 and /dev/null differ diff --git a/Library/Artifacts/2d/2ddf66859b451c1722c8c5329ef3689a b/Library/Artifacts/2d/2ddf66859b451c1722c8c5329ef3689a deleted file mode 100644 index 639f6b57..00000000 Binary files a/Library/Artifacts/2d/2ddf66859b451c1722c8c5329ef3689a and /dev/null differ diff --git a/Library/Artifacts/2e/2efad4ac5c6f0433679e08983bf863f9 b/Library/Artifacts/2e/2efad4ac5c6f0433679e08983bf863f9 deleted file mode 100644 index 16f7e487..00000000 Binary files a/Library/Artifacts/2e/2efad4ac5c6f0433679e08983bf863f9 and /dev/null differ diff --git a/Library/Artifacts/2f/2fdc3371eae8a9967d4c833fa40864bb b/Library/Artifacts/2f/2fdc3371eae8a9967d4c833fa40864bb deleted file mode 100644 index 0ff6301c..00000000 Binary files a/Library/Artifacts/2f/2fdc3371eae8a9967d4c833fa40864bb and /dev/null differ diff --git a/Library/Artifacts/30/304f502d92dd6c60ba9477e769a9c153 b/Library/Artifacts/30/304f502d92dd6c60ba9477e769a9c153 deleted file mode 100644 index 71e6f17a..00000000 Binary files a/Library/Artifacts/30/304f502d92dd6c60ba9477e769a9c153 and /dev/null differ diff --git a/Library/Artifacts/8d/8dd7c2ec60d2ad7e4749859a17aa52ad b/Library/Artifacts/34/34170db071fa775b44c99ba6ac91ca35 similarity index 89% rename from Library/Artifacts/8d/8dd7c2ec60d2ad7e4749859a17aa52ad rename to Library/Artifacts/34/34170db071fa775b44c99ba6ac91ca35 index 28ad6f35..96a1018c 100644 Binary files a/Library/Artifacts/8d/8dd7c2ec60d2ad7e4749859a17aa52ad and b/Library/Artifacts/34/34170db071fa775b44c99ba6ac91ca35 differ diff --git a/Library/Artifacts/37/37fe0f726004c759d9cf5d60b52ccb4e b/Library/Artifacts/37/37fe0f726004c759d9cf5d60b52ccb4e deleted file mode 100644 index c9d6e02b..00000000 Binary files a/Library/Artifacts/37/37fe0f726004c759d9cf5d60b52ccb4e and /dev/null differ diff --git a/Library/Artifacts/38/38119cfa528ad5a507ccba124c03242f b/Library/Artifacts/38/38119cfa528ad5a507ccba124c03242f deleted file mode 100644 index 233fa8c9..00000000 Binary files a/Library/Artifacts/38/38119cfa528ad5a507ccba124c03242f and /dev/null differ diff --git a/Library/Artifacts/ce/ceb1b81ef4b0c2b29dd54b5685f8ba2c b/Library/Artifacts/38/38a46c5c20fcf373ef0096876f4da8a7 similarity index 95% rename from Library/Artifacts/ce/ceb1b81ef4b0c2b29dd54b5685f8ba2c rename to Library/Artifacts/38/38a46c5c20fcf373ef0096876f4da8a7 index a0a24005..ee9db3e3 100644 Binary files a/Library/Artifacts/ce/ceb1b81ef4b0c2b29dd54b5685f8ba2c and b/Library/Artifacts/38/38a46c5c20fcf373ef0096876f4da8a7 differ diff --git a/Library/Artifacts/39/39284f866479457635876737f2470936 b/Library/Artifacts/39/39284f866479457635876737f2470936 deleted file mode 100644 index aed658d0..00000000 Binary files a/Library/Artifacts/39/39284f866479457635876737f2470936 and /dev/null differ diff --git a/Library/Artifacts/39/39c1a10ff1acdbaa6546285a4cd9a61b b/Library/Artifacts/39/39c1a10ff1acdbaa6546285a4cd9a61b deleted file mode 100644 index c56a3613..00000000 Binary files a/Library/Artifacts/39/39c1a10ff1acdbaa6546285a4cd9a61b and /dev/null differ diff --git a/Library/Artifacts/39/39699d27989ae7571067707c63c95428 b/Library/Artifacts/3d/3db557fe59f1f6a411897092c13e7918 similarity index 64% rename from Library/Artifacts/39/39699d27989ae7571067707c63c95428 rename to Library/Artifacts/3d/3db557fe59f1f6a411897092c13e7918 index e71c4d95..cf04fc37 100644 Binary files a/Library/Artifacts/39/39699d27989ae7571067707c63c95428 and b/Library/Artifacts/3d/3db557fe59f1f6a411897092c13e7918 differ diff --git a/Library/Artifacts/3e/3e4e44e41ce18cf6ee961f6e090873b5 b/Library/Artifacts/3e/3e4e44e41ce18cf6ee961f6e090873b5 deleted file mode 100644 index 54e8278f..00000000 Binary files a/Library/Artifacts/3e/3e4e44e41ce18cf6ee961f6e090873b5 and /dev/null differ diff --git a/Library/Artifacts/3e/3e765f9bf99ca908186083e73e9118af b/Library/Artifacts/3e/3e765f9bf99ca908186083e73e9118af deleted file mode 100644 index 9d4fbaa0..00000000 Binary files a/Library/Artifacts/3e/3e765f9bf99ca908186083e73e9118af and /dev/null differ diff --git a/Library/Artifacts/3f/3fe6fadc848425da10caf41948061392 b/Library/Artifacts/3f/3fe6fadc848425da10caf41948061392 deleted file mode 100644 index d2149b2a..00000000 Binary files a/Library/Artifacts/3f/3fe6fadc848425da10caf41948061392 and /dev/null differ diff --git a/Library/Artifacts/42/42c85e6ab9351a5b17e3503988998adb b/Library/Artifacts/42/42c85e6ab9351a5b17e3503988998adb deleted file mode 100644 index d9c95f24..00000000 Binary files a/Library/Artifacts/42/42c85e6ab9351a5b17e3503988998adb and /dev/null differ diff --git a/Library/Artifacts/42/42f2127bfd17542c0233581bc9cd57a0 b/Library/Artifacts/42/42f2127bfd17542c0233581bc9cd57a0 deleted file mode 100644 index a33b61a2..00000000 Binary files a/Library/Artifacts/42/42f2127bfd17542c0233581bc9cd57a0 and /dev/null differ diff --git a/Library/Artifacts/47/478b6096979cd6e6512c7136317ef454 b/Library/Artifacts/47/478b6096979cd6e6512c7136317ef454 deleted file mode 100644 index ef56e515..00000000 Binary files a/Library/Artifacts/47/478b6096979cd6e6512c7136317ef454 and /dev/null differ diff --git a/Library/Artifacts/49/496db8de80129dbc1ad20a6972edebf2 b/Library/Artifacts/49/496db8de80129dbc1ad20a6972edebf2 deleted file mode 100644 index 32be0083..00000000 Binary files a/Library/Artifacts/49/496db8de80129dbc1ad20a6972edebf2 and /dev/null differ diff --git a/Library/Artifacts/4a/4ac54b493a20dc89675ec8380e692a5f b/Library/Artifacts/4a/4ac54b493a20dc89675ec8380e692a5f deleted file mode 100644 index c3cdb7b6..00000000 Binary files a/Library/Artifacts/4a/4ac54b493a20dc89675ec8380e692a5f and /dev/null differ diff --git a/Library/Artifacts/4d/4d26e6486fe8f754ec076031b0c19087 b/Library/Artifacts/4d/4d26e6486fe8f754ec076031b0c19087 deleted file mode 100644 index f6f65832..00000000 Binary files a/Library/Artifacts/4d/4d26e6486fe8f754ec076031b0c19087 and /dev/null differ diff --git a/Library/Artifacts/4d/4d9cbec4da33bf727c2e74acec45aadc b/Library/Artifacts/4d/4d9cbec4da33bf727c2e74acec45aadc deleted file mode 100644 index db4b4550..00000000 Binary files a/Library/Artifacts/4d/4d9cbec4da33bf727c2e74acec45aadc and /dev/null differ diff --git a/Library/Artifacts/4d/4ddf7ff94e166903afcc2bb542ea68b9 b/Library/Artifacts/4d/4ddf7ff94e166903afcc2bb542ea68b9 deleted file mode 100644 index ee38436e..00000000 Binary files a/Library/Artifacts/4d/4ddf7ff94e166903afcc2bb542ea68b9 and /dev/null differ diff --git a/Library/Artifacts/4f/4ff04535994e9574a2f4c0e41508654e b/Library/Artifacts/4f/4ff04535994e9574a2f4c0e41508654e deleted file mode 100644 index 21c7596a..00000000 Binary files a/Library/Artifacts/4f/4ff04535994e9574a2f4c0e41508654e and /dev/null differ diff --git a/Library/Artifacts/51/510d1f3b22e20fc5cccdd9c96c152c49 b/Library/Artifacts/51/510d1f3b22e20fc5cccdd9c96c152c49 deleted file mode 100644 index f6efd074..00000000 Binary files a/Library/Artifacts/51/510d1f3b22e20fc5cccdd9c96c152c49 and /dev/null differ diff --git a/Library/Artifacts/51/516ba8037dc10b377684e37f1517bd78 b/Library/Artifacts/51/516ba8037dc10b377684e37f1517bd78 deleted file mode 100644 index d203eeca..00000000 Binary files a/Library/Artifacts/51/516ba8037dc10b377684e37f1517bd78 and /dev/null differ diff --git a/Library/Artifacts/52/5215aee885ceee5bed11949f911f6186 b/Library/Artifacts/52/5215aee885ceee5bed11949f911f6186 deleted file mode 100644 index ac943081..00000000 Binary files a/Library/Artifacts/52/5215aee885ceee5bed11949f911f6186 and /dev/null differ diff --git a/Library/Artifacts/54/5431f7c8b13778c7ab711b56235305ba b/Library/Artifacts/54/5431f7c8b13778c7ab711b56235305ba deleted file mode 100644 index 0377b5d0..00000000 Binary files a/Library/Artifacts/54/5431f7c8b13778c7ab711b56235305ba and /dev/null differ diff --git a/Library/Artifacts/9f/9fdb4c842997f027c8d6feacb01e2e92 b/Library/Artifacts/57/57006930ca024d466eb7810444453b44 similarity index 51% rename from Library/Artifacts/9f/9fdb4c842997f027c8d6feacb01e2e92 rename to Library/Artifacts/57/57006930ca024d466eb7810444453b44 index 062e6cb6..fae89ba7 100644 Binary files a/Library/Artifacts/9f/9fdb4c842997f027c8d6feacb01e2e92 and b/Library/Artifacts/57/57006930ca024d466eb7810444453b44 differ diff --git a/Library/Artifacts/59/599a335481ae6da7d87fbc33987c9696 b/Library/Artifacts/59/599a335481ae6da7d87fbc33987c9696 deleted file mode 100644 index f584122c..00000000 Binary files a/Library/Artifacts/59/599a335481ae6da7d87fbc33987c9696 and /dev/null differ diff --git a/Library/Artifacts/5a/5a889a8f8a53ae2821354fea17a2d79b b/Library/Artifacts/5a/5a889a8f8a53ae2821354fea17a2d79b deleted file mode 100644 index 45b55de9..00000000 Binary files a/Library/Artifacts/5a/5a889a8f8a53ae2821354fea17a2d79b and /dev/null differ diff --git a/Library/Artifacts/5a/5a92d92bd2ef65ee6abe75db78b464f9 b/Library/Artifacts/5a/5a92d92bd2ef65ee6abe75db78b464f9 deleted file mode 100644 index 02e31c6b..00000000 Binary files a/Library/Artifacts/5a/5a92d92bd2ef65ee6abe75db78b464f9 and /dev/null differ diff --git a/Library/Artifacts/ff/ff03648052982483b364770e0c10342b b/Library/Artifacts/5b/5b07add66b3897ab4782fe20fefea463 similarity index 93% rename from Library/Artifacts/ff/ff03648052982483b364770e0c10342b rename to Library/Artifacts/5b/5b07add66b3897ab4782fe20fefea463 index f000e256..4466d306 100644 Binary files a/Library/Artifacts/ff/ff03648052982483b364770e0c10342b and b/Library/Artifacts/5b/5b07add66b3897ab4782fe20fefea463 differ diff --git a/Library/Artifacts/5b/5b4ac533e038d397188b53d6dd878933 b/Library/Artifacts/5b/5b4ac533e038d397188b53d6dd878933 deleted file mode 100644 index 7030c26b..00000000 Binary files a/Library/Artifacts/5b/5b4ac533e038d397188b53d6dd878933 and /dev/null differ diff --git a/Library/Artifacts/5d/5d7e27c116089c230833e449d42120a0 b/Library/Artifacts/5d/5d7e27c116089c230833e449d42120a0 deleted file mode 100644 index cfaf1faf..00000000 Binary files a/Library/Artifacts/5d/5d7e27c116089c230833e449d42120a0 and /dev/null differ diff --git a/Library/Artifacts/5e/5e55c6573c4170775eaebfee14a88b27 b/Library/Artifacts/5e/5e55c6573c4170775eaebfee14a88b27 deleted file mode 100644 index 8a263913..00000000 Binary files a/Library/Artifacts/5e/5e55c6573c4170775eaebfee14a88b27 and /dev/null differ diff --git a/Library/Artifacts/61/61681508209c794c453eb6d0f73a47bb b/Library/Artifacts/61/61681508209c794c453eb6d0f73a47bb deleted file mode 100644 index 534e98ef..00000000 Binary files a/Library/Artifacts/61/61681508209c794c453eb6d0f73a47bb and /dev/null differ diff --git a/Library/Artifacts/63/63e94cdb87cc4e5dabed4c6110c4b6b2 b/Library/Artifacts/63/63e94cdb87cc4e5dabed4c6110c4b6b2 deleted file mode 100644 index 8c6652a6..00000000 Binary files a/Library/Artifacts/63/63e94cdb87cc4e5dabed4c6110c4b6b2 and /dev/null differ diff --git a/Library/Artifacts/64/6468c5bccbda2501c9cdfc032e9a4c66 b/Library/Artifacts/64/6468c5bccbda2501c9cdfc032e9a4c66 deleted file mode 100644 index 3e5e310c..00000000 Binary files a/Library/Artifacts/64/6468c5bccbda2501c9cdfc032e9a4c66 and /dev/null differ diff --git a/Library/Artifacts/64/64b8ca282ab8ec3d325068b0a44f2395 b/Library/Artifacts/64/64b8ca282ab8ec3d325068b0a44f2395 deleted file mode 100644 index fa401c72..00000000 Binary files a/Library/Artifacts/64/64b8ca282ab8ec3d325068b0a44f2395 and /dev/null differ diff --git a/Library/Artifacts/65/657e06ecc6c0ce7a89abdda8fed31efb b/Library/Artifacts/65/657e06ecc6c0ce7a89abdda8fed31efb new file mode 100644 index 00000000..f55277a5 Binary files /dev/null and b/Library/Artifacts/65/657e06ecc6c0ce7a89abdda8fed31efb differ diff --git a/Library/Artifacts/65/65e7d15754c599667d2f56a6518d7529 b/Library/Artifacts/65/65e7d15754c599667d2f56a6518d7529 deleted file mode 100644 index 4824696a..00000000 Binary files a/Library/Artifacts/65/65e7d15754c599667d2f56a6518d7529 and /dev/null differ diff --git a/Library/Artifacts/69/694040adaa7d7dfa92cb3759459f0688 b/Library/Artifacts/69/694040adaa7d7dfa92cb3759459f0688 deleted file mode 100644 index 9103f0d0..00000000 Binary files a/Library/Artifacts/69/694040adaa7d7dfa92cb3759459f0688 and /dev/null differ diff --git a/Library/Artifacts/6b/6b506329149d5b98eeda34f09a9a0055 b/Library/Artifacts/6b/6b506329149d5b98eeda34f09a9a0055 deleted file mode 100644 index c82f752f..00000000 Binary files a/Library/Artifacts/6b/6b506329149d5b98eeda34f09a9a0055 and /dev/null differ diff --git a/Library/Artifacts/6c/6c66137ccfa3dae5b4b8eee9829f4358 b/Library/Artifacts/6c/6c66137ccfa3dae5b4b8eee9829f4358 deleted file mode 100644 index c23c7d7d..00000000 Binary files a/Library/Artifacts/6c/6c66137ccfa3dae5b4b8eee9829f4358 and /dev/null differ diff --git a/Library/Artifacts/6d/6de0f18e2d0005b60f65cfe6dca9fe89 b/Library/Artifacts/6d/6de0f18e2d0005b60f65cfe6dca9fe89 deleted file mode 100644 index 5de783c9..00000000 Binary files a/Library/Artifacts/6d/6de0f18e2d0005b60f65cfe6dca9fe89 and /dev/null differ diff --git a/Library/Artifacts/65/65e73d8b76ceac5752a4423522fef8d0 b/Library/Artifacts/6e/6ee8ce67f0c6f67e73a8207315498d2b similarity index 95% rename from Library/Artifacts/65/65e73d8b76ceac5752a4423522fef8d0 rename to Library/Artifacts/6e/6ee8ce67f0c6f67e73a8207315498d2b index b4f77c6e..d6f62e96 100644 Binary files a/Library/Artifacts/65/65e73d8b76ceac5752a4423522fef8d0 and b/Library/Artifacts/6e/6ee8ce67f0c6f67e73a8207315498d2b differ diff --git a/Library/Artifacts/6e/6efa5f4124f93d7596bc812e8febeebf b/Library/Artifacts/6e/6efa5f4124f93d7596bc812e8febeebf deleted file mode 100644 index ee57fa2c..00000000 Binary files a/Library/Artifacts/6e/6efa5f4124f93d7596bc812e8febeebf and /dev/null differ diff --git a/Library/Artifacts/71/713b84a76bf89c32a1a73ae4a9f7f32b b/Library/Artifacts/71/713b84a76bf89c32a1a73ae4a9f7f32b new file mode 100644 index 00000000..0c2b791a Binary files /dev/null and b/Library/Artifacts/71/713b84a76bf89c32a1a73ae4a9f7f32b differ diff --git a/Library/Artifacts/72/7236ff55c121dd45aadb5ad4c34da640 b/Library/Artifacts/72/7236ff55c121dd45aadb5ad4c34da640 deleted file mode 100644 index 17bf5f7c..00000000 Binary files a/Library/Artifacts/72/7236ff55c121dd45aadb5ad4c34da640 and /dev/null differ diff --git a/Library/Artifacts/72/72fb5977241d084f0fa4be71acf57fb7 b/Library/Artifacts/72/72fb5977241d084f0fa4be71acf57fb7 deleted file mode 100644 index 376d950a..00000000 Binary files a/Library/Artifacts/72/72fb5977241d084f0fa4be71acf57fb7 and /dev/null differ diff --git a/Library/Artifacts/75/7521ff4d6b743d1b063396ac6c119c60 b/Library/Artifacts/75/7521ff4d6b743d1b063396ac6c119c60 deleted file mode 100644 index 81a6515a..00000000 Binary files a/Library/Artifacts/75/7521ff4d6b743d1b063396ac6c119c60 and /dev/null differ diff --git a/Library/Artifacts/75/75a80830f3f002f853d4930f0924d069 b/Library/Artifacts/75/75a80830f3f002f853d4930f0924d069 deleted file mode 100644 index 595fcbf7..00000000 Binary files a/Library/Artifacts/75/75a80830f3f002f853d4930f0924d069 and /dev/null differ diff --git a/Library/Artifacts/97/97371326671abac27c2b6cd92186a358 b/Library/Artifacts/76/76507fa674f9b44aacd16a181780cdae similarity index 70% rename from Library/Artifacts/97/97371326671abac27c2b6cd92186a358 rename to Library/Artifacts/76/76507fa674f9b44aacd16a181780cdae index 9b7a6cf9..253c341f 100644 Binary files a/Library/Artifacts/97/97371326671abac27c2b6cd92186a358 and b/Library/Artifacts/76/76507fa674f9b44aacd16a181780cdae differ diff --git a/Library/Artifacts/7a/7a400fc2d12f9290fea596c62c1b9781 b/Library/Artifacts/7a/7a400fc2d12f9290fea596c62c1b9781 new file mode 100644 index 00000000..feb0c8de Binary files /dev/null and b/Library/Artifacts/7a/7a400fc2d12f9290fea596c62c1b9781 differ diff --git a/Library/Artifacts/7a/7aeebcd54aff440d47d2441bc496b6a6 b/Library/Artifacts/7a/7aeebcd54aff440d47d2441bc496b6a6 deleted file mode 100644 index 7c54f520..00000000 Binary files a/Library/Artifacts/7a/7aeebcd54aff440d47d2441bc496b6a6 and /dev/null differ diff --git a/Library/Artifacts/7a/7af54909ff81aa00969e0d8cfe2d4668 b/Library/Artifacts/7a/7af54909ff81aa00969e0d8cfe2d4668 new file mode 100644 index 00000000..c976c9a4 Binary files /dev/null and b/Library/Artifacts/7a/7af54909ff81aa00969e0d8cfe2d4668 differ diff --git a/Library/Artifacts/7b/7b2422d93efba713291f987c418c55b2 b/Library/Artifacts/7b/7b2422d93efba713291f987c418c55b2 deleted file mode 100644 index 57e7acf7..00000000 Binary files a/Library/Artifacts/7b/7b2422d93efba713291f987c418c55b2 and /dev/null differ diff --git a/Library/Artifacts/7b/7bdcf7dfa2de9c620883d0002e3d02a8 b/Library/Artifacts/7b/7bdcf7dfa2de9c620883d0002e3d02a8 new file mode 100644 index 00000000..900d658b Binary files /dev/null and b/Library/Artifacts/7b/7bdcf7dfa2de9c620883d0002e3d02a8 differ diff --git a/Library/Artifacts/7c/7c7895f31ab98b7d8be0176360bc4695 b/Library/Artifacts/7c/7c7895f31ab98b7d8be0176360bc4695 deleted file mode 100644 index 4bbd5404..00000000 Binary files a/Library/Artifacts/7c/7c7895f31ab98b7d8be0176360bc4695 and /dev/null differ diff --git a/Library/Artifacts/7f/7f79ff8ad819e38bfb4aa5c2adb0785d b/Library/Artifacts/7f/7f79ff8ad819e38bfb4aa5c2adb0785d deleted file mode 100644 index 0b4f1bc6..00000000 Binary files a/Library/Artifacts/7f/7f79ff8ad819e38bfb4aa5c2adb0785d and /dev/null differ diff --git a/Library/Artifacts/7f/7fbfd8a0332e305ca9c585a012f8da30 b/Library/Artifacts/7f/7fbfd8a0332e305ca9c585a012f8da30 deleted file mode 100644 index f37f3ec1..00000000 Binary files a/Library/Artifacts/7f/7fbfd8a0332e305ca9c585a012f8da30 and /dev/null differ diff --git a/Library/Artifacts/82/82280b69cff6c1699d6c78cbbe5c6bf0 b/Library/Artifacts/82/82280b69cff6c1699d6c78cbbe5c6bf0 deleted file mode 100644 index 65e09385..00000000 Binary files a/Library/Artifacts/82/82280b69cff6c1699d6c78cbbe5c6bf0 and /dev/null differ diff --git a/Library/Artifacts/82/829502566d4349c55da602672da7d094 b/Library/Artifacts/82/829502566d4349c55da602672da7d094 deleted file mode 100644 index 5f4e8f31..00000000 Binary files a/Library/Artifacts/82/829502566d4349c55da602672da7d094 and /dev/null differ diff --git a/Library/Artifacts/83/83c803b7e99ab0aa4424432de3fd329c b/Library/Artifacts/83/83c803b7e99ab0aa4424432de3fd329c new file mode 100644 index 00000000..3e3d2f21 Binary files /dev/null and b/Library/Artifacts/83/83c803b7e99ab0aa4424432de3fd329c differ diff --git a/Library/Artifacts/84/844b4250ac760632b6e1124768c293a8 b/Library/Artifacts/84/844b4250ac760632b6e1124768c293a8 deleted file mode 100644 index d9ada629..00000000 Binary files a/Library/Artifacts/84/844b4250ac760632b6e1124768c293a8 and /dev/null differ diff --git a/Library/Artifacts/84/84d4ed39419a20765d7b7a311a30d5b3 b/Library/Artifacts/84/84d4ed39419a20765d7b7a311a30d5b3 deleted file mode 100644 index 57255acb..00000000 Binary files a/Library/Artifacts/84/84d4ed39419a20765d7b7a311a30d5b3 and /dev/null differ diff --git a/Library/Artifacts/ba/ba252289d99cbece65477f399386501b b/Library/Artifacts/86/8632f7f533f7d92bece882a62a158b67 similarity index 98% rename from Library/Artifacts/ba/ba252289d99cbece65477f399386501b rename to Library/Artifacts/86/8632f7f533f7d92bece882a62a158b67 index 26689177..1ed748e1 100644 Binary files a/Library/Artifacts/ba/ba252289d99cbece65477f399386501b and b/Library/Artifacts/86/8632f7f533f7d92bece882a62a158b67 differ diff --git a/Library/Artifacts/8c/8c122cef2e04956ee6b55fa3ebc070a2 b/Library/Artifacts/8c/8c122cef2e04956ee6b55fa3ebc070a2 deleted file mode 100644 index da09d9ce..00000000 Binary files a/Library/Artifacts/8c/8c122cef2e04956ee6b55fa3ebc070a2 and /dev/null differ diff --git a/Library/Artifacts/8c/8ca994468e8871f771597fa3e65f5e8d b/Library/Artifacts/8c/8ca994468e8871f771597fa3e65f5e8d deleted file mode 100644 index 3eb975e1..00000000 Binary files a/Library/Artifacts/8c/8ca994468e8871f771597fa3e65f5e8d and /dev/null differ diff --git a/Library/Artifacts/8e/8eb80412350db359936d77ed9b79a470 b/Library/Artifacts/8e/8eb80412350db359936d77ed9b79a470 deleted file mode 100644 index a558ceaa..00000000 Binary files a/Library/Artifacts/8e/8eb80412350db359936d77ed9b79a470 and /dev/null differ diff --git a/Library/Artifacts/8f/8f0a8cdff0a6262f8f66cdedb3bace03 b/Library/Artifacts/8f/8f0a8cdff0a6262f8f66cdedb3bace03 new file mode 100644 index 00000000..bd6b9e87 Binary files /dev/null and b/Library/Artifacts/8f/8f0a8cdff0a6262f8f66cdedb3bace03 differ diff --git a/Library/Artifacts/90/90e660596c323f8b7473ff3d3882f76e b/Library/Artifacts/90/90e660596c323f8b7473ff3d3882f76e deleted file mode 100644 index 963fdce4..00000000 Binary files a/Library/Artifacts/90/90e660596c323f8b7473ff3d3882f76e and /dev/null differ diff --git a/Library/Artifacts/93/935199b85543c691e023436ade3ea025 b/Library/Artifacts/93/935199b85543c691e023436ade3ea025 deleted file mode 100644 index 5cca3c8d..00000000 Binary files a/Library/Artifacts/93/935199b85543c691e023436ade3ea025 and /dev/null differ diff --git a/Library/Artifacts/94/94491cdb73b06266f33f3df2f0b97643 b/Library/Artifacts/94/94491cdb73b06266f33f3df2f0b97643 deleted file mode 100644 index 95ec5f3c..00000000 Binary files a/Library/Artifacts/94/94491cdb73b06266f33f3df2f0b97643 and /dev/null differ diff --git a/Library/Artifacts/94/946507269b30ee75ca32f7b229368276 b/Library/Artifacts/94/946507269b30ee75ca32f7b229368276 deleted file mode 100644 index c6e67889..00000000 Binary files a/Library/Artifacts/94/946507269b30ee75ca32f7b229368276 and /dev/null differ diff --git a/Library/Artifacts/96/9614df1c4c1ef4316f9d7d0d903997d1 b/Library/Artifacts/96/9614df1c4c1ef4316f9d7d0d903997d1 deleted file mode 100644 index 4d8d1b18..00000000 Binary files a/Library/Artifacts/96/9614df1c4c1ef4316f9d7d0d903997d1 and /dev/null differ diff --git a/Library/Artifacts/96/961d54a22dd850de8e5e95f9afabd3a6 b/Library/Artifacts/96/961d54a22dd850de8e5e95f9afabd3a6 deleted file mode 100644 index 440e0cd8..00000000 Binary files a/Library/Artifacts/96/961d54a22dd850de8e5e95f9afabd3a6 and /dev/null differ diff --git a/Library/Artifacts/97/972d7f19a452b822ad1b855429cdedbc b/Library/Artifacts/97/972d7f19a452b822ad1b855429cdedbc deleted file mode 100644 index 62ff801c..00000000 Binary files a/Library/Artifacts/97/972d7f19a452b822ad1b855429cdedbc and /dev/null differ diff --git a/Library/Artifacts/97/9790bcfb9cfc4fd10080812834bfde73 b/Library/Artifacts/97/9790bcfb9cfc4fd10080812834bfde73 deleted file mode 100644 index e3dd05b4..00000000 Binary files a/Library/Artifacts/97/9790bcfb9cfc4fd10080812834bfde73 and /dev/null differ diff --git a/Library/Artifacts/98/982f5feb13fe534b7a5e53c81e09eb9f b/Library/Artifacts/98/982f5feb13fe534b7a5e53c81e09eb9f deleted file mode 100644 index 5f0fbd11..00000000 Binary files a/Library/Artifacts/98/982f5feb13fe534b7a5e53c81e09eb9f and /dev/null differ diff --git a/Library/Artifacts/9a/9a5492eae6832e81cec2b814f609fe50 b/Library/Artifacts/9a/9a5492eae6832e81cec2b814f609fe50 deleted file mode 100644 index 80d13043..00000000 Binary files a/Library/Artifacts/9a/9a5492eae6832e81cec2b814f609fe50 and /dev/null differ diff --git a/Library/Artifacts/9c/9c6c537bed36eeead1a38ca2a815bd57 b/Library/Artifacts/9c/9c6c537bed36eeead1a38ca2a815bd57 deleted file mode 100644 index 621d16a5..00000000 Binary files a/Library/Artifacts/9c/9c6c537bed36eeead1a38ca2a815bd57 and /dev/null differ diff --git a/Library/Artifacts/9d/9d51de36d3b1ec3cc0836011ba673140 b/Library/Artifacts/9d/9d51de36d3b1ec3cc0836011ba673140 deleted file mode 100644 index 47ef0a4c..00000000 Binary files a/Library/Artifacts/9d/9d51de36d3b1ec3cc0836011ba673140 and /dev/null differ diff --git a/Library/Artifacts/9d/9db2bf243d3144dc52c5b47c69f89691 b/Library/Artifacts/9d/9db2bf243d3144dc52c5b47c69f89691 deleted file mode 100644 index 987b0e79..00000000 Binary files a/Library/Artifacts/9d/9db2bf243d3144dc52c5b47c69f89691 and /dev/null differ diff --git a/Library/Artifacts/9f/9f209b3bdb7a7ff3076541ccbc01c16b b/Library/Artifacts/9f/9f209b3bdb7a7ff3076541ccbc01c16b deleted file mode 100644 index a70003c8..00000000 Binary files a/Library/Artifacts/9f/9f209b3bdb7a7ff3076541ccbc01c16b and /dev/null differ diff --git a/Library/Artifacts/9f/9fc08e0e4c8cf804c98c40aecb659efe b/Library/Artifacts/9f/9fc08e0e4c8cf804c98c40aecb659efe deleted file mode 100644 index 5d55235e..00000000 Binary files a/Library/Artifacts/9f/9fc08e0e4c8cf804c98c40aecb659efe and /dev/null differ diff --git a/Library/Artifacts/a4/a4ec77683c234b613c3e8d8f5531cd75 b/Library/Artifacts/a4/a4ec77683c234b613c3e8d8f5531cd75 deleted file mode 100644 index a08d887b..00000000 Binary files a/Library/Artifacts/a4/a4ec77683c234b613c3e8d8f5531cd75 and /dev/null differ diff --git a/Library/Artifacts/e0/e04e852abecc403e081e725ed77abb09 b/Library/Artifacts/a6/a6e94b0767b482473d8ed5b909d5b97f similarity index 92% rename from Library/Artifacts/e0/e04e852abecc403e081e725ed77abb09 rename to Library/Artifacts/a6/a6e94b0767b482473d8ed5b909d5b97f index c9e06bc0..16b14355 100644 Binary files a/Library/Artifacts/e0/e04e852abecc403e081e725ed77abb09 and b/Library/Artifacts/a6/a6e94b0767b482473d8ed5b909d5b97f differ diff --git a/Library/Artifacts/a7/a75a1f402798cd684c34aab987edb6d9 b/Library/Artifacts/a7/a75a1f402798cd684c34aab987edb6d9 deleted file mode 100644 index 04b35ffa..00000000 Binary files a/Library/Artifacts/a7/a75a1f402798cd684c34aab987edb6d9 and /dev/null differ diff --git a/Library/Artifacts/a7/a7be02db757a931bfb68b599d08c9bba b/Library/Artifacts/a7/a7be02db757a931bfb68b599d08c9bba deleted file mode 100644 index 9caa9c8d..00000000 Binary files a/Library/Artifacts/a7/a7be02db757a931bfb68b599d08c9bba and /dev/null differ diff --git a/Library/Artifacts/a9/a9a9936c9f5d91c2c3bf7b485e566fda b/Library/Artifacts/a9/a9a9936c9f5d91c2c3bf7b485e566fda deleted file mode 100644 index ff884145..00000000 Binary files a/Library/Artifacts/a9/a9a9936c9f5d91c2c3bf7b485e566fda and /dev/null differ diff --git a/Library/Artifacts/aa/aabf5ae0034da57dbfdd6e3e3c33dc19 b/Library/Artifacts/aa/aabf5ae0034da57dbfdd6e3e3c33dc19 deleted file mode 100644 index 86200fd4..00000000 Binary files a/Library/Artifacts/aa/aabf5ae0034da57dbfdd6e3e3c33dc19 and /dev/null differ diff --git a/Library/Artifacts/ab/ab068e80f0f9b9ab1ed1580de1ba14db b/Library/Artifacts/ab/ab068e80f0f9b9ab1ed1580de1ba14db deleted file mode 100644 index a74ff32f..00000000 Binary files a/Library/Artifacts/ab/ab068e80f0f9b9ab1ed1580de1ba14db and /dev/null differ diff --git a/Library/Artifacts/ac/aced836d1333ec5060af81d14647116b b/Library/Artifacts/ac/aced836d1333ec5060af81d14647116b deleted file mode 100644 index f8ad298e..00000000 Binary files a/Library/Artifacts/ac/aced836d1333ec5060af81d14647116b and /dev/null differ diff --git a/Library/Artifacts/ad/ad46a8cbf4baf23fc3c84f6aaa557ee5 b/Library/Artifacts/ad/ad46a8cbf4baf23fc3c84f6aaa557ee5 deleted file mode 100644 index 7c5bf503..00000000 Binary files a/Library/Artifacts/ad/ad46a8cbf4baf23fc3c84f6aaa557ee5 and /dev/null differ diff --git a/Library/Artifacts/5f/5f8596b6a6f35017efa775c3136dbd99 b/Library/Artifacts/ad/ad5fc6b86efa62efbc49dabb2e711f41 similarity index 94% rename from Library/Artifacts/5f/5f8596b6a6f35017efa775c3136dbd99 rename to Library/Artifacts/ad/ad5fc6b86efa62efbc49dabb2e711f41 index 552cfd3c..6ce89fda 100644 Binary files a/Library/Artifacts/5f/5f8596b6a6f35017efa775c3136dbd99 and b/Library/Artifacts/ad/ad5fc6b86efa62efbc49dabb2e711f41 differ diff --git a/Library/Artifacts/e5/e5e78f4f03ad6ed7bb895bde5c2c072c b/Library/Artifacts/ad/addf79cb03cb977759a56fdc08498fe8 similarity index 92% rename from Library/Artifacts/e5/e5e78f4f03ad6ed7bb895bde5c2c072c rename to Library/Artifacts/ad/addf79cb03cb977759a56fdc08498fe8 index cae3307c..8a0f653c 100644 Binary files a/Library/Artifacts/e5/e5e78f4f03ad6ed7bb895bde5c2c072c and b/Library/Artifacts/ad/addf79cb03cb977759a56fdc08498fe8 differ diff --git a/Library/Artifacts/ae/ae74592bbd623432a2b5ff92d0cb0726 b/Library/Artifacts/ae/ae74592bbd623432a2b5ff92d0cb0726 deleted file mode 100644 index 44ec04bd..00000000 Binary files a/Library/Artifacts/ae/ae74592bbd623432a2b5ff92d0cb0726 and /dev/null differ diff --git a/Library/Artifacts/b0/b04d60724debf901a4056cfc1bf2515e b/Library/Artifacts/b0/b04d60724debf901a4056cfc1bf2515e deleted file mode 100644 index c2828f90..00000000 Binary files a/Library/Artifacts/b0/b04d60724debf901a4056cfc1bf2515e and /dev/null differ diff --git a/Library/Artifacts/b0/b076b893e4773d29d5e6ff4ce0db7fb1 b/Library/Artifacts/b0/b076b893e4773d29d5e6ff4ce0db7fb1 deleted file mode 100644 index 6a8964d7..00000000 Binary files a/Library/Artifacts/b0/b076b893e4773d29d5e6ff4ce0db7fb1 and /dev/null differ diff --git a/Library/Artifacts/b3/b3d70e33488ddaf7f38fd9af9c8f3a4d b/Library/Artifacts/b3/b3d70e33488ddaf7f38fd9af9c8f3a4d deleted file mode 100644 index f04c5a42..00000000 Binary files a/Library/Artifacts/b3/b3d70e33488ddaf7f38fd9af9c8f3a4d and /dev/null differ diff --git a/Library/Artifacts/b8/b83fad42199d666ec7e7bf2dc112ed0a b/Library/Artifacts/b8/b83fad42199d666ec7e7bf2dc112ed0a deleted file mode 100644 index 26caffc4..00000000 Binary files a/Library/Artifacts/b8/b83fad42199d666ec7e7bf2dc112ed0a and /dev/null differ diff --git a/Library/Artifacts/a8/a89818b6835aaa561187e1237cea3e21 b/Library/Artifacts/b8/b858c50f4e28f1f75704f68745209c53 similarity index 80% rename from Library/Artifacts/a8/a89818b6835aaa561187e1237cea3e21 rename to Library/Artifacts/b8/b858c50f4e28f1f75704f68745209c53 index 3991af5f..bd488758 100644 Binary files a/Library/Artifacts/a8/a89818b6835aaa561187e1237cea3e21 and b/Library/Artifacts/b8/b858c50f4e28f1f75704f68745209c53 differ diff --git a/Library/Artifacts/b9/b99a6cc464850af492414dc67b5491a4 b/Library/Artifacts/b9/b99a6cc464850af492414dc67b5491a4 deleted file mode 100644 index 547bfced..00000000 Binary files a/Library/Artifacts/b9/b99a6cc464850af492414dc67b5491a4 and /dev/null differ diff --git a/Library/Artifacts/b9/b9d676bfbdda181863cdf9b8e7d1f2a1 b/Library/Artifacts/b9/b9d676bfbdda181863cdf9b8e7d1f2a1 deleted file mode 100644 index c86ed776..00000000 Binary files a/Library/Artifacts/b9/b9d676bfbdda181863cdf9b8e7d1f2a1 and /dev/null differ diff --git a/Library/Artifacts/ba/ba6618cd87d9d1f5dcbf5a37b38209dd b/Library/Artifacts/ba/ba6618cd87d9d1f5dcbf5a37b38209dd deleted file mode 100644 index 0ff66072..00000000 Binary files a/Library/Artifacts/ba/ba6618cd87d9d1f5dcbf5a37b38209dd and /dev/null differ diff --git a/Library/Artifacts/bb/bbb2c3fc43e1e546f018e37f798da68a b/Library/Artifacts/bb/bbb2c3fc43e1e546f018e37f798da68a deleted file mode 100644 index 0db54c7c..00000000 Binary files a/Library/Artifacts/bb/bbb2c3fc43e1e546f018e37f798da68a and /dev/null differ diff --git a/Library/Artifacts/bc/bc320a8ef22f79d25a5eeefca1a33017 b/Library/Artifacts/bc/bc320a8ef22f79d25a5eeefca1a33017 deleted file mode 100644 index c4761608..00000000 Binary files a/Library/Artifacts/bc/bc320a8ef22f79d25a5eeefca1a33017 and /dev/null differ diff --git a/Library/Artifacts/bd/bdef75b93b7bd686ca9463e1d11a7000 b/Library/Artifacts/bd/bdef75b93b7bd686ca9463e1d11a7000 deleted file mode 100644 index 15c2f7ff..00000000 Binary files a/Library/Artifacts/bd/bdef75b93b7bd686ca9463e1d11a7000 and /dev/null differ diff --git a/Library/Artifacts/bd/bdffc44de103833a4c21d85fa6058c85 b/Library/Artifacts/bd/bdffc44de103833a4c21d85fa6058c85 deleted file mode 100644 index b00224ef..00000000 Binary files a/Library/Artifacts/bd/bdffc44de103833a4c21d85fa6058c85 and /dev/null differ diff --git a/Library/Artifacts/be/be12c0618425ecf06140a2fb08fe7304 b/Library/Artifacts/be/be12c0618425ecf06140a2fb08fe7304 deleted file mode 100644 index 08e14216..00000000 Binary files a/Library/Artifacts/be/be12c0618425ecf06140a2fb08fe7304 and /dev/null differ diff --git a/Library/Artifacts/be/beb712b29e042e4741370fc8a9907785 b/Library/Artifacts/be/beb712b29e042e4741370fc8a9907785 deleted file mode 100644 index d9d628b8..00000000 Binary files a/Library/Artifacts/be/beb712b29e042e4741370fc8a9907785 and /dev/null differ diff --git a/Library/Artifacts/c0/c018feb37252ca51f3f98f3a7882dbb4 b/Library/Artifacts/c0/c018feb37252ca51f3f98f3a7882dbb4 deleted file mode 100644 index 0a897328..00000000 Binary files a/Library/Artifacts/c0/c018feb37252ca51f3f98f3a7882dbb4 and /dev/null differ diff --git a/Library/Artifacts/c0/c0901ca6c60da38cb987a5fc4d343b8d b/Library/Artifacts/c0/c0901ca6c60da38cb987a5fc4d343b8d deleted file mode 100644 index 3f03ffed..00000000 Binary files a/Library/Artifacts/c0/c0901ca6c60da38cb987a5fc4d343b8d and /dev/null differ diff --git a/Library/Artifacts/c0/c0c1d0a4dd2c705e7ce42404b6627398 b/Library/Artifacts/c0/c0c1d0a4dd2c705e7ce42404b6627398 deleted file mode 100644 index db654995..00000000 Binary files a/Library/Artifacts/c0/c0c1d0a4dd2c705e7ce42404b6627398 and /dev/null differ diff --git a/Library/Artifacts/c0/c0ec91a78dc82a9f0fce9a1898d3977a b/Library/Artifacts/c0/c0ec91a78dc82a9f0fce9a1898d3977a deleted file mode 100644 index a34a8669..00000000 Binary files a/Library/Artifacts/c0/c0ec91a78dc82a9f0fce9a1898d3977a and /dev/null differ diff --git a/Library/Artifacts/c1/c1039315fa5ccdd822a17d626f10c94c b/Library/Artifacts/c1/c1039315fa5ccdd822a17d626f10c94c deleted file mode 100644 index c75ca0b1..00000000 Binary files a/Library/Artifacts/c1/c1039315fa5ccdd822a17d626f10c94c and /dev/null differ diff --git a/Library/Artifacts/c1/c1af6791d2d1bba7cc34e815962da34e b/Library/Artifacts/c1/c1af6791d2d1bba7cc34e815962da34e deleted file mode 100644 index 7dbf5483..00000000 Binary files a/Library/Artifacts/c1/c1af6791d2d1bba7cc34e815962da34e and /dev/null differ diff --git a/Library/Artifacts/c2/c22c72eda30a5c8662c6c0f6ef6cfa94 b/Library/Artifacts/c2/c22c72eda30a5c8662c6c0f6ef6cfa94 deleted file mode 100644 index 66e7f63c..00000000 Binary files a/Library/Artifacts/c2/c22c72eda30a5c8662c6c0f6ef6cfa94 and /dev/null differ diff --git a/Library/Artifacts/c4/c4442d3de48ec5b2aaa6217d14db404d b/Library/Artifacts/c4/c4442d3de48ec5b2aaa6217d14db404d deleted file mode 100644 index c456de52..00000000 Binary files a/Library/Artifacts/c4/c4442d3de48ec5b2aaa6217d14db404d and /dev/null differ diff --git a/Library/Artifacts/fb/fb0825091e72ae34b6492c2774ce43e3 b/Library/Artifacts/c4/c49a1d5dc78a21c4bee8304f3a51f093 similarity index 71% rename from Library/Artifacts/fb/fb0825091e72ae34b6492c2774ce43e3 rename to Library/Artifacts/c4/c49a1d5dc78a21c4bee8304f3a51f093 index 711cd527..699680b1 100644 Binary files a/Library/Artifacts/fb/fb0825091e72ae34b6492c2774ce43e3 and b/Library/Artifacts/c4/c49a1d5dc78a21c4bee8304f3a51f093 differ diff --git a/Library/Artifacts/c7/c7db6589189ba6be9acb1ab764082182 b/Library/Artifacts/c7/c7db6589189ba6be9acb1ab764082182 deleted file mode 100644 index 3f9dc6b7..00000000 Binary files a/Library/Artifacts/c7/c7db6589189ba6be9acb1ab764082182 and /dev/null differ diff --git a/Library/Artifacts/c8/c8413f90e163aa2ea4b204556245b506 b/Library/Artifacts/c8/c8413f90e163aa2ea4b204556245b506 deleted file mode 100644 index 9d44ec9b..00000000 Binary files a/Library/Artifacts/c8/c8413f90e163aa2ea4b204556245b506 and /dev/null differ diff --git a/Library/Artifacts/f4/f4a7bf2fd5a6471b7a4dcda65894fb43 b/Library/Artifacts/ca/cac247182d21188b873f0af3c966f713 similarity index 93% rename from Library/Artifacts/f4/f4a7bf2fd5a6471b7a4dcda65894fb43 rename to Library/Artifacts/ca/cac247182d21188b873f0af3c966f713 index d0244403..0142741e 100644 Binary files a/Library/Artifacts/f4/f4a7bf2fd5a6471b7a4dcda65894fb43 and b/Library/Artifacts/ca/cac247182d21188b873f0af3c966f713 differ diff --git a/Library/Artifacts/cc/ccb2f5b3045746c032c6ba7ca4b44376 b/Library/Artifacts/cc/ccb2f5b3045746c032c6ba7ca4b44376 deleted file mode 100644 index e9c245d8..00000000 Binary files a/Library/Artifacts/cc/ccb2f5b3045746c032c6ba7ca4b44376 and /dev/null differ diff --git a/Library/Artifacts/cd/cd0eefdf494d980e4b3b4a0b6fbcbb5f b/Library/Artifacts/cd/cd0eefdf494d980e4b3b4a0b6fbcbb5f deleted file mode 100644 index 972f007c..00000000 Binary files a/Library/Artifacts/cd/cd0eefdf494d980e4b3b4a0b6fbcbb5f and /dev/null differ diff --git a/Library/Artifacts/cd/cd1650cee95bd45595fbbafd39b49667 b/Library/Artifacts/cd/cd1650cee95bd45595fbbafd39b49667 deleted file mode 100644 index 28741ac9..00000000 Binary files a/Library/Artifacts/cd/cd1650cee95bd45595fbbafd39b49667 and /dev/null differ diff --git a/Library/Artifacts/cd/cd41068bacb2e71305f9f5fb77261fd4 b/Library/Artifacts/cd/cd41068bacb2e71305f9f5fb77261fd4 deleted file mode 100644 index 89e3fd30..00000000 Binary files a/Library/Artifacts/cd/cd41068bacb2e71305f9f5fb77261fd4 and /dev/null differ diff --git a/Library/Artifacts/d0/d0387b829b281a3e9d112d845b0fb652 b/Library/Artifacts/d0/d0387b829b281a3e9d112d845b0fb652 deleted file mode 100644 index 3634d6ce..00000000 Binary files a/Library/Artifacts/d0/d0387b829b281a3e9d112d845b0fb652 and /dev/null differ diff --git a/Library/Artifacts/d2/d2ce63c95c8caad800db9b6ee97c80e2 b/Library/Artifacts/d2/d2ce63c95c8caad800db9b6ee97c80e2 deleted file mode 100644 index 805ef990..00000000 Binary files a/Library/Artifacts/d2/d2ce63c95c8caad800db9b6ee97c80e2 and /dev/null differ diff --git a/Library/Artifacts/d3/d3397799e24bb3d2f155bcf66dedb705 b/Library/Artifacts/d3/d3397799e24bb3d2f155bcf66dedb705 new file mode 100644 index 00000000..ae920e24 Binary files /dev/null and b/Library/Artifacts/d3/d3397799e24bb3d2f155bcf66dedb705 differ diff --git a/Library/Artifacts/d5/d5c78707cfde3873059a6a262f9799de b/Library/Artifacts/d5/d5c78707cfde3873059a6a262f9799de deleted file mode 100644 index 4dcbb39f..00000000 Binary files a/Library/Artifacts/d5/d5c78707cfde3873059a6a262f9799de and /dev/null differ diff --git a/Library/Artifacts/d6/d636c132341417b4f3c04439a20d0869 b/Library/Artifacts/d6/d636c132341417b4f3c04439a20d0869 deleted file mode 100644 index bf45f158..00000000 Binary files a/Library/Artifacts/d6/d636c132341417b4f3c04439a20d0869 and /dev/null differ diff --git a/Library/Artifacts/d6/d6fe8966d195ad2e0ec50db860a35874 b/Library/Artifacts/d6/d6fe8966d195ad2e0ec50db860a35874 deleted file mode 100644 index 78af0d30..00000000 Binary files a/Library/Artifacts/d6/d6fe8966d195ad2e0ec50db860a35874 and /dev/null differ diff --git a/Library/Artifacts/dd/dd2dc4c37338839a4cc9ecccc4da7233 b/Library/Artifacts/dd/dd2dc4c37338839a4cc9ecccc4da7233 deleted file mode 100644 index 70f2e21d..00000000 Binary files a/Library/Artifacts/dd/dd2dc4c37338839a4cc9ecccc4da7233 and /dev/null differ diff --git a/Library/Artifacts/e1/e15f2fb08e6b429ac39dc118b0378a71 b/Library/Artifacts/e1/e15f2fb08e6b429ac39dc118b0378a71 deleted file mode 100644 index e169476e..00000000 Binary files a/Library/Artifacts/e1/e15f2fb08e6b429ac39dc118b0378a71 and /dev/null differ diff --git a/Library/Artifacts/e2/e2d2aca0449191ef8d947183ff98da22 b/Library/Artifacts/e2/e2d2aca0449191ef8d947183ff98da22 deleted file mode 100644 index 8aa2cde7..00000000 Binary files a/Library/Artifacts/e2/e2d2aca0449191ef8d947183ff98da22 and /dev/null differ diff --git a/Library/Artifacts/e4/e4c240b6c9bb3d3bc6565d7fcfc30ba3 b/Library/Artifacts/e4/e4c240b6c9bb3d3bc6565d7fcfc30ba3 new file mode 100644 index 00000000..f9277188 Binary files /dev/null and b/Library/Artifacts/e4/e4c240b6c9bb3d3bc6565d7fcfc30ba3 differ diff --git a/Library/Artifacts/e5/e5d930d5fbaeecf2ca2a585ff7191df7 b/Library/Artifacts/e5/e5d930d5fbaeecf2ca2a585ff7191df7 new file mode 100644 index 00000000..ea572b41 Binary files /dev/null and b/Library/Artifacts/e5/e5d930d5fbaeecf2ca2a585ff7191df7 differ diff --git a/Library/Artifacts/e6/e69bf5f5e470683873590854231eebbd b/Library/Artifacts/e6/e69bf5f5e470683873590854231eebbd deleted file mode 100644 index 99a6aef0..00000000 Binary files a/Library/Artifacts/e6/e69bf5f5e470683873590854231eebbd and /dev/null differ diff --git a/Library/Artifacts/e9/e9a2b11cf5f7215a365a6f619c66f353 b/Library/Artifacts/e9/e9a2b11cf5f7215a365a6f619c66f353 deleted file mode 100644 index 9eb25753..00000000 Binary files a/Library/Artifacts/e9/e9a2b11cf5f7215a365a6f619c66f353 and /dev/null differ diff --git a/Library/Artifacts/eb/ebc9ab77e62825d36455ae8ec36ca946 b/Library/Artifacts/eb/ebc9ab77e62825d36455ae8ec36ca946 deleted file mode 100644 index 5dd01d04..00000000 Binary files a/Library/Artifacts/eb/ebc9ab77e62825d36455ae8ec36ca946 and /dev/null differ diff --git a/Library/Artifacts/ef/efe24ffa1b0c3b7a1e86b0826d9c64f5 b/Library/Artifacts/ef/efe24ffa1b0c3b7a1e86b0826d9c64f5 deleted file mode 100644 index 62d6eee4..00000000 Binary files a/Library/Artifacts/ef/efe24ffa1b0c3b7a1e86b0826d9c64f5 and /dev/null differ diff --git a/Library/Artifacts/f4/f4bca2b54148da19991c632b2977a556 b/Library/Artifacts/f4/f4bca2b54148da19991c632b2977a556 deleted file mode 100644 index 62390bdd..00000000 Binary files a/Library/Artifacts/f4/f4bca2b54148da19991c632b2977a556 and /dev/null differ diff --git a/Library/Artifacts/f6/f670c57c63f7be31cefb6d4de015b4b8 b/Library/Artifacts/f6/f670c57c63f7be31cefb6d4de015b4b8 deleted file mode 100644 index e0828a08..00000000 Binary files a/Library/Artifacts/f6/f670c57c63f7be31cefb6d4de015b4b8 and /dev/null differ diff --git a/Library/Artifacts/f6/f6fea552da35de6f134a6c463e9dbc95 b/Library/Artifacts/f6/f6fea552da35de6f134a6c463e9dbc95 deleted file mode 100644 index e633c0df..00000000 Binary files a/Library/Artifacts/f6/f6fea552da35de6f134a6c463e9dbc95 and /dev/null differ diff --git a/Library/Artifacts/ff/ffa81a024e3dc8e41fd20480dc049234 b/Library/Artifacts/ff/ffa81a024e3dc8e41fd20480dc049234 deleted file mode 100644 index 5d921a36..00000000 Binary files a/Library/Artifacts/ff/ffa81a024e3dc8e41fd20480dc049234 and /dev/null differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 89f0444c..7529b604 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: 678, y: 342} + m_MaxSize: {x: 12003, y: 8042} vertical: 0 - controlID: 38602 + controlID: 10945 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,7 +140,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 342} m_MaxSize: {x: 8002, y: 8042} vertical: 1 - controlID: 38603 + controlID: 10946 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,7 +165,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 38604 + controlID: 10947 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f274faff0675faffaa75faff385cfcff4693fcff7093fcff7883fdffa283fdff9af5ffff66f7ffff8ef8ffff54f9ffff58f9ffff60f9ffff62f9ffff62fbffff043b00006e3b0000ac3d0000623e0000863e0000903e0000dc3e00007440000062410000a2420000d64200003643000080460000f046000016480000 + m_ExpandedIDs: 703effff843effff283fffff3e6fffff526ffffff66fffff72acffff50dbffff1ee8ffff34f5ffff62fbffffd63a0000043b0000543e0000d83e00002040000086400000064100004a420000aa420000e04300002e440000bc4500002a46000026470000505f0100ae620100d6630100d266010098680100086901008c690100726b0100446d0100346f010084700100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 638.22284, y: 49.60802, z: -41.375} + m_Target: {x: 1031.471, y: 174.15503, z: -88.27445} speed: 2 - m_Value: {x: 638.22284, y: 49.60802, z: -41.375} + m_Value: {x: 1031.471, y: 174.15503, z: -88.27445} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -510,9 +510,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 386.79572 + m_Target: 171.80833 speed: 2 - m_Value: 386.79572 + m_Value: 171.80833 m_Ortho: m_Target: 1 speed: 2 @@ -1104,20 +1104,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Textures/Humanlike/Appendages + - Assets/Scripts/GUI m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Textures/Humanlike/Appendages + - Assets/Scripts/GUI/SelfContained m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 41} - m_SelectedIDs: 564f0000 - m_LastClickedID: 20310 - m_ExpandedIDs: ffffffff00000000024f0000044f0000064f0000084f00000a4f00000c4f00000e4f000000ca9a3b + scrollPos: {x: 0, y: 229} + m_SelectedIDs: 284f0000 + m_LastClickedID: 20264 + m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000024f0000044f0000064f0000084f00000a4f00000c4f00000e4f000000ca9a3b + m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1170,8 +1170,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 0ebf0200 - m_LastClickedInstanceID: 179982 + m_SelectedInstanceIDs: 50420000 + m_LastClickedInstanceID: 16976 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: @@ -1197,7 +1197,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 5} m_GridSize: 67 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 379 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 32bc2342..cee535dc 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 342} - m_MaxSize: {x: 12002, y: 8042} + m_MinSize: {x: 678, y: 342} + m_MaxSize: {x: 12003, y: 8042} vertical: 0 - controlID: 38224 + controlID: 10709 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 342} m_MaxSize: {x: 8002, y: 8042} vertical: 1 - controlID: 38225 + controlID: 10710 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 38226 + controlID: 10711 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 385cfcff4693fcff7093fcff7883fdffa283fdff9af5ffff66f7ffff8ef8ffff54f9ffff58f9ffff60f9ffff62f9ffff62fbffff043b00006e3b0000ac3d0000623e0000863e0000903e0000dc3e00007440000062410000a2420000d64200003643000080460000f046000016480000 + m_ExpandedIDs: 3e6fffff526ffffff66fffff72acffff50dbffff1ee8ffff34f5ffff62fbffffd63a0000043b0000543e0000d83e00002040000086400000064100004a420000aa420000e04300002e440000bc4500002a46000026470000505f0100ae620100d6630100d266010098680100086901008c690100726b0100446d0100346f010084700100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 638.22284, y: 49.60802, z: -41.375} + m_Target: {x: 1031.471, y: 174.15503, z: -88.27445} speed: 2 - m_Value: {x: 638.22284, y: 49.60802, z: -41.375} + m_Value: {x: 1031.471, y: 174.15503, z: -88.27445} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -365,9 +365,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 386.79572 + m_Target: 171.80833 speed: 2 - m_Value: 386.79572 + m_Value: 171.80833 m_Ortho: m_Target: 1 speed: 2 @@ -939,8 +939,8 @@ MonoBehaviour: y: 671 width: 1414 height: 276 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 12} @@ -987,20 +987,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Textures/Humanlike/Appendages + - Assets/Scripts/GUI m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Textures/Humanlike/Appendages + - Assets/Scripts/GUI/SelfContained m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 41} - m_SelectedIDs: 564f0000 - m_LastClickedID: 20310 - m_ExpandedIDs: ffffffff00000000024f0000044f0000064f0000084f00000a4f00000c4f00000e4f000000ca9a3b + scrollPos: {x: 0, y: 229} + m_SelectedIDs: 284f0000 + m_LastClickedID: 20264 + m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000024f0000044f0000064f0000084f00000a4f00000c4f00000e4f000000ca9a3b + m_ExpandedIDs: 000000002c4e00002e4e0000304e0000324e0000344e0000364e0000384e00003a4e0000564e00005a4e0000284f00005c4f000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 0ebf0200 - m_LastClickedInstanceID: 179982 + m_SelectedInstanceIDs: 50420000 + m_LastClickedInstanceID: 16976 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: @@ -1080,7 +1080,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 5} m_GridSize: 67 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 379 @@ -1160,8 +1160,8 @@ MonoBehaviour: y: 0 width: 506 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 94004 m_LastVerticalScrollValue: 0 diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 226cb43c..1ab92fc8 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 562770ba..30c46206 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 bd644199..52f6dff3 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/Unity.2D.Animation.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll index f0387d5d..a5aa24c0 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 ad18466a..c0e75d9b 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 6751e7f0..281ccb02 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 5f7aa9c3..a899bd55 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 220629b1..0fcfda72 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 69912a75..937304fc 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 f78c2549..d0aad499 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 84dcc7df..1ce61772 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 5261b2ba..6cae95b3 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 2e83b222..35b4357d 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 204882b6..62080a07 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets index 4c97fe8f..fb8f4e5b 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets and b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets differ diff --git a/Library/PlayerDataCache/Win/Data/level0 b/Library/PlayerDataCache/Win/Data/level0 index 249a067a..88f09bda 100644 Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Library/PlayerDataCache/Win/Data/resources.assets b/Library/PlayerDataCache/Win/Data/resources.assets index a19592a6..3c97a8a4 100644 Binary files a/Library/PlayerDataCache/Win/Data/resources.assets and b/Library/PlayerDataCache/Win/Data/resources.assets differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index a215e2c5..0225ecbc 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 14d52d44..15674396 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -125,129 +125,129 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11262} - Class: 114 - Script: {instanceID: 11266} + Script: {instanceID: 11264} - Class: 114 - Script: {instanceID: 11290} + Script: {instanceID: 11268} - Class: 114 - Script: {instanceID: 11448} + Script: {instanceID: 11292} - Class: 114 - Script: {instanceID: 11502} + Script: {instanceID: 11450} - Class: 114 - Script: {instanceID: 11586} + Script: {instanceID: 11504} - Class: 114 - Script: {instanceID: 11600} + Script: {instanceID: 11590} - Class: 114 - Script: {instanceID: 11654} + Script: {instanceID: 11604} - Class: 114 - Script: {instanceID: 11728} + Script: {instanceID: 11658} - Class: 114 - Script: {instanceID: 11752} + Script: {instanceID: 11732} - Class: 114 Script: {instanceID: 11756} - Class: 114 - Script: {instanceID: 11758} + Script: {instanceID: 11760} - Class: 114 - Script: {instanceID: 11766} + Script: {instanceID: 11762} - Class: 114 - Script: {instanceID: 11776} + Script: {instanceID: 11770} - Class: 114 - Script: {instanceID: 11798} + Script: {instanceID: 11780} - Class: 114 - Script: {instanceID: 11862} + Script: {instanceID: 11802} - Class: 114 - Script: {instanceID: 11868} + Script: {instanceID: 11866} - Class: 114 - Script: {instanceID: 12132} + Script: {instanceID: 11872} - Class: 114 - Script: {instanceID: 12168} + Script: {instanceID: 12138} - Class: 114 - Script: {instanceID: 12312} + Script: {instanceID: 12174} - Class: 114 - Script: {instanceID: 12336} + Script: {instanceID: 12318} - Class: 114 - Script: {instanceID: 12352} + Script: {instanceID: 12342} - Class: 114 - Script: {instanceID: 12422} + Script: {instanceID: 12358} - Class: 114 - Script: {instanceID: 12602} + Script: {instanceID: 12428} - Class: 114 - Script: {instanceID: 12720} + Script: {instanceID: 12608} - Class: 114 - Script: {instanceID: 12744} + Script: {instanceID: 12632} - Class: 114 - Script: {instanceID: 12868} + Script: {instanceID: 12750} - Class: 114 - Script: {instanceID: 12912} + Script: {instanceID: 12874} - Class: 114 - Script: {instanceID: 13162} + Script: {instanceID: 12918} - Class: 114 - Script: {instanceID: 13188} + Script: {instanceID: 13168} - Class: 114 - Script: {instanceID: 13228} + Script: {instanceID: 13194} - Class: 114 - Script: {instanceID: 13238} + Script: {instanceID: 13234} - Class: 114 - Script: {instanceID: 13248} + Script: {instanceID: 13244} - Class: 114 - Script: {instanceID: 13256} + Script: {instanceID: 13254} - Class: 114 - Script: {instanceID: 13260} + Script: {instanceID: 13266} - Class: 114 - Script: {instanceID: 13362} + Script: {instanceID: 13368} - Class: 114 - Script: {instanceID: 13380} + Script: {instanceID: 13386} - Class: 114 - Script: {instanceID: 13382} + Script: {instanceID: 13388} - Class: 114 - Script: {instanceID: 13414} + Script: {instanceID: 13420} - Class: 114 - Script: {instanceID: 13454} + Script: {instanceID: 13460} - Class: 114 - Script: {instanceID: 13470} + Script: {instanceID: 13476} - Class: 114 - Script: {instanceID: 13486} + Script: {instanceID: 13492} - Class: 114 - Script: {instanceID: 13498} + Script: {instanceID: 13504} - Class: 114 - Script: {instanceID: 13502} + Script: {instanceID: 13508} - Class: 114 - Script: {instanceID: 13538} + Script: {instanceID: 13544} - Class: 114 - Script: {instanceID: 13670} + Script: {instanceID: 13676} - Class: 114 - Script: {instanceID: 13696} + Script: {instanceID: 13702} - Class: 114 - Script: {instanceID: 13828} + Script: {instanceID: 13834} - Class: 114 - Script: {instanceID: 13904} + Script: {instanceID: 13908} - Class: 114 - Script: {instanceID: 14094} + Script: {instanceID: 13912} - Class: 114 - Script: {instanceID: 14190} + Script: {instanceID: 14102} - Class: 114 - Script: {instanceID: 14340} + Script: {instanceID: 14198} - Class: 114 - Script: {instanceID: 14486} + Script: {instanceID: 14348} - Class: 114 - Script: {instanceID: 14512} + Script: {instanceID: 14496} - Class: 114 - Script: {instanceID: 14514} + Script: {instanceID: 14522} - Class: 114 - Script: {instanceID: 14546} + Script: {instanceID: 14524} - Class: 114 - Script: {instanceID: 14568} + Script: {instanceID: 14556} - Class: 114 - Script: {instanceID: 14570} + Script: {instanceID: 14578} - Class: 114 - Script: {instanceID: 14610} + Script: {instanceID: 14580} - Class: 114 - Script: {instanceID: 14616} + Script: {instanceID: 14620} - Class: 114 - Script: {instanceID: 14658} + Script: {instanceID: 14626} - Class: 114 - Script: {instanceID: 32402} + Script: {instanceID: 14668} - Class: 114 - Script: {instanceID: 55990} + Script: {instanceID: 58294} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -273,6 +273,12 @@ ScriptsOnlyBuild: assemblyName: UnityEngine.UI.dll namespaceName: UnityEngine.UI className: Button + - hash: + serializedVersion: 2 + Hash: d4020bafcd3ccbb5601a6e6c8ac78be0 + assemblyName: UnityEngine.UI.dll + namespaceName: UnityEngine.UI + className: ScrollRect - hash: serializedVersion: 2 Hash: aeb62f729c52c814dec86c47dcac1471 @@ -629,10 +635,10 @@ ScriptsOnlyBuild: className: ActorKeyframeCard - hash: serializedVersion: 2 - Hash: d4020bafcd3ccbb5601a6e6c8ac78be0 - assemblyName: UnityEngine.UI.dll - namespaceName: UnityEngine.UI - className: ScrollRect + Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: AddonAnchorDropdown - hash: serializedVersion: 2 Hash: 7fa489254157ab6a0341a98a57005c5f @@ -717,12 +723,6 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: Chaser - - hash: - serializedVersion: 2 - Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f - assemblyName: Assembly-CSharp.dll - namespaceName: RimWorldAnimationStudio - className: SnapToKeyframe - hash: serializedVersion: 2 Hash: 5ad4aa237d47ac2bab17bacb672edf7a @@ -743,7 +743,7 @@ ScriptsOnlyBuild: className: SelectActorAddonsDialog - hash: serializedVersion: 2 - Hash: 051834992c1c1bd1815f7b2033388890 + Hash: 03a1740ba4df0e87f3f9feb473ac1ef4 assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: ActorBody @@ -861,6 +861,12 @@ ScriptsOnlyBuild: assemblyName: Unity.Timeline.dll namespaceName: UnityEngine.Timeline className: AudioTrack + - hash: + serializedVersion: 2 + Hash: 595fea81f1b9a2a5ad1548ecf33c32e8 + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: ActorAddonCard - hash: serializedVersion: 2 Hash: 3af5b3ca64bb584fbe1f8b06b916df17 @@ -1034,13 +1040,7 @@ ScriptsOnlyBuild: Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio - className: AddonAnchorDropdown - - hash: - serializedVersion: 2 - Hash: 595fea81f1b9a2a5ad1548ecf33c32e8 - assemblyName: Assembly-CSharp.dll - namespaceName: RimWorldAnimationStudio - className: ActorAddonCard + className: SnapToKeyframe platform: 5 scenePathNames: - Assets/Scenes/MainScene.unity diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index db5fdb30..841a4150 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-Editor.pdb b/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb index b6cd1f21..c0093a27 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 5da59509..38c43c89 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 64a37639..484134d3 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index e0d89570..37ab98f7 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json b/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json index 4d3eff84..a994741d 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json +++ b/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[7929422520673851210],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":5655091321662588893,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[7929422520673851210],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":7929422520673851210,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-ffbd7531e8f98f94db.json b/Library/StateCache/Hierarchy/8cbfdc-ffbd7531e8f98f94db.json new file mode 100644 index 00000000..4461fa5f --- /dev/null +++ b/Library/StateCache/Hierarchy/8cbfdc-ffbd7531e8f98f94db.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[],"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-ffbd7531e8f98f94db.json b/Library/StateCache/SceneView/352ee9-ffbd7531e8f98f94db.json new file mode 100644 index 00000000..5fa0bd99 --- /dev/null +++ b/Library/StateCache/SceneView/352ee9-ffbd7531e8f98f94db.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":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"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 67eb8341..3340c305 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":638.2228393554688,"y":49.6080207824707,"z":-41.375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":386.79571533203127,"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":1031.470947265625,"y":174.155029296875,"z":-88.27445220947266},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":171.80833435058595,"orthographic":true} \ No newline at end of file diff --git a/Library/expandedItems b/Library/expandedItems index 7510b75d..22955ab9 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 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,2 +1,4 @@ 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.exe11.log b/Library/shadercompiler-UnityShaderCompiler.exe11.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe11.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe11.log @@ -1,2 +1,4 @@ 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.exe4.log b/Library/shadercompiler-UnityShaderCompiler.exe4.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe4.log @@ -1,2 +1,4 @@ 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 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,2 +1,4 @@ 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.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index eb8e89a0..58922346 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 96c4aeaa..973381be 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ