diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 40d9f493..c1a960d7 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 53002575..376b7dc2 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -75,6 +75,7 @@ + diff --git a/Assets/Resources/Prefabs/GhostSlider.prefab b/Assets/Resources/Prefabs/GhostSlider.prefab index 438a4178..95c9a30f 100644 --- a/Assets/Resources/Prefabs/GhostSlider.prefab +++ b/Assets/Resources/Prefabs/GhostSlider.prefab @@ -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: 0, y: 20} + m_SizeDelta: {x: -16, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3581489635090573721 MonoBehaviour: diff --git a/Assets/Resources/Prefabs/KeyframeSlider.prefab b/Assets/Resources/Prefabs/KeyframeSlider.prefab index 0273df79..76ab41ed 100644 --- a/Assets/Resources/Prefabs/KeyframeSlider.prefab +++ b/Assets/Resources/Prefabs/KeyframeSlider.prefab @@ -107,7 +107,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: -10, y: 20} + m_SizeDelta: {x: -16, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7758949423219383195 MonoBehaviour: @@ -163,7 +163,7 @@ MonoBehaviour: ghostSliders: {fileID: 2175275438354546744} ghostSliderPrefab: {fileID: 3581489635090573721, guid: 890d76c226858de4fa96adfe7cc85383, type: 3} - maxGhosts: 0 + maxGhosts: 4 actorID: 0 keyframeID: 0 --- !u!1 &8359461402257861397 @@ -177,6 +177,8 @@ GameObject: - component: {fileID: 5757681650493455882} - component: {fileID: 4736752906210224906} - component: {fileID: 1135382459109805448} + - component: {fileID: 6141625215454872087} + - component: {fileID: 1036971081672004212} m_Layer: 5 m_Name: Handle m_TagString: Untagged @@ -240,3 +242,41 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!223 &6141625215454872087 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 20 + m_TargetDisplay: 0 +--- !u!114 &1036971081672004212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8359461402257861397} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ed0232d5..cae00e1a 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: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1066,6 +1066,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134868802} m_CullTransparentMesh: 0 +--- !u!1 &138865803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 138865804} + - component: {fileID: 138865806} + - component: {fileID: 138865805} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &138865804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138865803} + 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: 1289465654} + m_Father: {fileID: 219230438} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1200, y: 15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &138865805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138865803} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.75, g: 0.75, b: 0.75, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &138865806 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138865803} + m_CullTransparentMesh: 0 --- !u!1 &143158138 GameObject: m_ObjectHideFlags: 0 @@ -1301,7 +1376,7 @@ RectTransform: m_Children: - {fileID: 44343587} m_Father: {fileID: 1335076903} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1429,8 +1504,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 591894605} + - {fileID: 138865804} m_Father: {fileID: 1335076903} - m_RootOrder: 18 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1664,7 +1740,7 @@ RectTransform: m_Children: - {fileID: 1397551272} m_Father: {fileID: 1335076903} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2537,7 +2613,7 @@ RectTransform: m_Children: - {fileID: 239634964} m_Father: {fileID: 1335076903} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3117,7 +3193,7 @@ RectTransform: - {fileID: 2041360447} - {fileID: 1377952650} m_Father: {fileID: 1335076903} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3255,7 +3331,7 @@ RectTransform: - {fileID: 749354207} - {fileID: 1153227823} m_Father: {fileID: 1335076903} - m_RootOrder: 20 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3818,7 +3894,7 @@ RectTransform: m_Children: - {fileID: 1514381832} m_Father: {fileID: 1335076903} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4030,7 +4106,7 @@ RectTransform: - {fileID: 567758162} - {fileID: 1676585154} m_Father: {fileID: 1335076903} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -4749,13 +4825,15 @@ GameObject: - component: {fileID: 591894608} - component: {fileID: 591894607} - component: {fileID: 591894606} + - component: {fileID: 591894609} + - component: {fileID: 591894610} m_Layer: 5 - m_Name: Image + m_Name: Chaser m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &591894605 RectTransform: m_ObjectHideFlags: 0 @@ -4772,8 +4850,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 2, y: 0} + m_AnchoredPosition: {x: 8, y: -2.5} + m_SizeDelta: {x: 4, y: -15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &591894606 MonoBehaviour: @@ -4808,7 +4886,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0.5, b: 0.5, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -4832,6 +4910,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 591894604} m_CullTransparentMesh: 0 +--- !u!223 &591894609 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591894604} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 10 + m_TargetDisplay: 0 +--- !u!114 &591894610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591894604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9584d659e560b88409843604ae04229b, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 1437263270} + chaseAlongX: 1 + chaseAlongY: 0 --- !u!1 &592018739 GameObject: m_ObjectHideFlags: 0 @@ -4995,7 +5109,7 @@ RectTransform: - {fileID: 1960844026} - {fileID: 1463915053} m_Father: {fileID: 1335076903} - m_RootOrder: 17 + 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} @@ -5117,7 +5231,7 @@ RectTransform: - {fileID: 783530509} - {fileID: 725162531} m_Father: {fileID: 1335076903} - m_RootOrder: 19 + 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} @@ -5520,7 +5634,7 @@ RectTransform: - {fileID: 371198550} - {fileID: 77649836} m_Father: {fileID: 1335076903} - m_RootOrder: 25 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5731,80 +5845,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698711480} m_CullTransparentMesh: 0 ---- !u!1 &723601102 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 723601103} - - component: {fileID: 723601105} - - component: {fileID: 723601104} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &723601103 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 723601102} - 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: 1811965325} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &723601104 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 723601102} - 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 &723601105 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 723601102} - m_CullTransparentMesh: 0 --- !u!1 &725162530 GameObject: m_ObjectHideFlags: 0 @@ -6028,9 +6068,9 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &749354208 MonoBehaviour: @@ -6467,7 +6507,7 @@ RectTransform: m_Children: - {fileID: 415722554} m_Father: {fileID: 1335076903} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7000,7 +7040,7 @@ RectTransform: m_Children: - {fileID: 395375412} m_Father: {fileID: 1335076903} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8094,7 +8134,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1335076903} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -8306,7 +8346,7 @@ RectTransform: - {fileID: 347034222} - {fileID: 932977622} m_Father: {fileID: 1335076903} - m_RootOrder: 26 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8399,7 +8439,7 @@ RectTransform: - {fileID: 1898380637} - {fileID: 1966925531} m_Father: {fileID: 1335076903} - m_RootOrder: 28 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8490,7 +8530,7 @@ RectTransform: m_Children: - {fileID: 1321044693} m_Father: {fileID: 1335076903} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8588,80 +8628,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1136677496} m_CullTransparentMesh: 0 ---- !u!1 &1142371456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1142371457} - - component: {fileID: 1142371459} - - component: {fileID: 1142371458} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1142371457 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142371456} - 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: 1289465654} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1142371458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142371456} - 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: 10907, 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 &1142371459 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1142371456} - m_CullTransparentMesh: 0 --- !u!1 &1149068017 GameObject: m_ObjectHideFlags: 0 @@ -8821,7 +8787,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 922060210} m_HandleRect: {fileID: 922060209} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -9577,20 +9543,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1289465653} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1142371457} - - {fileID: 1811965325} - {fileID: 1628817485} - m_Father: {fileID: 1335076903} - m_RootOrder: 4 + m_Father: {fileID: 138865804} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 88} - m_SizeDelta: {x: 1200, y: 20} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1289465655 MonoBehaviour: @@ -9632,11 +9596,11 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1437263272} - m_FillRect: {fileID: 723601103} + m_FillRect: {fileID: 0} m_HandleRect: {fileID: 1437263271} m_Direction: 0 m_MinValue: 1 - m_MaxValue: 1 + m_MaxValue: 100 m_WholeNumbers: 1 m_Value: 1 m_OnValueChanged: @@ -10036,14 +10000,13 @@ RectTransform: - {fileID: 134868803} - {fileID: 502634721} - {fileID: 585946794} - - {fileID: 1289465654} - {fileID: 539052777} - {fileID: 1083597498} - {fileID: 429161117} - {fileID: 842870043} - {fileID: 364433430} - - {fileID: 972501617} - {fileID: 527085934} + - {fileID: 972501617} - {fileID: 257242826} - {fileID: 1572887942} - {fileID: 899286715} @@ -11265,6 +11228,8 @@ GameObject: - component: {fileID: 1437263271} - component: {fileID: 1437263273} - component: {fileID: 1437263272} + - component: {fileID: 1437263274} + - component: {fileID: 1437263275} m_Layer: 5 m_Name: Handle m_TagString: Untagged @@ -11304,7 +11269,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.5, b: 0.5, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -11328,6 +11293,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1437263270} m_CullTransparentMesh: 0 +--- !u!223 &1437263274 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437263270} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 20 + m_TargetDisplay: 0 +--- !u!114 &1437263275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437263270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &1441706102 GameObject: m_ObjectHideFlags: 0 @@ -13237,7 +13240,7 @@ RectTransform: m_Children: - {fileID: 1741478633} m_Father: {fileID: 1335076903} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13446,7 +13449,7 @@ RectTransform: - {fileID: 1395818346} - {fileID: 1798757604} m_Father: {fileID: 1335076903} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13542,7 +13545,7 @@ RectTransform: - {fileID: 1092312354} - {fileID: 891468915} m_Father: {fileID: 1335076903} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13630,12 +13633,12 @@ RectTransform: m_Children: - {fileID: 1437263271} m_Father: {fileID: 1289465654} - m_RootOrder: 2 + 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: -20, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1632534165 GameObject: @@ -14879,42 +14882,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1811133721} m_CullTransparentMesh: 0 ---- !u!1 &1811965324 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1811965325} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1811965325 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1811965324} - 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: 723601103} - m_Father: {fileID: 1289465654} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1813469519 GameObject: m_ObjectHideFlags: 0 @@ -15837,7 +15804,7 @@ RectTransform: - {fileID: 1543793723} - {fileID: 1344070788} m_Father: {fileID: 1335076903} - m_RootOrder: 27 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16138,7 +16105,7 @@ RectTransform: - {fileID: 1481521047} - {fileID: 1261535758} m_Father: {fileID: 1335076903} - m_RootOrder: 24 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scripts/Chaser.cs b/Assets/Scripts/Chaser.cs new file mode 100644 index 00000000..a2f28734 --- /dev/null +++ b/Assets/Scripts/Chaser.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace RimWorldAnimationStudio +{ + public class Chaser : MonoBehaviour + { + public GameObject target; + public bool chaseAlongX = true; + public bool chaseAlongY = false; + + void Update() + { + if (target == null) + { return; } + + float x = chaseAlongX ? target.transform.position.x : transform.position.x; + float y = chaseAlongY ? target.transform.position.y : transform.position.y; + + transform.position = new Vector3(x, y, 0f); + } + } +} diff --git a/Assets/Scripts/Chaser.cs.meta b/Assets/Scripts/Chaser.cs.meta new file mode 100644 index 00000000..e2f844aa --- /dev/null +++ b/Assets/Scripts/Chaser.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9584d659e560b88409843604ae04229b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GUI/ActorBody.cs b/Assets/Scripts/GUI/ActorBody.cs index 6335d84f..05cde4f1 100644 --- a/Assets/Scripts/GUI/ActorBody.cs +++ b/Assets/Scripts/GUI/ActorBody.cs @@ -72,12 +72,12 @@ namespace RimWorldAnimationStudio if (actorBody == this) { continue; } - actorBody.bodyRenderer.color = new Color(1f, 1f, 1f); - actorBody.headRenderer.color = new Color(1f, 1f, 1f); + actorBody.bodyRenderer.color = Constants.ColorWhite; + actorBody.headRenderer.color = Constants.ColorWhite; } - bodyRenderer.color = new Color(0f, 1f, 0f); - headRenderer.color = new Color(0f, 1f, 0f); + bodyRenderer.color = Constants.ColorGreen; + headRenderer.color = Constants.ColorGreen; } } } diff --git a/Assets/Scripts/GUI/ActorBodyPart.cs b/Assets/Scripts/GUI/ActorBodyPart.cs index 8d017e60..fad35ee1 100644 --- a/Assets/Scripts/GUI/ActorBodyPart.cs +++ b/Assets/Scripts/GUI/ActorBodyPart.cs @@ -23,26 +23,29 @@ namespace RimWorldAnimationStudio { Activate(); + PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(); + + if (Workspace.Instance.GetCurrentPawnKeyframe() == null) + { Debug.LogWarning("Cannot alter actor - no keyframe data available"); return; } + Vector3 mousePosition = Camera.main.ScreenToWorldPoint(Input.mousePosition); - PawnKeyframe keyframe = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[parent.actorID].keyframes.FirstOrDefault(x => x.keyframeID == Workspace.keyframeID); if (Workspace.actorManipulationMode == ActorManipulationMode.Pan) { float distance = ((Vector2)mousePosition - (Vector2)transform.position).y; + Vector3 headOffset = new Vector3(0f, 0.34f, 0f); headOffset = Quaternion.Euler(0, 0, keyframe.bodyAngle) * headOffset; distance = Vector2.Dot(parent.transform.up, (Vector2)(mousePosition - parent.transform.position - headOffset)); - Debug.Log(headOffset.ToString()); - - Workspace.animationDef.animationStages[Workspace.stageID].animationClips[parent.actorID].keyframes.FirstOrDefault(x => x.keyframeID == Workspace.keyframeID).headBob = distance; + keyframe.headBob = distance; } else if (Workspace.actorManipulationMode == ActorManipulationMode.Rotate) { float angle = Vector2.SignedAngle(Vector2.down, (Vector2)mousePosition - (Vector2)transform.position); - Workspace.animationDef.animationStages[Workspace.stageID].animationClips[parent.actorID].keyframes.FirstOrDefault(x => x.keyframeID == Workspace.keyframeID).headAngle = angle; + keyframe.headAngle = angle; } else if (Workspace.actorManipulationMode == ActorManipulationMode.Face) @@ -51,9 +54,7 @@ namespace RimWorldAnimationStudio int facing = -Mathf.RoundToInt(angle / 90f); facing = facing < 0 ? facing + 4 : facing; - Debug.Log(facing.ToString()); - - Workspace.animationDef.animationStages[Workspace.stageID].animationClips[parent.actorID].keyframes.FirstOrDefault(x => x.keyframeID == Workspace.keyframeID).headFacing = facing; + keyframe.headFacing = facing; } PawnAnimationClip clip = Workspace.Instance.GetPawnAnimationClip(parent.actorID); @@ -66,11 +67,11 @@ namespace RimWorldAnimationStudio foreach (ActorBody actorBody in AnimationController.Instance.GetComponentsInChildren()) { - actorBody.bodyRenderer.color = new Color(1f, 1f, 1f); - actorBody.headRenderer.color = new Color(1f, 1f, 1f); + actorBody.bodyRenderer.color = Constants.ColorWhite; + actorBody.headRenderer.color = Constants.ColorWhite; } - bodyPartRenderer.color = new Color(0f, 1f, 0f); + bodyPartRenderer.color = Constants.ColorGreen; } } } diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs index 3874ae30..d9c31e10 100644 --- a/Assets/Scripts/GUI/KeyframeSlider.cs +++ b/Assets/Scripts/GUI/KeyframeSlider.cs @@ -66,12 +66,10 @@ namespace RimWorldAnimationStudio if (ghostSliders.childCount <= i) { Instantiate(ghostSliderPrefab, ghostSliders); } - GameObject ghostSliderObject = ghostSliders.GetChild(i).gameObject; - Debug.Log(ghostSliderObject); + GameObject ghostSliderObject = ghostSliders.GetChild(i).gameObject; ghostSliderObject.SetActive(true); Slider ghostSlider = ghostSliderObject.GetComponent(); - Debug.Log(ghostSlider); ghostSlider.value = (int)((i + 1) * clip.duration + keyframe.atTick); float mult = 1f - Mathf.Pow((float)i / maxGhosts, 2); @@ -96,12 +94,20 @@ namespace RimWorldAnimationStudio public void OnPointerClick(PointerEventData eventData) { - Activate(); + Workspace.actorID = actorID; + Workspace.keyframeID = keyframeID; + + if (eventData.clickCount >= 2) + { + AnimationController.Instance.stageTick = keyframe.atTick.Value; + } } public void OnBeginDrag(PointerEventData eventData) { - Activate(); + AnimationController.Instance.stageTick = keyframe.atTick.Value; + Workspace.actorID = actorID; + Workspace.keyframeID = keyframeID; if (keyframe.atTick == 1) { return; } @@ -113,7 +119,8 @@ namespace RimWorldAnimationStudio { base.OnDrag(eventData); - Activate(); + AnimationController.Instance.stageTick = keyframe.atTick.Value; + Workspace.actorID = actorID; } public void OnEndDrag(PointerEventData eventData) @@ -121,23 +128,21 @@ namespace RimWorldAnimationStudio interactable = false; } - public void Activate() + protected override void Update() { - AnimationController.Instance.stageTick = keyframe.atTick.Value; + base.Update(); - Workspace.keyframeID = keyframeID; + if (Workspace.keyframeID == keyframeID && AnimationController.Instance.stageTick == keyframe.atTick.Value) + { transform.FindDeepChild("Handle").GetComponent().color = Constants.ColorPurple; } - foreach (AnimationTimeline _timeline in AnimationController.Instance.animationTimelines.GetComponentsInChildren()) - { - foreach (KeyframeSlider keyframeSlider in _timeline.GetComponentsInChildren()) - { - if (keyframeSlider.keyframe.atTick.Value == keyframe.atTick.Value) - { keyframeSlider.transform.FindDeepChild("Handle").GetComponent().color = new Color(0f, 1f, 0f); } + else if (Workspace.keyframeID == keyframeID) + { transform.FindDeepChild("Handle").GetComponent().color = Constants.ColorCyan; } - else - { keyframeSlider.transform.FindDeepChild("Handle").GetComponent().color = new Color(1f, 1f, 1f); } - } - } + else if (AnimationController.Instance.stageTick == keyframe.atTick.Value) + { transform.FindDeepChild("Handle").GetComponent().color = Constants.ColorPink; } + + else + { transform.FindDeepChild("Handle").GetComponent().color = Constants.ColorWhite; } } } } diff --git a/Assets/Scripts/GUI/StageCard.cs b/Assets/Scripts/GUI/StageCard.cs index 48da16e5..184f9e0d 100644 --- a/Assets/Scripts/GUI/StageCard.cs +++ b/Assets/Scripts/GUI/StageCard.cs @@ -60,8 +60,8 @@ namespace RimWorldAnimationStudio Workspace.stageID = transform.GetSiblingIndex(); - AnimationController.Instance.ResetAnimationTimeline(); - AnimationController.Instance.InitializeAnimationTimeline(); + //AnimationController.Instance.ResetAnimationTimeline(); + //AnimationController.Instance.InitializeAnimationTimeline(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index e337cad5..4b1a3d24 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -31,6 +31,7 @@ namespace RimWorldAnimationStudio public AnimationTimeline animationTimelinePrefab; // Private timing variables + private int lastStageTick = 1; private float timeSinceLastUpdate = 0; private int cycleIndex = 0; @@ -54,9 +55,6 @@ namespace RimWorldAnimationStudio timeSinceLastUpdate -= 1f / 60f; stageTick += 1; - stageTimelineSlider.value = stageTick; - animationClipTimeField.text = stageTick.ToString(); - if (stageTick > Workspace.StageWindowSize) { if (stageLoopDropdown.value == 1) @@ -73,8 +71,8 @@ namespace RimWorldAnimationStudio ++Workspace.stageID; cycleIndex = 0; - ResetAnimationTimeline(); - InitializeAnimationTimeline(); + //ResetAnimationTimeline(); + //InitializeAnimationTimeline(); } } @@ -84,15 +82,29 @@ namespace RimWorldAnimationStudio } // Update stage timeline - animationClipTimeField.interactable = isAnimating == false; + animationClipTimeField.interactable = isAnimating == false; animationClipLengthField.interactable = isAnimating == false; + if (lastStageTick != stageTick) + { + stageTimelineSlider.value = stageTick; + animationClipTimeField.text = stageTick.ToString(); + + lastStageTick = stageTick; + } + // Update animation UpdateAnimation(); } public void UpdateAnimation() { + if (Workspace.Instance.AnimationTimelinesNeedUpdate()) + { + ResetAnimationTimeline(); + InitializeAnimationTimeline(); + } + List actorBodies = GetComponentsInChildren().ToList(); for (int actorID = 0; actorID < actorBodies.Count; actorID++) @@ -177,21 +189,20 @@ namespace RimWorldAnimationStudio public void Reset() { Workspace.stageID = 0; - + isAnimating = false; ResetAnimationTimeline(); StageCardManager.Instance.Reset(); } public void ResetAnimationTimeline() - { - isAnimating = false; + { timeSinceLastUpdate = 0; cycleIndex = 0; foreach (ActorBody actorBody in GetComponentsInChildren()) { Destroy(actorBody.gameObject); } - foreach (Transform animationTimeline in animationTimelines) + foreach (AnimationTimeline animationTimeline in animationTimelines.GetComponentsInChildren()) { Destroy(animationTimeline.gameObject); } } @@ -299,7 +310,7 @@ namespace RimWorldAnimationStudio clip.BuildSimpleCurves(); - animationTimelines.GetChild(Workspace.actorID).GetComponent().AddPawnKeyFrame(keyframe.keyframeID); + animationTimelines.GetComponentsInChildren()[Workspace.actorID].AddPawnKeyFrame(keyframe.keyframeID); } public void RemovePawnKeyframe() @@ -311,12 +322,12 @@ namespace RimWorldAnimationStudio { PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(actorID, keyframeID); - if (keyframe.atTick == 1) + if (keyframe != null && keyframe.atTick == 1) { Debug.LogWarning("Cannot delete key frame - the first key frame of an animation cannot be deleted"); return; } if (keyframe != null) { - animationTimelines.GetChild(actorID).GetComponent().RemovePawnKeyFrame(keyframe.keyframeID); + animationTimelines.GetComponentsInChildren()[Workspace.actorID].RemovePawnKeyFrame(keyframe.keyframeID); PawnAnimationClip clip = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[actorID]; clip.keyframes.Remove(keyframe); @@ -383,8 +394,8 @@ namespace RimWorldAnimationStudio animationClipLengthField.text = newstageWindowSize.ToString(); Workspace.animationDef.animationStages[Workspace.stageID].stageWindowSize = newstageWindowSize; - ResetAnimationTimeline(); - InitializeAnimationTimeline(); + //ResetAnimationTimeline(); + //InitializeAnimationTimeline(); } public void OnCycleNormalFieldChange() diff --git a/Assets/Scripts/Math/Constants/Constants.cs b/Assets/Scripts/Math/Constants/Constants.cs index 30966c03..90648588 100644 --- a/Assets/Scripts/Math/Constants/Constants.cs +++ b/Assets/Scripts/Math/Constants/Constants.cs @@ -13,5 +13,10 @@ namespace RimWorldAnimationStudio public static Color ColorGoldYellow = new Color(1f, 0.85f, 0f); public static Color ColorGrey = new Color(0.5f, 0.5f, 0.5f); public static Color ColorDarkGrey = new Color(0.2f, 0.2f, 0.2f); + public static Color ColorPink = new Color(1.0f, 0.5f, 0.5f); + public static Color ColorOrange = new Color(1.0f, 0.7f, 0.0f); + 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); } } diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs index 7231180b..4f14e91c 100644 --- a/Assets/Scripts/Workspace/Workspace.cs +++ b/Assets/Scripts/Workspace/Workspace.cs @@ -41,12 +41,12 @@ namespace RimWorldAnimationStudio } } - public PawnKeyframe GetCurrentPawnKeyframe(bool makeNewIfNull = true) + public PawnKeyframe GetCurrentPawnKeyframe() { int stageTick = AnimationController.Instance.stageTick; PawnKeyframe keyframe = animationDef?.animationStages[stageID]?.animationClips[actorID]?.keyframes.FirstOrDefault(x => x.atTick == stageTick); - if (keyframe != null || makeNewIfNull == false) + if (keyframe != null) { return keyframe; } AnimationController.Instance.AddPawnKeyframe(); @@ -105,5 +105,41 @@ namespace RimWorldAnimationStudio // All other data } + + private int lastactorCount = 0; + private int lastStageID = 0; + private int lastStageCount = 0; + private int lastStageWindowSize = 0; + + public bool AnimationTimelinesNeedUpdate() + { + 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; + } } } diff --git a/Library/ArtifactDB b/Library/ArtifactDB index c62e7071..a2f20b6f 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/94/944a2134e7dae456024a69fb67788143 b/Library/Artifacts/05/0561447c154a8039e6896a5af9167cff similarity index 51% rename from Library/Artifacts/94/944a2134e7dae456024a69fb67788143 rename to Library/Artifacts/05/0561447c154a8039e6896a5af9167cff index b49b9deb..078b1eba 100644 Binary files a/Library/Artifacts/94/944a2134e7dae456024a69fb67788143 and b/Library/Artifacts/05/0561447c154a8039e6896a5af9167cff differ diff --git a/Library/Artifacts/05/059180618b611ecbf7ec7b1cfdc51e06 b/Library/Artifacts/05/059180618b611ecbf7ec7b1cfdc51e06 new file mode 100644 index 00000000..38818a67 Binary files /dev/null and b/Library/Artifacts/05/059180618b611ecbf7ec7b1cfdc51e06 differ diff --git a/Library/Artifacts/07/07dc5f1a51e347d4d31dcc3eeb06beaa b/Library/Artifacts/07/07dc5f1a51e347d4d31dcc3eeb06beaa deleted file mode 100644 index 6600e520..00000000 Binary files a/Library/Artifacts/07/07dc5f1a51e347d4d31dcc3eeb06beaa and /dev/null differ diff --git a/Library/Artifacts/09/09993198a208731750afec22181b61ed b/Library/Artifacts/09/09993198a208731750afec22181b61ed deleted file mode 100644 index 8ac272ec..00000000 Binary files a/Library/Artifacts/09/09993198a208731750afec22181b61ed and /dev/null differ diff --git a/Library/Artifacts/f6/f6ce0a6afd8c36c6a437ed9b0709aebb b/Library/Artifacts/0e/0e1c61461918d4c5c40cd7c1ce435199 similarity index 85% rename from Library/Artifacts/f6/f6ce0a6afd8c36c6a437ed9b0709aebb rename to Library/Artifacts/0e/0e1c61461918d4c5c40cd7c1ce435199 index 58c1b0bd..5b0b0194 100644 Binary files a/Library/Artifacts/f6/f6ce0a6afd8c36c6a437ed9b0709aebb and b/Library/Artifacts/0e/0e1c61461918d4c5c40cd7c1ce435199 differ diff --git a/Library/Artifacts/1f/1fb0509a93a7b941e20f9551838d8e36 b/Library/Artifacts/1f/1fb0509a93a7b941e20f9551838d8e36 deleted file mode 100644 index aa05847f..00000000 Binary files a/Library/Artifacts/1f/1fb0509a93a7b941e20f9551838d8e36 and /dev/null differ diff --git a/Library/Artifacts/4b/4bce872469a980222947446d5b168228 b/Library/Artifacts/24/246c7723954f026e3885759c48e8e8c3 similarity index 90% rename from Library/Artifacts/4b/4bce872469a980222947446d5b168228 rename to Library/Artifacts/24/246c7723954f026e3885759c48e8e8c3 index 964e9783..f9604e64 100644 Binary files a/Library/Artifacts/4b/4bce872469a980222947446d5b168228 and b/Library/Artifacts/24/246c7723954f026e3885759c48e8e8c3 differ diff --git a/Library/Artifacts/24/2499463cc7c0f7055f2765a0ef3dc813 b/Library/Artifacts/24/2499463cc7c0f7055f2765a0ef3dc813 deleted file mode 100644 index 6557344c..00000000 Binary files a/Library/Artifacts/24/2499463cc7c0f7055f2765a0ef3dc813 and /dev/null differ diff --git a/Library/Artifacts/9d/9d387a513d9722d323b20f2c52731b3d b/Library/Artifacts/24/24eb1d52cc3612ca83f3d3b2155f1f0a similarity index 61% rename from Library/Artifacts/9d/9d387a513d9722d323b20f2c52731b3d rename to Library/Artifacts/24/24eb1d52cc3612ca83f3d3b2155f1f0a index 36559245..3358cd23 100644 Binary files a/Library/Artifacts/9d/9d387a513d9722d323b20f2c52731b3d and b/Library/Artifacts/24/24eb1d52cc3612ca83f3d3b2155f1f0a differ diff --git a/Library/Artifacts/25/25f0aebcdf4673eff6b14bcf211e6dbf b/Library/Artifacts/25/25f0aebcdf4673eff6b14bcf211e6dbf new file mode 100644 index 00000000..4850e302 Binary files /dev/null and b/Library/Artifacts/25/25f0aebcdf4673eff6b14bcf211e6dbf differ diff --git a/Library/Artifacts/28/283ee003f1048806929163729418e059 b/Library/Artifacts/28/283ee003f1048806929163729418e059 new file mode 100644 index 00000000..13bdc3e3 Binary files /dev/null and b/Library/Artifacts/28/283ee003f1048806929163729418e059 differ diff --git a/Library/Artifacts/98/98eb7ac05a7f2e2985a3fd3e8b78f705 b/Library/Artifacts/2b/2b65137e8c4d6b9c7995fe3547235db7 similarity index 90% rename from Library/Artifacts/98/98eb7ac05a7f2e2985a3fd3e8b78f705 rename to Library/Artifacts/2b/2b65137e8c4d6b9c7995fe3547235db7 index 8145ae96..b5ae673f 100644 Binary files a/Library/Artifacts/98/98eb7ac05a7f2e2985a3fd3e8b78f705 and b/Library/Artifacts/2b/2b65137e8c4d6b9c7995fe3547235db7 differ diff --git a/Library/Artifacts/3c/3cc90fd8a0578e5862087839a591148e b/Library/Artifacts/39/3959e26e570f241f335f4a8672a3dcf8 similarity index 51% rename from Library/Artifacts/3c/3cc90fd8a0578e5862087839a591148e rename to Library/Artifacts/39/3959e26e570f241f335f4a8672a3dcf8 index eb3f2da5..ca010c7e 100644 Binary files a/Library/Artifacts/3c/3cc90fd8a0578e5862087839a591148e and b/Library/Artifacts/39/3959e26e570f241f335f4a8672a3dcf8 differ diff --git a/Library/Artifacts/42/426c9128e64c47dc2a3f7eac07e4f89a b/Library/Artifacts/42/426c9128e64c47dc2a3f7eac07e4f89a new file mode 100644 index 00000000..9e59c60f Binary files /dev/null and b/Library/Artifacts/42/426c9128e64c47dc2a3f7eac07e4f89a differ diff --git a/Library/Artifacts/43/43a316982c8fd587a2296a757507740d b/Library/Artifacts/43/43a316982c8fd587a2296a757507740d deleted file mode 100644 index 80dfa901..00000000 Binary files a/Library/Artifacts/43/43a316982c8fd587a2296a757507740d and /dev/null differ diff --git a/Library/Artifacts/48/4847112b2cf71b2f45f6016ed1b3ebe7 b/Library/Artifacts/48/4847112b2cf71b2f45f6016ed1b3ebe7 new file mode 100644 index 00000000..17fcbbd1 Binary files /dev/null and b/Library/Artifacts/48/4847112b2cf71b2f45f6016ed1b3ebe7 differ diff --git a/Library/Artifacts/4c/4c7a303b1741b3074e7f0c33fa025952 b/Library/Artifacts/4c/4c7a303b1741b3074e7f0c33fa025952 deleted file mode 100644 index e93357c2..00000000 Binary files a/Library/Artifacts/4c/4c7a303b1741b3074e7f0c33fa025952 and /dev/null differ diff --git a/Library/Artifacts/55/554773a5ce1b152a54c9b73369e648fc b/Library/Artifacts/55/554773a5ce1b152a54c9b73369e648fc new file mode 100644 index 00000000..ca56205d Binary files /dev/null and b/Library/Artifacts/55/554773a5ce1b152a54c9b73369e648fc differ diff --git a/Library/Artifacts/1d/1df26ba0dd34b84407d3d26a882130e7 b/Library/Artifacts/5f/5f7ba66a5f49521c9abaf3f2300a89bd similarity index 95% rename from Library/Artifacts/1d/1df26ba0dd34b84407d3d26a882130e7 rename to Library/Artifacts/5f/5f7ba66a5f49521c9abaf3f2300a89bd index 2cfcd0d1..77c59a87 100644 Binary files a/Library/Artifacts/1d/1df26ba0dd34b84407d3d26a882130e7 and b/Library/Artifacts/5f/5f7ba66a5f49521c9abaf3f2300a89bd differ diff --git a/Library/Artifacts/62/6270d146ccdd2ad803ba51e4ebed4f1a b/Library/Artifacts/62/6270d146ccdd2ad803ba51e4ebed4f1a new file mode 100644 index 00000000..17738bb6 Binary files /dev/null and b/Library/Artifacts/62/6270d146ccdd2ad803ba51e4ebed4f1a differ diff --git a/Library/Artifacts/67/67e4f8e30b53b4174a607257ac63ee48 b/Library/Artifacts/67/67e4f8e30b53b4174a607257ac63ee48 new file mode 100644 index 00000000..b7c3b268 Binary files /dev/null and b/Library/Artifacts/67/67e4f8e30b53b4174a607257ac63ee48 differ diff --git a/Library/Artifacts/f9/f9e461b7a01fd65125861c9117f2dea0 b/Library/Artifacts/6c/6cbbbafbd1daf0e90aaeebab68613c70 similarity index 87% rename from Library/Artifacts/f9/f9e461b7a01fd65125861c9117f2dea0 rename to Library/Artifacts/6c/6cbbbafbd1daf0e90aaeebab68613c70 index 99e73ac9..7f59e880 100644 Binary files a/Library/Artifacts/f9/f9e461b7a01fd65125861c9117f2dea0 and b/Library/Artifacts/6c/6cbbbafbd1daf0e90aaeebab68613c70 differ diff --git a/Library/Artifacts/6f/6fe46d47fc9dba8cbee22c6dd1ffb8e2 b/Library/Artifacts/6f/6fe46d47fc9dba8cbee22c6dd1ffb8e2 deleted file mode 100644 index 7a4f82e5..00000000 Binary files a/Library/Artifacts/6f/6fe46d47fc9dba8cbee22c6dd1ffb8e2 and /dev/null differ diff --git a/Library/Artifacts/75/75ff07eec505b42bad849448239d0e22 b/Library/Artifacts/75/75ff07eec505b42bad849448239d0e22 deleted file mode 100644 index cadd4472..00000000 Binary files a/Library/Artifacts/75/75ff07eec505b42bad849448239d0e22 and /dev/null differ diff --git a/Library/Artifacts/78/787e7e38257f8ebad8e432f58993ecea b/Library/Artifacts/78/787e7e38257f8ebad8e432f58993ecea new file mode 100644 index 00000000..4e1d8e4e Binary files /dev/null and b/Library/Artifacts/78/787e7e38257f8ebad8e432f58993ecea differ diff --git a/Library/Artifacts/7d/7dad8137662d77f2b3f6d0a76e6f4b6f b/Library/Artifacts/7d/7dad8137662d77f2b3f6d0a76e6f4b6f deleted file mode 100644 index f20490db..00000000 Binary files a/Library/Artifacts/7d/7dad8137662d77f2b3f6d0a76e6f4b6f and /dev/null differ diff --git a/Library/Artifacts/7e/7e8b7f2f2294e313aadaed386a65b299 b/Library/Artifacts/7e/7e8b7f2f2294e313aadaed386a65b299 deleted file mode 100644 index 3e6f3a85..00000000 Binary files a/Library/Artifacts/7e/7e8b7f2f2294e313aadaed386a65b299 and /dev/null differ diff --git a/Library/Artifacts/7e/7ef1db5e076cb00f8f01e09ad6f9b5c1 b/Library/Artifacts/7e/7ef1db5e076cb00f8f01e09ad6f9b5c1 deleted file mode 100644 index 3e89d0b0..00000000 Binary files a/Library/Artifacts/7e/7ef1db5e076cb00f8f01e09ad6f9b5c1 and /dev/null differ diff --git a/Library/Artifacts/d8/d894f48a8564ccc235f27c4ed54e6edd b/Library/Artifacts/7f/7fb66242170d856e3756054de7e4d826 similarity index 86% rename from Library/Artifacts/d8/d894f48a8564ccc235f27c4ed54e6edd rename to Library/Artifacts/7f/7fb66242170d856e3756054de7e4d826 index 7f739da7..da83c623 100644 Binary files a/Library/Artifacts/d8/d894f48a8564ccc235f27c4ed54e6edd and b/Library/Artifacts/7f/7fb66242170d856e3756054de7e4d826 differ diff --git a/Library/Artifacts/82/825b46c33919c8e1de74b4fe7475a6bf b/Library/Artifacts/82/825b46c33919c8e1de74b4fe7475a6bf new file mode 100644 index 00000000..9f9082f7 Binary files /dev/null and b/Library/Artifacts/82/825b46c33919c8e1de74b4fe7475a6bf differ diff --git a/Library/Artifacts/8f/8f364943b8764dc6e0ca95a2e3eea6b3 b/Library/Artifacts/8f/8f364943b8764dc6e0ca95a2e3eea6b3 deleted file mode 100644 index 17ffa40d..00000000 Binary files a/Library/Artifacts/8f/8f364943b8764dc6e0ca95a2e3eea6b3 and /dev/null differ diff --git a/Library/Artifacts/98/98ad8666103068faf03feb3f314126bb b/Library/Artifacts/98/98ad8666103068faf03feb3f314126bb deleted file mode 100644 index 71f54cfb..00000000 Binary files a/Library/Artifacts/98/98ad8666103068faf03feb3f314126bb and /dev/null differ diff --git a/Library/Artifacts/9e/9ef7baae4df7c41929a3b03df8aabe68 b/Library/Artifacts/9e/9ef7baae4df7c41929a3b03df8aabe68 new file mode 100644 index 00000000..3197b983 Binary files /dev/null and b/Library/Artifacts/9e/9ef7baae4df7c41929a3b03df8aabe68 differ diff --git a/Library/Artifacts/9f/9f88a55822386eaf7c1d652d14e412eb b/Library/Artifacts/9f/9f88a55822386eaf7c1d652d14e412eb new file mode 100644 index 00000000..3c3043e5 Binary files /dev/null and b/Library/Artifacts/9f/9f88a55822386eaf7c1d652d14e412eb differ diff --git a/Library/Artifacts/a5/a52347d03de8236d840a57aa06e8c867 b/Library/Artifacts/a5/a52347d03de8236d840a57aa06e8c867 deleted file mode 100644 index 96e68c63..00000000 Binary files a/Library/Artifacts/a5/a52347d03de8236d840a57aa06e8c867 and /dev/null differ diff --git a/Library/Artifacts/a9/a9667b69ca1942300d0d0ede9330f41f b/Library/Artifacts/a9/a9667b69ca1942300d0d0ede9330f41f deleted file mode 100644 index 693fe2b3..00000000 Binary files a/Library/Artifacts/a9/a9667b69ca1942300d0d0ede9330f41f and /dev/null differ diff --git a/Library/Artifacts/a9/a9dd0f0123236c75548079135893861f b/Library/Artifacts/a9/a9dd0f0123236c75548079135893861f new file mode 100644 index 00000000..7576e14c Binary files /dev/null and b/Library/Artifacts/a9/a9dd0f0123236c75548079135893861f differ diff --git a/Library/Artifacts/ac/ac9be49fad511b4eaf2d0b0d279bc33c b/Library/Artifacts/ac/ac9be49fad511b4eaf2d0b0d279bc33c new file mode 100644 index 00000000..ada0ca4d Binary files /dev/null and b/Library/Artifacts/ac/ac9be49fad511b4eaf2d0b0d279bc33c differ diff --git a/Library/Artifacts/b1/b138ee12fb8ffb99321ce4b21eda8148 b/Library/Artifacts/b1/b138ee12fb8ffb99321ce4b21eda8148 deleted file mode 100644 index 98ce7f34..00000000 Binary files a/Library/Artifacts/b1/b138ee12fb8ffb99321ce4b21eda8148 and /dev/null differ diff --git a/Library/Artifacts/b3/b35a378f2262d8e6660bdf77b57c417f b/Library/Artifacts/b3/b35a378f2262d8e6660bdf77b57c417f deleted file mode 100644 index ac168f67..00000000 Binary files a/Library/Artifacts/b3/b35a378f2262d8e6660bdf77b57c417f and /dev/null differ diff --git a/Library/Artifacts/f4/f472f1dfb487910a82757bc80fc20bdc b/Library/Artifacts/b3/b3d021050f94c8b017ebfeb5f99be22a similarity index 97% rename from Library/Artifacts/f4/f472f1dfb487910a82757bc80fc20bdc rename to Library/Artifacts/b3/b3d021050f94c8b017ebfeb5f99be22a index e9f4e2f1..854239a7 100644 Binary files a/Library/Artifacts/f4/f472f1dfb487910a82757bc80fc20bdc and b/Library/Artifacts/b3/b3d021050f94c8b017ebfeb5f99be22a differ diff --git a/Library/Artifacts/b3/b3e0b904f5618a8ada0b5c8e7f2d5bef b/Library/Artifacts/b3/b3e0b904f5618a8ada0b5c8e7f2d5bef new file mode 100644 index 00000000..e320a8fd Binary files /dev/null and b/Library/Artifacts/b3/b3e0b904f5618a8ada0b5c8e7f2d5bef differ diff --git a/Library/Artifacts/8a/8a7d344172849eaa81bc26d47d876ee1 b/Library/Artifacts/b5/b51f71437178b6650e7e628da978427f similarity index 88% rename from Library/Artifacts/8a/8a7d344172849eaa81bc26d47d876ee1 rename to Library/Artifacts/b5/b51f71437178b6650e7e628da978427f index 4d1769e1..91ca36a5 100644 Binary files a/Library/Artifacts/8a/8a7d344172849eaa81bc26d47d876ee1 and b/Library/Artifacts/b5/b51f71437178b6650e7e628da978427f differ diff --git a/Library/Artifacts/b8/b88790641c846f2b2cb3d6b9f1d5b3e0 b/Library/Artifacts/b8/b88790641c846f2b2cb3d6b9f1d5b3e0 new file mode 100644 index 00000000..c60e656e Binary files /dev/null and b/Library/Artifacts/b8/b88790641c846f2b2cb3d6b9f1d5b3e0 differ diff --git a/Library/Artifacts/b9/b98a629929ef585e245641fac49b850c b/Library/Artifacts/b9/b98a629929ef585e245641fac49b850c new file mode 100644 index 00000000..477d6392 Binary files /dev/null and b/Library/Artifacts/b9/b98a629929ef585e245641fac49b850c differ diff --git a/Library/Artifacts/bc/bc58b764d80325ab74cc893955ccc0eb b/Library/Artifacts/bc/bc58b764d80325ab74cc893955ccc0eb new file mode 100644 index 00000000..554befb8 Binary files /dev/null and b/Library/Artifacts/bc/bc58b764d80325ab74cc893955ccc0eb differ diff --git a/Library/Artifacts/c1/c166a9ec76d4e718dab5ce7ea5fc0da1 b/Library/Artifacts/c1/c166a9ec76d4e718dab5ce7ea5fc0da1 deleted file mode 100644 index 01885435..00000000 Binary files a/Library/Artifacts/c1/c166a9ec76d4e718dab5ce7ea5fc0da1 and /dev/null differ diff --git a/Library/Artifacts/6b/6b5f6c98ef08139d6286ab9fb59752f0 b/Library/Artifacts/c2/c2955c687ca37ee69a014601028b997d similarity index 87% rename from Library/Artifacts/6b/6b5f6c98ef08139d6286ab9fb59752f0 rename to Library/Artifacts/c2/c2955c687ca37ee69a014601028b997d index 1918efe8..97fd62d6 100644 Binary files a/Library/Artifacts/6b/6b5f6c98ef08139d6286ab9fb59752f0 and b/Library/Artifacts/c2/c2955c687ca37ee69a014601028b997d differ diff --git a/Library/Artifacts/76/76a56a556119bbf8eefb243de074faa4 b/Library/Artifacts/c2/c295bc2fcd0ab520efb85cc27dfc0d9b similarity index 85% rename from Library/Artifacts/76/76a56a556119bbf8eefb243de074faa4 rename to Library/Artifacts/c2/c295bc2fcd0ab520efb85cc27dfc0d9b index d6f2bbd7..7825cb1b 100644 Binary files a/Library/Artifacts/76/76a56a556119bbf8eefb243de074faa4 and b/Library/Artifacts/c2/c295bc2fcd0ab520efb85cc27dfc0d9b differ diff --git a/Library/Artifacts/c4/c4fce3f124e42a3d9d0dc3a6d8213e62 b/Library/Artifacts/c4/c4fce3f124e42a3d9d0dc3a6d8213e62 new file mode 100644 index 00000000..cb45138a Binary files /dev/null and b/Library/Artifacts/c4/c4fce3f124e42a3d9d0dc3a6d8213e62 differ diff --git a/Library/Artifacts/cd/cdadb43e80158716276c064aef5583c5 b/Library/Artifacts/cb/cbbe750524e0b5e7738c2d235efccd87 similarity index 57% rename from Library/Artifacts/cd/cdadb43e80158716276c064aef5583c5 rename to Library/Artifacts/cb/cbbe750524e0b5e7738c2d235efccd87 index fe6686d4..ad1322ab 100644 Binary files a/Library/Artifacts/cd/cdadb43e80158716276c064aef5583c5 and b/Library/Artifacts/cb/cbbe750524e0b5e7738c2d235efccd87 differ diff --git a/Library/Artifacts/d7/d79d86eb249a5420e17be284b290da43 b/Library/Artifacts/d7/d79d86eb249a5420e17be284b290da43 deleted file mode 100644 index 7f301224..00000000 Binary files a/Library/Artifacts/d7/d79d86eb249a5420e17be284b290da43 and /dev/null differ diff --git a/Library/Artifacts/db/dbb852ca9d5136d9377b4625c9a359e2 b/Library/Artifacts/db/dbb852ca9d5136d9377b4625c9a359e2 new file mode 100644 index 00000000..def6da33 Binary files /dev/null and b/Library/Artifacts/db/dbb852ca9d5136d9377b4625c9a359e2 differ diff --git a/Library/Artifacts/de/de77ed6b9b74e2fe8b0bf29924e01118 b/Library/Artifacts/de/de77ed6b9b74e2fe8b0bf29924e01118 new file mode 100644 index 00000000..063e3c99 Binary files /dev/null and b/Library/Artifacts/de/de77ed6b9b74e2fe8b0bf29924e01118 differ diff --git a/Library/Artifacts/89/89f5bceef91d9e041c59199b6ee8d3c7 b/Library/Artifacts/df/df4a9c09c14c72d40c79c78015ef4c18 similarity index 90% rename from Library/Artifacts/89/89f5bceef91d9e041c59199b6ee8d3c7 rename to Library/Artifacts/df/df4a9c09c14c72d40c79c78015ef4c18 index f07d58d9..675a70c8 100644 Binary files a/Library/Artifacts/89/89f5bceef91d9e041c59199b6ee8d3c7 and b/Library/Artifacts/df/df4a9c09c14c72d40c79c78015ef4c18 differ diff --git a/Library/Artifacts/df/df7e39c6248e14b15cc6c804ad498495 b/Library/Artifacts/df/df7e39c6248e14b15cc6c804ad498495 deleted file mode 100644 index b16542de..00000000 Binary files a/Library/Artifacts/df/df7e39c6248e14b15cc6c804ad498495 and /dev/null differ diff --git a/Library/Artifacts/77/77ae043ce86a84355152f68779c76219 b/Library/Artifacts/e1/e1d56466bb79b78853d4b8b900984d89 similarity index 84% rename from Library/Artifacts/77/77ae043ce86a84355152f68779c76219 rename to Library/Artifacts/e1/e1d56466bb79b78853d4b8b900984d89 index ee29239e..97d6397a 100644 Binary files a/Library/Artifacts/77/77ae043ce86a84355152f68779c76219 and b/Library/Artifacts/e1/e1d56466bb79b78853d4b8b900984d89 differ diff --git a/Library/Artifacts/e4/e402822e73690a81a17f72e9b2886a7f b/Library/Artifacts/e4/e402822e73690a81a17f72e9b2886a7f deleted file mode 100644 index c70a2695..00000000 Binary files a/Library/Artifacts/e4/e402822e73690a81a17f72e9b2886a7f and /dev/null differ diff --git a/Library/Artifacts/e6/e6d85c2c8aec1b12bad63d63fe30d6e3 b/Library/Artifacts/e6/e6d85c2c8aec1b12bad63d63fe30d6e3 new file mode 100644 index 00000000..32a82ee0 Binary files /dev/null and b/Library/Artifacts/e6/e6d85c2c8aec1b12bad63d63fe30d6e3 differ diff --git a/Library/Artifacts/e7/e7a66c2322894f57c55c4ff7f3044c0c b/Library/Artifacts/e7/e7a66c2322894f57c55c4ff7f3044c0c deleted file mode 100644 index 7268d454..00000000 Binary files a/Library/Artifacts/e7/e7a66c2322894f57c55c4ff7f3044c0c and /dev/null differ diff --git a/Library/Artifacts/01/01ee2b32f969bfa3554dc5fabc00d1d1 b/Library/Artifacts/e7/e7bda01e83eca40c89389790a3727f8d similarity index 89% rename from Library/Artifacts/01/01ee2b32f969bfa3554dc5fabc00d1d1 rename to Library/Artifacts/e7/e7bda01e83eca40c89389790a3727f8d index 9dcdf7a6..102aec6d 100644 Binary files a/Library/Artifacts/01/01ee2b32f969bfa3554dc5fabc00d1d1 and b/Library/Artifacts/e7/e7bda01e83eca40c89389790a3727f8d differ diff --git a/Library/Artifacts/ec/ec90a71ddbdc60c5518485f0de4588f0 b/Library/Artifacts/ec/ec90a71ddbdc60c5518485f0de4588f0 deleted file mode 100644 index 619cb9fc..00000000 Binary files a/Library/Artifacts/ec/ec90a71ddbdc60c5518485f0de4588f0 and /dev/null differ diff --git a/Library/Artifacts/ec/ecbbd68eb5b1aa3597401155877d7bd0 b/Library/Artifacts/ec/ecbbd68eb5b1aa3597401155877d7bd0 deleted file mode 100644 index ded5725e..00000000 Binary files a/Library/Artifacts/ec/ecbbd68eb5b1aa3597401155877d7bd0 and /dev/null differ diff --git a/Library/Artifacts/8c/8c423f0bf0f4135b8dc57f207b7f02b3 b/Library/Artifacts/ee/eea6751b18221b1d6011bdc2d9c63ee3 similarity index 51% rename from Library/Artifacts/8c/8c423f0bf0f4135b8dc57f207b7f02b3 rename to Library/Artifacts/ee/eea6751b18221b1d6011bdc2d9c63ee3 index ce113736..5b7ca819 100644 Binary files a/Library/Artifacts/8c/8c423f0bf0f4135b8dc57f207b7f02b3 and b/Library/Artifacts/ee/eea6751b18221b1d6011bdc2d9c63ee3 differ diff --git a/Library/Artifacts/f0/f07d4e15fbb3b5395dc45d3ea4834f22 b/Library/Artifacts/f0/f07d4e15fbb3b5395dc45d3ea4834f22 new file mode 100644 index 00000000..9478f79b Binary files /dev/null and b/Library/Artifacts/f0/f07d4e15fbb3b5395dc45d3ea4834f22 differ diff --git a/Library/Artifacts/6e/6e6053d293ecb8428eb2a4411865a235 b/Library/Artifacts/f1/f1a1a3da25578838190bad5e96f14555 similarity index 81% rename from Library/Artifacts/6e/6e6053d293ecb8428eb2a4411865a235 rename to Library/Artifacts/f1/f1a1a3da25578838190bad5e96f14555 index d2d128b0..0d58aabc 100644 Binary files a/Library/Artifacts/6e/6e6053d293ecb8428eb2a4411865a235 and b/Library/Artifacts/f1/f1a1a3da25578838190bad5e96f14555 differ diff --git a/Library/Artifacts/f3/f336d5dec6e8908318d91b5eb159a3f6 b/Library/Artifacts/f3/f336d5dec6e8908318d91b5eb159a3f6 new file mode 100644 index 00000000..d8fb6606 Binary files /dev/null and b/Library/Artifacts/f3/f336d5dec6e8908318d91b5eb159a3f6 differ diff --git a/Library/Artifacts/f3/f37921f6681abacd2260bbaf3fb9614f b/Library/Artifacts/f3/f37921f6681abacd2260bbaf3fb9614f new file mode 100644 index 00000000..30f8d1c8 Binary files /dev/null and b/Library/Artifacts/f3/f37921f6681abacd2260bbaf3fb9614f differ diff --git a/Library/Artifacts/f3/f3e559e45d1c2e9e4c910620fee2ca91 b/Library/Artifacts/f3/f3e559e45d1c2e9e4c910620fee2ca91 deleted file mode 100644 index 043a7c31..00000000 Binary files a/Library/Artifacts/f3/f3e559e45d1c2e9e4c910620fee2ca91 and /dev/null differ diff --git a/Library/Artifacts/f7/f73840d89f642db9589f9536dc88bf80 b/Library/Artifacts/f7/f73840d89f642db9589f9536dc88bf80 deleted file mode 100644 index 194c6281..00000000 Binary files a/Library/Artifacts/f7/f73840d89f642db9589f9536dc88bf80 and /dev/null differ diff --git a/Library/Artifacts/c1/c18b518fd1d0c4fb29ad6508b2927383 b/Library/Artifacts/f9/f9ac628906cfdc518aaf14f21c08a0bd similarity index 64% rename from Library/Artifacts/c1/c18b518fd1d0c4fb29ad6508b2927383 rename to Library/Artifacts/f9/f9ac628906cfdc518aaf14f21c08a0bd index 8feead5e..9b4434e8 100644 Binary files a/Library/Artifacts/c1/c18b518fd1d0c4fb29ad6508b2927383 and b/Library/Artifacts/f9/f9ac628906cfdc518aaf14f21c08a0bd differ diff --git a/Library/Artifacts/8f/8f6c145988331d993bbf2322fc1be985 b/Library/Artifacts/f9/f9d273b28ad557433c1dcdbf963a0fe6 similarity index 89% rename from Library/Artifacts/8f/8f6c145988331d993bbf2322fc1be985 rename to Library/Artifacts/f9/f9d273b28ad557433c1dcdbf963a0fe6 index 5ec87c3c..6dfd1b6e 100644 Binary files a/Library/Artifacts/8f/8f6c145988331d993bbf2322fc1be985 and b/Library/Artifacts/f9/f9d273b28ad557433c1dcdbf963a0fe6 differ diff --git a/Library/Artifacts/f9/f9fd6e9ef4809ab55f86eeeb4716b997 b/Library/Artifacts/f9/f9fd6e9ef4809ab55f86eeeb4716b997 deleted file mode 100644 index b9a23958..00000000 Binary files a/Library/Artifacts/f9/f9fd6e9ef4809ab55f86eeeb4716b997 and /dev/null differ diff --git a/Library/Artifacts/9f/9f3b316f9d071dfbc55afb2068fd377b b/Library/Artifacts/fc/fc765bbb24e2660591bb5edf7ec34e5b similarity index 69% rename from Library/Artifacts/9f/9f3b316f9d071dfbc55afb2068fd377b rename to Library/Artifacts/fc/fc765bbb24e2660591bb5edf7ec34e5b index 28ce3aa7..546d5b83 100644 Binary files a/Library/Artifacts/9f/9f3b316f9d071dfbc55afb2068fd377b and b/Library/Artifacts/fc/fc765bbb24e2660591bb5edf7ec34e5b differ diff --git a/Library/Artifacts/fd/fd0748de51e78de45a9b91489bfed20e b/Library/Artifacts/fd/fd0748de51e78de45a9b91489bfed20e deleted file mode 100644 index 156696f4..00000000 Binary files a/Library/Artifacts/fd/fd0748de51e78de45a9b91489bfed20e and /dev/null differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 57116f43..fa40b73c 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -46,7 +46,7 @@ MonoBehaviour: y: 0 width: 1920 height: 997 - m_MinSize: {x: 875, y: 542} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -112,10 +112,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 492} - m_MaxSize: {x: 14001, y: 14042} + m_MinSize: {x: 679, y: 342} + m_MaxSize: {x: 12004, y: 8042} vertical: 0 - controlID: 19719 + controlID: 29144 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1373 height: 947 - m_MinSize: {x: 402, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 403, y: 342} + m_MaxSize: {x: 8003, y: 8042} vertical: 1 - controlID: 19720 + controlID: 28985 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: y: 0 width: 1373 height: 676 - m_MinSize: {x: 402, y: 221} - m_MaxSize: {x: 8002, y: 4021} + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 19721 + controlID: 28986 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,8 +185,8 @@ MonoBehaviour: y: 0 width: 295 height: 676 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,8 +211,8 @@ MonoBehaviour: y: 0 width: 1078 height: 676 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -231,7 +231,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -240,15 +240,15 @@ MonoBehaviour: y: 676 width: 1373 height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,8 +268,8 @@ MonoBehaviour: y: 0 width: 547 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -324,10 +324,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -453.5 - m_VBaseRangeMax: 453.5 + m_HBaseRangeMin: -538 + m_HBaseRangeMax: 538 + m_VBaseRangeMin: -317 + m_VBaseRangeMax: 317 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -345,23 +345,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1920 - height: 907 + width: 1076 + height: 634 m_Scale: {x: 1, y: 1} - m_Translation: {x: 960, y: 453.5} + m_Translation: {x: 538, y: 317} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -453.5 - width: 1920 - height: 907 + x: -538 + y: -317 + width: 1076 + height: 634 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1920, y: 928} + m_LastWindowPixelSize: {x: 1076, y: 655} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -395,10 +395,10 @@ MonoBehaviour: m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 150} - m_SelectedIDs: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 7a400000 m_LastClickedID: 0 - m_ExpandedIDs: 70c9ffff2aeaffff18edffff74f4ffffd8f4ffff62fbffffc8390000c43a0000ce3a0000123b00001a3b0000ce3b0000da3b0000fc3b0000303d0000a43f0000 + m_ExpandedIDs: 70aefeffbc8fffffc68fffff8695ffff7097ffffcc97ffff62fbffff2c3a0000243d0000483d0000bc3d0000963e0000123f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1006.87854, y: 701.7758, z: -153.22008} + m_Target: {x: 321.58847, y: 165.28635, z: -267.465} speed: 2 - m_Value: {x: 993.00183, y: 690.4389, z: -150.89366} + m_Value: {x: 321.58847, y: 165.28635, z: -267.465} 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: 540.21484 + m_Target: 320.3778 speed: 2 - m_Value: 516.952 + m_Value: 320.3778 m_Ortho: m_Target: 1 speed: 2 @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7a420000 - m_LastClickedID: 17018 - m_ExpandedIDs: 000000005e4200006042000000ca9a3b + m_SelectedIDs: 96420000 + m_LastClickedID: 17046 + m_ExpandedIDs: 00000000804200008242000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005e4200006042000000ca9a3b + m_ExpandedIDs: 00000000804200008242000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1170,8 +1170,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 7a400000 + m_LastClickedInstanceID: 16506 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a0000000000004a46000024430000 m_RenameOverlay: diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index d1f3f9e6..02b20c53 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 492} + m_MinSize: {x: 678, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 19588 + controlID: 28757 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1373 height: 947 - m_MinSize: {x: 402, y: 492} + m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 19589 + controlID: 28731 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: y: 0 width: 1373 height: 676 - m_MinSize: {x: 402, y: 221} - m_MaxSize: {x: 8002, y: 4021} + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 19590 + controlID: 28732 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -221,10 +221,10 @@ MonoBehaviour: m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 150} + scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 70c9ffff2aeaffff18edffff74f4ffffd8f4ffff62fbffffc8390000c43a0000ce3a0000123b00001a3b0000ce3b0000da3b0000fc3b0000303d0000a43f0000 + m_ExpandedIDs: 70aefeffbc8fffffc68fffff8695ffff7097ffffcc97ffff62fbffff2c3a0000243d0000483d0000bc3d0000963e0000123f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 955.3771, y: 659.5994, z: -144.5} + m_Target: {x: 321.58847, y: 165.28635, z: -267.465} speed: 2 - m_Value: {x: 955.3771, y: 659.5994, z: -144.5} + m_Value: {x: 321.58847, y: 165.28635, z: -267.465} 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: 453.0033 + m_Target: 320.3778 speed: 2 - m_Value: 453.0033 + m_Value: 320.3778 m_Ortho: m_Target: 1 speed: 2 @@ -939,8 +939,8 @@ MonoBehaviour: y: 676 width: 1373 height: 271 - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} 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: 7a420000 - m_LastClickedID: 17018 - m_ExpandedIDs: 000000005e4200006042000000ca9a3b + m_SelectedIDs: 96420000 + m_LastClickedID: 17046 + m_ExpandedIDs: 00000000804200008242000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005e4200006042000000ca9a3b + m_ExpandedIDs: 00000000804200008242000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,9 +1053,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: 7a400000 + m_LastClickedInstanceID: 16506 + m_HadKeyboardFocusLastEvent: 1 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: -1 + m_LastInspectedObjectInstanceID: 16506 m_LastVerticalScrollValue: 0 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 8e0e9f07..3f0c2e50 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 c75eec29..9644984c 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 81e2c6cf..1eff6783 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 64db0b64..53913300 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json b/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json index 4461fa5f..baa957f6 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json +++ b/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":3541467645058788217,"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 9c64dcb3..0f410dd8 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":1006.8785400390625,"y":701.7758178710938,"z":-153.22007751464845},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":540.21484375,"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":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 diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index 86437e88..bdf648b1 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ