diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index ba2bf947..fde2b27a 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Resources/Prefabs/AnimationTimeline.prefab b/Assets/Resources/Prefabs/AnimationTimeline.prefab index e3d16f72..20c1de94 100644 --- a/Assets/Resources/Prefabs/AnimationTimeline.prefab +++ b/Assets/Resources/Prefabs/AnimationTimeline.prefab @@ -522,7 +522,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.85, b: 0, a: 1} + m_Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 0691edc4..1dd1b5ec 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -6646,9 +6646,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 926.45465, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &429161118 @@ -7165,9 +7165,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 640.0244, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 176.86053, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &462332576 @@ -8319,6 +8319,8 @@ MonoBehaviour: stretchKeyframesToggle: {fileID: 462332576} playBackSpeedField: {fileID: 1579799916} playToggleButton: {fileID: 79733375} + stageLengthText: {fileID: 1137451986} + animationLengthText: {fileID: 1293297801} actorBodyPrefab: {fileID: -4411442180840688308, guid: dc4c8b005322f3b46a2f122a55f38db2, type: 3} animationTimelinePrefab: {fileID: 3541467645058788217, guid: eac2d5e7275f9064facfeb818ee30308, @@ -8642,7 +8644,6 @@ GameObject: - component: {fileID: 539052777} - component: {fileID: 539052779} - component: {fileID: 539052781} - - component: {fileID: 539052780} m_Layer: 5 m_Name: AnimControlPanel m_TagString: Untagged @@ -8669,13 +8670,14 @@ RectTransform: - {fileID: 462332575} - {fileID: 1083597498} - {fileID: 429161117} + - {fileID: 665717983} m_Father: {fileID: 1100016168} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -22.5} - m_SizeDelta: {x: 1055, y: 45} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 45} m_Pivot: {x: 0, y: 0.5} --- !u!222 &539052779 CanvasRenderer: @@ -8685,20 +8687,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 539052776} m_CullTransparentMesh: 0 ---- !u!114 &539052780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539052776} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 1 - m_VerticalFit: 1 --- !u!114 &539052781 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9099,10 +9087,10 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 490.79706, y: -22.5} - m_SizeDelta: {x: 11.594109, y: 25} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 12, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &567758163 MonoBehaviour: @@ -10735,6 +10723,128 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 658284331} m_CullTransparentMesh: 0 +--- !u!1 &665717982 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 665717983} + - component: {fileID: 665717987} + - component: {fileID: 665717986} + - component: {fileID: 665717985} + - component: {fileID: 665717984} + m_Layer: 5 + m_Name: 'StageTimeMetricsLabel ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &665717983 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665717982} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1137451984} + - {fileID: 1834285083} + - {fileID: 1293297799} + m_Father: {fileID: 539052777} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1006.86053, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &665717984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665717982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &665717985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665717982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 1 +--- !u!114 &665717986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665717982} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &665717987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665717982} + m_CullTransparentMesh: 0 --- !u!1 &671921653 GameObject: m_ObjectHideFlags: 0 @@ -11311,10 +11421,10 @@ RectTransform: m_Father: {fileID: 1100016168} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 537.5, y: -52.5} - m_SizeDelta: {x: 1055, y: 15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 15} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &719308825 GameObject: @@ -12090,9 +12200,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 457.5, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 55, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &760297267 @@ -16228,9 +16338,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 787.45465, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 118, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1083597499 @@ -16423,7 +16533,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1100016168 RectTransform: m_ObjectHideFlags: 0 @@ -16444,7 +16554,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 40} - m_SizeDelta: {x: 0, y: 65} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1100016169 MonoBehaviour: @@ -16952,6 +17062,99 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1136677496} m_CullTransparentMesh: 0 +--- !u!1 &1137451983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1137451984} + - component: {fileID: 1137451987} + - component: {fileID: 1137451986} + - component: {fileID: 1137451985} + m_Layer: 5 + m_Name: StageLengthText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1137451984 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137451983} + 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: 665717983} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 0, y: 25} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1137451985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137451983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &1137451986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137451983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Stage length: 600 (10 s)' +--- !u!222 &1137451987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1137451983} + m_CullTransparentMesh: 0 --- !u!1 &1148771915 GameObject: m_ObjectHideFlags: 0 @@ -19933,6 +20136,99 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1293104865} m_CullTransparentMesh: 0 +--- !u!1 &1293297798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1293297799} + - component: {fileID: 1293297802} + - component: {fileID: 1293297801} + - component: {fileID: 1293297800} + m_Layer: 5 + m_Name: AnimationLengthText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1293297799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293297798} + 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: 665717983} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 185, y: 0} + m_SizeDelta: {x: 0, y: 25} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1293297800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293297798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &1293297801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293297798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Animation length: 600 (10 s)' +--- !u!222 &1293297802 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293297798} + m_CullTransparentMesh: 0 --- !u!1 &1297071851 GameObject: m_ObjectHideFlags: 0 @@ -22179,7 +22475,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -24293,9 +24589,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 382.5, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 95, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1567556988 @@ -25561,9 +25857,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 524.0941, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 55, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676585155 @@ -26939,9 +27235,9 @@ RectTransform: m_Father: {fileID: 539052777} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 190, y: -22.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 290, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1791478861 @@ -27740,6 +28036,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833911027} m_CullTransparentMesh: 0 +--- !u!1 &1834285082 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1834285083} + - component: {fileID: 1834285085} + - component: {fileID: 1834285084} + m_Layer: 5 + m_Name: / + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1834285083 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834285082} + 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: 665717983} + 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: 0, y: 0} + m_SizeDelta: {x: 12, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1834285084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834285082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: / +--- !u!222 &1834285085 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1834285082} + m_CullTransparentMesh: 0 --- !u!1 &1845441704 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AnimationComponents/AnimationDef.cs b/Assets/Scripts/AnimationComponents/AnimationDef.cs index 9439dbfa..fa44c7c5 100644 --- a/Assets/Scripts/AnimationComponents/AnimationDef.cs +++ b/Assets/Scripts/AnimationComponents/AnimationDef.cs @@ -16,7 +16,9 @@ namespace RimWorldAnimationStudio [XmlArray("interactionDefTypes"), XmlArrayItem("li")] public List interactionDefTypes = new List(); [XmlArray("actors"), XmlArrayItem("li")] public List actors = new List(); [XmlArray("animationStages"), XmlArrayItem("li")] public List animationStages = new List(); - [XmlIgnore] public int animationTimeTicks = 0; + + [XmlIgnore] public int animationTimeTicks { get { return animationStages.Sum(x => x.playTimeTicks); } } + [XmlIgnore] public int animationTimeTicksQuick { get { return animationStages.Sum(x => x.playTimeTicksQuick); } } public bool ShouldSerializesexTypes() { return sexTypes.NotNullOrEmpty(); } public bool ShouldSerializeinteractionDefTypes() { return interactionDefTypes.NotNullOrEmpty(); } @@ -25,13 +27,8 @@ namespace RimWorldAnimationStudio public void Initialize() { - animationTimeTicks = 0; - foreach (AnimationStage stage in animationStages) - { - stage.Initialize(); - animationTimeTicks += stage.playTimeTicks; - } + { stage.Initialize(); } } public void ValidateData() diff --git a/Assets/Scripts/AnimationComponents/AnimationStage.cs b/Assets/Scripts/AnimationComponents/AnimationStage.cs index 723d2aa5..43fa9d98 100644 --- a/Assets/Scripts/AnimationComponents/AnimationStage.cs +++ b/Assets/Scripts/AnimationComponents/AnimationStage.cs @@ -11,7 +11,7 @@ namespace RimWorldAnimationStudio public string stageName = "NewStage"; public int stageIndex = 0; public int playTimeTicks = 0; - public int playTimeTicksQuick = -1; + public int playTimeTicksQuick = 0; public bool isLooping = false; [XmlArray("animationClips"), XmlArrayItem("li")] public List animationClips = new List(); @@ -50,7 +50,7 @@ namespace RimWorldAnimationStudio } Initialize(); - + playTimeTicksQuick = playTimeTicks; Workspace.animationDef.animationStages.Add(this); return true; diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs b/Assets/Scripts/GUI/AnimationTimeline.cs index 6ea2bb04..a030e81a 100644 --- a/Assets/Scripts/GUI/AnimationTimeline.cs +++ b/Assets/Scripts/GUI/AnimationTimeline.cs @@ -21,14 +21,10 @@ namespace RimWorldAnimationStudio anchorTransform = transform.parent; this.actorID = actorID; - Reset(); - PawnAnimationClip clip = Workspace.Instance.GetPawnAnimationClip(actorID); if (clip == null || clip.keyframes.NullOrEmpty()) { - //Debug.Log("Clip was empty"); - clip = new PawnAnimationClip(); clip.keyframes.Add(new PawnKeyframe()); clip.BuildSimpleCurves(); @@ -39,12 +35,27 @@ namespace RimWorldAnimationStudio KeyframeSlider keyframeSlider = Instantiate(keyframeSliderPrefab, transform); keyframeSlider.Initialize(this, actorID, keyframe.keyframeID); } - } - public void Reset() - { - foreach(KeyframeSlider keyframeSlider in GetComponentsInChildren()) - { Destroy(keyframeSlider.gameObject); } + int keyframeCount = clip.keyframes.Count; + int childCount = GetComponentsInChildren().Count(); + + for (int i = 0; i < Mathf.Max(keyframeCount, childCount); i++) + { + // Add new keyframe sliders as required + if (i >= childCount) + { Instantiate(keyframeSliderPrefab, transform); } + + // Get objects to update + KeyframeSlider keyframeSlider = GetComponentsInChildren()[i]; + + // Update values + if (i < keyframeCount) + { keyframeSlider.Initialize(this, actorID, clip.keyframes[i].keyframeID); } + + // Remove excess objects as required + else + { Destroy(keyframeSlider.gameObject); } + } } public void AddPawnKeyFrame(int keyframeID) @@ -70,6 +81,8 @@ namespace RimWorldAnimationStudio public void InitiateUpdateOfGhostFrames() { + if (AnimationController.Instance.IsTimelineDirty()) return; + BroadcastMessage("UpdateGhostFrames"); } @@ -79,12 +92,7 @@ namespace RimWorldAnimationStudio int? siblingCount = anchorTransform.parent.GetComponentsInChildren()?.ToList()?.Count(); if (siblingIndex != null && siblingCount != null && MoveAnimationTimeline(siblingIndex.Value, delta)) - { - //siblingIndex = Mathf.Clamp(siblingCount.Value + delta, 0, siblingCount.Value - 1); - //transform.SetSiblingIndex(transform.GetSiblingIndex() + delta); - AnimationController.Instance.ResetAnimationTimeline(); - AnimationController.Instance.InitializeAnimationTimeline(); - } + { AnimationController.Instance.InitializeAnimationTimeline(); } } public bool MoveAnimationTimeline(int startIndex, int delta) diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs index 2af15d83..6497201e 100644 --- a/Assets/Scripts/GUI/KeyframeSlider.cs +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -187,11 +187,7 @@ namespace RimWorldAnimationStudio { linkedSlider = null; } else if (AnimationController.Instance.stretchKeyframesToggle.isOn && linkedSlider != null && linkedSlider.IsPivotKeyframe(keyframe) == false) - { - //int minTick = linkedSlider.pivotKeyframe.atTick.Value + GetIndexAmongstSelectedKeyframes(); - //value = Mathf.Clamp(Mathf.CeilToInt(linkedSlider.keyframe.atTick.Value + linkedOffset * linkedSlider.ScaledOffsetFromPivot()), minTick, Workspace.StageWindowSize); - value = Mathf.CeilToInt(linkedSlider.keyframe.atTick.Value + linkedOffset * linkedSlider.ScaledOffsetFromPivot()); - } + { value = Mathf.CeilToInt(linkedSlider.keyframe.atTick.Value + linkedOffset * linkedSlider.ScaledOffsetFromPivot()); } else if (AnimationController.Instance.stretchKeyframesToggle.isOn == false && linkedSlider != null) { value = Mathf.Clamp(linkedSlider.keyframe.atTick.Value + linkedOffset, Constants.minTick + 1, Workspace.StageWindowSize); } @@ -219,7 +215,6 @@ namespace RimWorldAnimationStudio public float ScaledOffsetFromPivot() { - //if (IsPivotKeyframe(keyframe)) return 1f; if (dragTickStart == pivotKeyframe.atTick.Value) return 0f; return (float)(keyframe.atTick.Value - pivotKeyframe.atTick.Value) / (dragTickStart - pivotKeyframe.atTick.Value); @@ -229,13 +224,5 @@ namespace RimWorldAnimationStudio { return pivotKeyframe == otherKeyframe; } - - public int GetIndexAmongstSelectedKeyframes() - { - List selectedKeyframes = Workspace.Instance.GetPawnKeyframes(Workspace.keyframeID).OrderBy(x => x.atTick)?.ToList(); - if (selectedKeyframes.NullOrEmpty() || selectedKeyframes.Contains(keyframe) == false) return -1; - - return selectedKeyframes.IndexOf(keyframe); - } } } diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index a215599e..8286d896 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -28,6 +28,8 @@ namespace RimWorldAnimationStudio public Toggle stretchKeyframesToggle; public InputField playBackSpeedField; public Button playToggleButton; + public Text stageLengthText; + public Text animationLengthText; [Header("Prefabs")] public ActorBody actorBodyPrefab; @@ -47,6 +49,12 @@ namespace RimWorldAnimationStudio public void MakeTimelineDirty() { isTimelineDirty = true; } + public bool IsDirty() + { return isDirty; } + + public bool IsTimelineDirty() + { return isTimelineDirty; } + public void Update() { // No animation, exit @@ -56,6 +64,25 @@ namespace RimWorldAnimationStudio if (Workspace.animationDef != null && isDirty) { Initialize(); } + // Update animation lengths + if (stageLoopDropdown.value == 3) + { + stageLengthText.text = "Stage length (quickie): " + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick + " (" + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick / 60f + " s)"; + animationLengthText.text = "Animation length (quickie): " + Workspace.animationDef.animationTimeTicksQuick + " (" + Workspace.animationDef.animationTimeTicksQuick / 60f + " s)"; + + LayoutRebuilder.ForceRebuildLayoutImmediate(stageLengthText.GetComponent()); + LayoutRebuilder.ForceRebuildLayoutImmediate(animationLengthText.GetComponent()); + } + + else + { + stageLengthText.text = "Stage length (normal): " + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks + " (" + Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks / 60f + " s)"; + animationLengthText.text = "Animation length (normal): " + Workspace.animationDef.animationTimeTicks + " (" + Workspace.animationDef.animationTimeTicks / 60f + " s)"; + + LayoutRebuilder.ForceRebuildLayoutImmediate(stageLengthText.GetComponent()); + LayoutRebuilder.ForceRebuildLayoutImmediate(animationLengthText.GetComponent()); + } + // Update tick if animating stageTick = Mathf.Clamp(stageTick, Constants.minTick, Workspace.StageWindowSize); @@ -123,10 +150,7 @@ namespace RimWorldAnimationStudio public void UpdateAnimation() { if (AnimationTimelinesNeedUpdate()) - { - ResetAnimationTimeline(); - InitializeAnimationTimeline(); - } + { InitializeAnimationTimeline(); } List _actorBodies = actorBodies.GetComponentsInChildren().ToList(); @@ -217,59 +241,73 @@ namespace RimWorldAnimationStudio public void Initialize() { + isDirty = true; Debug.Log("Initializing animation preview"); foreach (Transform child in transform) { child.gameObject.SetActive(true); } - Reset(); - InitializeAnimationTimeline(); StageCardManager.Instance.Initialize(); isDirty = false; } + public void Reset() + { + Workspace.stageID = 0; + isAnimating = false; + timeSinceLastUpdate = 0; + cycleIndex = 0; + } + public void InitializeAnimationTimeline() { + isTimelineDirty = true; + cyclesNormalField.text = Mathf.Max(Mathf.CeilToInt((float)Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks / Workspace.StageWindowSize), 1).ToString(); cyclesFastField.text = Mathf.Max(Mathf.CeilToInt((float)Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick / Workspace.StageWindowSize), 0).ToString(); Workspace.animationDef.animationStages[Workspace.stageID].isLooping = int.Parse(cyclesNormalField.text) > 1 ? true : false; - for (int actorID = 0; actorID < Workspace.animationDef.actors.Count; actorID++) - { - ActorBody actorBody = Instantiate(actorBodyPrefab, actorBodies.transform); - actorBody.Initialize(actorID); + int actorCount = Workspace.animationDef.actors.Count; + int childCount = animationTimelines.GetComponentsInChildren().Count(); - AnimationTimeline animationTimeline = Instantiate(animationTimelinePrefab, animationTimelines).GetComponentInChildren(); - animationTimeline.Initialize(actorID); + for (int actorID = 0; actorID < Mathf.Max(actorCount, childCount); actorID++) + { + // Add new actors as required + if (actorID >= childCount) + { + Instantiate(animationTimelinePrefab, animationTimelines); + Instantiate(actorBodyPrefab, actorBodies.transform); + } + + // Get objects to update + AnimationTimeline animationTimeline = animationTimelines.GetComponentsInChildren()[actorID]; + ActorBody actorBody = actorBodies.GetComponentsInChildren()[actorID]; + + // Update values + if (actorID < actorCount) + { + animationTimeline.Initialize(actorID); + actorBody.Initialize(actorID); + } + + // Remove excess objects as required + else + { + Destroy(animationTimeline.transform.parent.gameObject); + Destroy(actorBody.gameObject); + } } animationClipLengthField.text = Workspace.StageWindowSize.ToString(); stageTimelineSlider.maxValue = Workspace.StageWindowSize; isTimelineDirty = false; - } - public void Reset() - { - Workspace.stageID = 0; - isAnimating = false; - ResetAnimationTimeline(); - StageCardManager.Instance.Reset(); - } - - public void ResetAnimationTimeline() - { - timeSinceLastUpdate = 0; - cycleIndex = 0; - - foreach (ActorBody actorBody in actorBodies.GetComponentsInChildren()) - { Destroy(actorBody.gameObject); } - - foreach (AnimationTimeline animationTimeline in animationTimelines.GetComponentsInChildren()) - { Destroy(animationTimeline.transform.parent.gameObject); } + foreach (AnimationTimeline timeline in animationTimelines.GetComponentsInChildren()) + { timeline.InitiateUpdateOfGhostFrames(); } } public void AddActor() @@ -436,41 +474,6 @@ namespace RimWorldAnimationStudio Workspace.Instance.RecordEvent("Keyframe pasted"); } - - /*public void PastePawnKeyframes() - { - foreach (PawnKeyframe keyframe in Workspace.copiedKeyframes) - { - PawnAnimationClip clip = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[keyframe.actorID]; - - if (Workspace.Instance.DoesPawnKeyframeExistAtTick(Workspace.stageID, keyframe.actorID, stageTick)) - { - PawnKeyframe oldKeyframe = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[keyframe.actorID].keyframes.First(x => x.atTick == stageTick); - - RemovePawnKeyframe(keyframe.actorID, oldKeyframe.keyframeID, true); - } - - keyframe.GenerateKeyframeID(keyframe.actorID); - keyframe.atTick = stageTick; - - PawnKeyframe nextKeyframe = clip.keyframes.FirstOrDefault(x => x.atTick > stageTick); - - if (nextKeyframe != null) - { clip.keyframes.Insert(clip.keyframes.IndexOf(nextKeyframe), keyframe); } - - else - { clip.keyframes.Add(keyframe); } - - clip.BuildSimpleCurves(); - - animationTimelines.GetComponentsInChildren()[keyframe.actorID].AddPawnKeyFrame(keyframe.keyframeID); - - clip.BuildSimpleCurves(); - } - - Workspace.Instance.RecordEvent("Keyframe pasted"); - }*/ - public void RemovePawnKeyframe() { foreach (int keyframeID in Workspace.keyframeID) @@ -541,10 +544,7 @@ namespace RimWorldAnimationStudio Debug.Log("Resizing animation clip length to " + newStageWindowSize.ToString() + " ticks."); if (stretchKeyframesToggle.isOn) - { - List keyframes = Workspace.animationDef.animationStages[Workspace.stageID].animationClips.SelectMany(x => x.keyframes)?.ToList(); - StretchKeyframes(keyframes, Workspace.StageWindowSize, newStageWindowSize); - } + { StretchKeyframes(newStageWindowSize); } else { @@ -569,7 +569,7 @@ namespace RimWorldAnimationStudio ResizeStageWindowSize(newStageWindowSize); } - /*public void StretchKeyframes(int newStageWindowSize) + public void StretchKeyframes(int newStageWindowSize) { float scale = (float)newStageWindowSize / Workspace.StageWindowSize; @@ -583,39 +583,6 @@ namespace RimWorldAnimationStudio clip.BuildSimpleCurves(); } - }*/ - - public void StretchKeyframes(List keyframesToStretch, int v1, int v2) - { - int v0 = keyframesToStretch.Min(x => x.atTick.Value); - - if (v1 == v0) - { OffsetKeyframes(keyframesToStretch, v1, v2); return; } - - float scaleFactor = (float)(v2 - v0) / (v1 - v0); - - foreach (PawnKeyframe keyframe in keyframesToStretch) - { - keyframe.atTick = Mathf.RoundToInt(scaleFactor * (keyframe.atTick.Value - v0) + v0); - } - - foreach(PawnAnimationClip clip in Workspace.animationDef.animationStages[Workspace.stageID].animationClips) - { clip.BuildSimpleCurves(); } - } - - public void OffsetKeyframes(List keyframesToOffset, int v1, int v2) - { - float offset = v2 - v1; - - foreach (PawnKeyframe keyframe in keyframesToOffset) - { - keyframe.atTick = Mathf.RoundToInt(keyframe.atTick.Value + offset); - Debug.Log(keyframe.atTick); - Workspace.Instance.GetAnimationClipThatOwnsKeyframe(keyframe.keyframeID, out int clipID).BuildSimpleCurves(); - } - - foreach (PawnAnimationClip clip in Workspace.animationDef.animationStages[Workspace.stageID].animationClips) - { clip.BuildSimpleCurves(); } } public void ResizeStageWindowSize(int newStageWindowSize) diff --git a/Assets/Scripts/Managers/ApplicationManager.cs b/Assets/Scripts/Managers/ApplicationManager.cs index ac08ea25..2593196d 100644 --- a/Assets/Scripts/Managers/ApplicationManager.cs +++ b/Assets/Scripts/Managers/ApplicationManager.cs @@ -78,7 +78,20 @@ namespace RimWorldAnimationStudio public void RunPostLoadOperations(AnimationDef animationDef) { + if (animationDef.animationTimeTicksQuick <= 0) + { + if (animationDef.animationStages.Count > 1) + { + for (int i = 0; i < animationDef.animationStages.Count; i++) + { + if (i == 0) continue; + animationDef.animationStages[i].playTimeTicksQuick = animationDef.animationStages[i].playTimeTicks; + } + } + else if (animationDef.animationStages.Count == 0) + { animationDef.animationStages[0].playTimeTicksQuick = animationDef.animationStages[0].playTimeTicks; } + } } public void TryToSaveAnimation() diff --git a/Assets/Scripts/Managers/StageCardManager.cs b/Assets/Scripts/Managers/StageCardManager.cs index ea148867..c42e9e1c 100644 --- a/Assets/Scripts/Managers/StageCardManager.cs +++ b/Assets/Scripts/Managers/StageCardManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -14,6 +15,27 @@ namespace RimWorldAnimationStudio { foreach(AnimationStage stage in Workspace.animationDef.animationStages) { MakeStageCard(stage.stageName); } + + int stageCount = Workspace.animationDef.animationStages.Count; + int childCount = GetComponentsInChildren().Count(); + + for (int i = 0; i < Mathf.Max(stageCount, childCount); i++) + { + // Add new stage cards as required + if (i >= childCount) + { Instantiate(stageCardPrefab, transform); } + + // Get objects to update + StageCard stageCard = GetComponentsInChildren()[i]; + + // Update values + if (i < stageCount) + { stageCard.Initialize(Workspace.animationDef.animationStages[i].stageName); } + + // Remove excess objects as required + else + { Destroy(stageCard.gameObject); } + } } public void Reset() @@ -41,7 +63,6 @@ namespace RimWorldAnimationStudio public bool AddAnimationStage() { AnimationStage stage = new AnimationStage(); - Workspace.Instance.RecordEvent("Stage addition"); return stage.MakeNew(); diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs index 0ac8a52d..fde8537f 100644 --- a/Assets/Scripts/Workspace/Workspace.cs +++ b/Assets/Scripts/Workspace/Workspace.cs @@ -37,9 +37,6 @@ namespace RimWorldAnimationStudio if (animationDef.animationStages[stageID].stageWindowSize < 0) { animationDef.animationStages[stageID].stageWindowSize = animationDef.animationStages[stageID].animationClips.Select(x => x.duration).Max(); } - Debug.Log(animationDef.animationStages[stageID].stageWindowSize); - - return animationDef.animationStages[stageID].stageWindowSize; } } @@ -230,7 +227,6 @@ namespace RimWorldAnimationStudio stageID = record.stageID; AnimationController.Instance.MakeTimelineDirty(); - StageCardManager.Instance.Reset(); StageCardManager.Instance.Initialize(); } diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 0710f5c5..83809e68 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 3ac2922a..b683f666 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 026ee543..5223570d 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 f6c0fa3b..3bfb983b 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 765d0818..34f21410 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 274d6b97..91dac00d 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 38fe504b..66c4e9d9 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 12f50bab..c227160c 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 e2183b0e..98b74c69 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 a521dad9..40e725c9 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 6ac4f12a..1029fe7f 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers index dbdb5d3a..ae4c3888 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 f64f682b..87c9565d 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 bca7944e..547d57d0 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/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets index 2dc8bf92..4e7dbfd0 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 a4ca2c88..592e6b2e 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/02/02d038242aec7f08a0ae0ef619f35253 b/Library/Artifacts/02/02d038242aec7f08a0ae0ef619f35253 deleted file mode 100644 index 98c4912a..00000000 Binary files a/Library/Artifacts/02/02d038242aec7f08a0ae0ef619f35253 and /dev/null differ diff --git a/Library/Artifacts/06/0603edbd8db104006fa2917f358c2a93 b/Library/Artifacts/06/0603edbd8db104006fa2917f358c2a93 new file mode 100644 index 00000000..07506d6b Binary files /dev/null and b/Library/Artifacts/06/0603edbd8db104006fa2917f358c2a93 differ diff --git a/Library/Artifacts/08/0849b09ca822548dbe60ea1cf0d488a7 b/Library/Artifacts/08/0849b09ca822548dbe60ea1cf0d488a7 deleted file mode 100644 index 1d683eff..00000000 Binary files a/Library/Artifacts/08/0849b09ca822548dbe60ea1cf0d488a7 and /dev/null differ diff --git a/Library/Artifacts/0e/0e12311ad2d088363b0e1aa9d63c6e76 b/Library/Artifacts/0e/0e12311ad2d088363b0e1aa9d63c6e76 deleted file mode 100644 index 59c74d51..00000000 Binary files a/Library/Artifacts/0e/0e12311ad2d088363b0e1aa9d63c6e76 and /dev/null differ diff --git a/Library/Artifacts/0e/0e9c5317b41cd4f57111a1dd7414a115 b/Library/Artifacts/0e/0e9c5317b41cd4f57111a1dd7414a115 deleted file mode 100644 index 5e74be58..00000000 Binary files a/Library/Artifacts/0e/0e9c5317b41cd4f57111a1dd7414a115 and /dev/null differ diff --git a/Library/Artifacts/0f/0fc8b8437dd20dce6456b408a2605838 b/Library/Artifacts/0f/0fc8b8437dd20dce6456b408a2605838 deleted file mode 100644 index baef6762..00000000 Binary files a/Library/Artifacts/0f/0fc8b8437dd20dce6456b408a2605838 and /dev/null differ diff --git a/Library/Artifacts/0f/0fd3798c82988bee4ba95f635a8b1d18 b/Library/Artifacts/0f/0fd3798c82988bee4ba95f635a8b1d18 new file mode 100644 index 00000000..6acd232d Binary files /dev/null and b/Library/Artifacts/0f/0fd3798c82988bee4ba95f635a8b1d18 differ diff --git a/Library/Artifacts/16/163bcf49b225efc92a6f74793a83a0f0 b/Library/Artifacts/16/163bcf49b225efc92a6f74793a83a0f0 new file mode 100644 index 00000000..e4b24898 Binary files /dev/null and b/Library/Artifacts/16/163bcf49b225efc92a6f74793a83a0f0 differ diff --git a/Library/Artifacts/a1/a1df5a1b70c88300b8b54a1d537be0db b/Library/Artifacts/16/16e69c23ac626dddb3c6ab08505a56fd similarity index 89% rename from Library/Artifacts/a1/a1df5a1b70c88300b8b54a1d537be0db rename to Library/Artifacts/16/16e69c23ac626dddb3c6ab08505a56fd index 949f22f6..c6616031 100644 Binary files a/Library/Artifacts/a1/a1df5a1b70c88300b8b54a1d537be0db and b/Library/Artifacts/16/16e69c23ac626dddb3c6ab08505a56fd differ diff --git a/Library/Artifacts/1b/1be3197b4cea048fca37d5d1e008ae8f b/Library/Artifacts/1b/1be3197b4cea048fca37d5d1e008ae8f deleted file mode 100644 index d97f18f8..00000000 Binary files a/Library/Artifacts/1b/1be3197b4cea048fca37d5d1e008ae8f and /dev/null differ diff --git a/Library/Artifacts/1c/1cd72c8d9cf2e32d335c1559118249c3 b/Library/Artifacts/1c/1cd72c8d9cf2e32d335c1559118249c3 deleted file mode 100644 index 605ef153..00000000 Binary files a/Library/Artifacts/1c/1cd72c8d9cf2e32d335c1559118249c3 and /dev/null differ diff --git a/Library/Artifacts/1c/1ce3ca8b9c02dd9608f1d0d9a8e689a7 b/Library/Artifacts/1c/1ce3ca8b9c02dd9608f1d0d9a8e689a7 new file mode 100644 index 00000000..20cd37e6 Binary files /dev/null and b/Library/Artifacts/1c/1ce3ca8b9c02dd9608f1d0d9a8e689a7 differ diff --git a/Library/Artifacts/1d/1df6d1645d796f1d98c338b82971d674 b/Library/Artifacts/1d/1df6d1645d796f1d98c338b82971d674 deleted file mode 100644 index ae54b82e..00000000 Binary files a/Library/Artifacts/1d/1df6d1645d796f1d98c338b82971d674 and /dev/null differ diff --git a/Library/Artifacts/23/2391bf4e29e8a5b6c1fa9644fc9b7e2a b/Library/Artifacts/23/2391bf4e29e8a5b6c1fa9644fc9b7e2a deleted file mode 100644 index ff8a300c..00000000 Binary files a/Library/Artifacts/23/2391bf4e29e8a5b6c1fa9644fc9b7e2a and /dev/null differ diff --git a/Library/Artifacts/60/605d028ce47aa1384a27aa9c11093b4d b/Library/Artifacts/26/268ddf2519481966fb0c41b9890be64d similarity index 91% rename from Library/Artifacts/60/605d028ce47aa1384a27aa9c11093b4d rename to Library/Artifacts/26/268ddf2519481966fb0c41b9890be64d index 87b89cf3..79b2ef47 100644 Binary files a/Library/Artifacts/60/605d028ce47aa1384a27aa9c11093b4d and b/Library/Artifacts/26/268ddf2519481966fb0c41b9890be64d differ diff --git a/Library/Artifacts/2c/2c1fbee12cc0dc68c752ca3699f82d1d b/Library/Artifacts/2c/2c1fbee12cc0dc68c752ca3699f82d1d new file mode 100644 index 00000000..88967fe2 Binary files /dev/null and b/Library/Artifacts/2c/2c1fbee12cc0dc68c752ca3699f82d1d differ diff --git a/Library/Artifacts/2e/2e250bdde9493b7d139b4111f5250868 b/Library/Artifacts/2e/2e250bdde9493b7d139b4111f5250868 new file mode 100644 index 00000000..5901b3cd Binary files /dev/null and b/Library/Artifacts/2e/2e250bdde9493b7d139b4111f5250868 differ diff --git a/Library/Artifacts/2e/2ea355ffc2a6caf29b72c0f2f22af111 b/Library/Artifacts/2e/2ea355ffc2a6caf29b72c0f2f22af111 deleted file mode 100644 index 2e07458b..00000000 Binary files a/Library/Artifacts/2e/2ea355ffc2a6caf29b72c0f2f22af111 and /dev/null differ diff --git a/Library/Artifacts/30/30eb8dd3906f65be5279da4f880695d8 b/Library/Artifacts/30/30eb8dd3906f65be5279da4f880695d8 new file mode 100644 index 00000000..c2bed5f5 Binary files /dev/null and b/Library/Artifacts/30/30eb8dd3906f65be5279da4f880695d8 differ diff --git a/Library/Artifacts/32/323cfebd1ab3ab1eb238bca56546faea b/Library/Artifacts/32/323cfebd1ab3ab1eb238bca56546faea deleted file mode 100644 index 4e5e7fe2..00000000 Binary files a/Library/Artifacts/32/323cfebd1ab3ab1eb238bca56546faea and /dev/null differ diff --git a/Library/Artifacts/34/3443da02546860be97e3e7fa8b74051f b/Library/Artifacts/34/3443da02546860be97e3e7fa8b74051f deleted file mode 100644 index 759ceb41..00000000 Binary files a/Library/Artifacts/34/3443da02546860be97e3e7fa8b74051f and /dev/null differ diff --git a/Library/Artifacts/36/3668d4d5a5812a1434d80ce887fb1b93 b/Library/Artifacts/36/3668d4d5a5812a1434d80ce887fb1b93 deleted file mode 100644 index 2c96821e..00000000 Binary files a/Library/Artifacts/36/3668d4d5a5812a1434d80ce887fb1b93 and /dev/null differ diff --git a/Library/Artifacts/3a/3a2b37b588f2f995091e1021d2dfdf88 b/Library/Artifacts/3a/3a2b37b588f2f995091e1021d2dfdf88 new file mode 100644 index 00000000..178220d4 Binary files /dev/null and b/Library/Artifacts/3a/3a2b37b588f2f995091e1021d2dfdf88 differ diff --git a/Library/Artifacts/3d/3d24a99f7315ba23370371b8d70e1880 b/Library/Artifacts/3d/3d24a99f7315ba23370371b8d70e1880 deleted file mode 100644 index 60873d54..00000000 Binary files a/Library/Artifacts/3d/3d24a99f7315ba23370371b8d70e1880 and /dev/null differ diff --git a/Library/Artifacts/3d/3df8530ec14d4448d800a26ddeb13d49 b/Library/Artifacts/3d/3df8530ec14d4448d800a26ddeb13d49 deleted file mode 100644 index c8ee36a2..00000000 Binary files a/Library/Artifacts/3d/3df8530ec14d4448d800a26ddeb13d49 and /dev/null differ diff --git a/Library/Artifacts/43/43510e176a4e71bce2b76e02a5b15ab2 b/Library/Artifacts/43/43510e176a4e71bce2b76e02a5b15ab2 new file mode 100644 index 00000000..aeefb634 Binary files /dev/null and b/Library/Artifacts/43/43510e176a4e71bce2b76e02a5b15ab2 differ diff --git a/Library/Artifacts/43/43f1a6eb34c1e39a2d12fe4f8a18f827 b/Library/Artifacts/43/43f1a6eb34c1e39a2d12fe4f8a18f827 new file mode 100644 index 00000000..7e60e6c3 Binary files /dev/null and b/Library/Artifacts/43/43f1a6eb34c1e39a2d12fe4f8a18f827 differ diff --git a/Library/Artifacts/09/09ca70aebe2c96652ec7d70cfe64b434 b/Library/Artifacts/44/44a1eafe1b5e9d1ce19d5892b739c6eb similarity index 70% rename from Library/Artifacts/09/09ca70aebe2c96652ec7d70cfe64b434 rename to Library/Artifacts/44/44a1eafe1b5e9d1ce19d5892b739c6eb index ae4e3a86..6f594e04 100644 Binary files a/Library/Artifacts/09/09ca70aebe2c96652ec7d70cfe64b434 and b/Library/Artifacts/44/44a1eafe1b5e9d1ce19d5892b739c6eb differ diff --git a/Library/Artifacts/44/44ab55c35ca3923374369d539047727b b/Library/Artifacts/44/44ab55c35ca3923374369d539047727b deleted file mode 100644 index c3dbd809..00000000 Binary files a/Library/Artifacts/44/44ab55c35ca3923374369d539047727b and /dev/null differ diff --git a/Library/Artifacts/45/45830c73f62d7dd6cd13d692383dfd30 b/Library/Artifacts/45/45830c73f62d7dd6cd13d692383dfd30 new file mode 100644 index 00000000..12efa441 Binary files /dev/null and b/Library/Artifacts/45/45830c73f62d7dd6cd13d692383dfd30 differ diff --git a/Library/Artifacts/49/498a068a834e39ea2168f2ef4539f92e b/Library/Artifacts/49/498a068a834e39ea2168f2ef4539f92e deleted file mode 100644 index d8013d45..00000000 Binary files a/Library/Artifacts/49/498a068a834e39ea2168f2ef4539f92e and /dev/null differ diff --git a/Library/Artifacts/bb/bb94090f399549e74864dd45e53c7569 b/Library/Artifacts/4e/4e9057ed6b41541716feb1f57277cdc4 similarity index 88% rename from Library/Artifacts/bb/bb94090f399549e74864dd45e53c7569 rename to Library/Artifacts/4e/4e9057ed6b41541716feb1f57277cdc4 index ea6ec21a..748faf8f 100644 Binary files a/Library/Artifacts/bb/bb94090f399549e74864dd45e53c7569 and b/Library/Artifacts/4e/4e9057ed6b41541716feb1f57277cdc4 differ diff --git a/Library/Artifacts/4e/4ee7126d9488be838ec8ce261b530940 b/Library/Artifacts/4e/4ee7126d9488be838ec8ce261b530940 new file mode 100644 index 00000000..6119087e Binary files /dev/null and b/Library/Artifacts/4e/4ee7126d9488be838ec8ce261b530940 differ diff --git a/Library/Artifacts/51/5131fe4a17a1247a0551a24ba6e1962f b/Library/Artifacts/51/5131fe4a17a1247a0551a24ba6e1962f deleted file mode 100644 index 17baf159..00000000 Binary files a/Library/Artifacts/51/5131fe4a17a1247a0551a24ba6e1962f and /dev/null differ diff --git a/Library/Artifacts/5a/5a52b1acbc2f4f2cfd61fa2829f185b5 b/Library/Artifacts/54/5453ab3d5d65d7d665489dea9a5a72a1 similarity index 98% rename from Library/Artifacts/5a/5a52b1acbc2f4f2cfd61fa2829f185b5 rename to Library/Artifacts/54/5453ab3d5d65d7d665489dea9a5a72a1 index a16bab67..0aae125a 100644 Binary files a/Library/Artifacts/5a/5a52b1acbc2f4f2cfd61fa2829f185b5 and b/Library/Artifacts/54/5453ab3d5d65d7d665489dea9a5a72a1 differ diff --git a/Library/Artifacts/56/56c6f1e704206665706fe41ed727b2d0 b/Library/Artifacts/56/56c6f1e704206665706fe41ed727b2d0 deleted file mode 100644 index 83123fff..00000000 Binary files a/Library/Artifacts/56/56c6f1e704206665706fe41ed727b2d0 and /dev/null differ diff --git a/Library/Artifacts/5a/5a57c9b955014b661a1c774bb6ecb782 b/Library/Artifacts/5a/5a57c9b955014b661a1c774bb6ecb782 deleted file mode 100644 index 2f4a5418..00000000 Binary files a/Library/Artifacts/5a/5a57c9b955014b661a1c774bb6ecb782 and /dev/null differ diff --git a/Library/Artifacts/c0/c00c90404a134c6f3b381a5e88bdc92f b/Library/Artifacts/5b/5b1e6b9885f48d0cb7f7595de8f8f09c similarity index 97% rename from Library/Artifacts/c0/c00c90404a134c6f3b381a5e88bdc92f rename to Library/Artifacts/5b/5b1e6b9885f48d0cb7f7595de8f8f09c index 55d8baff..2fea2946 100644 Binary files a/Library/Artifacts/c0/c00c90404a134c6f3b381a5e88bdc92f and b/Library/Artifacts/5b/5b1e6b9885f48d0cb7f7595de8f8f09c differ diff --git a/Library/Artifacts/5e/5ee82798c357968ec0b9bf4622589f63 b/Library/Artifacts/5e/5ee82798c357968ec0b9bf4622589f63 deleted file mode 100644 index 9e3c357e..00000000 Binary files a/Library/Artifacts/5e/5ee82798c357968ec0b9bf4622589f63 and /dev/null differ diff --git a/Library/Artifacts/d7/d7cae56c69f1ca17b8445ab3e546dde1 b/Library/Artifacts/63/631020ba493309d6b309642c80481319 similarity index 86% rename from Library/Artifacts/d7/d7cae56c69f1ca17b8445ab3e546dde1 rename to Library/Artifacts/63/631020ba493309d6b309642c80481319 index 1d54b03b..da81ca54 100644 Binary files a/Library/Artifacts/d7/d7cae56c69f1ca17b8445ab3e546dde1 and b/Library/Artifacts/63/631020ba493309d6b309642c80481319 differ diff --git a/Library/Artifacts/64/649a6fc93ff5bff0e8410995bd1d62d0 b/Library/Artifacts/64/649a6fc93ff5bff0e8410995bd1d62d0 deleted file mode 100644 index 6f5bb98e..00000000 Binary files a/Library/Artifacts/64/649a6fc93ff5bff0e8410995bd1d62d0 and /dev/null differ diff --git a/Library/Artifacts/66/66570a981116293f4bacb9581dcbcdbc b/Library/Artifacts/66/66570a981116293f4bacb9581dcbcdbc deleted file mode 100644 index 93663baa..00000000 Binary files a/Library/Artifacts/66/66570a981116293f4bacb9581dcbcdbc and /dev/null differ diff --git a/Library/Artifacts/67/670cea0a382c95cd40eb591ad5b272b8 b/Library/Artifacts/67/670cea0a382c95cd40eb591ad5b272b8 deleted file mode 100644 index a4156001..00000000 Binary files a/Library/Artifacts/67/670cea0a382c95cd40eb591ad5b272b8 and /dev/null differ diff --git a/Library/Artifacts/67/678663bf1ace83d88bb8809803a0feec b/Library/Artifacts/67/678663bf1ace83d88bb8809803a0feec deleted file mode 100644 index 5dad78e7..00000000 Binary files a/Library/Artifacts/67/678663bf1ace83d88bb8809803a0feec and /dev/null differ diff --git a/Library/Artifacts/47/47aa84f3d2f1d608fab8d95a072b1a8b b/Library/Artifacts/68/68c54a5546892378af64d91eabcbc0f3 similarity index 64% rename from Library/Artifacts/47/47aa84f3d2f1d608fab8d95a072b1a8b rename to Library/Artifacts/68/68c54a5546892378af64d91eabcbc0f3 index fd48cbcc..033c1fb4 100644 Binary files a/Library/Artifacts/47/47aa84f3d2f1d608fab8d95a072b1a8b and b/Library/Artifacts/68/68c54a5546892378af64d91eabcbc0f3 differ diff --git a/Library/Artifacts/6c/6c04cf4a103a0d51404d9e6761b28fb4 b/Library/Artifacts/6c/6c04cf4a103a0d51404d9e6761b28fb4 new file mode 100644 index 00000000..45e4e4f2 Binary files /dev/null and b/Library/Artifacts/6c/6c04cf4a103a0d51404d9e6761b28fb4 differ diff --git a/Library/Artifacts/6c/6c95962149208c32b6af1c4843df7dd2 b/Library/Artifacts/6c/6c95962149208c32b6af1c4843df7dd2 new file mode 100644 index 00000000..204e59c8 Binary files /dev/null and b/Library/Artifacts/6c/6c95962149208c32b6af1c4843df7dd2 differ diff --git a/Library/Artifacts/6d/6d073850cf62451d5d93ee9da26f8a2a b/Library/Artifacts/6d/6d073850cf62451d5d93ee9da26f8a2a deleted file mode 100644 index b005a74a..00000000 Binary files a/Library/Artifacts/6d/6d073850cf62451d5d93ee9da26f8a2a and /dev/null differ diff --git a/Library/Artifacts/1a/1abece6722aa0aef74545a4c54c26668 b/Library/Artifacts/6e/6ea567340460850f7eaf6cfb8281b9b7 similarity index 87% rename from Library/Artifacts/1a/1abece6722aa0aef74545a4c54c26668 rename to Library/Artifacts/6e/6ea567340460850f7eaf6cfb8281b9b7 index b03b4226..53cb048a 100644 Binary files a/Library/Artifacts/1a/1abece6722aa0aef74545a4c54c26668 and b/Library/Artifacts/6e/6ea567340460850f7eaf6cfb8281b9b7 differ diff --git a/Library/Artifacts/9e/9e3019cbdeaea5f2007208846059b4c6 b/Library/Artifacts/6f/6fffa868d4281c39bd4b725dbb0a99b9 similarity index 70% rename from Library/Artifacts/9e/9e3019cbdeaea5f2007208846059b4c6 rename to Library/Artifacts/6f/6fffa868d4281c39bd4b725dbb0a99b9 index c389757a..c0c8fbad 100644 Binary files a/Library/Artifacts/9e/9e3019cbdeaea5f2007208846059b4c6 and b/Library/Artifacts/6f/6fffa868d4281c39bd4b725dbb0a99b9 differ diff --git a/Library/Artifacts/73/73970973be75cfcba4b6985db34d359e b/Library/Artifacts/73/73970973be75cfcba4b6985db34d359e deleted file mode 100644 index 409117df..00000000 Binary files a/Library/Artifacts/73/73970973be75cfcba4b6985db34d359e and /dev/null differ diff --git a/Library/Artifacts/76/76c9cf49b70a2b8af2747e1087d09757 b/Library/Artifacts/76/76c9cf49b70a2b8af2747e1087d09757 new file mode 100644 index 00000000..1d55c46f Binary files /dev/null and b/Library/Artifacts/76/76c9cf49b70a2b8af2747e1087d09757 differ diff --git a/Library/Artifacts/77/77bbd8b37d489f02dadfe86c89d317df b/Library/Artifacts/77/77bbd8b37d489f02dadfe86c89d317df new file mode 100644 index 00000000..50e17a0a Binary files /dev/null and b/Library/Artifacts/77/77bbd8b37d489f02dadfe86c89d317df differ diff --git a/Library/Artifacts/80/802004f37a33bffe1b682d3bc24044e9 b/Library/Artifacts/80/802004f37a33bffe1b682d3bc24044e9 new file mode 100644 index 00000000..801c324c Binary files /dev/null and b/Library/Artifacts/80/802004f37a33bffe1b682d3bc24044e9 differ diff --git a/Library/Artifacts/80/806ca765630a0000d90c11162ca1719a b/Library/Artifacts/80/806ca765630a0000d90c11162ca1719a deleted file mode 100644 index ef5f3874..00000000 Binary files a/Library/Artifacts/80/806ca765630a0000d90c11162ca1719a and /dev/null differ diff --git a/Library/Artifacts/86/86b02e5cf178c09116679e7707d5266a b/Library/Artifacts/86/86b02e5cf178c09116679e7707d5266a new file mode 100644 index 00000000..d32dc32c Binary files /dev/null and b/Library/Artifacts/86/86b02e5cf178c09116679e7707d5266a differ diff --git a/Library/Artifacts/88/8841eaf9af5e44599e7011ef9b3cce6c b/Library/Artifacts/88/8841eaf9af5e44599e7011ef9b3cce6c deleted file mode 100644 index ad43236b..00000000 Binary files a/Library/Artifacts/88/8841eaf9af5e44599e7011ef9b3cce6c and /dev/null differ diff --git a/Library/Artifacts/89/894f69b5f3f87fb768c0de0dc19e9732 b/Library/Artifacts/89/894f69b5f3f87fb768c0de0dc19e9732 new file mode 100644 index 00000000..19c2132d Binary files /dev/null and b/Library/Artifacts/89/894f69b5f3f87fb768c0de0dc19e9732 differ diff --git a/Library/Artifacts/89/89619f484fdf58b39e0b938400a64608 b/Library/Artifacts/89/89619f484fdf58b39e0b938400a64608 deleted file mode 100644 index 164aa836..00000000 Binary files a/Library/Artifacts/89/89619f484fdf58b39e0b938400a64608 and /dev/null differ diff --git a/Library/Artifacts/89/89fa44427cebb99893d66cefec028087 b/Library/Artifacts/89/89fa44427cebb99893d66cefec028087 deleted file mode 100644 index c277523d..00000000 Binary files a/Library/Artifacts/89/89fa44427cebb99893d66cefec028087 and /dev/null differ diff --git a/Library/Artifacts/8a/8af2c2d0ca781bb4666d524a1922d351 b/Library/Artifacts/8a/8af2c2d0ca781bb4666d524a1922d351 deleted file mode 100644 index 21375c34..00000000 Binary files a/Library/Artifacts/8a/8af2c2d0ca781bb4666d524a1922d351 and /dev/null differ diff --git a/Library/Artifacts/8e/8e0ad6822c89b6f90e209f4197100f68 b/Library/Artifacts/8e/8e0ad6822c89b6f90e209f4197100f68 new file mode 100644 index 00000000..4cf0ff8d Binary files /dev/null and b/Library/Artifacts/8e/8e0ad6822c89b6f90e209f4197100f68 differ diff --git a/Library/Artifacts/91/916b645af3c0b2ef8b41920896a0d165 b/Library/Artifacts/91/916b645af3c0b2ef8b41920896a0d165 deleted file mode 100644 index 27ebb691..00000000 Binary files a/Library/Artifacts/91/916b645af3c0b2ef8b41920896a0d165 and /dev/null differ diff --git a/Library/Artifacts/94/944d0e282cd10494e5d6b6f937a01fbf b/Library/Artifacts/94/944d0e282cd10494e5d6b6f937a01fbf deleted file mode 100644 index 942d3f9d..00000000 Binary files a/Library/Artifacts/94/944d0e282cd10494e5d6b6f937a01fbf and /dev/null differ diff --git a/Library/Artifacts/94/94856e6bdd22cf835b494abed65be7c0 b/Library/Artifacts/94/94856e6bdd22cf835b494abed65be7c0 deleted file mode 100644 index 9ddd85df..00000000 Binary files a/Library/Artifacts/94/94856e6bdd22cf835b494abed65be7c0 and /dev/null differ diff --git a/Library/Artifacts/95/9535dba88e96b11a6049796a2486ae9f b/Library/Artifacts/95/9535dba88e96b11a6049796a2486ae9f deleted file mode 100644 index 28e3e876..00000000 Binary files a/Library/Artifacts/95/9535dba88e96b11a6049796a2486ae9f and /dev/null differ diff --git a/Library/Artifacts/96/967ddfe8516a7e978ce90bb37c8079c0 b/Library/Artifacts/96/967ddfe8516a7e978ce90bb37c8079c0 new file mode 100644 index 00000000..342e605f Binary files /dev/null and b/Library/Artifacts/96/967ddfe8516a7e978ce90bb37c8079c0 differ diff --git a/Library/Artifacts/99/99ab23523be72ba427e1c8f3c737912e b/Library/Artifacts/99/99ab23523be72ba427e1c8f3c737912e deleted file mode 100644 index 9d6807e1..00000000 Binary files a/Library/Artifacts/99/99ab23523be72ba427e1c8f3c737912e and /dev/null differ diff --git a/Library/Artifacts/9a/9a0d64004528f452f40cc7ec14e196d8 b/Library/Artifacts/9a/9a0d64004528f452f40cc7ec14e196d8 deleted file mode 100644 index 99e16cc1..00000000 Binary files a/Library/Artifacts/9a/9a0d64004528f452f40cc7ec14e196d8 and /dev/null differ diff --git a/Library/Artifacts/9e/9e3278fa93e14ee411ccd0010c37395b b/Library/Artifacts/9e/9e3278fa93e14ee411ccd0010c37395b new file mode 100644 index 00000000..4f2e4786 Binary files /dev/null and b/Library/Artifacts/9e/9e3278fa93e14ee411ccd0010c37395b differ diff --git a/Library/Artifacts/a0/a00f49cf5ac488a05b9467a25525d828 b/Library/Artifacts/a0/a00f49cf5ac488a05b9467a25525d828 deleted file mode 100644 index 292bee9f..00000000 Binary files a/Library/Artifacts/a0/a00f49cf5ac488a05b9467a25525d828 and /dev/null differ diff --git a/Library/Artifacts/a0/a0d9c5823b6824a8c0d942b9b7f9911c b/Library/Artifacts/a0/a0d9c5823b6824a8c0d942b9b7f9911c deleted file mode 100644 index 5d42b841..00000000 Binary files a/Library/Artifacts/a0/a0d9c5823b6824a8c0d942b9b7f9911c and /dev/null differ diff --git a/Library/Artifacts/03/03db2095983134d8e17839b7b918003a b/Library/Artifacts/a3/a3f51fa9742e79c1443b279d3c05dd24 similarity index 51% rename from Library/Artifacts/03/03db2095983134d8e17839b7b918003a rename to Library/Artifacts/a3/a3f51fa9742e79c1443b279d3c05dd24 index d4499cbd..d16b70e3 100644 Binary files a/Library/Artifacts/03/03db2095983134d8e17839b7b918003a and b/Library/Artifacts/a3/a3f51fa9742e79c1443b279d3c05dd24 differ diff --git a/Library/Artifacts/a6/a6664b09d5cdfe1ed5889c1adc49dfe2 b/Library/Artifacts/a6/a6664b09d5cdfe1ed5889c1adc49dfe2 new file mode 100644 index 00000000..19d12ee8 Binary files /dev/null and b/Library/Artifacts/a6/a6664b09d5cdfe1ed5889c1adc49dfe2 differ diff --git a/Library/Artifacts/4f/4f8ed142a7c2608511e1c60192124240 b/Library/Artifacts/a6/a6cd06dab9e33d07fd5e7f5563d7051c similarity index 51% rename from Library/Artifacts/4f/4f8ed142a7c2608511e1c60192124240 rename to Library/Artifacts/a6/a6cd06dab9e33d07fd5e7f5563d7051c index 15d42b12..ff4f6f77 100644 Binary files a/Library/Artifacts/4f/4f8ed142a7c2608511e1c60192124240 and b/Library/Artifacts/a6/a6cd06dab9e33d07fd5e7f5563d7051c differ diff --git a/Library/Artifacts/09/09d5f5a0acc8d9eb4e75d166755c7858 b/Library/Artifacts/a6/a6fbfd855a883d0cf1caa2543db2aa26 similarity index 51% rename from Library/Artifacts/09/09d5f5a0acc8d9eb4e75d166755c7858 rename to Library/Artifacts/a6/a6fbfd855a883d0cf1caa2543db2aa26 index 17f2ab10..b12ab056 100644 Binary files a/Library/Artifacts/09/09d5f5a0acc8d9eb4e75d166755c7858 and b/Library/Artifacts/a6/a6fbfd855a883d0cf1caa2543db2aa26 differ diff --git a/Library/Artifacts/a7/a71c575c22c59430a9b7c6052ff5b0b3 b/Library/Artifacts/a7/a71c575c22c59430a9b7c6052ff5b0b3 deleted file mode 100644 index c3eee965..00000000 Binary files a/Library/Artifacts/a7/a71c575c22c59430a9b7c6052ff5b0b3 and /dev/null differ diff --git a/Library/Artifacts/a7/a72bcd27df6bcd07f7d6974fcae4794a b/Library/Artifacts/a7/a72bcd27df6bcd07f7d6974fcae4794a new file mode 100644 index 00000000..44eca35c Binary files /dev/null and b/Library/Artifacts/a7/a72bcd27df6bcd07f7d6974fcae4794a differ diff --git a/Library/Artifacts/ac/ac8ca18eeb2b48a944fd3e14c53de09b b/Library/Artifacts/ac/ac8ca18eeb2b48a944fd3e14c53de09b deleted file mode 100644 index f5ae180c..00000000 Binary files a/Library/Artifacts/ac/ac8ca18eeb2b48a944fd3e14c53de09b and /dev/null differ diff --git a/Library/Artifacts/ae/ae8acaf5e06375958ac1f8f4e1829be8 b/Library/Artifacts/ae/ae8acaf5e06375958ac1f8f4e1829be8 deleted file mode 100644 index 4dd8e561..00000000 Binary files a/Library/Artifacts/ae/ae8acaf5e06375958ac1f8f4e1829be8 and /dev/null differ diff --git a/Library/Artifacts/af/af2744f17af312e449883ad24c1dc560 b/Library/Artifacts/af/af2744f17af312e449883ad24c1dc560 new file mode 100644 index 00000000..68af22bd Binary files /dev/null and b/Library/Artifacts/af/af2744f17af312e449883ad24c1dc560 differ diff --git a/Library/Artifacts/af/af3e2b083ded73933e142bd964ee7c6a b/Library/Artifacts/af/af3e2b083ded73933e142bd964ee7c6a deleted file mode 100644 index 114226ba..00000000 Binary files a/Library/Artifacts/af/af3e2b083ded73933e142bd964ee7c6a and /dev/null differ diff --git a/Library/Artifacts/b4/b493d91632c61bbb00bd3a216fb36954 b/Library/Artifacts/b4/b493d91632c61bbb00bd3a216fb36954 deleted file mode 100644 index 70642384..00000000 Binary files a/Library/Artifacts/b4/b493d91632c61bbb00bd3a216fb36954 and /dev/null differ diff --git a/Library/Artifacts/b5/b530e645717e1a38c555ecbb0e87d9b2 b/Library/Artifacts/b5/b530e645717e1a38c555ecbb0e87d9b2 deleted file mode 100644 index 0b32b8aa..00000000 Binary files a/Library/Artifacts/b5/b530e645717e1a38c555ecbb0e87d9b2 and /dev/null differ diff --git a/Library/Artifacts/b6/b63bc4155f99dba0318877c683c97458 b/Library/Artifacts/b6/b63bc4155f99dba0318877c683c97458 deleted file mode 100644 index df7b70d8..00000000 Binary files a/Library/Artifacts/b6/b63bc4155f99dba0318877c683c97458 and /dev/null differ diff --git a/Library/Artifacts/b6/b6842725fe5696f4d5e35c7f368fadf1 b/Library/Artifacts/b6/b6842725fe5696f4d5e35c7f368fadf1 deleted file mode 100644 index 178c60a0..00000000 Binary files a/Library/Artifacts/b6/b6842725fe5696f4d5e35c7f368fadf1 and /dev/null differ diff --git a/Library/Artifacts/ba/ba53a25ec580b7ad21efac86c74bbf28 b/Library/Artifacts/ba/ba53a25ec580b7ad21efac86c74bbf28 deleted file mode 100644 index 4c24235c..00000000 Binary files a/Library/Artifacts/ba/ba53a25ec580b7ad21efac86c74bbf28 and /dev/null differ diff --git a/Library/Artifacts/bf/bfdcc988f29ea86f1d7a06e0da364a95 b/Library/Artifacts/bf/bfdcc988f29ea86f1d7a06e0da364a95 deleted file mode 100644 index 6523732e..00000000 Binary files a/Library/Artifacts/bf/bfdcc988f29ea86f1d7a06e0da364a95 and /dev/null differ diff --git a/Library/Artifacts/c8/c82f34917da6d7275ebabfa591a4b498 b/Library/Artifacts/c8/c82f34917da6d7275ebabfa591a4b498 deleted file mode 100644 index e0442a7a..00000000 Binary files a/Library/Artifacts/c8/c82f34917da6d7275ebabfa591a4b498 and /dev/null differ diff --git a/Library/Artifacts/c9/c93fbf96a645634f5be891cb5de71ab8 b/Library/Artifacts/c9/c93fbf96a645634f5be891cb5de71ab8 deleted file mode 100644 index 59d61363..00000000 Binary files a/Library/Artifacts/c9/c93fbf96a645634f5be891cb5de71ab8 and /dev/null differ diff --git a/Library/Artifacts/3f/3f7d662127509df25ba49e5255102b2e b/Library/Artifacts/c9/c958e7d121d516ce3c13778f9e454204 similarity index 89% rename from Library/Artifacts/3f/3f7d662127509df25ba49e5255102b2e rename to Library/Artifacts/c9/c958e7d121d516ce3c13778f9e454204 index 9b1fa0a5..a3fcf22d 100644 Binary files a/Library/Artifacts/3f/3f7d662127509df25ba49e5255102b2e and b/Library/Artifacts/c9/c958e7d121d516ce3c13778f9e454204 differ diff --git a/Library/Artifacts/cd/cd37515b89519f0e068800b24f9134df b/Library/Artifacts/cd/cd37515b89519f0e068800b24f9134df new file mode 100644 index 00000000..0a30ad06 Binary files /dev/null and b/Library/Artifacts/cd/cd37515b89519f0e068800b24f9134df differ diff --git a/Library/Artifacts/28/2845d34db55908ebf7fc1e3c919fedd0 b/Library/Artifacts/ce/ce3f8884332db9affa92984d3ce0b14b similarity index 98% rename from Library/Artifacts/28/2845d34db55908ebf7fc1e3c919fedd0 rename to Library/Artifacts/ce/ce3f8884332db9affa92984d3ce0b14b index 24efc674..f85dc020 100644 Binary files a/Library/Artifacts/28/2845d34db55908ebf7fc1e3c919fedd0 and b/Library/Artifacts/ce/ce3f8884332db9affa92984d3ce0b14b differ diff --git a/Library/Artifacts/cf/cf1e9528d83b000d0cde3079fd702142 b/Library/Artifacts/cf/cf1e9528d83b000d0cde3079fd702142 new file mode 100644 index 00000000..52ca69c6 Binary files /dev/null and b/Library/Artifacts/cf/cf1e9528d83b000d0cde3079fd702142 differ diff --git a/Library/Artifacts/d0/d02fd8b9ec2d772f679a89ae6f7e503b b/Library/Artifacts/d0/d02fd8b9ec2d772f679a89ae6f7e503b deleted file mode 100644 index 764d5bfe..00000000 Binary files a/Library/Artifacts/d0/d02fd8b9ec2d772f679a89ae6f7e503b and /dev/null differ diff --git a/Library/Artifacts/d7/d72aab511b7787059894b3034f70f480 b/Library/Artifacts/d7/d72aab511b7787059894b3034f70f480 deleted file mode 100644 index b2da8596..00000000 Binary files a/Library/Artifacts/d7/d72aab511b7787059894b3034f70f480 and /dev/null differ diff --git a/Library/Artifacts/d9/d97cb90045265e262a43687b73274634 b/Library/Artifacts/d9/d97cb90045265e262a43687b73274634 deleted file mode 100644 index 275f19bd..00000000 Binary files a/Library/Artifacts/d9/d97cb90045265e262a43687b73274634 and /dev/null differ diff --git a/Library/Artifacts/db/db00d420b6f65f8f933eff7d7c5c0177 b/Library/Artifacts/db/db00d420b6f65f8f933eff7d7c5c0177 deleted file mode 100644 index 224a0c94..00000000 Binary files a/Library/Artifacts/db/db00d420b6f65f8f933eff7d7c5c0177 and /dev/null differ diff --git a/Library/Artifacts/dd/dda39ed8e607d540fb3c6e6e2f1b61a6 b/Library/Artifacts/dd/dda39ed8e607d540fb3c6e6e2f1b61a6 deleted file mode 100644 index e7e02d77..00000000 Binary files a/Library/Artifacts/dd/dda39ed8e607d540fb3c6e6e2f1b61a6 and /dev/null differ diff --git a/Library/Artifacts/dd/ddb1bc6ed1f2c35dda161ceea677473e b/Library/Artifacts/dd/ddb1bc6ed1f2c35dda161ceea677473e deleted file mode 100644 index 08e58d0b..00000000 Binary files a/Library/Artifacts/dd/ddb1bc6ed1f2c35dda161ceea677473e and /dev/null differ diff --git a/Library/Artifacts/de/de3aa507514f05e7ace2551a4f75edc6 b/Library/Artifacts/de/de3aa507514f05e7ace2551a4f75edc6 new file mode 100644 index 00000000..a4acb9ec Binary files /dev/null and b/Library/Artifacts/de/de3aa507514f05e7ace2551a4f75edc6 differ diff --git a/Library/Artifacts/df/df3fcfe4980e8ea29a9eb0d7cb90fe3b b/Library/Artifacts/df/df3fcfe4980e8ea29a9eb0d7cb90fe3b deleted file mode 100644 index 3ee32b4c..00000000 Binary files a/Library/Artifacts/df/df3fcfe4980e8ea29a9eb0d7cb90fe3b and /dev/null differ diff --git a/Library/Artifacts/df/df9dcaaf0673a14e861b7234334c459d b/Library/Artifacts/df/df9dcaaf0673a14e861b7234334c459d deleted file mode 100644 index 2f34bf94..00000000 Binary files a/Library/Artifacts/df/df9dcaaf0673a14e861b7234334c459d and /dev/null differ diff --git a/Library/Artifacts/e5/e5688387228c3a9296775f5ff8834450 b/Library/Artifacts/e5/e5688387228c3a9296775f5ff8834450 deleted file mode 100644 index 55d56478..00000000 Binary files a/Library/Artifacts/e5/e5688387228c3a9296775f5ff8834450 and /dev/null differ diff --git a/Library/Artifacts/e6/e633a12ff417532e45230d5c35333a20 b/Library/Artifacts/e6/e633a12ff417532e45230d5c35333a20 deleted file mode 100644 index 43a1e89b..00000000 Binary files a/Library/Artifacts/e6/e633a12ff417532e45230d5c35333a20 and /dev/null differ diff --git a/Library/Artifacts/e7/e79d5102857bd8ca1138fed92d2121e9 b/Library/Artifacts/e7/e79d5102857bd8ca1138fed92d2121e9 deleted file mode 100644 index b331877d..00000000 Binary files a/Library/Artifacts/e7/e79d5102857bd8ca1138fed92d2121e9 and /dev/null differ diff --git a/Library/Artifacts/ea/ea2284230b4c6c399fa104ca9f256e98 b/Library/Artifacts/ea/ea2284230b4c6c399fa104ca9f256e98 deleted file mode 100644 index 01a355bf..00000000 Binary files a/Library/Artifacts/ea/ea2284230b4c6c399fa104ca9f256e98 and /dev/null differ diff --git a/Library/Artifacts/ec/ecf78cc080b3c30c43321e760e6da82f b/Library/Artifacts/ec/ecf78cc080b3c30c43321e760e6da82f deleted file mode 100644 index 3ef0de71..00000000 Binary files a/Library/Artifacts/ec/ecf78cc080b3c30c43321e760e6da82f and /dev/null differ diff --git a/Library/Artifacts/ed/edcf699b43f8b112a6b54529945834f1 b/Library/Artifacts/ed/edcf699b43f8b112a6b54529945834f1 deleted file mode 100644 index f9e31d54..00000000 Binary files a/Library/Artifacts/ed/edcf699b43f8b112a6b54529945834f1 and /dev/null differ diff --git a/Library/Artifacts/f1/f1d589e7b4e015b00006884eb2669d42 b/Library/Artifacts/f1/f1d589e7b4e015b00006884eb2669d42 deleted file mode 100644 index 750382f7..00000000 Binary files a/Library/Artifacts/f1/f1d589e7b4e015b00006884eb2669d42 and /dev/null differ diff --git a/Library/Artifacts/f7/f798cd819383ef6866dd29cc3b53cb34 b/Library/Artifacts/f7/f798cd819383ef6866dd29cc3b53cb34 deleted file mode 100644 index 834a15cd..00000000 Binary files a/Library/Artifacts/f7/f798cd819383ef6866dd29cc3b53cb34 and /dev/null differ diff --git a/Library/Artifacts/f9/f93e7483bb95976d7b54ab3b903c3205 b/Library/Artifacts/f9/f93e7483bb95976d7b54ab3b903c3205 new file mode 100644 index 00000000..75101c2a Binary files /dev/null and b/Library/Artifacts/f9/f93e7483bb95976d7b54ab3b903c3205 differ diff --git a/Library/Artifacts/fb/fb45f46c507a6424ca848cc6cb5ebe9f b/Library/Artifacts/fb/fb45f46c507a6424ca848cc6cb5ebe9f deleted file mode 100644 index df37b97e..00000000 Binary files a/Library/Artifacts/fb/fb45f46c507a6424ca848cc6cb5ebe9f and /dev/null differ diff --git a/Library/Artifacts/fc/fc25adc3d507ff3a2d82dfe460775cd9 b/Library/Artifacts/fc/fc25adc3d507ff3a2d82dfe460775cd9 deleted file mode 100644 index b359b6ba..00000000 Binary files a/Library/Artifacts/fc/fc25adc3d507ff3a2d82dfe460775cd9 and /dev/null differ diff --git a/Library/Artifacts/fc/fc6454ad5d068dc9aecceda5707b8fee b/Library/Artifacts/fc/fc6454ad5d068dc9aecceda5707b8fee deleted file mode 100644 index fb34432f..00000000 Binary files a/Library/Artifacts/fc/fc6454ad5d068dc9aecceda5707b8fee and /dev/null differ diff --git a/Library/Artifacts/fc/fc977f43bd27767f0202d3380d1fb61a b/Library/Artifacts/fc/fc977f43bd27767f0202d3380d1fb61a new file mode 100644 index 00000000..d6ea141c Binary files /dev/null and b/Library/Artifacts/fc/fc977f43bd27767f0202d3380d1fb61a differ diff --git a/Library/Artifacts/fd/fd6444cb98e40b32f1280dc9f8797ba9 b/Library/Artifacts/fd/fd6444cb98e40b32f1280dc9f8797ba9 deleted file mode 100644 index 49515b2f..00000000 Binary files a/Library/Artifacts/fd/fd6444cb98e40b32f1280dc9f8797ba9 and /dev/null differ diff --git a/Library/Artifacts/fd/fddf626fc47a0bdf40d46cb317e015bf b/Library/Artifacts/fd/fddf626fc47a0bdf40d46cb317e015bf deleted file mode 100644 index 27a65d08..00000000 Binary files a/Library/Artifacts/fd/fddf626fc47a0bdf40d46cb317e015bf and /dev/null differ diff --git a/Library/Artifacts/21/2185b63a589824799b6e884ffe5f561b b/Library/Artifacts/ff/ffd8be4f11623381f73e69368f3f2383 similarity index 99% rename from Library/Artifacts/21/2185b63a589824799b6e884ffe5f561b rename to Library/Artifacts/ff/ffd8be4f11623381f73e69368f3f2383 index 300b0276..6dc4460b 100644 Binary files a/Library/Artifacts/21/2185b63a589824799b6e884ffe5f561b and b/Library/Artifacts/ff/ffd8be4f11623381f73e69368f3f2383 differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index ee81ca9d..8ef829c1 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: 678, y: 492} + m_MinSize: {x: 677, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 19449 + controlID: 20076 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 492} + m_MinSize: {x: 402, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 19450 + controlID: 20077 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: y: 0 width: 1414 height: 671 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 402, y: 221} + m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 19451 + controlID: 20078 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -396,9 +396,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: d43c0000 - m_LastClickedID: 15572 - m_ExpandedIDs: 3643ffff4043ffff6a43ffff62fbffffbc3a0000d43c0000f63c0000f03d0000c43f000032410000 + m_SelectedIDs: 2e44fdff + m_LastClickedID: -179154 + m_ExpandedIDs: 5446fdffa647fdffba47fdff6848fdff62fbffffd43c0000c43f000032410000b44b0100344c0100564c0100e04f0100aa500100a0510100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 478.72665, y: 297.94824, z: -1199.125} + m_Target: {x: 532.49615, y: 244.92505, z: -1227.1875} speed: 2 - m_Value: {x: 478.72665, y: 297.94824, z: -1199.125} + m_Value: {x: 532.49615, y: 244.92505, z: -1227.1875} 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: 337.53415 + m_Target: 376.689 speed: 2 - m_Value: 337.53415 + m_Value: 376.689 m_Ortho: m_Target: 1 speed: 2 @@ -1114,7 +1114,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 37} + scrollPos: {x: 0, y: 41} m_SelectedIDs: de490000 m_LastClickedID: 18910 m_ExpandedIDs: 00000000d2490000d4490000d6490000d8490000da490000dc490000de49000000ca9a3b @@ -1295,4 +1295,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 100 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index a06ba033..7b74d49c 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 492} + m_MinSize: {x: 677, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 18992 + controlID: 19747 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -67,7 +67,7 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 0 + m_Stats: 1 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 492} + m_MinSize: {x: 402, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 18993 + controlID: 19699 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: y: 0 width: 1414 height: 671 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 402, y: 221} + m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 18994 + controlID: 19661 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,8 @@ MonoBehaviour: y: 0 width: 337 height: 671 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 3643ffff4043ffff6a43ffff62fbffffbc3a0000d43c0000f63c0000f03d0000c43f000032410000 + m_ExpandedIDs: 5446fdffa647fdffba47fdff6848fdff62fbffffd43c0000c43f000032410000b44b0100344c0100564c0100e04f0100aa500100a0510100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 478.72665, y: 297.94824, z: -1199.125} + m_Target: {x: 950.63794, y: 210.07976, z: -1227.1875} speed: 2 - m_Value: {x: 478.72665, y: 297.94824, z: -1199.125} + m_Value: {x: 950.63794, y: 210.07976, z: -1227.1875} 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: 337.53415 + m_Target: 376.689 speed: 2 - m_Value: 337.53415 + m_Value: 376.689 m_Ortho: m_Target: 1 speed: 2 @@ -997,7 +997,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 37} + scrollPos: {x: 0, y: 41} m_SelectedIDs: de490000 m_LastClickedID: 18910 m_ExpandedIDs: 00000000d2490000d4490000d6490000d8490000da490000dc490000de49000000ca9a3b @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: d43c0000 - m_LastClickedInstanceID: 15572 + m_SelectedInstanceIDs: 2e44fdff + m_LastClickedInstanceID: -179154 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e980000024900008698000000000000 m_RenameOverlay: @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: 15572 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: -179154 + m_LastVerticalScrollValue: 100 diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 520e65aa..790fc77e 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 0710f5c5..83809e68 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 3ac2922a..b683f666 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 026ee543..5223570d 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 f6c0fa3b..3bfb983b 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 765d0818..34f21410 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 274d6b97..91dac00d 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 38fe504b..66c4e9d9 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 12f50bab..c227160c 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 e2183b0e..98b74c69 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 a521dad9..40e725c9 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 6ac4f12a..1029fe7f 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 dbdb5d3a..ae4c3888 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 f64f682b..87c9565d 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 bca7944e..547d57d0 100644 Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets index 2dc8bf92..4e7dbfd0 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 506a5c55..c9691e1e 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -1,5 +1,7 @@ ScriptsOnlyBuild: usedScripts: + Assembly-CSharp-Editor.dll: + - RimWorldAnimationStudio.KeyframeSliderEditor Assembly-CSharp.dll: - DigitalRuby.AdvancedPolygonCollider.AdvancedPolygonCollider - NumberValidator @@ -392,7 +394,7 @@ ScriptsOnlyBuild: className: GridLayoutGroup - hash: serializedVersion: 2 - Hash: 85e1eaf364912ba4ab10024988761d24 + Hash: abc861828c981ee93311dccac7a8cbde assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: KeyframeSlider @@ -404,7 +406,7 @@ ScriptsOnlyBuild: className: StageCard - hash: serializedVersion: 2 - Hash: 3b6987f769b9af6dce23f3530de12cf8 + Hash: 0e48f73172d6b8a9ce546d49ec3f8b6e assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: AnimationController diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 0068030f..80f67f4e 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 7e3be5fb..f1150443 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 77666d87..3da9c794 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 64a8b5ca..769a8655 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json b/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json index e9b17bd2..9e378b56 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json +++ b/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[3541467645058788217],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[3541467645058788217],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":8349152464423077224,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-mainStage.json b/Library/StateCache/SceneView/352ee9-mainStage.json index 17d6c215..3fcc055b 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":478.7266540527344,"y":297.9482421875,"z":-1199.125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":337.5341491699219,"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":532.4961547851563,"y":244.925048828125,"z":-1227.1875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":376.6889953613281,"orthographic":true} \ No newline at end of file diff --git a/Library/shadercompiler-UnityShaderCompiler.exe10.log b/Library/shadercompiler-UnityShaderCompiler.exe10.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe11.log b/Library/shadercompiler-UnityShaderCompiler.exe11.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe11.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe11.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe9.log b/Library/shadercompiler-UnityShaderCompiler.exe9.log index 9ae621b0..57b2c568 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe9.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe9.log @@ -1,4 +1,2 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler - -Quitting shader compiler process