diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index c1a960d7..420b8255 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/ActorCard.prefab b/Assets/Resources/Prefabs/ActorCard.prefab index 3cb0be26..30f7d2d6 100644 --- a/Assets/Resources/Prefabs/ActorCard.prefab +++ b/Assets/Resources/Prefabs/ActorCard.prefab @@ -815,7 +815,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303198879684} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -983,10 +983,10 @@ RectTransform: - {fileID: 935483304734640508} - {fileID: 935483304451841478} - {fileID: 935483303811839839} - - {fileID: 935483304407649878} - - {fileID: 935483304187088279} - {fileID: 935483302976181084} + - {fileID: 935483304407649878} - {fileID: 935483303286354285} + - {fileID: 935483304187088279} - {fileID: 935483303347104685} - {fileID: 4300837137852148242} - {fileID: 6085830301941788007} @@ -1190,7 +1190,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 935483303198879684} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2251,7 +2251,7 @@ RectTransform: m_Children: - {fileID: 935483302769328936} m_Father: {fileID: 935483303198879684} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2740,7 +2740,7 @@ RectTransform: m_Children: - {fileID: 935483304355133267} m_Father: {fileID: 935483303198879684} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/Resources/Prefabs/GhostSlider.prefab b/Assets/Resources/Prefabs/GhostSlider.prefab index 95c9a30f..7a2d3cec 100644 --- a/Assets/Resources/Prefabs/GhostSlider.prefab +++ b/Assets/Resources/Prefabs/GhostSlider.prefab @@ -32,7 +32,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -52,7 +52,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3922218029245345 RectTransform: m_ObjectHideFlags: 0 @@ -71,7 +71,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -16, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3581489635090573721 MonoBehaviour: @@ -116,10 +116,10 @@ MonoBehaviour: m_FillRect: {fileID: 0} m_HandleRect: {fileID: 4629009613275671144} m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0 + m_MinValue: 1 + m_MaxValue: 100 + m_WholeNumbers: 1 + m_Value: 1 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -181,8 +181,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 1, b: 0.9510727, a: 0.5019608} - m_RaycastTarget: 1 + m_Color: {r: 0.2, g: 0.2, b: 0.2, a: 0.5019608} + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index cae00e1a..f6b92c1a 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -322,7 +322,7 @@ RectTransform: - {fileID: 1302075273} - {fileID: 1849536740} m_Father: {fileID: 1335076903} - m_RootOrder: 22 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -471,7 +471,18 @@ MonoBehaviour: m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1323324190} + m_MethodName: OnCycleNormalFieldChange + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -637,6 +648,76 @@ PrefabInstance: propertyPath: m_Name value: ActorCard objectReference: {fileID: 0} + - target: {fileID: 935483303347104684, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 935483303347104684, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 935483303347104684, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 457137179} + - target: {fileID: 935483303347104684, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 935483303347104684, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: UpdateAnimationDef + objectReference: {fileID: 0} + - target: {fileID: 935483303347104684, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 935483303811839838, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnBodyTypeChanged + objectReference: {fileID: 0} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 457137179} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: UpdateAnimationDef + objectReference: {fileID: 0} + - target: {fileID: 935483304734640511, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, type: 3} --- !u!1 &77649835 @@ -1078,7 +1159,7 @@ GameObject: - component: {fileID: 138865806} - component: {fileID: 138865805} m_Layer: 5 - m_Name: Background + m_Name: SliderBackground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1506,7 +1587,7 @@ RectTransform: - {fileID: 591894605} - {fileID: 138865804} m_Father: {fileID: 1335076903} - m_RootOrder: 17 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2816,7 +2897,7 @@ Transform: - {fileID: 143158141} - {fileID: 284483059} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &395375411 GameObject: @@ -3331,7 +3412,7 @@ RectTransform: - {fileID: 749354207} - {fileID: 1153227823} m_Father: {fileID: 1335076903} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3381,7 +3462,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -3405,6 +3486,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 433613847} m_CullTransparentMesh: 0 +--- !u!114 &457137179 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3804747680697097237, guid: 73a40f7e8cdb25c4390e3ea857ff50ea, + type: 3} + m_PrefabInstance: {fileID: 75718000} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9731614c7527b624492dd33f9b006fcb, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &502634720 GameObject: m_ObjectHideFlags: 0 @@ -3714,7 +3807,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &519420033 MonoBehaviour: @@ -5109,7 +5202,7 @@ RectTransform: - {fileID: 1960844026} - {fileID: 1463915053} m_Father: {fileID: 1335076903} - m_RootOrder: 16 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5231,7 +5324,7 @@ RectTransform: - {fileID: 783530509} - {fileID: 725162531} m_Father: {fileID: 1335076903} - m_RootOrder: 18 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5634,7 +5727,7 @@ RectTransform: - {fileID: 371198550} - {fileID: 77649836} m_Father: {fileID: 1335076903} - m_RootOrder: 24 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6641,6 +6734,84 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &859476423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 859476424} + - component: {fileID: 859476426} + - component: {fileID: 859476425} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &859476424 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859476423} + 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: 1345808904} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &859476425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859476423} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: Redo +--- !u!222 &859476426 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 859476423} + m_CullTransparentMesh: 0 --- !u!1 &891070577 GameObject: m_ObjectHideFlags: 0 @@ -7428,7 +7599,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &932977621 GameObject: @@ -8346,7 +8517,7 @@ RectTransform: - {fileID: 347034222} - {fileID: 932977622} m_Father: {fileID: 1335076903} - m_RootOrder: 25 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8439,7 +8610,7 @@ RectTransform: - {fileID: 1898380637} - {fileID: 1966925531} m_Father: {fileID: 1335076903} - m_RootOrder: 27 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9904,7 +10075,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1335076899 GameObject: @@ -10012,6 +10183,8 @@ RectTransform: - {fileID: 899286715} - {fileID: 1136677497} - {fileID: 149343615} + - {fileID: 2134497164} + - {fileID: 1345808904} - {fileID: 592091831} - {fileID: 219230438} - {fileID: 629081414} @@ -10025,7 +10198,7 @@ RectTransform: - {fileID: 1914421494} - {fileID: 1121706670} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -10162,6 +10335,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1344070787} m_CullTransparentMesh: 0 +--- !u!1 &1345808903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1345808904} + - component: {fileID: 1345808907} + - component: {fileID: 1345808906} + - component: {fileID: 1345808905} + m_Layer: 5 + m_Name: RedoButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1345808904 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345808903} + 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: 859476424} + m_Father: {fileID: 1335076903} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 98, y: 285} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1345808905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345808903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1345808906} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2086782053} + m_MethodName: Redo + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1345808906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345808903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1345808907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345808903} + m_CullTransparentMesh: 0 --- !u!1 &1354159499 GameObject: m_ObjectHideFlags: 0 @@ -11546,7 +11849,18 @@ MonoBehaviour: m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1323324190} + m_MethodName: OnCycleFastFieldChange + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -11872,6 +12186,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481521046} m_CullTransparentMesh: 0 +--- !u!1 &1484247518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1484247519} + - component: {fileID: 1484247521} + - component: {fileID: 1484247520} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1484247519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484247518} + 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: 2134497164} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1484247520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484247518} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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: Undo +--- !u!222 &1484247521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484247518} + m_CullTransparentMesh: 0 --- !u!1 &1486546820 GameObject: m_ObjectHideFlags: 0 @@ -13449,7 +13841,7 @@ RectTransform: - {fileID: 1395818346} - {fileID: 1798757604} m_Father: {fileID: 1335076903} - m_RootOrder: 21 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13545,7 +13937,7 @@ RectTransform: - {fileID: 1092312354} - {fileID: 891468915} m_Father: {fileID: 1335076903} - m_RootOrder: 20 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -15526,7 +15918,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1895236501 GameObject: @@ -15804,7 +16196,7 @@ RectTransform: - {fileID: 1543793723} - {fileID: 1344070788} m_Father: {fileID: 1335076903} - m_RootOrder: 26 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16105,7 +16497,7 @@ RectTransform: - {fileID: 1481521047} - {fileID: 1261535758} m_Father: {fileID: 1335076903} - m_RootOrder: 23 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16497,6 +16889,52 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!1 &2086782052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2086782054} + - component: {fileID: 2086782053} + m_Layer: 0 + m_Name: Workspace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2086782053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086782052} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf0f782b7c407bf4896b633d509f5568, type: 3} + m_Name: + m_EditorClassIdentifier: + workspaceHistory: [] + historyIndex: -1 + maxHistoryDepth: 100 +--- !u!4 &2086782054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086782052} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 699.4843, y: 244.28134, z: -283} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2093466856 GameObject: m_ObjectHideFlags: 0 @@ -16849,3 +17287,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124969760} m_CullTransparentMesh: 0 +--- !u!1 &2134497163 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2134497164} + - component: {fileID: 2134497167} + - component: {fileID: 2134497166} + - component: {fileID: 2134497165} + m_Layer: 5 + m_Name: UndoButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2134497164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134497163} + 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: 1484247519} + m_Father: {fileID: 1335076903} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -62, y: 285.5} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2134497165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134497163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2134497166} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2086782053} + m_MethodName: Undo + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &2134497166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134497163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2134497167 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2134497163} + m_CullTransparentMesh: 0 diff --git a/Assets/Scripts/AnimationComponents/AnimationClips/AnimationClip.cs b/Assets/Scripts/AnimationComponents/AnimationClips/AnimationClip.cs index ee211a6c..d4e8527d 100644 --- a/Assets/Scripts/AnimationComponents/AnimationClips/AnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/AnimationClips/AnimationClip.cs @@ -9,8 +9,10 @@ namespace RimWorldAnimationStudio public string layer = "Pawn"; public List tags; - [XmlIgnore] public int duration; - [XmlIgnore] public Dictionary SoundEffects = new Dictionary(); + //[XmlIgnore] public Dictionary SoundEffects = new Dictionary(); + //[XmlIgnore] public int duration; + + public virtual int duration { get { return 0; } } public abstract void BuildSimpleCurves(); diff --git a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs index 82d2c380..a25c9f49 100644 --- a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using System.Xml; using System.Xml.Serialization; using UnityEngine; @@ -20,6 +21,8 @@ namespace RimWorldAnimationStudio [XmlIgnore] public SimpleCurve HeadFacing = new SimpleCurve(); [XmlIgnore] public SimpleCurve BodyFacing = new SimpleCurve(); + public override int duration { get { return keyframes.Max(x => x.atTick.Value); } } + public override void BuildSimpleCurves() { BodyAngle.Clear(); @@ -36,7 +39,6 @@ namespace RimWorldAnimationStudio foreach (PawnKeyframe frame in keyframes) { duration += frame.tickDuration; } - this.duration = duration; int keyframePosition = 0; for (int i = 0; i < keyframes.Count; i++) diff --git a/Assets/Scripts/AnimationComponents/AnimationClips/ThingAnimationClip.cs b/Assets/Scripts/AnimationComponents/AnimationClips/ThingAnimationClip.cs index e4977867..486c8be8 100644 --- a/Assets/Scripts/AnimationComponents/AnimationClips/ThingAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/AnimationClips/ThingAnimationClip.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using System.Xml; using System.Xml.Serialization; @@ -13,9 +14,12 @@ namespace RimWorldAnimationStudio [XmlIgnore] public SimpleCurve PositionZ = new SimpleCurve(); [XmlIgnore] public SimpleCurve Rotation = new SimpleCurve(); + public override int duration { get { return keyframes.Max(x => x.atTick.Value); } } + public override void BuildSimpleCurves() { int duration = 0; + //getting the length of the whole clip foreach (ThingKeyframe frame in keyframes) { @@ -23,7 +27,7 @@ namespace RimWorldAnimationStudio } //guarantees loops don't get cut off mid-anim - this.duration = duration; + //this.duration = duration; int keyframePosition = 0; foreach (ThingKeyframe frame in keyframes) @@ -33,9 +37,6 @@ namespace RimWorldAnimationStudio PositionX.Add((float)frame.atTick / (float)duration, frame.positionX, true); PositionZ.Add((float)frame.atTick / (float)duration, frame.positionZ, true); Rotation.Add((float)frame.atTick / (float)duration, frame.rotation, true); - - if (frame.soundEffect != null) - { SoundEffects.Add((int)frame.atTick, frame.soundEffect); } } else @@ -44,9 +45,6 @@ namespace RimWorldAnimationStudio PositionZ.Add((float)keyframePosition / (float)duration, frame.positionZ, true); Rotation.Add((float)keyframePosition / (float)duration, frame.rotation, true); - if (frame.soundEffect != null) - { SoundEffects.Add(keyframePosition, frame.soundEffect); } - keyframePosition += frame.tickDuration; } } diff --git a/Assets/Scripts/AnimationComponents/AnimationDef.cs b/Assets/Scripts/AnimationComponents/AnimationDef.cs index 4e49b526..cc9e0304 100644 --- a/Assets/Scripts/AnimationComponents/AnimationDef.cs +++ b/Assets/Scripts/AnimationComponents/AnimationDef.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; +using System.Linq; using System.Xml; using System.Xml.Serialization; +using UnityEngine; namespace RimWorldAnimationStudio { @@ -27,5 +29,53 @@ namespace RimWorldAnimationStudio animationTimeTicks += stage.playTimeTicks; } } + + public void RunPreSaveOperations() + { + // Stage edits + for (int i = 0; i < animationStages.Count; i++) + { + AnimationStage stage = animationStages[i]; + + // Sort keyframes by atTick + foreach (PawnAnimationClip clip in stage.animationClips) + { clip.keyframes = clip.keyframes.OrderBy(x => x.atTick).ToList(); } + + // Check if looping + int stageWindowSize = animationStages[i].stageWindowSize > 0 ? animationStages[i].stageWindowSize : animationStages[i].animationClips.Select(x => x.duration).Max(); + int cycles = Mathf.CeilToInt(animationStages[i].playTimeTicks / stageWindowSize); + + Debug.Log(animationStages[i].playTimeTicks); + Debug.Log(animationStages[i].stageWindowSize); + Debug.Log(cycles); + stage.isLooping = cycles > 1; + } + + // Body part list edit + foreach (Actor actor in actors) + { + actor.isFucking = actor.requiredGenitals.Contains("Any appendage"); + + if (actor.isFucking == true) + { actor.requiredGenitals.Remove("Any appendage"); } + + actor.isFucked= actor.requiredGenitals.Contains("Any orifice"); + + if (actor.isFucked == true) + { actor.requiredGenitals.Remove("Any orifice"); } + } + } + + public void RunPostLoadOperations() + { + foreach (Actor actor in actors) + { + if (actor.isFucking == true) + { actor.requiredGenitals.Add("Any appendage"); } + + if (actor.isFucked == true) + { actor.requiredGenitals.Add("Any orifice"); } + } + } } } diff --git a/Assets/Scripts/AnimationComponents/AnimationStage.cs b/Assets/Scripts/AnimationComponents/AnimationStage.cs index 27733a30..14d9aef9 100644 --- a/Assets/Scripts/AnimationComponents/AnimationStage.cs +++ b/Assets/Scripts/AnimationComponents/AnimationStage.cs @@ -18,7 +18,7 @@ namespace RimWorldAnimationStudio public void Initialize() { - foreach (AnimationClip clip in animationClips) + foreach (PawnAnimationClip clip in animationClips) { clip.BuildSimpleCurves(); diff --git a/Assets/Scripts/GUI/ActorCard.cs b/Assets/Scripts/GUI/ActorCard.cs index 68f82cc5..6c8b55e6 100644 --- a/Assets/Scripts/GUI/ActorCard.cs +++ b/Assets/Scripts/GUI/ActorCard.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -13,6 +14,9 @@ namespace RimWorldAnimationStudio public InputField bodyOffsetZField; public Toggle initiatorToggle; + private int actorID = -1; + private bool isDirty = false; + public void Initialize() { Actor actor = Workspace.animationDef.actors[Workspace.actorID]; @@ -24,15 +28,30 @@ namespace RimWorldAnimationStudio bodyOffsetZField.text = actor.bodyTypeOffset.GetOffset(bodyType).z.ToString(); } - public void UpdateAnimationDef() + public void OnBodyTypeChanged() { + if (Workspace.animationDef == null) return; + Actor actor = Workspace.animationDef.actors[Workspace.actorID]; string bodyType = bodyTypeDropdown.options[bodyTypeDropdown.value].text; bodyType = bodyType == null || bodyType == "" ? "Male" : bodyType; - Debug.Log(bodyType); - AnimationController.Instance.transform.GetChild(Workspace.actorID).GetComponent().bodyType = bodyType; - + + AnimationController.Instance.GetComponentsInChildren()[Workspace.actorID].bodyType = bodyType; + + bodyOffsetXField.text = actor.bodyTypeOffset.GetOffset(bodyType).x.ToString(); + bodyOffsetZField.text = actor.bodyTypeOffset.GetOffset(bodyType).z.ToString(); + } + + public void UpdateAnimationDef() + { + if (Workspace.animationDef == null || isDirty) return; + + Actor actor = Workspace.animationDef.actors[Workspace.actorID]; + + string bodyType = bodyTypeDropdown.options[bodyTypeDropdown.value].text; + bodyType = bodyType == null || bodyType == "" ? "Male" : bodyType; + float.TryParse(bodyOffsetXField.text, out float x); float.TryParse(bodyOffsetZField.text, out float z); actor.bodyTypeOffset.SetOffset(bodyType, new Vector2(x, z)); @@ -42,6 +61,8 @@ namespace RimWorldAnimationStudio public void OpenSelectBodyPartsDialog() { + if (Workspace.animationDef == null) return; + Actor actor = Workspace.animationDef.actors[Workspace.actorID]; var dialog = Resources.FindObjectsOfTypeAll(typeof(SelectBodyPartsDialog)) as SelectBodyPartsDialog[]; @@ -51,6 +72,8 @@ namespace RimWorldAnimationStudio public void OpenSelectDefNamesDialog() { + if (Workspace.animationDef == null) return; + Actor actor = Workspace.animationDef.actors[Workspace.actorID]; var dialog = Resources.FindObjectsOfTypeAll(typeof(SelectDefNamesDialog)) as SelectDefNamesDialog[]; @@ -60,11 +83,42 @@ namespace RimWorldAnimationStudio public void OpenSelectBodyDefTypesDialog() { + if (Workspace.animationDef == null) return; + Actor actor = Workspace.animationDef.actors[Workspace.actorID]; var dialog = Resources.FindObjectsOfTypeAll(typeof(SelectBodyDefTypesDialog)) as SelectBodyDefTypesDialog[]; if (dialog != null) { dialog[0].Initialize(actor); dialog[0].Pop(); } } + + public void Update() + { + if (Workspace.animationDef == null) return; + + if (actorID != Workspace.actorID) + { + isDirty = true; + + if (Workspace.actorID >= AnimationController.Instance.GetComponentsInChildren().Count()) + { Debug.Log("Waiting for actors to initialize..."); return; } + + Actor actor = Workspace.animationDef.actors[Workspace.actorID]; + ActorBody actorBody = AnimationController.Instance.GetComponentsInChildren()[Workspace.actorID]; + + string bodyType = actorBody.bodyType; + bodyType = bodyType == null || bodyType == "" ? "Male" : bodyType; + + bodyTypeDropdown.value = bodyTypeDropdown.options.IndexOf(bodyTypeDropdown.options.First(x => x.text == bodyType)); + bodyOffsetXField.text = actor.bodyTypeOffset.GetOffset(bodyType).x.ToString(); + bodyOffsetZField.text = actor.bodyTypeOffset.GetOffset(bodyType).z.ToString(); + + initiatorToggle.isOn = actor.initiator; + + actorID = Workspace.actorID; + + isDirty = false; + } + } } } diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs b/Assets/Scripts/GUI/AnimationTimeline.cs index 34d89d42..98a6c564 100644 --- a/Assets/Scripts/GUI/AnimationTimeline.cs +++ b/Assets/Scripts/GUI/AnimationTimeline.cs @@ -63,5 +63,10 @@ namespace RimWorldAnimationStudio else { GetComponent().color = Constants.ColorGrey; } } + + public void InitiateUpdateOfGhostFrames() + { + BroadcastMessage("UpdateGhostFrames"); + } } } diff --git a/Assets/Scripts/GUI/DialogBoxes/SelectInteractionDefsDialog.cs b/Assets/Scripts/GUI/DialogBoxes/SelectInteractionDefsDialog.cs index 3862300a..21bc7ad1 100644 --- a/Assets/Scripts/GUI/DialogBoxes/SelectInteractionDefsDialog.cs +++ b/Assets/Scripts/GUI/DialogBoxes/SelectInteractionDefsDialog.cs @@ -41,7 +41,7 @@ namespace RimWorldAnimationStudio Transform contentWindow = transform.FindDeepChild("Content"); Reset(); - for (int i = 0; i < Workspace.bodyParts.Count; i++) + for (int i = 0; i < Workspace.interactionDefTypes.Count; i++) { string interactionDefType = Workspace.interactionDefTypes[i]; diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs index d9c31e10..3d4afb6c 100644 --- a/Assets/Scripts/GUI/KeyframeSlider.cs +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -43,12 +43,11 @@ namespace RimWorldAnimationStudio public void OnValueChanged() { keyframe.atTick = (int)value; - - UpdateGhostFrames(); - clip.BuildSimpleCurves(); AnimationController.Instance.stageTick = keyframe.atTick.Value; + + timeline.InitiateUpdateOfGhostFrames(); } // Ghost sliders are non-interactable slider handle @@ -57,27 +56,25 @@ namespace RimWorldAnimationStudio if (maxGhosts == 0) { return; } - int nGhosts = GetGhostFramesRequired(); + int requiredGhosts = GetGhostFramesRequired(); + int currentGhostCount = ghostSliders.childCount; - for (int i = 0; i < Mathf.Max(nGhosts, ghostSliders.childCount); i++) + for (int i = 0; i < Mathf.Max(requiredGhosts, currentGhostCount); i++) { - if ((i - 1) * clip.duration + keyframe.atTick <= Workspace.StageWindowSize) - { - if (ghostSliders.childCount <= i) - { Instantiate(ghostSliderPrefab, ghostSliders); } + int targetTick = (int)(i * clip.duration + keyframe.atTick); - GameObject ghostSliderObject = ghostSliders.GetChild(i).gameObject; - ghostSliderObject.SetActive(true); + if (ghostSliders.childCount <= i) + { Instantiate(ghostSliderPrefab, ghostSliders); } - Slider ghostSlider = ghostSliderObject.GetComponent(); - ghostSlider.value = (int)((i + 1) * clip.duration + keyframe.atTick); + GameObject ghostSliderObject = ghostSliders.GetChild(i).gameObject; + ghostSliderObject.SetActive(i < requiredGhosts); - float mult = 1f - Mathf.Pow((float)i / maxGhosts, 2); - ghostSlider.transform.FindDeepChild("Handle").GetComponent().color = new Color(0, 0.5f, 0.5f, 0.5f * mult); - } - - if (i >= nGhosts) - { transform.GetChild(i).gameObject.SetActive(false); } + Slider ghostSlider = ghostSliderObject.GetComponent(); + ghostSlider.maxValue = Workspace.StageWindowSize; + ghostSlider.value = targetTick; + + if (targetTick > ghostSlider.maxValue) + { ghostSlider.gameObject.SetActive(false); } } } @@ -98,9 +95,9 @@ namespace RimWorldAnimationStudio Workspace.keyframeID = keyframeID; if (eventData.clickCount >= 2) - { - AnimationController.Instance.stageTick = keyframe.atTick.Value; - } + { AnimationController.Instance.stageTick = keyframe.atTick.Value; } + + Workspace.Instance.MakeDirty(); } public void OnBeginDrag(PointerEventData eventData) @@ -126,6 +123,8 @@ namespace RimWorldAnimationStudio public void OnEndDrag(PointerEventData eventData) { interactable = false; + + Workspace.Instance.MakeDirty(); } protected override void Update() diff --git a/Assets/Scripts/GUI/StageCard.cs b/Assets/Scripts/GUI/StageCard.cs index 184f9e0d..e24410dd 100644 --- a/Assets/Scripts/GUI/StageCard.cs +++ b/Assets/Scripts/GUI/StageCard.cs @@ -16,6 +16,10 @@ namespace RimWorldAnimationStudio { stageName.text = stageNameField.text; stageNameField.gameObject.SetActive(false); + + Workspace.animationDef.animationStages[Workspace.stageID].stageName = stageName.text; + + Workspace.Instance.MakeDirty(); } public void OnMoveStage(int delta) @@ -60,8 +64,7 @@ namespace RimWorldAnimationStudio Workspace.stageID = transform.GetSiblingIndex(); - //AnimationController.Instance.ResetAnimationTimeline(); - //AnimationController.Instance.InitializeAnimationTimeline(); + Workspace.Instance.MakeDirty(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index 4b1a3d24..7ad63e1d 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -34,14 +34,22 @@ namespace RimWorldAnimationStudio private int lastStageTick = 1; private float timeSinceLastUpdate = 0; private int cycleIndex = 0; + private bool isDirty = true; + private bool isTimelineDirty = true; + public void MakeDirty() + { isDirty = true; } + + public void MakeTimelineDirty() + { isTimelineDirty = true; } + public void Update() { // No animation, exit if (Workspace.animationDef == null) { return; } // Dirty animation, reset - if (Workspace.animationDef != null && Workspace.isDirty) + if (Workspace.animationDef != null && isDirty) { Initialize(); return; } // Update tick if animating @@ -65,14 +73,11 @@ namespace RimWorldAnimationStudio ++cycleIndex; stageTick = 1; - if ((stageLoopDropdown.value == 2 && cycleIndex > int.Parse(cyclesNormalField.text)) || - (stageLoopDropdown.value == 3 && cycleIndex > int.Parse(cyclesFastField.text))) + if ((stageLoopDropdown.value == 2 && cycleIndex >= int.Parse(cyclesNormalField.text)) || + (stageLoopDropdown.value == 3 && cycleIndex >= int.Parse(cyclesFastField.text))) { ++Workspace.stageID; cycleIndex = 0; - - //ResetAnimationTimeline(); - //InitializeAnimationTimeline(); } } @@ -99,7 +104,7 @@ namespace RimWorldAnimationStudio public void UpdateAnimation() { - if (Workspace.Instance.AnimationTimelinesNeedUpdate()) + if (AnimationTimelinesNeedUpdate()) { ResetAnimationTimeline(); InitializeAnimationTimeline(); @@ -109,6 +114,12 @@ namespace RimWorldAnimationStudio for (int actorID = 0; actorID < actorBodies.Count; actorID++) { + if (Workspace.stageID >= Workspace.animationDef?.animationStages.Count) + { Debug.Log("Waiting for animation stage data to initialize..."); return; } + + if (actorID >= Workspace.animationDef?.animationStages[Workspace.stageID]?.animationClips.Count) + { Debug.Log("Waiting for animation clip data to initialize..."); return; } + PawnAnimationClip clip = Workspace.animationDef?.animationStages[Workspace.stageID]?.animationClips[actorID]; if (clip == null) @@ -162,7 +173,7 @@ namespace RimWorldAnimationStudio InitializeAnimationTimeline(); StageCardManager.Instance.Initialize(); - Workspace.isDirty = false; + isDirty = false; } public void InitializeAnimationTimeline() @@ -184,6 +195,8 @@ namespace RimWorldAnimationStudio stageTimelineSlider.maxValue = Workspace.StageWindowSize; stageTimelineSlider.value = 1; stageTick = 1; + + isTimelineDirty = false; } public void Reset() @@ -209,7 +222,9 @@ namespace RimWorldAnimationStudio public bool AddAnimationStage() { AnimationStage stage = new AnimationStage(); - + + Workspace.Instance.MakeDirty(); + return stage.MakeNew(); } @@ -221,6 +236,8 @@ namespace RimWorldAnimationStudio Workspace.animationDef.animationStages.Insert(Workspace.stageID + 1, stage); + Workspace.Instance.MakeDirty(); + return true; } @@ -233,6 +250,8 @@ namespace RimWorldAnimationStudio Workspace.animationDef.animationStages[startIndex] = Workspace.animationDef.animationStages[startIndex + delta]; Workspace.animationDef.animationStages[startIndex + delta] = stage; + Workspace.Instance.MakeDirty(); + return true; } @@ -247,15 +266,17 @@ namespace RimWorldAnimationStudio Workspace.animationDef.animationStages.RemoveAt(Workspace.stageID); Workspace.stageID = Workspace.stageID >= Workspace.animationDef.animationStages.Count ? Workspace.stageID = Workspace.animationDef.animationStages.Count - 1 : Workspace.stageID; + Workspace.Instance.MakeDirty(); + return true; } public void AddActor() { Actor actor = new Actor(); + actor.MakeNew(); - if (actor.MakeNew()) - { Initialize(); } + Workspace.Instance.MakeDirty(); } public void RemoveActor() @@ -272,7 +293,7 @@ namespace RimWorldAnimationStudio Workspace.animationDef.actors.RemoveAt(Workspace.actorID); Workspace.actorID = Workspace.actorID >= Workspace.animationDef.actors.Count ? Workspace.actorID = Workspace.animationDef.actors.Count - 1 : Workspace.actorID; - Initialize(); + Workspace.Instance.MakeDirty(); } public void AddPawnKeyframe() @@ -311,11 +332,15 @@ namespace RimWorldAnimationStudio clip.BuildSimpleCurves(); animationTimelines.GetComponentsInChildren()[Workspace.actorID].AddPawnKeyFrame(keyframe.keyframeID); + + Workspace.Instance.MakeDirty(); } public void RemovePawnKeyframe() { RemovePawnKeyframe(Workspace.actorID, Workspace.keyframeID); + + Workspace.Instance.MakeDirty(); } public void RemovePawnKeyframe(int actorID, int keyframeID) @@ -333,6 +358,8 @@ namespace RimWorldAnimationStudio clip.keyframes.Remove(keyframe); clip.BuildSimpleCurves(); } + + Workspace.Instance.MakeDirty(); } public void ToggleAnimation() @@ -363,6 +390,8 @@ namespace RimWorldAnimationStudio int.TryParse(animationClipTimeField.text, out int newStageTick); stageTick = Mathf.Clamp(newStageTick, 1, Workspace.StageWindowSize); stageTimelineSlider.value = stageTick; + + Workspace.Instance.MakeDirty(); } public void OnAnimationClipLengthFieldChange() @@ -394,8 +423,7 @@ namespace RimWorldAnimationStudio animationClipLengthField.text = newstageWindowSize.ToString(); Workspace.animationDef.animationStages[Workspace.stageID].stageWindowSize = newstageWindowSize; - //ResetAnimationTimeline(); - //InitializeAnimationTimeline(); + Workspace.Instance.MakeDirty(); } public void OnCycleNormalFieldChange() @@ -404,6 +432,8 @@ namespace RimWorldAnimationStudio if (int.TryParse(cyclesNormalField.text, out int cycles)) { Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicks = cycles * Workspace.StageWindowSize; } + + Workspace.Instance.MakeDirty(); } public void OnCycleFastFieldChange() @@ -412,6 +442,44 @@ namespace RimWorldAnimationStudio if (int.TryParse(cyclesFastField.text, out int cycles)) { Workspace.animationDef.animationStages[Workspace.stageID].playTimeTicksQuick = cycles * Workspace.StageWindowSize; } + + Workspace.Instance.MakeDirty(); + } + + private int lastactorCount = 0; + private int lastStageID = 0; + private int lastStageCount = 0; + private int lastStageWindowSize = 0; + + public bool AnimationTimelinesNeedUpdate() + { + if (Workspace.animationDef == null) return false; + + bool update = isTimelineDirty; + + if (lastStageID != Workspace.stageID) + { update = true; } + + if (lastStageCount != Workspace.animationDef.animationStages.Count) + { update = true; } + + if (lastactorCount != Workspace.animationDef.actors.Count) + { update = true; } + + if (lastStageWindowSize != Workspace.StageWindowSize) + { update = true; } + + if (update) + { + lastStageID = Workspace.stageID; + lastStageCount = Workspace.animationDef.animationStages.Count; + lastactorCount = Workspace.animationDef.actors.Count; + lastStageWindowSize = Workspace.StageWindowSize; + + return true; + } + + return false; } } } diff --git a/Assets/Scripts/Managers/ApplicationManager.cs b/Assets/Scripts/Managers/ApplicationManager.cs index 63b83544..87d0b715 100644 --- a/Assets/Scripts/Managers/ApplicationManager.cs +++ b/Assets/Scripts/Managers/ApplicationManager.cs @@ -46,11 +46,15 @@ namespace RimWorldAnimationStudio public void LoadAnimation(AnimationDef animationDef) { + animationDef.RunPostLoadOperations(); Debug.Log("Loaded AnimationDef: " + animationDef.defName); - + Workspace.animationDef = animationDef; animationDef.Initialize(); - Workspace.isDirty = true; + + Workspace.Instance.ClearHistory(); + Workspace.Instance.MakeDirty(); + AnimationController.Instance.MakeDirty(); var animationDefCards = Resources.FindObjectsOfTypeAll(typeof(AnimationDefCard)) as AnimationDefCard[]; @@ -78,16 +82,8 @@ namespace RimWorldAnimationStudio { Debug.Log("Saving AnimationDef: " + Workspace.animationDef.defName); - AnimationDef animationDef = Workspace.animationDef; - - foreach (AnimationStage stage in animationDef.animationStages) - { - foreach (PawnAnimationClip clip in stage.animationClips) - { - clip.keyframes = clip.keyframes.OrderBy(x => x.atTick).ToList(); - } - } - + AnimationDef animationDef = Workspace.animationDef.Copy(); + animationDef.RunPreSaveOperations(); Defs defs = new Defs(); defs.animationDefs.Add(animationDef); @@ -104,7 +100,7 @@ namespace RimWorldAnimationStudio // Add one stage, add one actor, add one clip, add one frame Workspace.animationDef = new AnimationDef(); - Workspace.isDirty = true; + Workspace.Instance.MakeDirty(); var animationDefCards = Resources.FindObjectsOfTypeAll(typeof(AnimationDefCard)) as GameObject[]; diff --git a/Assets/Scripts/Math/Constants/Constants.cs b/Assets/Scripts/Math/Constants/Constants.cs index 90648588..6724110f 100644 --- a/Assets/Scripts/Math/Constants/Constants.cs +++ b/Assets/Scripts/Math/Constants/Constants.cs @@ -18,5 +18,6 @@ namespace RimWorldAnimationStudio public static Color ColorRichOrange = new Color(1.0f, 0.4f, 0.1f); public static Color ColorCyan = new Color(0.0f, 1.0f, 1.0f); public static Color ColorPurple = new Color(0.85f, 0.0f, 1.0f); + public static Color ColorGhost = new Color(0.5f, 0.5f, 0.5f, 0.5f); } } diff --git a/Assets/Scripts/Singleton.cs b/Assets/Scripts/Singleton.cs index d518bc11..effd2f53 100644 --- a/Assets/Scripts/Singleton.cs +++ b/Assets/Scripts/Singleton.cs @@ -39,11 +39,6 @@ namespace RimWorldAnimationStudio } } - private void Awake() - { - DontDestroyOnLoad(this.gameObject); - } - private void OnDestroy() { shuttingDown = true; diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs index 4f14e91c..83612e04 100644 --- a/Assets/Scripts/Workspace/Workspace.cs +++ b/Assets/Scripts/Workspace/Workspace.cs @@ -12,18 +12,18 @@ namespace RimWorldAnimationStudio public static AnimationDef animationDef; public static int stageID = 0; public static int actorID = 0; - public static int keyframeID = 0; - public static bool isDirty = false; + public static int keyframeID = 0; public static List defNames = new List() { "Human" }; - public static List bodyParts = new List() { "Penis", "Vagina", "Anus", "Breasts", "Mouth" }; + public static List bodyParts = new List() { "Any appendage", "Any orifice", "Penis", "Vagina", "Anus", "Breasts", "Mouth" }; public static List bodyDefTypes = new List() { "Human" }; public static List sexTypes = new List() { "None", "Vaginal", "Anal", "Oral", "Masturbation", "DoublePenetration", "Boobjob", "Handjob", "Footjob", "Fingering", "Scissoring", "MutualMasturbation", "Fisting", "MechImplant", "Rimming", "Fellatio", "Cunnilingus", "Sixtynine" }; public static List interactionDefTypes = new List(); - private static List workspaceHistory = new List(); - private static int maxHistoryDepth = 100; - private static int historyIndex = 0; + [SerializeField] private List workspaceHistory = new List(); + [SerializeField] private int historyIndex = 0; + [SerializeField] private int maxHistoryDepth = 100; + private bool isDirty = false; public static ActorManipulationMode actorManipulationMode = ActorManipulationMode.Pan; @@ -41,6 +41,12 @@ namespace RimWorldAnimationStudio } } + public void Update() + { + if (isDirty) + { TrackChanges(); } + } + public PawnKeyframe GetCurrentPawnKeyframe() { int stageTick = AnimationController.Instance.stageTick; @@ -70,21 +76,26 @@ namespace RimWorldAnimationStudio public void TrackChanges() { + Debug.Log("Test"); + Debug.Log(historyIndex + 1); + Debug.Log(workspaceHistory.Count - historyIndex); + if (historyIndex < workspaceHistory.Count - 1) - { workspaceHistory.RemoveRange(historyIndex + 1, workspaceHistory.Count - historyIndex); } + { workspaceHistory.RemoveRange(historyIndex + 1, workspaceHistory.Count - historyIndex - 1); } if (workspaceHistory.Any() && workspaceHistory.Count >= maxHistoryDepth) { workspaceHistory.RemoveAt(0); } WorkspaceSnapShot workspaceSnapShot = new WorkspaceSnapShot(); - workspaceSnapShot.animationDef = animationDef; + workspaceSnapShot.animationDef = animationDef.Copy(); workspaceSnapShot.stageID = stageID; + workspaceSnapShot.actorID = actorID; + workspaceSnapShot.keyframeID = keyframeID; workspaceHistory.Add(workspaceSnapShot); + historyIndex = workspaceHistory.Count - 1; - // track bType for actors, stageID, isdirty - - historyIndex++; + isDirty = false; } public void Undo() @@ -95,51 +106,30 @@ namespace RimWorldAnimationStudio public void Redo() { - historyIndex = Mathf.Clamp(historyIndex - 1, 0, workspaceHistory.Count - 1); + historyIndex = Mathf.Clamp(historyIndex + 1, 0, workspaceHistory.Count - 1); LoadHistoricState(); } public void LoadHistoricState() { - animationDef = workspaceHistory[historyIndex].animationDef; + if (workspaceHistory.NullOrEmpty()) + { Debug.LogWarning("Cannot load historic state - workspace history is empty"); return; } - // All other data + animationDef = workspaceHistory[historyIndex].animationDef.Copy(); + stageID = workspaceHistory[historyIndex].stageID; + actorID = workspaceHistory[historyIndex].actorID; + keyframeID = workspaceHistory[historyIndex].keyframeID; + + AnimationController.Instance.MakeTimelineDirty(); } - private int lastactorCount = 0; - private int lastStageID = 0; - private int lastStageCount = 0; - private int lastStageWindowSize = 0; - - public bool AnimationTimelinesNeedUpdate() + public void ClearHistory() { - if (animationDef == null) return false; - - bool update = false; - - if (lastStageID != stageID) - { update = true; } - - if (lastStageCount != animationDef.animationStages.Count) - { update = true; } - - if (lastactorCount != animationDef.actors.Count) - { update = true; } - - if (lastStageWindowSize != StageWindowSize) - { update = true; } - - if (update) - { - lastStageID = stageID; - lastStageCount = animationDef.animationStages.Count; - lastactorCount = animationDef.actors.Count; - lastStageWindowSize = StageWindowSize; - - return true; - } - - return false; + workspaceHistory.Clear(); + historyIndex = 0; } + + public void MakeDirty() + { isDirty = true; } } } diff --git a/Assets/Scripts/Workspace/WorkspaceSnapShot.cs b/Assets/Scripts/Workspace/WorkspaceSnapShot.cs index 03f9a918..485c12e8 100644 --- a/Assets/Scripts/Workspace/WorkspaceSnapShot.cs +++ b/Assets/Scripts/Workspace/WorkspaceSnapShot.cs @@ -6,9 +6,12 @@ using System.Threading.Tasks; namespace RimWorldAnimationStudio { + [Serializable] public class WorkspaceSnapShot { public AnimationDef animationDef; public int stageID = 0; + public int actorID = 0; + public int keyframeID = 0; } } diff --git a/Library/ArtifactDB b/Library/ArtifactDB index a2f20b6f..162e14be 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/cb/cbbe750524e0b5e7738c2d235efccd87 b/Library/Artifacts/02/02589b07dbf253037789e0ebeae5dd75 similarity index 56% rename from Library/Artifacts/cb/cbbe750524e0b5e7738c2d235efccd87 rename to Library/Artifacts/02/02589b07dbf253037789e0ebeae5dd75 index ad1322ab..4c3d1328 100644 Binary files a/Library/Artifacts/cb/cbbe750524e0b5e7738c2d235efccd87 and b/Library/Artifacts/02/02589b07dbf253037789e0ebeae5dd75 differ diff --git a/Library/Artifacts/f9/f9d273b28ad557433c1dcdbf963a0fe6 b/Library/Artifacts/02/02dfbc3e140b128e7f4b4be4bd460cd3 similarity index 88% rename from Library/Artifacts/f9/f9d273b28ad557433c1dcdbf963a0fe6 rename to Library/Artifacts/02/02dfbc3e140b128e7f4b4be4bd460cd3 index 6dfd1b6e..a0ba5904 100644 Binary files a/Library/Artifacts/f9/f9d273b28ad557433c1dcdbf963a0fe6 and b/Library/Artifacts/02/02dfbc3e140b128e7f4b4be4bd460cd3 differ diff --git a/Library/Artifacts/06/06b98f9db8c6159b65e16e2d90e4e13c b/Library/Artifacts/06/06b98f9db8c6159b65e16e2d90e4e13c new file mode 100644 index 00000000..093b61e8 Binary files /dev/null and b/Library/Artifacts/06/06b98f9db8c6159b65e16e2d90e4e13c differ diff --git a/Library/Artifacts/06/06f4b43d94b07db4e1e5e47ca120de96 b/Library/Artifacts/06/06f4b43d94b07db4e1e5e47ca120de96 new file mode 100644 index 00000000..3f2be488 Binary files /dev/null and b/Library/Artifacts/06/06f4b43d94b07db4e1e5e47ca120de96 differ diff --git a/Library/Artifacts/07/076fcfec114fc3ed263488877c7b1d67 b/Library/Artifacts/07/076fcfec114fc3ed263488877c7b1d67 new file mode 100644 index 00000000..3a1893f3 Binary files /dev/null and b/Library/Artifacts/07/076fcfec114fc3ed263488877c7b1d67 differ diff --git a/Library/Artifacts/08/08068abcf4937551e8ec1caac74416da b/Library/Artifacts/08/08068abcf4937551e8ec1caac74416da new file mode 100644 index 00000000..e79346e4 Binary files /dev/null and b/Library/Artifacts/08/08068abcf4937551e8ec1caac74416da differ diff --git a/Library/Artifacts/08/0896f6e22053ed99937837d0d5861050 b/Library/Artifacts/08/0896f6e22053ed99937837d0d5861050 new file mode 100644 index 00000000..fbb8815d Binary files /dev/null and b/Library/Artifacts/08/0896f6e22053ed99937837d0d5861050 differ diff --git a/Library/Artifacts/09/095d8593fbd527a5050cc6038bcf24fb b/Library/Artifacts/09/095d8593fbd527a5050cc6038bcf24fb new file mode 100644 index 00000000..abe49382 Binary files /dev/null and b/Library/Artifacts/09/095d8593fbd527a5050cc6038bcf24fb differ diff --git a/Library/Artifacts/0b/0b03623b58a6733b6c2c9184e6473581 b/Library/Artifacts/0b/0b03623b58a6733b6c2c9184e6473581 new file mode 100644 index 00000000..53bbf0c9 Binary files /dev/null and b/Library/Artifacts/0b/0b03623b58a6733b6c2c9184e6473581 differ diff --git a/Library/Artifacts/0b/0b42879c52ed6a2db68b059f2537ba59 b/Library/Artifacts/0b/0b42879c52ed6a2db68b059f2537ba59 new file mode 100644 index 00000000..6598b290 Binary files /dev/null and b/Library/Artifacts/0b/0b42879c52ed6a2db68b059f2537ba59 differ diff --git a/Library/Artifacts/0d/0df84995532d44ddb0378bd7136990a4 b/Library/Artifacts/0d/0df84995532d44ddb0378bd7136990a4 new file mode 100644 index 00000000..4b78af1c Binary files /dev/null and b/Library/Artifacts/0d/0df84995532d44ddb0378bd7136990a4 differ diff --git a/Library/Artifacts/10/107f3ee6e5a9cb7eb6cb41bb5bff0429 b/Library/Artifacts/10/107f3ee6e5a9cb7eb6cb41bb5bff0429 new file mode 100644 index 00000000..0590ce1f Binary files /dev/null and b/Library/Artifacts/10/107f3ee6e5a9cb7eb6cb41bb5bff0429 differ diff --git a/Library/Artifacts/11/11fe416d7499ebee5271c16cec0d9748 b/Library/Artifacts/11/11fe416d7499ebee5271c16cec0d9748 new file mode 100644 index 00000000..5a44c602 Binary files /dev/null and b/Library/Artifacts/11/11fe416d7499ebee5271c16cec0d9748 differ diff --git a/Library/Artifacts/12/122d48429f9b0c28de3e54770d6be015 b/Library/Artifacts/12/122d48429f9b0c28de3e54770d6be015 new file mode 100644 index 00000000..cdf3d2aa Binary files /dev/null and b/Library/Artifacts/12/122d48429f9b0c28de3e54770d6be015 differ diff --git a/Library/Artifacts/f5/f565acc4db88a3cfc33ac3d6925724d4 b/Library/Artifacts/1a/1a4d5cda9532a089f011e39958168b2f similarity index 83% rename from Library/Artifacts/f5/f565acc4db88a3cfc33ac3d6925724d4 rename to Library/Artifacts/1a/1a4d5cda9532a089f011e39958168b2f index 2a5e72ee..07225937 100644 Binary files a/Library/Artifacts/f5/f565acc4db88a3cfc33ac3d6925724d4 and b/Library/Artifacts/1a/1a4d5cda9532a089f011e39958168b2f differ diff --git a/Library/Artifacts/1d/1d5f2846db37420b01762206575c4902 b/Library/Artifacts/1d/1d5f2846db37420b01762206575c4902 new file mode 100644 index 00000000..157bba52 Binary files /dev/null and b/Library/Artifacts/1d/1d5f2846db37420b01762206575c4902 differ diff --git a/Library/Artifacts/55/554773a5ce1b152a54c9b73369e648fc b/Library/Artifacts/1f/1f2ac1a057d2afb1f7d1b93ea0302159 similarity index 96% rename from Library/Artifacts/55/554773a5ce1b152a54c9b73369e648fc rename to Library/Artifacts/1f/1f2ac1a057d2afb1f7d1b93ea0302159 index ca56205d..90960740 100644 Binary files a/Library/Artifacts/55/554773a5ce1b152a54c9b73369e648fc and b/Library/Artifacts/1f/1f2ac1a057d2afb1f7d1b93ea0302159 differ diff --git a/Library/Artifacts/25/25144525b11a343ef0f5bdd826e5532a b/Library/Artifacts/25/25144525b11a343ef0f5bdd826e5532a new file mode 100644 index 00000000..9cc1d946 Binary files /dev/null and b/Library/Artifacts/25/25144525b11a343ef0f5bdd826e5532a differ diff --git a/Library/Artifacts/8a/8a57085daeeaddc2607859723cf188d9 b/Library/Artifacts/25/255324ea29d079de27965f7a876bf9ea similarity index 74% rename from Library/Artifacts/8a/8a57085daeeaddc2607859723cf188d9 rename to Library/Artifacts/25/255324ea29d079de27965f7a876bf9ea index 9fbb4639..7140a24f 100644 Binary files a/Library/Artifacts/8a/8a57085daeeaddc2607859723cf188d9 and b/Library/Artifacts/25/255324ea29d079de27965f7a876bf9ea differ diff --git a/Library/Artifacts/26/2684e09c2f19ac1aa213d2118b048641 b/Library/Artifacts/26/2684e09c2f19ac1aa213d2118b048641 new file mode 100644 index 00000000..afac9c9a Binary files /dev/null and b/Library/Artifacts/26/2684e09c2f19ac1aa213d2118b048641 differ diff --git a/Library/Artifacts/28/283ee003f1048806929163729418e059 b/Library/Artifacts/28/283ee003f1048806929163729418e059 deleted file mode 100644 index 13bdc3e3..00000000 Binary files a/Library/Artifacts/28/283ee003f1048806929163729418e059 and /dev/null differ diff --git a/Library/Artifacts/2b/2b65137e8c4d6b9c7995fe3547235db7 b/Library/Artifacts/2b/2b65137e8c4d6b9c7995fe3547235db7 deleted file mode 100644 index b5ae673f..00000000 Binary files a/Library/Artifacts/2b/2b65137e8c4d6b9c7995fe3547235db7 and /dev/null differ diff --git a/Library/Artifacts/2e/2e27364efa61be806b476520990757ac b/Library/Artifacts/2e/2e27364efa61be806b476520990757ac new file mode 100644 index 00000000..afc6e387 Binary files /dev/null and b/Library/Artifacts/2e/2e27364efa61be806b476520990757ac differ diff --git a/Library/Artifacts/30/30a1681818823a6a3f70844d6f4ede89 b/Library/Artifacts/30/30a1681818823a6a3f70844d6f4ede89 new file mode 100644 index 00000000..f78c474c Binary files /dev/null and b/Library/Artifacts/30/30a1681818823a6a3f70844d6f4ede89 differ diff --git a/Library/Artifacts/32/32ebee44b8c6b16ac336d094d8e434db b/Library/Artifacts/32/32ebee44b8c6b16ac336d094d8e434db new file mode 100644 index 00000000..292cb2af Binary files /dev/null and b/Library/Artifacts/32/32ebee44b8c6b16ac336d094d8e434db differ diff --git a/Library/Artifacts/1b/1ba189fd2d5e470cc4801ab919abf4f8 b/Library/Artifacts/34/34184017aee8db755ea2c2d46e3f4765 similarity index 81% rename from Library/Artifacts/1b/1ba189fd2d5e470cc4801ab919abf4f8 rename to Library/Artifacts/34/34184017aee8db755ea2c2d46e3f4765 index b7b72c4b..b3b15424 100644 Binary files a/Library/Artifacts/1b/1ba189fd2d5e470cc4801ab919abf4f8 and b/Library/Artifacts/34/34184017aee8db755ea2c2d46e3f4765 differ diff --git a/Library/Artifacts/34/347a93de92fb8b22f01d8224e4813140 b/Library/Artifacts/34/347a93de92fb8b22f01d8224e4813140 new file mode 100644 index 00000000..6420dded Binary files /dev/null and b/Library/Artifacts/34/347a93de92fb8b22f01d8224e4813140 differ diff --git a/Library/Artifacts/38/389651417c78679dd53c3f6cae3453f0 b/Library/Artifacts/38/389651417c78679dd53c3f6cae3453f0 new file mode 100644 index 00000000..5a4f8f68 Binary files /dev/null and b/Library/Artifacts/38/389651417c78679dd53c3f6cae3453f0 differ diff --git a/Library/Artifacts/39/3959e26e570f241f335f4a8672a3dcf8 b/Library/Artifacts/39/3959e26e570f241f335f4a8672a3dcf8 deleted file mode 100644 index ca010c7e..00000000 Binary files a/Library/Artifacts/39/3959e26e570f241f335f4a8672a3dcf8 and /dev/null differ diff --git a/Library/Artifacts/9d/9ddf4a7eb5959e2b6f8b52438312c1b6 b/Library/Artifacts/3a/3aa949aec95c327ae62abf2228f98d11 similarity index 64% rename from Library/Artifacts/9d/9ddf4a7eb5959e2b6f8b52438312c1b6 rename to Library/Artifacts/3a/3aa949aec95c327ae62abf2228f98d11 index e3ea71ed..5d596ca0 100644 Binary files a/Library/Artifacts/9d/9ddf4a7eb5959e2b6f8b52438312c1b6 and b/Library/Artifacts/3a/3aa949aec95c327ae62abf2228f98d11 differ diff --git a/Library/Artifacts/3b/3b623aad3c8de94ca93f6fc96ce868e6 b/Library/Artifacts/3b/3b623aad3c8de94ca93f6fc96ce868e6 new file mode 100644 index 00000000..15d9a637 Binary files /dev/null and b/Library/Artifacts/3b/3b623aad3c8de94ca93f6fc96ce868e6 differ diff --git a/Library/Artifacts/42/426c9128e64c47dc2a3f7eac07e4f89a b/Library/Artifacts/42/426c9128e64c47dc2a3f7eac07e4f89a deleted file mode 100644 index 9e59c60f..00000000 Binary files a/Library/Artifacts/42/426c9128e64c47dc2a3f7eac07e4f89a and /dev/null differ diff --git a/Library/Artifacts/42/42b38c6769d3c77cba2d49b632ca3993 b/Library/Artifacts/42/42b38c6769d3c77cba2d49b632ca3993 new file mode 100644 index 00000000..0a0d5d2a Binary files /dev/null and b/Library/Artifacts/42/42b38c6769d3c77cba2d49b632ca3993 differ diff --git a/Library/Artifacts/3b/3bf58768a637452779e581c2e6257427 b/Library/Artifacts/42/42c9b03d70b73e4b51b9f2bff1bae445 similarity index 99% rename from Library/Artifacts/3b/3bf58768a637452779e581c2e6257427 rename to Library/Artifacts/42/42c9b03d70b73e4b51b9f2bff1bae445 index 58ad4c70..ce7fd2eb 100644 Binary files a/Library/Artifacts/3b/3bf58768a637452779e581c2e6257427 and b/Library/Artifacts/42/42c9b03d70b73e4b51b9f2bff1bae445 differ diff --git a/Library/Artifacts/ee/eea6751b18221b1d6011bdc2d9c63ee3 b/Library/Artifacts/47/4757847527f9d32a6660b3e9fc0b3ad4 similarity index 99% rename from Library/Artifacts/ee/eea6751b18221b1d6011bdc2d9c63ee3 rename to Library/Artifacts/47/4757847527f9d32a6660b3e9fc0b3ad4 index 5b7ca819..400a2863 100644 Binary files a/Library/Artifacts/ee/eea6751b18221b1d6011bdc2d9c63ee3 and b/Library/Artifacts/47/4757847527f9d32a6660b3e9fc0b3ad4 differ diff --git a/Library/Artifacts/48/4847112b2cf71b2f45f6016ed1b3ebe7 b/Library/Artifacts/48/4847112b2cf71b2f45f6016ed1b3ebe7 deleted file mode 100644 index 17fcbbd1..00000000 Binary files a/Library/Artifacts/48/4847112b2cf71b2f45f6016ed1b3ebe7 and /dev/null differ diff --git a/Library/Artifacts/7f/7fb66242170d856e3756054de7e4d826 b/Library/Artifacts/4a/4a61bcc8c5ad5336d03a19fad472dc01 similarity index 74% rename from Library/Artifacts/7f/7fb66242170d856e3756054de7e4d826 rename to Library/Artifacts/4a/4a61bcc8c5ad5336d03a19fad472dc01 index da83c623..d4fdaf1b 100644 Binary files a/Library/Artifacts/7f/7fb66242170d856e3756054de7e4d826 and b/Library/Artifacts/4a/4a61bcc8c5ad5336d03a19fad472dc01 differ diff --git a/Library/Artifacts/4a/4a61bd6f60ec3083f48c32c2af1e1fd1 b/Library/Artifacts/4a/4a61bd6f60ec3083f48c32c2af1e1fd1 new file mode 100644 index 00000000..44144893 Binary files /dev/null and b/Library/Artifacts/4a/4a61bd6f60ec3083f48c32c2af1e1fd1 differ diff --git a/Library/Artifacts/4b/4bb23e6a4cbe1ced09da9488fa26c073 b/Library/Artifacts/4b/4bb23e6a4cbe1ced09da9488fa26c073 new file mode 100644 index 00000000..3e47a3e6 Binary files /dev/null and b/Library/Artifacts/4b/4bb23e6a4cbe1ced09da9488fa26c073 differ diff --git a/Library/Artifacts/4f/4f747451bd0a2bc05124a248adaacc72 b/Library/Artifacts/4f/4f747451bd0a2bc05124a248adaacc72 new file mode 100644 index 00000000..8df4ca49 Binary files /dev/null and b/Library/Artifacts/4f/4f747451bd0a2bc05124a248adaacc72 differ diff --git a/Library/Artifacts/4f/4fa68673775e1285528d313687872e4c b/Library/Artifacts/4f/4fa68673775e1285528d313687872e4c new file mode 100644 index 00000000..77fb9ee8 Binary files /dev/null and b/Library/Artifacts/4f/4fa68673775e1285528d313687872e4c differ diff --git a/Library/Artifacts/52/525fb55f112b3a36fc0f6fb2e83663e9 b/Library/Artifacts/52/525fb55f112b3a36fc0f6fb2e83663e9 new file mode 100644 index 00000000..47c6543d Binary files /dev/null and b/Library/Artifacts/52/525fb55f112b3a36fc0f6fb2e83663e9 differ diff --git a/Library/Artifacts/5c/5c4b6027afde652f95aa7de5819c5598 b/Library/Artifacts/5c/5c4b6027afde652f95aa7de5819c5598 new file mode 100644 index 00000000..b2dc1c09 Binary files /dev/null and b/Library/Artifacts/5c/5c4b6027afde652f95aa7de5819c5598 differ diff --git a/Library/Artifacts/5f/5f7ba66a5f49521c9abaf3f2300a89bd b/Library/Artifacts/5f/5f7ba66a5f49521c9abaf3f2300a89bd deleted file mode 100644 index 77c59a87..00000000 Binary files a/Library/Artifacts/5f/5f7ba66a5f49521c9abaf3f2300a89bd and /dev/null differ diff --git a/Library/Artifacts/05/0561447c154a8039e6896a5af9167cff b/Library/Artifacts/63/6351246587b6bc72ddbd210f0d76a620 similarity index 98% rename from Library/Artifacts/05/0561447c154a8039e6896a5af9167cff rename to Library/Artifacts/63/6351246587b6bc72ddbd210f0d76a620 index 078b1eba..911b968f 100644 Binary files a/Library/Artifacts/05/0561447c154a8039e6896a5af9167cff and b/Library/Artifacts/63/6351246587b6bc72ddbd210f0d76a620 differ diff --git a/Library/Artifacts/64/64e2af6d096e9d9ac49a297b706cc81d b/Library/Artifacts/64/64e2af6d096e9d9ac49a297b706cc81d new file mode 100644 index 00000000..8276bbaa Binary files /dev/null and b/Library/Artifacts/64/64e2af6d096e9d9ac49a297b706cc81d differ diff --git a/Library/Artifacts/66/66413c3077e42e57fade4d9b62cf33fc b/Library/Artifacts/66/66413c3077e42e57fade4d9b62cf33fc new file mode 100644 index 00000000..c037be67 Binary files /dev/null and b/Library/Artifacts/66/66413c3077e42e57fade4d9b62cf33fc differ diff --git a/Library/Artifacts/69/6952660f8eeeadc26e8b5de1bd7bc8aa b/Library/Artifacts/69/6952660f8eeeadc26e8b5de1bd7bc8aa new file mode 100644 index 00000000..39f13531 Binary files /dev/null and b/Library/Artifacts/69/6952660f8eeeadc26e8b5de1bd7bc8aa differ diff --git a/Library/Artifacts/69/697937d58c4f7ae977b6774bcb938584 b/Library/Artifacts/69/697937d58c4f7ae977b6774bcb938584 new file mode 100644 index 00000000..7aac3a7e Binary files /dev/null and b/Library/Artifacts/69/697937d58c4f7ae977b6774bcb938584 differ diff --git a/Library/Artifacts/6a/6a9c07be4c1ed2f1f2038f07317a38cb b/Library/Artifacts/6a/6a9c07be4c1ed2f1f2038f07317a38cb new file mode 100644 index 00000000..e86c4e2c Binary files /dev/null and b/Library/Artifacts/6a/6a9c07be4c1ed2f1f2038f07317a38cb differ diff --git a/Library/Artifacts/6b/6b6a3e0c077e9734ad55c0bf758dcf50 b/Library/Artifacts/6b/6b6a3e0c077e9734ad55c0bf758dcf50 new file mode 100644 index 00000000..259d60da Binary files /dev/null and b/Library/Artifacts/6b/6b6a3e0c077e9734ad55c0bf758dcf50 differ diff --git a/Library/Artifacts/6c/6cbbbafbd1daf0e90aaeebab68613c70 b/Library/Artifacts/6c/6cbbbafbd1daf0e90aaeebab68613c70 deleted file mode 100644 index 7f59e880..00000000 Binary files a/Library/Artifacts/6c/6cbbbafbd1daf0e90aaeebab68613c70 and /dev/null differ diff --git a/Library/Artifacts/70/701b133079cd05fec2bdc7270294dab6 b/Library/Artifacts/70/701b133079cd05fec2bdc7270294dab6 new file mode 100644 index 00000000..9cf073ee Binary files /dev/null and b/Library/Artifacts/70/701b133079cd05fec2bdc7270294dab6 differ diff --git a/Library/Artifacts/72/72557898fc227e9c07818b392414685a b/Library/Artifacts/72/72557898fc227e9c07818b392414685a new file mode 100644 index 00000000..bb0adb39 Binary files /dev/null and b/Library/Artifacts/72/72557898fc227e9c07818b392414685a differ diff --git a/Library/Artifacts/72/7299cec76c8d5258340b25b8817cf67e b/Library/Artifacts/72/7299cec76c8d5258340b25b8817cf67e new file mode 100644 index 00000000..83f88812 Binary files /dev/null and b/Library/Artifacts/72/7299cec76c8d5258340b25b8817cf67e differ diff --git a/Library/Artifacts/75/756edb5853b2b55d51df2e1307faafe0 b/Library/Artifacts/75/756edb5853b2b55d51df2e1307faafe0 new file mode 100644 index 00000000..a6e74ffb Binary files /dev/null and b/Library/Artifacts/75/756edb5853b2b55d51df2e1307faafe0 differ diff --git a/Library/Artifacts/78/787e7e38257f8ebad8e432f58993ecea b/Library/Artifacts/78/787e7e38257f8ebad8e432f58993ecea deleted file mode 100644 index 4e1d8e4e..00000000 Binary files a/Library/Artifacts/78/787e7e38257f8ebad8e432f58993ecea and /dev/null differ diff --git a/Library/Artifacts/67/67e4f8e30b53b4174a607257ac63ee48 b/Library/Artifacts/78/78cbdfe0df76dbdfa17113afbf76a3bc similarity index 94% rename from Library/Artifacts/67/67e4f8e30b53b4174a607257ac63ee48 rename to Library/Artifacts/78/78cbdfe0df76dbdfa17113afbf76a3bc index b7c3b268..80d801e5 100644 Binary files a/Library/Artifacts/67/67e4f8e30b53b4174a607257ac63ee48 and b/Library/Artifacts/78/78cbdfe0df76dbdfa17113afbf76a3bc differ diff --git a/Library/Artifacts/7d/7d909b99dbc1138b5fa8fa3bcce82953 b/Library/Artifacts/7d/7d909b99dbc1138b5fa8fa3bcce82953 new file mode 100644 index 00000000..bb73bba6 Binary files /dev/null and b/Library/Artifacts/7d/7d909b99dbc1138b5fa8fa3bcce82953 differ diff --git a/Library/Artifacts/24/246c7723954f026e3885759c48e8e8c3 b/Library/Artifacts/81/819aab37e141d4c6d3fac711fb58150a similarity index 88% rename from Library/Artifacts/24/246c7723954f026e3885759c48e8e8c3 rename to Library/Artifacts/81/819aab37e141d4c6d3fac711fb58150a index f9604e64..a443a379 100644 Binary files a/Library/Artifacts/24/246c7723954f026e3885759c48e8e8c3 and b/Library/Artifacts/81/819aab37e141d4c6d3fac711fb58150a differ diff --git a/Library/Artifacts/82/825b46c33919c8e1de74b4fe7475a6bf b/Library/Artifacts/82/825b46c33919c8e1de74b4fe7475a6bf deleted file mode 100644 index 9f9082f7..00000000 Binary files a/Library/Artifacts/82/825b46c33919c8e1de74b4fe7475a6bf and /dev/null differ diff --git a/Library/Artifacts/82/82d71af5a319d1ad77bfa759e079854a b/Library/Artifacts/82/82d71af5a319d1ad77bfa759e079854a new file mode 100644 index 00000000..442bfa10 Binary files /dev/null and b/Library/Artifacts/82/82d71af5a319d1ad77bfa759e079854a differ diff --git a/Library/Artifacts/84/843293598ecdbaa261d52ec18ff301f3 b/Library/Artifacts/84/843293598ecdbaa261d52ec18ff301f3 new file mode 100644 index 00000000..657b9e5f Binary files /dev/null and b/Library/Artifacts/84/843293598ecdbaa261d52ec18ff301f3 differ diff --git a/Library/Artifacts/85/85588823cce39fa6e2d31c05faf6f19c b/Library/Artifacts/85/85588823cce39fa6e2d31c05faf6f19c new file mode 100644 index 00000000..97340b3f Binary files /dev/null and b/Library/Artifacts/85/85588823cce39fa6e2d31c05faf6f19c differ diff --git a/Library/Artifacts/87/87701e21a1de3dbc6c893f7eca0169ac b/Library/Artifacts/87/87701e21a1de3dbc6c893f7eca0169ac new file mode 100644 index 00000000..2cfe37d9 Binary files /dev/null and b/Library/Artifacts/87/87701e21a1de3dbc6c893f7eca0169ac differ diff --git a/Library/Artifacts/9e/9ef7baae4df7c41929a3b03df8aabe68 b/Library/Artifacts/8b/8b7ff373096e26eebc5f193f256fb778 similarity index 96% rename from Library/Artifacts/9e/9ef7baae4df7c41929a3b03df8aabe68 rename to Library/Artifacts/8b/8b7ff373096e26eebc5f193f256fb778 index 3197b983..8a652738 100644 Binary files a/Library/Artifacts/9e/9ef7baae4df7c41929a3b03df8aabe68 and b/Library/Artifacts/8b/8b7ff373096e26eebc5f193f256fb778 differ diff --git a/Library/Artifacts/c2/c295bc2fcd0ab520efb85cc27dfc0d9b b/Library/Artifacts/8b/8bc1cfd0cc7b8a12a68c8ccf3cff4799 similarity index 92% rename from Library/Artifacts/c2/c295bc2fcd0ab520efb85cc27dfc0d9b rename to Library/Artifacts/8b/8bc1cfd0cc7b8a12a68c8ccf3cff4799 index 7825cb1b..5f78b210 100644 Binary files a/Library/Artifacts/c2/c295bc2fcd0ab520efb85cc27dfc0d9b and b/Library/Artifacts/8b/8bc1cfd0cc7b8a12a68c8ccf3cff4799 differ diff --git a/Library/Artifacts/05/059180618b611ecbf7ec7b1cfdc51e06 b/Library/Artifacts/8e/8e4ed202b60e7d40c9c6c6bf500b3608 similarity index 94% rename from Library/Artifacts/05/059180618b611ecbf7ec7b1cfdc51e06 rename to Library/Artifacts/8e/8e4ed202b60e7d40c9c6c6bf500b3608 index 38818a67..d1d79e52 100644 Binary files a/Library/Artifacts/05/059180618b611ecbf7ec7b1cfdc51e06 and b/Library/Artifacts/8e/8e4ed202b60e7d40c9c6c6bf500b3608 differ diff --git a/Library/Artifacts/8f/8fc6ebfe936174cc90f962eea0dd4362 b/Library/Artifacts/8f/8fc6ebfe936174cc90f962eea0dd4362 new file mode 100644 index 00000000..be4b5004 Binary files /dev/null and b/Library/Artifacts/8f/8fc6ebfe936174cc90f962eea0dd4362 differ diff --git a/Library/Artifacts/90/902a55490f01f9c94ab86722e59c06e4 b/Library/Artifacts/90/902a55490f01f9c94ab86722e59c06e4 new file mode 100644 index 00000000..f804e04b Binary files /dev/null and b/Library/Artifacts/90/902a55490f01f9c94ab86722e59c06e4 differ diff --git a/Library/Artifacts/6f/6f98020403dc1061570eca17321ba04a b/Library/Artifacts/91/919750943dbff4772d5c65a497ef8335 similarity index 99% rename from Library/Artifacts/6f/6f98020403dc1061570eca17321ba04a rename to Library/Artifacts/91/919750943dbff4772d5c65a497ef8335 index 233d9601..4a6dfa33 100644 Binary files a/Library/Artifacts/6f/6f98020403dc1061570eca17321ba04a and b/Library/Artifacts/91/919750943dbff4772d5c65a497ef8335 differ diff --git a/Library/Artifacts/92/926c4df9b86000a554fc8ea974b67bb7 b/Library/Artifacts/92/926c4df9b86000a554fc8ea974b67bb7 new file mode 100644 index 00000000..c40c5cc8 Binary files /dev/null and b/Library/Artifacts/92/926c4df9b86000a554fc8ea974b67bb7 differ diff --git a/Library/Artifacts/27/278f6a2ef60e9a7ef546b0dd0302dec2 b/Library/Artifacts/93/93fd9f64ad02da444872cbf45cd43f51 similarity index 99% rename from Library/Artifacts/27/278f6a2ef60e9a7ef546b0dd0302dec2 rename to Library/Artifacts/93/93fd9f64ad02da444872cbf45cd43f51 index ec8ac848..9cff4a47 100644 Binary files a/Library/Artifacts/27/278f6a2ef60e9a7ef546b0dd0302dec2 and b/Library/Artifacts/93/93fd9f64ad02da444872cbf45cd43f51 differ diff --git a/Library/Artifacts/9b/9bf8b3d1f01d61063a3d80bd87fe6e91 b/Library/Artifacts/9b/9bf8b3d1f01d61063a3d80bd87fe6e91 new file mode 100644 index 00000000..5192777e Binary files /dev/null and b/Library/Artifacts/9b/9bf8b3d1f01d61063a3d80bd87fe6e91 differ diff --git a/Library/Artifacts/9e/9eafa20735a7e46bf3df0405cde55792 b/Library/Artifacts/9e/9eafa20735a7e46bf3df0405cde55792 new file mode 100644 index 00000000..8d72ee62 Binary files /dev/null and b/Library/Artifacts/9e/9eafa20735a7e46bf3df0405cde55792 differ diff --git a/Library/Artifacts/9f/9f88a55822386eaf7c1d652d14e412eb b/Library/Artifacts/9f/9f88a55822386eaf7c1d652d14e412eb deleted file mode 100644 index 3c3043e5..00000000 Binary files a/Library/Artifacts/9f/9f88a55822386eaf7c1d652d14e412eb and /dev/null differ diff --git a/Library/Artifacts/a2/a2feb69b7d8292e0370c8b8c0f7c1330 b/Library/Artifacts/a2/a2feb69b7d8292e0370c8b8c0f7c1330 new file mode 100644 index 00000000..2d834c7b Binary files /dev/null and b/Library/Artifacts/a2/a2feb69b7d8292e0370c8b8c0f7c1330 differ diff --git a/Library/Artifacts/bc/bc58b764d80325ab74cc893955ccc0eb b/Library/Artifacts/a4/a49f9605c5a8feeb1ae4d780f0d2b8ef similarity index 86% rename from Library/Artifacts/bc/bc58b764d80325ab74cc893955ccc0eb rename to Library/Artifacts/a4/a49f9605c5a8feeb1ae4d780f0d2b8ef index 554befb8..95dc73cf 100644 Binary files a/Library/Artifacts/bc/bc58b764d80325ab74cc893955ccc0eb and b/Library/Artifacts/a4/a49f9605c5a8feeb1ae4d780f0d2b8ef differ diff --git a/Library/Artifacts/b5/b51f71437178b6650e7e628da978427f b/Library/Artifacts/a4/a4b3efefe3e1f9c3be1c73c706e381a3 similarity index 95% rename from Library/Artifacts/b5/b51f71437178b6650e7e628da978427f rename to Library/Artifacts/a4/a4b3efefe3e1f9c3be1c73c706e381a3 index 91ca36a5..d9192405 100644 Binary files a/Library/Artifacts/b5/b51f71437178b6650e7e628da978427f and b/Library/Artifacts/a4/a4b3efefe3e1f9c3be1c73c706e381a3 differ diff --git a/Library/Artifacts/b3/b3e0b904f5618a8ada0b5c8e7f2d5bef b/Library/Artifacts/a5/a59227eaf9245f7ebb006c5d6e11a07b similarity index 97% rename from Library/Artifacts/b3/b3e0b904f5618a8ada0b5c8e7f2d5bef rename to Library/Artifacts/a5/a59227eaf9245f7ebb006c5d6e11a07b index e320a8fd..be0f369d 100644 Binary files a/Library/Artifacts/b3/b3e0b904f5618a8ada0b5c8e7f2d5bef and b/Library/Artifacts/a5/a59227eaf9245f7ebb006c5d6e11a07b differ diff --git a/Library/Artifacts/a7/a7ae14a40fc67f502a43fbbb39a0f300 b/Library/Artifacts/a7/a7ae14a40fc67f502a43fbbb39a0f300 new file mode 100644 index 00000000..444f8095 Binary files /dev/null and b/Library/Artifacts/a7/a7ae14a40fc67f502a43fbbb39a0f300 differ diff --git a/Library/Artifacts/a8/a82227fbd34200d3a28ce41591e2604f b/Library/Artifacts/a8/a82227fbd34200d3a28ce41591e2604f new file mode 100644 index 00000000..37bd8d2c Binary files /dev/null and b/Library/Artifacts/a8/a82227fbd34200d3a28ce41591e2604f differ diff --git a/Library/Artifacts/a8/a8d80fb36ad1a2f9cac80cfc1c24c322 b/Library/Artifacts/a8/a8d80fb36ad1a2f9cac80cfc1c24c322 deleted file mode 100644 index 3ef816ee..00000000 Binary files a/Library/Artifacts/a8/a8d80fb36ad1a2f9cac80cfc1c24c322 and /dev/null differ diff --git a/Library/Artifacts/ab/abe5b8bbc61a5c45ccf8c987001cc786 b/Library/Artifacts/ab/abe5b8bbc61a5c45ccf8c987001cc786 new file mode 100644 index 00000000..24d95aad Binary files /dev/null and b/Library/Artifacts/ab/abe5b8bbc61a5c45ccf8c987001cc786 differ diff --git a/Library/Artifacts/ac/ac9be49fad511b4eaf2d0b0d279bc33c b/Library/Artifacts/ac/ac9be49fad511b4eaf2d0b0d279bc33c deleted file mode 100644 index ada0ca4d..00000000 Binary files a/Library/Artifacts/ac/ac9be49fad511b4eaf2d0b0d279bc33c and /dev/null differ diff --git a/Library/Artifacts/e7/e7bda01e83eca40c89389790a3727f8d b/Library/Artifacts/ae/ae9cebe0166e7c91f8073561bbcaa6d5 similarity index 82% rename from Library/Artifacts/e7/e7bda01e83eca40c89389790a3727f8d rename to Library/Artifacts/ae/ae9cebe0166e7c91f8073561bbcaa6d5 index 102aec6d..3c3e7928 100644 Binary files a/Library/Artifacts/e7/e7bda01e83eca40c89389790a3727f8d and b/Library/Artifacts/ae/ae9cebe0166e7c91f8073561bbcaa6d5 differ diff --git a/Library/Artifacts/de/de77ed6b9b74e2fe8b0bf29924e01118 b/Library/Artifacts/af/af960002e466bf32c7f302436b2618ab similarity index 56% rename from Library/Artifacts/de/de77ed6b9b74e2fe8b0bf29924e01118 rename to Library/Artifacts/af/af960002e466bf32c7f302436b2618ab index 063e3c99..90626973 100644 Binary files a/Library/Artifacts/de/de77ed6b9b74e2fe8b0bf29924e01118 and b/Library/Artifacts/af/af960002e466bf32c7f302436b2618ab differ diff --git a/Library/Artifacts/b2/b27d3acae37041e1277a5de4e0de3578 b/Library/Artifacts/b2/b27d3acae37041e1277a5de4e0de3578 new file mode 100644 index 00000000..d0c08312 Binary files /dev/null and b/Library/Artifacts/b2/b27d3acae37041e1277a5de4e0de3578 differ diff --git a/Library/Artifacts/d3/d3110cb14f750c23bb8bb8f1bd7e8aa5 b/Library/Artifacts/b3/b38441b55db46a59f47fed326faf5522 similarity index 95% rename from Library/Artifacts/d3/d3110cb14f750c23bb8bb8f1bd7e8aa5 rename to Library/Artifacts/b3/b38441b55db46a59f47fed326faf5522 index 2e01c12e..5bd50ce8 100644 Binary files a/Library/Artifacts/d3/d3110cb14f750c23bb8bb8f1bd7e8aa5 and b/Library/Artifacts/b3/b38441b55db46a59f47fed326faf5522 differ diff --git a/Library/Artifacts/b3/b3d021050f94c8b017ebfeb5f99be22a b/Library/Artifacts/b3/b3d021050f94c8b017ebfeb5f99be22a deleted file mode 100644 index 854239a7..00000000 Binary files a/Library/Artifacts/b3/b3d021050f94c8b017ebfeb5f99be22a and /dev/null differ diff --git a/Library/Artifacts/b8/b86d27cd706ad83b4aa1f055a0db0865 b/Library/Artifacts/b8/b86d27cd706ad83b4aa1f055a0db0865 new file mode 100644 index 00000000..0ba50dfc Binary files /dev/null and b/Library/Artifacts/b8/b86d27cd706ad83b4aa1f055a0db0865 differ diff --git a/Library/Artifacts/b8/b88790641c846f2b2cb3d6b9f1d5b3e0 b/Library/Artifacts/b8/b88790641c846f2b2cb3d6b9f1d5b3e0 deleted file mode 100644 index c60e656e..00000000 Binary files a/Library/Artifacts/b8/b88790641c846f2b2cb3d6b9f1d5b3e0 and /dev/null differ diff --git a/Library/Artifacts/b9/b98a629929ef585e245641fac49b850c b/Library/Artifacts/b9/b98a629929ef585e245641fac49b850c deleted file mode 100644 index 477d6392..00000000 Binary files a/Library/Artifacts/b9/b98a629929ef585e245641fac49b850c and /dev/null differ diff --git a/Library/Artifacts/ba/ba71927f281c8a18be946a54d97f2973 b/Library/Artifacts/ba/ba71927f281c8a18be946a54d97f2973 new file mode 100644 index 00000000..3a94f6dc Binary files /dev/null and b/Library/Artifacts/ba/ba71927f281c8a18be946a54d97f2973 differ diff --git a/Library/Artifacts/81/81d1635f10cf91bfb85a664a0fc29967 b/Library/Artifacts/bc/bc7dbae62251fa42ed6e32da99ce8d7d similarity index 57% rename from Library/Artifacts/81/81d1635f10cf91bfb85a664a0fc29967 rename to Library/Artifacts/bc/bc7dbae62251fa42ed6e32da99ce8d7d index cb0f7d9a..32cefe6a 100644 Binary files a/Library/Artifacts/81/81d1635f10cf91bfb85a664a0fc29967 and b/Library/Artifacts/bc/bc7dbae62251fa42ed6e32da99ce8d7d differ diff --git a/Library/Artifacts/be/becd220ffbe04c36086edd07f81312fa b/Library/Artifacts/be/becd220ffbe04c36086edd07f81312fa new file mode 100644 index 00000000..8ae90cfa Binary files /dev/null and b/Library/Artifacts/be/becd220ffbe04c36086edd07f81312fa differ diff --git a/Library/Artifacts/bf/bf1ec12be158c0eae57a12260628d0f2 b/Library/Artifacts/bf/bf1ec12be158c0eae57a12260628d0f2 new file mode 100644 index 00000000..5780959b Binary files /dev/null and b/Library/Artifacts/bf/bf1ec12be158c0eae57a12260628d0f2 differ diff --git a/Library/Artifacts/bf/bf6b0719435bbdfccebc3cf5de8d846f b/Library/Artifacts/bf/bf6b0719435bbdfccebc3cf5de8d846f new file mode 100644 index 00000000..c3866ad7 Binary files /dev/null and b/Library/Artifacts/bf/bf6b0719435bbdfccebc3cf5de8d846f differ diff --git a/Library/Artifacts/c3/c306a94232f9ce6b3bf8a53b98cf2c2d b/Library/Artifacts/c3/c306a94232f9ce6b3bf8a53b98cf2c2d new file mode 100644 index 00000000..7b1bfb66 Binary files /dev/null and b/Library/Artifacts/c3/c306a94232f9ce6b3bf8a53b98cf2c2d differ diff --git a/Library/Artifacts/c4/c453cac47280fd6840516aeb4f2efe8b b/Library/Artifacts/c4/c453cac47280fd6840516aeb4f2efe8b new file mode 100644 index 00000000..38b8dbf8 Binary files /dev/null and b/Library/Artifacts/c4/c453cac47280fd6840516aeb4f2efe8b differ diff --git a/Library/Artifacts/c4/c4fce3f124e42a3d9d0dc3a6d8213e62 b/Library/Artifacts/c4/c4fce3f124e42a3d9d0dc3a6d8213e62 deleted file mode 100644 index cb45138a..00000000 Binary files a/Library/Artifacts/c4/c4fce3f124e42a3d9d0dc3a6d8213e62 and /dev/null differ diff --git a/Library/Artifacts/c6/c62f2711aabddbf1c75371258c5bddbc b/Library/Artifacts/c6/c62f2711aabddbf1c75371258c5bddbc new file mode 100644 index 00000000..23fdde12 Binary files /dev/null and b/Library/Artifacts/c6/c62f2711aabddbf1c75371258c5bddbc differ diff --git a/Library/Artifacts/c7/c71af771725cf8cbc498a7431ce62de8 b/Library/Artifacts/c7/c71af771725cf8cbc498a7431ce62de8 new file mode 100644 index 00000000..7d927e5f Binary files /dev/null and b/Library/Artifacts/c7/c71af771725cf8cbc498a7431ce62de8 differ diff --git a/Library/Artifacts/ca/ca131cef9dcf0c466eb33ee5a25b3929 b/Library/Artifacts/ca/ca131cef9dcf0c466eb33ee5a25b3929 new file mode 100644 index 00000000..7f0303da Binary files /dev/null and b/Library/Artifacts/ca/ca131cef9dcf0c466eb33ee5a25b3929 differ diff --git a/Library/Artifacts/e1/e1d56466bb79b78853d4b8b900984d89 b/Library/Artifacts/cc/cc01f67a22f38378ed19fa00c57265a8 similarity index 95% rename from Library/Artifacts/e1/e1d56466bb79b78853d4b8b900984d89 rename to Library/Artifacts/cc/cc01f67a22f38378ed19fa00c57265a8 index 97d6397a..1d376fb3 100644 Binary files a/Library/Artifacts/e1/e1d56466bb79b78853d4b8b900984d89 and b/Library/Artifacts/cc/cc01f67a22f38378ed19fa00c57265a8 differ diff --git a/Library/Artifacts/cc/ccb5c3c9bb0e55c06d3c1343dd31ac8c b/Library/Artifacts/cc/ccb5c3c9bb0e55c06d3c1343dd31ac8c deleted file mode 100644 index 1605a0cf..00000000 Binary files a/Library/Artifacts/cc/ccb5c3c9bb0e55c06d3c1343dd31ac8c and /dev/null differ diff --git a/Library/Artifacts/ce/ce175429e9ee54042b9882d37bf0c052 b/Library/Artifacts/ce/ce175429e9ee54042b9882d37bf0c052 new file mode 100644 index 00000000..117c9cf4 Binary files /dev/null and b/Library/Artifacts/ce/ce175429e9ee54042b9882d37bf0c052 differ diff --git a/Library/Artifacts/37/372c55347b3127eae3b16a900ef856d3 b/Library/Artifacts/ce/ce86e00d5a96af23a160e6ce57de3441 similarity index 94% rename from Library/Artifacts/37/372c55347b3127eae3b16a900ef856d3 rename to Library/Artifacts/ce/ce86e00d5a96af23a160e6ce57de3441 index 9977d628..c2fdc81f 100644 Binary files a/Library/Artifacts/37/372c55347b3127eae3b16a900ef856d3 and b/Library/Artifacts/ce/ce86e00d5a96af23a160e6ce57de3441 differ diff --git a/Library/Artifacts/d0/d0ea33fea57c8d3c50dfa7f5176f6714 b/Library/Artifacts/d0/d0ea33fea57c8d3c50dfa7f5176f6714 new file mode 100644 index 00000000..ac4b77e2 Binary files /dev/null and b/Library/Artifacts/d0/d0ea33fea57c8d3c50dfa7f5176f6714 differ diff --git a/Library/Artifacts/d3/d38b906da1d64ab1a3fb2359d9ef06e0 b/Library/Artifacts/d3/d38b906da1d64ab1a3fb2359d9ef06e0 new file mode 100644 index 00000000..58010e50 Binary files /dev/null and b/Library/Artifacts/d3/d38b906da1d64ab1a3fb2359d9ef06e0 differ diff --git a/Library/Artifacts/d4/d427fb2b24230574b82befbfed4d1682 b/Library/Artifacts/d4/d427fb2b24230574b82befbfed4d1682 new file mode 100644 index 00000000..1ef02321 Binary files /dev/null and b/Library/Artifacts/d4/d427fb2b24230574b82befbfed4d1682 differ diff --git a/Library/Artifacts/d8/d8d119ec2bf4743687c0f043191c34a1 b/Library/Artifacts/d8/d8d119ec2bf4743687c0f043191c34a1 new file mode 100644 index 00000000..ba4fd828 Binary files /dev/null and b/Library/Artifacts/d8/d8d119ec2bf4743687c0f043191c34a1 differ diff --git a/Library/Artifacts/df/df4a9c09c14c72d40c79c78015ef4c18 b/Library/Artifacts/df/df4a9c09c14c72d40c79c78015ef4c18 deleted file mode 100644 index 675a70c8..00000000 Binary files a/Library/Artifacts/df/df4a9c09c14c72d40c79c78015ef4c18 and /dev/null differ diff --git a/Library/Artifacts/e2/e2163d92a338157fe77aabe3da88c39d b/Library/Artifacts/e2/e2163d92a338157fe77aabe3da88c39d new file mode 100644 index 00000000..e7d8bd48 Binary files /dev/null and b/Library/Artifacts/e2/e2163d92a338157fe77aabe3da88c39d differ diff --git a/Library/Artifacts/e3/e3e2a8ae9913016089a7b7b6e2d91add b/Library/Artifacts/e3/e3e2a8ae9913016089a7b7b6e2d91add new file mode 100644 index 00000000..72894ec0 Binary files /dev/null and b/Library/Artifacts/e3/e3e2a8ae9913016089a7b7b6e2d91add differ diff --git a/Library/Artifacts/e6/e6d85c2c8aec1b12bad63d63fe30d6e3 b/Library/Artifacts/e6/e6d85c2c8aec1b12bad63d63fe30d6e3 deleted file mode 100644 index 32a82ee0..00000000 Binary files a/Library/Artifacts/e6/e6d85c2c8aec1b12bad63d63fe30d6e3 and /dev/null differ diff --git a/Library/Artifacts/c2/c2955c687ca37ee69a014601028b997d b/Library/Artifacts/ea/ea34aaf43aec7f8b27ad45f5428379d3 similarity index 87% rename from Library/Artifacts/c2/c2955c687ca37ee69a014601028b997d rename to Library/Artifacts/ea/ea34aaf43aec7f8b27ad45f5428379d3 index 97fd62d6..41ab53fe 100644 Binary files a/Library/Artifacts/c2/c2955c687ca37ee69a014601028b997d and b/Library/Artifacts/ea/ea34aaf43aec7f8b27ad45f5428379d3 differ diff --git a/Library/Artifacts/0e/0e1c61461918d4c5c40cd7c1ce435199 b/Library/Artifacts/ea/ea5319d11c1998c77bf9b4977b3ae8fd similarity index 89% rename from Library/Artifacts/0e/0e1c61461918d4c5c40cd7c1ce435199 rename to Library/Artifacts/ea/ea5319d11c1998c77bf9b4977b3ae8fd index 5b0b0194..6e3b41d4 100644 Binary files a/Library/Artifacts/0e/0e1c61461918d4c5c40cd7c1ce435199 and b/Library/Artifacts/ea/ea5319d11c1998c77bf9b4977b3ae8fd differ diff --git a/Library/Artifacts/ec/ecdc08d59576313b4abbf3a31cec40aa b/Library/Artifacts/ec/ecdc08d59576313b4abbf3a31cec40aa new file mode 100644 index 00000000..73ad00ea Binary files /dev/null and b/Library/Artifacts/ec/ecdc08d59576313b4abbf3a31cec40aa differ diff --git a/Library/Artifacts/ec/ecfb937b968e3de5a0e837f92681c587 b/Library/Artifacts/ec/ecfb937b968e3de5a0e837f92681c587 new file mode 100644 index 00000000..c349711a Binary files /dev/null and b/Library/Artifacts/ec/ecfb937b968e3de5a0e837f92681c587 differ diff --git a/Library/Artifacts/ed/ed940af27bfcc0d9eabf322e5434a9d4 b/Library/Artifacts/ed/ed940af27bfcc0d9eabf322e5434a9d4 new file mode 100644 index 00000000..8645145e Binary files /dev/null and b/Library/Artifacts/ed/ed940af27bfcc0d9eabf322e5434a9d4 differ diff --git a/Library/Artifacts/ed/ed99e8e219e32a1c3a596afa403caab3 b/Library/Artifacts/ed/ed99e8e219e32a1c3a596afa403caab3 new file mode 100644 index 00000000..6790a296 Binary files /dev/null and b/Library/Artifacts/ed/ed99e8e219e32a1c3a596afa403caab3 differ diff --git a/Library/Artifacts/f0/f07d4e15fbb3b5395dc45d3ea4834f22 b/Library/Artifacts/f0/f07d4e15fbb3b5395dc45d3ea4834f22 deleted file mode 100644 index 9478f79b..00000000 Binary files a/Library/Artifacts/f0/f07d4e15fbb3b5395dc45d3ea4834f22 and /dev/null differ diff --git a/Library/Artifacts/f0/f0c0f663f1b7a65d1321b5fcb2e92efb b/Library/Artifacts/f0/f0c0f663f1b7a65d1321b5fcb2e92efb new file mode 100644 index 00000000..0a57d340 Binary files /dev/null and b/Library/Artifacts/f0/f0c0f663f1b7a65d1321b5fcb2e92efb differ diff --git a/Library/Artifacts/f3/f336d5dec6e8908318d91b5eb159a3f6 b/Library/Artifacts/f3/f336d5dec6e8908318d91b5eb159a3f6 deleted file mode 100644 index d8fb6606..00000000 Binary files a/Library/Artifacts/f3/f336d5dec6e8908318d91b5eb159a3f6 and /dev/null differ diff --git a/Library/Artifacts/f3/f37921f6681abacd2260bbaf3fb9614f b/Library/Artifacts/f3/f37921f6681abacd2260bbaf3fb9614f deleted file mode 100644 index 30f8d1c8..00000000 Binary files a/Library/Artifacts/f3/f37921f6681abacd2260bbaf3fb9614f and /dev/null differ diff --git a/Library/Artifacts/f4/f4ac3a32d953eb5ebb87eb927ea4f465 b/Library/Artifacts/f4/f4ac3a32d953eb5ebb87eb927ea4f465 new file mode 100644 index 00000000..e5d5ea3a Binary files /dev/null and b/Library/Artifacts/f4/f4ac3a32d953eb5ebb87eb927ea4f465 differ diff --git a/Library/Artifacts/f7/f724df8978cf64b8189aa3ad9cbf7afc b/Library/Artifacts/f7/f724df8978cf64b8189aa3ad9cbf7afc new file mode 100644 index 00000000..66ee6169 Binary files /dev/null and b/Library/Artifacts/f7/f724df8978cf64b8189aa3ad9cbf7afc differ diff --git a/Library/Artifacts/f8/f8aec245647db05b0ff0e6caa9d7273f b/Library/Artifacts/f8/f8aec245647db05b0ff0e6caa9d7273f new file mode 100644 index 00000000..b5f76b03 Binary files /dev/null and b/Library/Artifacts/f8/f8aec245647db05b0ff0e6caa9d7273f differ diff --git a/Library/Artifacts/25/25f0aebcdf4673eff6b14bcf211e6dbf b/Library/Artifacts/f9/f94468018177b1764d5f7f1bc3850109 similarity index 95% rename from Library/Artifacts/25/25f0aebcdf4673eff6b14bcf211e6dbf rename to Library/Artifacts/f9/f94468018177b1764d5f7f1bc3850109 index 4850e302..8346476d 100644 Binary files a/Library/Artifacts/25/25f0aebcdf4673eff6b14bcf211e6dbf and b/Library/Artifacts/f9/f94468018177b1764d5f7f1bc3850109 differ diff --git a/Library/Artifacts/ff/ff6647ad01e6732bcc87624a6dce06b9 b/Library/Artifacts/ff/ff6647ad01e6732bcc87624a6dce06b9 new file mode 100644 index 00000000..d415b3d7 Binary files /dev/null and b/Library/Artifacts/ff/ff6647ad01e6732bcc87624a6dce06b9 differ diff --git a/Library/Artifacts/ff/ffff2a9c286891c526f64cf99b52a037 b/Library/Artifacts/ff/ffff2a9c286891c526f64cf99b52a037 new file mode 100644 index 00000000..0be73149 Binary files /dev/null and b/Library/Artifacts/ff/ffff2a9c286891c526f64cf99b52a037 differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index fa40b73c..f01f1878 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 542} + m_MinSize: {x: 875, y: 392} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 679, y: 342} - m_MaxSize: {x: 12004, y: 8042} + m_MinSize: {x: 678, y: 342} + m_MaxSize: {x: 12003, y: 8042} vertical: 0 - controlID: 29144 + controlID: 21254 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1373 height: 947 - m_MinSize: {x: 403, y: 342} - m_MaxSize: {x: 8003, y: 8042} + m_MinSize: {x: 402, y: 342} + m_MaxSize: {x: 8002, y: 8042} vertical: 1 - controlID: 28985 + controlID: 21255 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: y: 0 width: 1373 height: 676 - 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: 28986 + controlID: 21256 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -213,14 +213,14 @@ MonoBehaviour: height: 676 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 14} - {fileID: 12} - {fileID: 15} - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,8 +240,8 @@ MonoBehaviour: y: 676 width: 1373 height: 271 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} @@ -296,8 +296,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 296 - y: 19 + x: 295 + y: 73 width: 1076 height: 655 m_ViewDataDictionary: {fileID: 0} @@ -313,7 +313,7 @@ MonoBehaviour: m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_MaximizeOnPlay: 1 + m_MaximizeOnPlay: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -336,7 +336,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -396,9 +396,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7a400000 - m_LastClickedID: 0 - m_ExpandedIDs: 70aefeffbc8fffffc68fffff8695ffff7097ffffcc97ffff62fbffff2c3a0000243d0000483d0000bc3d0000963e0000123f0000 + m_SelectedIDs: 8854fdff + m_LastClickedID: -174968 + m_ExpandedIDs: 6ef4feff84f4feff8ef4feffc65cffffcc5cffff305dffff62fbffff263d00004a3d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 321.58847, y: 165.28635, z: -267.465} + m_Target: {x: 699.4843, y: 244.28134, z: -283} speed: 2 - m_Value: {x: 321.58847, y: 165.28635, z: -267.465} + m_Value: {x: 699.4843, y: 244.28134, z: -283} 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: 320.3778 + m_Target: 476.11185 speed: 2 - m_Value: 320.3778 + m_Value: 476.11185 m_Ortho: m_Target: 1 speed: 2 @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 96420000 - m_LastClickedID: 17046 - m_ExpandedIDs: 00000000804200008242000000ca9a3b + m_SelectedIDs: 9c420000 + m_LastClickedID: 17052 + m_ExpandedIDs: 00000000864200008842000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000804200008242000000ca9a3b + m_ExpandedIDs: 00000000864200008842000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1170,8 +1170,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 7a400000 - m_LastClickedInstanceID: 16506 + m_SelectedInstanceIDs: 8854fdff + m_LastClickedInstanceID: -174968 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a0000000000004a46000024430000 m_RenameOverlay: diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 02b20c53..d273d5fc 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: 28757 + controlID: 21068 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1373 height: 947 - m_MinSize: {x: 403, y: 492} + m_MinSize: {x: 402, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 28731 + controlID: 20982 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: y: 0 width: 1373 height: 676 - 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: 28732 + controlID: 20983 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 70aefeffbc8fffffc68fffff8695ffff7097ffffcc97ffff62fbffff2c3a0000243d0000483d0000bc3d0000963e0000123f0000 + m_ExpandedIDs: 6ef4feff84f4feff8ef4feffc65cffffcc5cffff305dffff62fbffff263d00004a3d0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 321.58847, y: 165.28635, z: -267.465} + m_Target: {x: 699.4843, y: 244.28134, z: -283} speed: 2 - m_Value: {x: 321.58847, y: 165.28635, z: -267.465} + m_Value: {x: 699.4843, y: 244.28134, z: -283} 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: 320.3778 + m_Target: 476.11185 speed: 2 - m_Value: 320.3778 + m_Value: 476.11185 m_Ortho: m_Target: 1 speed: 2 @@ -939,8 +939,8 @@ MonoBehaviour: y: 676 width: 1373 height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -998,9 +998,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 96420000 - m_LastClickedID: 17046 - m_ExpandedIDs: 00000000804200008242000000ca9a3b + m_SelectedIDs: 9c420000 + m_LastClickedID: 17052 + m_ExpandedIDs: 00000000864200008842000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000804200008242000000ca9a3b + m_ExpandedIDs: 00000000864200008842000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,9 +1053,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 7a400000 - m_LastClickedInstanceID: 16506 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: fa66fdff + m_LastClickedInstanceID: -170246 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a0000000000004a46000024430000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: 16506 + m_LastInspectedObjectInstanceID: -170246 m_LastVerticalScrollValue: 0 diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 2d7d2424..0e4a2dfa 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 3f0c2e50..3bbf4e16 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 9644984c..6571570d 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 1eff6783..3d931305 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 53913300..4514c9df 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-73a40f7e8cdb25c439.json b/Library/StateCache/Hierarchy/8cbfdc-73a40f7e8cdb25c439.json index 955cee4e..5162c025 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-73a40f7e8cdb25c439.json +++ b/Library/StateCache/Hierarchy/8cbfdc-73a40f7e8cdb25c439.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[935483303198879685,935483304407649879,935483304187088276],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":935483303198879685,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[935483303198879685,935483304407649879,935483304187088276],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":935483303286354274,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json b/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json index ad77a441..ee5a9cf7 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json +++ b/Library/StateCache/Hierarchy/8cbfdc-890d76c226858de4fa.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":4658118913435815158,"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 0f410dd8..659e3a5b 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":321.5884704589844,"y":165.28634643554688,"z":-267.4649963378906},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":320.3778076171875,"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":699.4843139648438,"y":244.28134155273438,"z":-283.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":476.1118469238281,"orthographic":true} \ No newline at end of file