diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo
index 46fc90ba..d3149205 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 0c7d8f24..bcd81540 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -110,6 +110,7 @@
+
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index b583a9ac..c6060ab4 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -275,6 +275,84 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 11575765}
m_CullTransparentMesh: 0
+--- !u!1 &28901883
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 28901884}
+ - component: {fileID: 28901886}
+ - component: {fileID: 28901885}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &28901884
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 28901883}
+ 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: 1673590781}
+ 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 &28901885
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 28901883}
+ 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: Cancel
+--- !u!222 &28901886
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 28901883}
+ m_CullTransparentMesh: 0
--- !u!1 &40775274
GameObject:
m_ObjectHideFlags: 0
@@ -629,7 +707,7 @@ RectTransform:
- {fileID: 1302075273}
- {fileID: 1849536740}
m_Father: {fileID: 682235885}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -2117,6 +2195,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
exitDialog: {fileID: 1588340716}
+ newAnimationDialog: {fileID: 1717923583}
selectAnimationDialog: {fileID: 56207934}
--- !u!1 &219230437
GameObject:
@@ -5908,7 +5987,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 168629124}
- m_MethodName: TrySaveAnimation
+ m_MethodName: TryToSaveAnimation
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -6309,7 +6388,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 168629124}
- m_MethodName: NewAnimation
+ m_MethodName: TryToMakeNewAnimation
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -9130,6 +9209,87 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 671921653}
m_CullTransparentMesh: 0
+--- !u!1 &675100305
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 675100306}
+ - component: {fileID: 675100308}
+ - component: {fileID: 675100307}
+ m_Layer: 5
+ m_Name: WarningText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &675100306
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 675100305}
+ 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: 1717923582}
+ m_RootOrder: 3
+ 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: 0, y: 20}
+ m_SizeDelta: {x: 330.00006, y: 90}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &675100307
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 675100305}
+ 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: 20
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 40
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: 'Create a new animation?
+
+
+ All unsaved changes will be lost'
+--- !u!222 &675100308
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 675100305}
+ m_CullTransparentMesh: 0
--- !u!1 &682235884
GameObject:
m_ObjectHideFlags: 0
@@ -9160,6 +9320,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1588340713}
+ - {fileID: 1717923582}
- {fileID: 56207931}
- {fileID: 1969226734}
- {fileID: 685077909}
@@ -9405,7 +9566,7 @@ RectTransform:
- {fileID: 371198550}
- {fileID: 77649836}
m_Father: {fileID: 682235885}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -12175,7 +12336,7 @@ PrefabInstance:
- target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505,
type: 3}
propertyPath: m_RootOrder
- value: 8
+ value: 9
objectReference: {fileID: 0}
- target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505,
type: 3}
@@ -13263,7 +13424,7 @@ RectTransform:
- {fileID: 347034222}
- {fileID: 932977622}
m_Father: {fileID: 682235885}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -15220,7 +15381,7 @@ PrefabInstance:
- target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505,
type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 7
objectReference: {fileID: 0}
- target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505,
type: 3}
@@ -16703,6 +16864,7 @@ GameObject:
- component: {fileID: 1335076901}
- component: {fileID: 1335076900}
- component: {fileID: 1335076904}
+ - component: {fileID: 1335076905}
m_Layer: 5
m_Name: Workspace
m_TagString: Untagged
@@ -16807,6 +16969,18 @@ MonoBehaviour:
m_EditorClassIdentifier:
workspaceHistory: []
maxHistoryDepth: 100
+--- !u!114 &1335076905
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1335076899}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 120c040fa90da65478716f3ccda1248f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1344070787
GameObject:
m_ObjectHideFlags: 0
@@ -19873,6 +20047,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1489591897}
m_CullTransparentMesh: 0
+--- !u!1 &1493764522
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1493764523}
+ - component: {fileID: 1493764525}
+ - component: {fileID: 1493764524}
+ m_Layer: 5
+ m_Name: BackSpalsh
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1493764523
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1493764522}
+ 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: 1717923582}
+ m_RootOrder: 0
+ 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: 0, y: 0}
+ m_SizeDelta: {x: 330, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1493764524
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1493764522}
+ 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 &1493764525
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1493764522}
+ m_CullTransparentMesh: 0
--- !u!1 &1502398120
GameObject:
m_ObjectHideFlags: 0
@@ -22688,6 +22936,136 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1671366298}
m_CullTransparentMesh: 0
+--- !u!1 &1673590780
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1673590781}
+ - component: {fileID: 1673590784}
+ - component: {fileID: 1673590783}
+ - component: {fileID: 1673590782}
+ m_Layer: 5
+ m_Name: CancelButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1673590781
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673590780}
+ 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: 28901884}
+ m_Father: {fileID: 1717923582}
+ m_RootOrder: 2
+ 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: 90, y: -45}
+ m_SizeDelta: {x: 120, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1673590782
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673590780}
+ 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: 1673590783}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 1717923581}
+ m_MethodName: SetActive
+ m_Mode: 6
+ 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 &1673590783
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673590780}
+ 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 &1673590784
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673590780}
+ m_CullTransparentMesh: 0
--- !u!1 &1676585153
GameObject:
m_ObjectHideFlags: 0
@@ -22931,6 +23309,98 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1697817321}
m_CullTransparentMesh: 0
+--- !u!1 &1717923581
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1717923582}
+ - component: {fileID: 1717923585}
+ - component: {fileID: 1717923584}
+ - component: {fileID: 1717923583}
+ m_Layer: 5
+ m_Name: NewAnimationDialog
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1717923582
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1717923581}
+ 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: 1493764523}
+ - {fileID: 1805611459}
+ - {fileID: 1673590781}
+ - {fileID: 675100306}
+ m_Father: {fileID: 682235885}
+ m_RootOrder: 1
+ 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 &1717923583
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1717923581}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5a554bad525e79e4fb3dea0d391daf48, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ cloneObjects: []
+--- !u!114 &1717923584
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1717923581}
+ 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, g: 0, b: 0, a: 0.392}
+ 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 &1717923585
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1717923581}
+ m_CullTransparentMesh: 0
--- !u!1 &1719111567
GameObject:
m_ObjectHideFlags: 0
@@ -24130,6 +24600,225 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1798757603}
m_CullTransparentMesh: 0
+--- !u!1 &1805611458
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1805611459}
+ - component: {fileID: 1805611462}
+ - component: {fileID: 1805611461}
+ - component: {fileID: 1805611460}
+ m_Layer: 5
+ m_Name: OKButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1805611459
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805611458}
+ 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: 1808559463}
+ m_Father: {fileID: 1717923582}
+ m_RootOrder: 1
+ 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: -90, y: -45}
+ m_SizeDelta: {x: 120, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1805611460
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805611458}
+ 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: 1805611461}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 168629124}
+ m_MethodName: NewAnimation
+ 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_Target: {fileID: 1717923583}
+ m_MethodName: Pop
+ 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 &1805611461
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805611458}
+ 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 &1805611462
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1805611458}
+ m_CullTransparentMesh: 0
+--- !u!1 &1808559462
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1808559463}
+ - component: {fileID: 1808559465}
+ - component: {fileID: 1808559464}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1808559463
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1808559462}
+ 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: 1805611459}
+ 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 &1808559464
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1808559462}
+ 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: OK
+--- !u!222 &1808559465
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1808559462}
+ m_CullTransparentMesh: 0
--- !u!1 &1811894048
GameObject:
m_ObjectHideFlags: 0
@@ -25708,7 +26397,7 @@ RectTransform:
- {fileID: 1543793723}
- {fileID: 1344070788}
m_Father: {fileID: 682235885}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -26063,7 +26752,7 @@ RectTransform:
- {fileID: 1481521047}
- {fileID: 1261535758}
m_Father: {fileID: 682235885}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -31524,7 +32213,7 @@ RectTransform:
- {fileID: 631515291}
- {fileID: 3579074259096323583}
m_Father: {fileID: 682235885}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -32288,7 +32977,7 @@ PrefabInstance:
- target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505,
type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 7715503544296011585, guid: 8b89f6c9e5f696c4997760829c45a505,
type: 3}
diff --git a/Assets/Scripts/GUI/KeyframeSlider.cs b/Assets/Scripts/GUI/KeyframeSlider.cs
index edaf7a1e..2f50f370 100644
--- a/Assets/Scripts/GUI/KeyframeSlider.cs
+++ b/Assets/Scripts/GUI/KeyframeSlider.cs
@@ -95,7 +95,12 @@ namespace RimWorldAnimationStudio
public void OnPointerClick(PointerEventData eventData)
{
Workspace.actorID = actorID;
- Workspace.keyframeID = keyframeID;
+
+ if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand))
+ { Workspace.keyframeID.Add(keyframeID); }
+
+ else
+ { Workspace.keyframeID = new List { keyframeID }; }
if (eventData.clickCount >= 2)
{ AnimationController.Instance.stageTick = keyframe.atTick.Value; }
@@ -107,7 +112,8 @@ namespace RimWorldAnimationStudio
{
//AnimationController.Instance.stageTick = keyframe.atTick.Value;
Workspace.actorID = actorID;
- Workspace.keyframeID = keyframeID;
+
+ Workspace.keyframeID = new List { keyframeID };
dragTimeStart = Time.unscaledTime;
}
@@ -132,17 +138,17 @@ namespace RimWorldAnimationStudio
{ value = 1; return; }
interactable = false;
- Workspace.Instance.RecordEvent("Keyframe tick");
+ Workspace.Instance.RecordEvent("Keyframe move");
}
protected override void Update()
{
base.Update();
- if (keyframe.atTick.HasValue && Workspace.keyframeID == keyframeID && AnimationController.Instance.stageTick == keyframe.atTick.Value)
+ if (keyframe.atTick.HasValue && Workspace.keyframeID.Contains(keyframeID) && AnimationController.Instance.stageTick == keyframe.atTick.Value)
{ handleImage.color = Constants.ColorPurple; }
- else if (Workspace.keyframeID == keyframeID)
+ else if (Workspace.keyframeID.Contains(keyframeID))
{ handleImage.color = Constants.ColorCyan; }
else if (keyframe.atTick.HasValue && AnimationController.Instance.stageTick == keyframe.atTick.Value)
diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs
index 7bde06f9..e42c5ea5 100644
--- a/Assets/Scripts/Managers/AnimationController.cs
+++ b/Assets/Scripts/Managers/AnimationController.cs
@@ -132,10 +132,10 @@ 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; }
+ { /*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; }
+ { /*Debug.Log("Waiting for animation clip data to initialize...");*/ return; }
Actor actor = Workspace.animationDef.actors[actorID];
PawnAnimationClip clip = Workspace.animationDef?.animationStages[Workspace.stageID]?.animationClips[actorID];
@@ -340,39 +340,45 @@ namespace RimWorldAnimationStudio
public void ClonePawnKeyframe()
{
- PawnAnimationClip clip = Workspace.Instance.GetCurrentPawnAnimationClip();
- List keyframes = clip?.keyframes;
- PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(Workspace.actorID, Workspace.keyframeID);
+ List keyframesToClone = Workspace.Instance.GetPawnKeyframes(Workspace.keyframeID);
- if (clip == null || keyframes == null)
- { Debug.LogWarning("Cannot clone pawn keyframe - the AnimationDef is invalid"); return; }
+ foreach (PawnKeyframe keyframe in keyframesToClone)
+ {
+ PawnAnimationClip clip = Workspace.Instance.GetAnimationClipThatOwnsKeyframe(keyframe.keyframeID, out int clipID);
- if (keyframes.FirstOrDefault(x => x.atTick == stageTick) != null)
- { Debug.LogWarning("Cannot clone pawn keyframe - a keyframe already exists at this tick"); return; }
+ if (clip == null)
+ { Debug.LogWarning("Cannot clone pawn keyframe - no clip owns this keyframe"); continue; }
- if (keyframe == null)
- { Debug.LogWarning("Cannot clone pawn keyframe - no keyframe has been selected for cloning"); return; }
+ if (clip.keyframes.FirstOrDefault(x => x.atTick == stageTick) != null)
+ { Debug.LogWarning("Cannot clone pawn keyframe - a keyframe already exists at this tick"); return; }
- PawnKeyframe cloneFrame = keyframe.Copy();
- cloneFrame.GenerateKeyframeID();
- cloneFrame.atTick = stageTick;
+ PawnKeyframe cloneFrame = keyframe.Copy();
+ cloneFrame.GenerateKeyframeID();
+ cloneFrame.atTick = stageTick;
- PawnKeyframe nextKeyframe = keyframes.FirstOrDefault(x => x.atTick > stageTick);
+ PawnKeyframe nextKeyframe = clip.keyframes.FirstOrDefault(x => x.atTick > stageTick);
- if (nextKeyframe != null)
- { keyframes.Insert(keyframes.IndexOf(nextKeyframe), cloneFrame); }
+ if (nextKeyframe != null)
+ { clip.keyframes.Insert(clip.keyframes.IndexOf(nextKeyframe), cloneFrame); }
- else
- { keyframes.Add(cloneFrame); }
+ else
+ { clip.keyframes.Add(cloneFrame); }
- clip.BuildSimpleCurves();
+ clip.BuildSimpleCurves();
- animationTimelines.GetComponentsInChildren()[Workspace.actorID].AddPawnKeyFrame(cloneFrame.keyframeID);
+ animationTimelines.GetComponentsInChildren()[clipID].AddPawnKeyFrame(cloneFrame.keyframeID);
+ }
+
+ Workspace.Instance.RecordEvent("Keyframe clone");
}
public void RemovePawnKeyframe()
{
- RemovePawnKeyframe(Workspace.actorID, Workspace.keyframeID);
+ foreach (int keyframeID in Workspace.keyframeID)
+ {
+ if (Workspace.Instance.GetAnimationClipThatOwnsKeyframe(keyframeID, out int clipID) != null)
+ { RemovePawnKeyframe(clipID, keyframeID); }
+ }
}
public void RemovePawnKeyframe(int actorID, int keyframeID)
@@ -388,7 +394,7 @@ namespace RimWorldAnimationStudio
if (clip.keyframes.Count <= 2)
{ Debug.LogWarning("Cannot delete key frame - an animation clip must have two or more keyframes"); return; }
- animationTimelines.GetComponentsInChildren()[Workspace.actorID].RemovePawnKeyFrame(keyframe.keyframeID);
+ animationTimelines.GetComponentsInChildren()[actorID].RemovePawnKeyFrame(keyframe.keyframeID);
clip.keyframes.Remove(keyframe);
clip.BuildSimpleCurves();
diff --git a/Assets/Scripts/Managers/ApplicationManager.cs b/Assets/Scripts/Managers/ApplicationManager.cs
index f5bc0eb3..ef4832c6 100644
--- a/Assets/Scripts/Managers/ApplicationManager.cs
+++ b/Assets/Scripts/Managers/ApplicationManager.cs
@@ -13,6 +13,7 @@ namespace RimWorldAnimationStudio
public class ApplicationManager : Singleton
{
public DialogBox exitDialog;
+ public DialogBox newAnimationDialog;
public SelectAnimationDialog selectAnimationDialog;
public void Start()
@@ -74,7 +75,7 @@ namespace RimWorldAnimationStudio
}
- public void TrySaveAnimation()
+ public void TryToSaveAnimation()
{
if (Workspace.animationDef == null)
{ return; }
@@ -121,6 +122,14 @@ namespace RimWorldAnimationStudio
}
}
+ public void TryToMakeNewAnimation()
+ {
+ if (Workspace.animationDef == null)
+ { NewAnimation(); return; }
+
+ newAnimationDialog.Pop();
+ }
+
public void NewAnimation()
{
var path = Path.Combine(Application.streamingAssetsPath, "AnimationDefs/newAnimationDef.xml");
diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs
new file mode 100644
index 00000000..cb2203ef
--- /dev/null
+++ b/Assets/Scripts/Managers/InputManager.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace RimWorldAnimationStudio
+{
+ public class InputManager : Singleton
+ {
+ public void Update()
+ {
+ if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Z))
+ { Workspace.Instance.Undo(); }
+
+ else if (Input.GetKey(KeyCode.LeftCommand) && Input.GetKeyDown(KeyCode.Z))
+ { Workspace.Instance.Undo(); }
+
+ else if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Y))
+ { Workspace.Instance.Redo(); }
+
+ else if (Input.GetKey(KeyCode.LeftCommand) && Input.GetKey(KeyCode.LeftShift) && Input.GetKeyDown(KeyCode.Z))
+ { Workspace.Instance.Redo(); }
+
+ else if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.C))
+ { AnimationController.Instance.ClonePawnKeyframe(); }
+
+ else if (Input.GetKey(KeyCode.Backspace) || Input.GetKey(KeyCode.Delete))
+ { AnimationController.Instance.RemovePawnKeyframe(); }
+
+ else if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.N))
+ { ApplicationManager.Instance.TryToMakeNewAnimation(); }
+
+ else if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.S))
+ { ApplicationManager.Instance.TryToSaveAnimation(); }
+
+ else if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.L))
+ { ApplicationManager.Instance.TryToLoadAnimation(); }
+ }
+ }
+}
diff --git a/Assets/Scripts/Managers/InputManager.cs.meta b/Assets/Scripts/Managers/InputManager.cs.meta
new file mode 100644
index 00000000..b28e1757
--- /dev/null
+++ b/Assets/Scripts/Managers/InputManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 120c040fa90da65478716f3ccda1248f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Utilities/XmlUtility.cs b/Assets/Scripts/Utilities/XmlUtility.cs
index e991c5b6..fe607e73 100644
--- a/Assets/Scripts/Utilities/XmlUtility.cs
+++ b/Assets/Scripts/Utilities/XmlUtility.cs
@@ -13,14 +13,14 @@ namespace RimWorldAnimationStudio
{
public static T ReadXML(string path)
{
- Debug.Log("Reading data from " + path);
+ //Debug.Log("Reading data from " + path);
using (StreamReader stringReader = new StreamReader(path))
{
XmlSerializer serializer = new XmlSerializer(typeof(T));
var data = (T)serializer.Deserialize(stringReader);
- Debug.Log("Read successful");
+ //Debug.Log("Read successful");
return data;
}
}
@@ -30,7 +30,7 @@ namespace RimWorldAnimationStudio
if (obj == null || path == null || path == "")
{ return; }
- Debug.Log("Saving data to " + path);
+ //Debug.Log("Saving data to " + path);
XmlSerializer writer = new XmlSerializer(typeof(T));
XmlSerializerNamespaces nameSpaces = new XmlSerializerNamespaces();
@@ -40,7 +40,7 @@ namespace RimWorldAnimationStudio
writer.Serialize(file, obj, nameSpaces);
file.Close();
- Debug.Log("Saving successful");
+ //Debug.Log("Saving successful");
}
}
}
diff --git a/Assets/Scripts/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs
index fc9b0516..67954bec 100644
--- a/Assets/Scripts/Workspace/Workspace.cs
+++ b/Assets/Scripts/Workspace/Workspace.cs
@@ -12,7 +12,7 @@ namespace RimWorldAnimationStudio
public static AnimationDef animationDef;
public static int stageID = 0;
- public static int keyframeID = 0;
+ public static List keyframeID = new List();
[SerializeField] private List workspaceHistory = new List();
[SerializeField] private int maxHistoryDepth = 100;
@@ -61,9 +61,49 @@ namespace RimWorldAnimationStudio
public PawnKeyframe GetPawnKeyframe(int actorID, int keyframeID)
{
+ if (stageID < 0) return null;
+ if (actorID < 0) return null;
+
+ if (stageID >= animationDef.animationStages.Count) return null;
+ if (actorID >= animationDef.animationStages[stageID].animationClips.Count) return null;
+
return animationDef.animationStages[stageID].animationClips[actorID].keyframes.FirstOrDefault(x => x.keyframeID == keyframeID);
}
+ public List GetPawnKeyframes(List keyframeIDs)
+ {
+ List pawnKeyframes = new List();
+
+ foreach (PawnAnimationClip clip in animationDef.animationStages[stageID].animationClips)
+ {
+ foreach (PawnKeyframe keyframe in clip.keyframes)
+ {
+ if (keyframeIDs.Contains(keyframe.keyframeID))
+ { pawnKeyframes.Add(keyframe); }
+ }
+ }
+
+ return pawnKeyframes;
+ }
+
+ public PawnAnimationClip GetAnimationClipThatOwnsKeyframe(int keyframeID, out int clipID)
+ {
+ clipID = -1;
+
+ for (int i = 0; i < animationDef.animationStages[stageID].animationClips.Count; i++)
+ {
+ PawnAnimationClip clip = animationDef.animationStages[stageID].animationClips[i];
+
+ if (clip.keyframes.Any(x => x.keyframeID == keyframeID))
+ {
+ clipID = i;
+ return clip;
+ }
+ }
+
+ return null;
+ }
+
[SerializeField]
public LinkedList pastSnapshots = new LinkedList();
public LinkedList futureSnapshots = new LinkedList();
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll
index e00dad4e..85b3e4f1 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll
index 44ba7ac6..327befc7 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll
index f0e6dcf3..b87def44 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll
index cdc4b9d4..a6292052 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.Common.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll
index 78b47471..c6d37cc2 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.PixelPerfect.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll
index 93408458..2d9b77cc 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll
index a2c6ef0c..bf279e64 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll
index d3cc4747..4a1ef51c 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Mathematics.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll
index cac35165..cededa10 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.TextMeshPro.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll
index 35675fcb..24573618 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/Unity.Timeline.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll
index f0aded45..9315edff 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ
diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers
index ef341e76..6be6f81d 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers differ
diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets
index 5d9d5066..ee1ba83e 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers.assets differ
diff --git a/Build/RimWorld-Animation-Studio_Data/level0 b/Build/RimWorld-Animation-Studio_Data/level0
index d83774d4..af2810ba 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/level0 and b/Build/RimWorld-Animation-Studio_Data/level0 differ
diff --git a/Build/RimWorld-Animation-Studio_Data/resources.assets b/Build/RimWorld-Animation-Studio_Data/resources.assets
index c9a71f22..1951d957 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/resources.assets and b/Build/RimWorld-Animation-Studio_Data/resources.assets differ
diff --git a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets
index c52443a0..fa6d4adc 100644
Binary files a/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets and b/Build/RimWorld-Animation-Studio_Data/sharedassets0.assets differ
diff --git a/Library/ArtifactDB b/Library/ArtifactDB
index a3fa44c2..860276b9 100644
Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ
diff --git a/Library/Artifacts/05/05cdb1340af7a5e268c69556c47bda59 b/Library/Artifacts/05/05cdb1340af7a5e268c69556c47bda59
deleted file mode 100644
index 177686e7..00000000
Binary files a/Library/Artifacts/05/05cdb1340af7a5e268c69556c47bda59 and /dev/null differ
diff --git a/Library/Artifacts/73/7365d2615254b459a3cf4c4fb324e531 b/Library/Artifacts/06/067b5839d2498a55ee31b48b48345944
similarity index 79%
rename from Library/Artifacts/73/7365d2615254b459a3cf4c4fb324e531
rename to Library/Artifacts/06/067b5839d2498a55ee31b48b48345944
index 95bd6372..57149c18 100644
Binary files a/Library/Artifacts/73/7365d2615254b459a3cf4c4fb324e531 and b/Library/Artifacts/06/067b5839d2498a55ee31b48b48345944 differ
diff --git a/Library/Artifacts/2f/2fb69d773badf21abbabe061baf68856 b/Library/Artifacts/19/19b453c251c7032967db51c975ec194d
similarity index 77%
rename from Library/Artifacts/2f/2fb69d773badf21abbabe061baf68856
rename to Library/Artifacts/19/19b453c251c7032967db51c975ec194d
index 589cea95..98e27385 100644
Binary files a/Library/Artifacts/2f/2fb69d773badf21abbabe061baf68856 and b/Library/Artifacts/19/19b453c251c7032967db51c975ec194d differ
diff --git a/Library/Artifacts/8b/8b7519565aa2631e503a0b2e7c6f7a8b b/Library/Artifacts/33/33d94ca559de6698343ba2cb4570b305
similarity index 92%
rename from Library/Artifacts/8b/8b7519565aa2631e503a0b2e7c6f7a8b
rename to Library/Artifacts/33/33d94ca559de6698343ba2cb4570b305
index 8e0222f5..336f2abd 100644
Binary files a/Library/Artifacts/8b/8b7519565aa2631e503a0b2e7c6f7a8b and b/Library/Artifacts/33/33d94ca559de6698343ba2cb4570b305 differ
diff --git a/Library/Artifacts/86/863306785f83f3673f959a95ff73ff1c b/Library/Artifacts/35/35dbbea1757fa28afb8cef6ef676a73b
similarity index 92%
rename from Library/Artifacts/86/863306785f83f3673f959a95ff73ff1c
rename to Library/Artifacts/35/35dbbea1757fa28afb8cef6ef676a73b
index fcfb8413..896f98db 100644
Binary files a/Library/Artifacts/86/863306785f83f3673f959a95ff73ff1c and b/Library/Artifacts/35/35dbbea1757fa28afb8cef6ef676a73b differ
diff --git a/Library/Artifacts/62/62cfba73a40324317eb9faeb8320d050 b/Library/Artifacts/3a/3abcf57d393d253496d49bd93b7bb953
similarity index 91%
rename from Library/Artifacts/62/62cfba73a40324317eb9faeb8320d050
rename to Library/Artifacts/3a/3abcf57d393d253496d49bd93b7bb953
index a8b7a3b3..46a21634 100644
Binary files a/Library/Artifacts/62/62cfba73a40324317eb9faeb8320d050 and b/Library/Artifacts/3a/3abcf57d393d253496d49bd93b7bb953 differ
diff --git a/Library/Artifacts/41/41113419aab5598bcf20f804937ad645 b/Library/Artifacts/41/41113419aab5598bcf20f804937ad645
new file mode 100644
index 00000000..6fe67e2a
Binary files /dev/null and b/Library/Artifacts/41/41113419aab5598bcf20f804937ad645 differ
diff --git a/Library/Artifacts/f0/f01e335b4c9d6bd69544adee7efa86cb b/Library/Artifacts/42/42978a7aeee62c3f2d0712e99abb346e
similarity index 91%
rename from Library/Artifacts/f0/f01e335b4c9d6bd69544adee7efa86cb
rename to Library/Artifacts/42/42978a7aeee62c3f2d0712e99abb346e
index af3ecd1b..98d44d81 100644
Binary files a/Library/Artifacts/f0/f01e335b4c9d6bd69544adee7efa86cb and b/Library/Artifacts/42/42978a7aeee62c3f2d0712e99abb346e differ
diff --git a/Library/Artifacts/47/47433e95164175e033cea242de128baa b/Library/Artifacts/47/47433e95164175e033cea242de128baa
deleted file mode 100644
index a0cd1ffe..00000000
Binary files a/Library/Artifacts/47/47433e95164175e033cea242de128baa and /dev/null differ
diff --git a/Library/Artifacts/48/48cfd693075bef0a9af89c5daae5eace b/Library/Artifacts/48/48cfd693075bef0a9af89c5daae5eace
deleted file mode 100644
index 83f6da08..00000000
Binary files a/Library/Artifacts/48/48cfd693075bef0a9af89c5daae5eace and /dev/null differ
diff --git a/Library/Artifacts/49/49fc063fdbe74c2767cb49063bc03661 b/Library/Artifacts/49/49fc063fdbe74c2767cb49063bc03661
new file mode 100644
index 00000000..76966123
Binary files /dev/null and b/Library/Artifacts/49/49fc063fdbe74c2767cb49063bc03661 differ
diff --git a/Library/Artifacts/4d/4d18a366ffd2106231e180478511eb04 b/Library/Artifacts/4d/4d18a366ffd2106231e180478511eb04
deleted file mode 100644
index 02f5f0a8..00000000
Binary files a/Library/Artifacts/4d/4d18a366ffd2106231e180478511eb04 and /dev/null differ
diff --git a/Library/Artifacts/4e/4e6ae4f8752a2e97fd5ac90edd4be66a b/Library/Artifacts/4e/4e6ae4f8752a2e97fd5ac90edd4be66a
deleted file mode 100644
index 85ee2836..00000000
Binary files a/Library/Artifacts/4e/4e6ae4f8752a2e97fd5ac90edd4be66a and /dev/null differ
diff --git a/Library/Artifacts/50/5050ab5f06f2cbfda4a0898a4bbfd796 b/Library/Artifacts/50/5050ab5f06f2cbfda4a0898a4bbfd796
new file mode 100644
index 00000000..84c7623b
Binary files /dev/null and b/Library/Artifacts/50/5050ab5f06f2cbfda4a0898a4bbfd796 differ
diff --git a/Library/Artifacts/5a/5aba07c5f99eede664cc6968a5c1a600 b/Library/Artifacts/5a/5aba07c5f99eede664cc6968a5c1a600
deleted file mode 100644
index 85fc8490..00000000
Binary files a/Library/Artifacts/5a/5aba07c5f99eede664cc6968a5c1a600 and /dev/null differ
diff --git a/Library/Artifacts/5e/5e55f0d68605ada004c20a21ba61e4d3 b/Library/Artifacts/5e/5e55f0d68605ada004c20a21ba61e4d3
deleted file mode 100644
index 122993b4..00000000
Binary files a/Library/Artifacts/5e/5e55f0d68605ada004c20a21ba61e4d3 and /dev/null differ
diff --git a/Library/Artifacts/6d/6d7804155c7a45dfac2d65fd9e4b13a6 b/Library/Artifacts/6d/6d7804155c7a45dfac2d65fd9e4b13a6
new file mode 100644
index 00000000..50134821
Binary files /dev/null and b/Library/Artifacts/6d/6d7804155c7a45dfac2d65fd9e4b13a6 differ
diff --git a/Library/Artifacts/6e/6ecd266bdd0ddb0835a1920b47521cb3 b/Library/Artifacts/6e/6ecd266bdd0ddb0835a1920b47521cb3
deleted file mode 100644
index 3919a7ec..00000000
Binary files a/Library/Artifacts/6e/6ecd266bdd0ddb0835a1920b47521cb3 and /dev/null differ
diff --git a/Library/Artifacts/70/70abfb32c652785aa36cb70c9b52b0db b/Library/Artifacts/70/70abfb32c652785aa36cb70c9b52b0db
new file mode 100644
index 00000000..5056a1a6
Binary files /dev/null and b/Library/Artifacts/70/70abfb32c652785aa36cb70c9b52b0db differ
diff --git a/Library/Artifacts/3e/3e14b4b5062b2e8c5a654764e7793804 b/Library/Artifacts/71/71e59e783a8a01e9e495b0b24be17437
similarity index 92%
rename from Library/Artifacts/3e/3e14b4b5062b2e8c5a654764e7793804
rename to Library/Artifacts/71/71e59e783a8a01e9e495b0b24be17437
index 3466b7a6..edd59cde 100644
Binary files a/Library/Artifacts/3e/3e14b4b5062b2e8c5a654764e7793804 and b/Library/Artifacts/71/71e59e783a8a01e9e495b0b24be17437 differ
diff --git a/Library/Artifacts/76/76fa528d43dc8e6487d0360c5dd99ce3 b/Library/Artifacts/76/76fa528d43dc8e6487d0360c5dd99ce3
deleted file mode 100644
index 2d461eca..00000000
Binary files a/Library/Artifacts/76/76fa528d43dc8e6487d0360c5dd99ce3 and /dev/null differ
diff --git a/Library/Artifacts/79/796e66aaa9677f9dd989282ce2869b35 b/Library/Artifacts/79/796e66aaa9677f9dd989282ce2869b35
new file mode 100644
index 00000000..9e8fefa4
Binary files /dev/null and b/Library/Artifacts/79/796e66aaa9677f9dd989282ce2869b35 differ
diff --git a/Library/Artifacts/7b/7b2b0fb13cb89e503a42bdef83c33e8c b/Library/Artifacts/7b/7b2b0fb13cb89e503a42bdef83c33e8c
new file mode 100644
index 00000000..15ec5b11
Binary files /dev/null and b/Library/Artifacts/7b/7b2b0fb13cb89e503a42bdef83c33e8c differ
diff --git a/Library/Artifacts/4e/4ec6f0c095e4d419a7660342fd0f489b b/Library/Artifacts/7e/7ee87a5e3db0570414b5a5838ade4c61
similarity index 77%
rename from Library/Artifacts/4e/4ec6f0c095e4d419a7660342fd0f489b
rename to Library/Artifacts/7e/7ee87a5e3db0570414b5a5838ade4c61
index eb35cac2..b2668a45 100644
Binary files a/Library/Artifacts/4e/4ec6f0c095e4d419a7660342fd0f489b and b/Library/Artifacts/7e/7ee87a5e3db0570414b5a5838ade4c61 differ
diff --git a/Library/Artifacts/8e/8e47f0bbb5e45d50b533e69e51899eb2 b/Library/Artifacts/8e/8e47f0bbb5e45d50b533e69e51899eb2
new file mode 100644
index 00000000..17347203
Binary files /dev/null and b/Library/Artifacts/8e/8e47f0bbb5e45d50b533e69e51899eb2 differ
diff --git a/Library/Artifacts/b2/b23621ca1d34476f39c1ef9fd4684077 b/Library/Artifacts/b2/b23621ca1d34476f39c1ef9fd4684077
deleted file mode 100644
index d2aa21e7..00000000
Binary files a/Library/Artifacts/b2/b23621ca1d34476f39c1ef9fd4684077 and /dev/null differ
diff --git a/Library/Artifacts/c2/c20486b9f0aff847a477fb41f48637f1 b/Library/Artifacts/c2/c20486b9f0aff847a477fb41f48637f1
deleted file mode 100644
index 01463b3e..00000000
Binary files a/Library/Artifacts/c2/c20486b9f0aff847a477fb41f48637f1 and /dev/null differ
diff --git a/Library/Artifacts/4c/4c59e80f2143445de36d24f17651c260 b/Library/Artifacts/cc/ccb165680e9fd751795f632c0dc906e1
similarity index 93%
rename from Library/Artifacts/4c/4c59e80f2143445de36d24f17651c260
rename to Library/Artifacts/cc/ccb165680e9fd751795f632c0dc906e1
index 76a547cb..994a2f54 100644
Binary files a/Library/Artifacts/4c/4c59e80f2143445de36d24f17651c260 and b/Library/Artifacts/cc/ccb165680e9fd751795f632c0dc906e1 differ
diff --git a/Library/Artifacts/e4/e4979aef194e3a80954eef1d3c1f78da b/Library/Artifacts/e4/e4979aef194e3a80954eef1d3c1f78da
new file mode 100644
index 00000000..8846b377
Binary files /dev/null and b/Library/Artifacts/e4/e4979aef194e3a80954eef1d3c1f78da differ
diff --git a/Library/Artifacts/e5/e51d96ce4df39c8fb6313debe24ac376 b/Library/Artifacts/e5/e51d96ce4df39c8fb6313debe24ac376
new file mode 100644
index 00000000..27112b4f
Binary files /dev/null and b/Library/Artifacts/e5/e51d96ce4df39c8fb6313debe24ac376 differ
diff --git a/Library/Artifacts/ea/eaf8e32b3c034007c0198d0e9957046c b/Library/Artifacts/ea/eaf8e32b3c034007c0198d0e9957046c
new file mode 100644
index 00000000..b02336d1
Binary files /dev/null and b/Library/Artifacts/ea/eaf8e32b3c034007c0198d0e9957046c differ
diff --git a/Library/Artifacts/ec/ec14014b6eeae8de12e46d3f93c715df b/Library/Artifacts/ec/ec14014b6eeae8de12e46d3f93c715df
new file mode 100644
index 00000000..52f013a5
Binary files /dev/null and b/Library/Artifacts/ec/ec14014b6eeae8de12e46d3f93c715df differ
diff --git a/Library/Artifacts/f9/f9b834c00b287e793f80707b129161d7 b/Library/Artifacts/f9/f9b834c00b287e793f80707b129161d7
deleted file mode 100644
index e274c236..00000000
Binary files a/Library/Artifacts/f9/f9b834c00b287e793f80707b129161d7 and /dev/null differ
diff --git a/Library/Artifacts/fc/fc3fc8759c257b5aeda34ccd758214ba b/Library/Artifacts/fc/fc3fc8759c257b5aeda34ccd758214ba
deleted file mode 100644
index 08350431..00000000
Binary files a/Library/Artifacts/fc/fc3fc8759c257b5aeda34ccd758214ba and /dev/null differ
diff --git a/Library/Artifacts/fe/feca31394b05ca84358a110a622628a9 b/Library/Artifacts/fe/feca31394b05ca84358a110a622628a9
deleted file mode 100644
index 96932b46..00000000
Binary files a/Library/Artifacts/fe/feca31394b05ca84358a110a622628a9 and /dev/null differ
diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt
index f79b529b..253e2374 100644
--- a/Library/CurrentLayout-default.dwlt
+++ b/Library/CurrentLayout-default.dwlt
@@ -115,7 +115,7 @@ MonoBehaviour:
m_MinSize: {x: 678, y: 471}
m_MaxSize: {x: 14000, y: 14021}
vertical: 0
- controlID: 6558
+ controlID: 8042
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -135,12 +135,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1524
+ width: 1314
height: 947
m_MinSize: {x: 403, y: 471}
m_MaxSize: {x: 10000, y: 14021}
vertical: 1
- controlID: 6559
+ controlID: 8043
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -160,12 +160,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1524
- height: 648
+ width: 1314
+ height: 426
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
- controlID: 6560
+ controlID: 8044
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -183,8 +183,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 384
- height: 648
+ width: 441
+ height: 426
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
@@ -207,10 +207,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 384
+ x: 441
y: 0
- width: 1140
- height: 648
+ width: 873
+ height: 426
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 14}
@@ -237,9 +237,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 648
- width: 1524
- height: 299
+ y: 426
+ width: 1314
+ height: 521
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17}
@@ -264,9 +264,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1524
+ x: 1314
y: 0
- width: 396
+ width: 606
height: 947
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
@@ -296,10 +296,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 385
+ x: 442
y: 19
- width: 1138
- height: 627
+ width: 871
+ height: 405
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
@@ -309,7 +309,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 1138, y: 606}
+ m_TargetSize: {x: 871, y: 384}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -390,15 +390,15 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73
- width: 383
- height: 627
+ width: 440
+ height: 405
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: ec32feff0033feffa633feff668afeff888afeffb68afeffc4cbfeffdacbfeff84ccfeffd6d6ffffead6ffff8cd7ffffe6d9fffffad9ffff98daffff5ae9ffff6ee9ffff0ceaffff62fbffffb2be0000a2c20000940a0100620c010052100100
+ m_ExpandedIDs: d81effffec1effff8a1fffff0c58ffff2058ffffbe58ffff787cffff4afbffffa23a00003e3d0000e83f0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -443,10 +443,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 384
+ x: 441
y: 73
- width: 1138
- height: 627
+ width: 871
+ height: 405
m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0
m_WindowGUID: 352ee9c972596684b9fdf9db32bf21bf
@@ -1087,9 +1087,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 721
- width: 1523
- height: 278
+ y: 499
+ width: 1313
+ height: 500
m_ViewDataDictionary: {fileID: 0}
m_SearchFilter:
m_NameFilter:
@@ -1115,9 +1115,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 20480000
- m_LastClickedID: 18464
- m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b
+ m_SelectedIDs: 14480000
+ m_LastClickedID: 18452
+ m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1145,7 +1145,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b
+ m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1172,7 +1172,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 0
+ m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -1279,9 +1279,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1524
+ x: 1314
y: 73
- width: 395
+ width: 605
height: 926
m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0
@@ -1295,4 +1295,4 @@ MonoBehaviour:
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
m_LastInspectedObjectInstanceID: -1
- m_LastVerticalScrollValue: 100
+ m_LastVerticalScrollValue: 0
diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt
index 6b71655e..314d53dd 100644
--- a/Library/CurrentMaximizeLayout.dwlt
+++ b/Library/CurrentMaximizeLayout.dwlt
@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 678, y: 471}
m_MaxSize: {x: 14000, y: 14021}
vertical: 0
- controlID: 6238
+ controlID: 7920
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -46,10 +46,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 385
+ x: 442
y: 19
- width: 1138
- height: 627
+ width: 871
+ height: 405
m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: []
m_SerializedViewValues: []
@@ -59,7 +59,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 1138, y: 606}
+ m_TargetSize: {x: 871, y: 384}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -74,10 +74,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
- m_HBaseRangeMin: -569
- m_HBaseRangeMax: 569
- m_VBaseRangeMin: -303
- m_VBaseRangeMax: 303
+ m_HBaseRangeMin: -435.5
+ m_HBaseRangeMax: 435.5
+ m_VBaseRangeMin: -192
+ m_VBaseRangeMax: 192
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -95,23 +95,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 1138
- height: 606
+ width: 871
+ height: 384
m_Scale: {x: 1, y: 1}
- m_Translation: {x: 569, y: 303}
+ m_Translation: {x: 435.5, y: 192}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -569
- y: -303
- width: 1138
- height: 606
+ x: -435.5
+ y: -192
+ width: 871
+ height: 384
m_MinimalGUI: 1
m_defaultScale: 1
- m_LastWindowPixelSize: {x: 1138, y: 627}
+ m_LastWindowPixelSize: {x: 871, y: 405}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -136,12 +136,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1524
+ width: 1314
height: 947
m_MinSize: {x: 403, y: 471}
m_MaxSize: {x: 10000, y: 14021}
vertical: 1
- controlID: 6239
+ controlID: 7921
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -161,12 +161,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 1524
- height: 648
+ width: 1314
+ height: 426
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
vertical: 0
- controlID: 6240
+ controlID: 7890
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -184,8 +184,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 384
- height: 648
+ width: 441
+ height: 426
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6}
@@ -216,15 +216,15 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73
- width: 383
- height: 627
+ width: 440
+ height: 405
m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 668afeff888afeffb68afeffc4cbfeffdacbfeff84ccfeffd6d6ffffead6ffff8cd7ffffe6d9fffffad9ffff98daffff5ae9ffff6ee9ffff0ceaffff62fbffffb2be0000a2c20000940a0100620c010052100100
+ m_ExpandedIDs: 0c58ffff2058ffffbe58ffff787cffff4afbffffa23a00003e3d0000e83f0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -263,10 +263,10 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 384
+ x: 441
y: 0
- width: 1140
- height: 648
+ width: 873
+ height: 426
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2}
@@ -298,10 +298,10 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 384
+ x: 441
y: 73
- width: 1138
- height: 627
+ width: 871
+ height: 405
m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0
m_WindowGUID: 352ee9c972596684b9fdf9db32bf21bf
@@ -936,11 +936,11 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 648
- width: 1524
- height: 299
- m_MinSize: {x: 230, y: 250}
- m_MaxSize: {x: 10000, y: 10000}
+ y: 426
+ width: 1314
+ height: 521
+ m_MinSize: {x: 231, y: 271}
+ m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 12}
@@ -970,9 +970,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 721
- width: 1523
- height: 278
+ y: 499
+ width: 1313
+ height: 500
m_ViewDataDictionary: {fileID: 0}
m_SearchFilter:
m_NameFilter:
@@ -998,9 +998,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 20480000
- m_LastClickedID: 18464
- m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b
+ m_SelectedIDs: 14480000
+ m_LastClickedID: 18452
+ m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1028,7 +1028,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000fc470000fe470000004800000248000004480000184800002048000000ca9a3b
+ m_ExpandedIDs: 00000000084800000a4800000c4800000e48000010480000124800001448000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1053,8 +1053,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs: 52460000
- m_LastClickedInstanceID: 18002
+ m_SelectedInstanceIDs:
+ m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c43000000000000
m_RenameOverlay:
@@ -1156,12 +1156,12 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 1524
+ x: 1314
y: 0
- width: 396
+ width: 606
height: 947
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 276, y: 71}
+ m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
@@ -1188,9 +1188,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 1524
+ x: 1314
y: 73
- width: 395
+ width: 605
height: 926
m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0
@@ -1203,5 +1203,5 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
- m_LastInspectedObjectInstanceID: 18002
- m_LastVerticalScrollValue: 100
+ m_LastInspectedObjectInstanceID: -1
+ m_LastVerticalScrollValue: 0
diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset
index adb3f742..19fad74e 100644
Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ
diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport
index 78862720..5816ee10 100644
Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll
index e00dad4e..85b3e4f1 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll
index 44ba7ac6..327befc7 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll
index f0e6dcf3..b87def44 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll
index cdc4b9d4..a6292052 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll
index 78b47471..c6d37cc2 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll
index 93408458..2d9b77cc 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll
index a2c6ef0c..bf279e64 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll
index d3cc4747..4a1ef51c 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll
index cac35165..cededa10 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll
index 35675fcb..24573618 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll and b/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll
index f0aded45..9315edff 100644
Binary files a/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll and b/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll differ
diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Library/PlayerDataCache/Win/Data/globalgamemanagers
index ef341e76..6be6f81d 100644
Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ
diff --git a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets
index 5d9d5066..ee1ba83e 100644
Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets and b/Library/PlayerDataCache/Win/Data/globalgamemanagers.assets differ
diff --git a/Library/PlayerDataCache/Win/Data/level0 b/Library/PlayerDataCache/Win/Data/level0
index d83774d4..af2810ba 100644
Binary files a/Library/PlayerDataCache/Win/Data/level0 and b/Library/PlayerDataCache/Win/Data/level0 differ
diff --git a/Library/PlayerDataCache/Win/Data/resources.assets b/Library/PlayerDataCache/Win/Data/resources.assets
index c9a71f22..1951d957 100644
Binary files a/Library/PlayerDataCache/Win/Data/resources.assets and b/Library/PlayerDataCache/Win/Data/resources.assets differ
diff --git a/Library/PlayerDataCache/Win/Data/sharedassets0.assets b/Library/PlayerDataCache/Win/Data/sharedassets0.assets
index c52443a0..fa6d4adc 100644
Binary files a/Library/PlayerDataCache/Win/Data/sharedassets0.assets and b/Library/PlayerDataCache/Win/Data/sharedassets0.assets differ
diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml
index 21f4db24..473082a1 100644
--- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml
+++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml
@@ -17,6 +17,7 @@ ScriptsOnlyBuild:
- RimWorldAnimationStudio.Chaser
- RimWorldAnimationStudio.ConsoleMessagesDialog
- RimWorldAnimationStudio.DialogBox
+ - RimWorldAnimationStudio.InputManager
- RimWorldAnimationStudio.KeyframeSlider
- RimWorldAnimationStudio.QuiverToggle
- RimWorldAnimationStudio.RaceSettingsDialog
@@ -110,39 +111,39 @@ ScriptsOnlyBuild:
- Class: 114
Script: {instanceID: 11262}
- Class: 114
- Script: {instanceID: 11288}
+ Script: {instanceID: 11290}
- Class: 114
- Script: {instanceID: 11448}
+ Script: {instanceID: 11450}
- Class: 114
- Script: {instanceID: 11500}
- - Class: 114
- Script: {instanceID: 11596}
+ Script: {instanceID: 11502}
- Class: 114
Script: {instanceID: 11598}
- Class: 114
- Script: {instanceID: 11652}
+ Script: {instanceID: 11600}
- Class: 114
- Script: {instanceID: 11728}
+ Script: {instanceID: 11654}
- Class: 114
- Script: {instanceID: 11752}
+ Script: {instanceID: 11730}
- Class: 114
- Script: {instanceID: 11764}
+ Script: {instanceID: 11754}
- Class: 114
- Script: {instanceID: 11774}
+ Script: {instanceID: 11766}
- Class: 114
- Script: {instanceID: 11796}
+ Script: {instanceID: 11776}
- Class: 114
- Script: {instanceID: 11858}
+ Script: {instanceID: 11798}
- Class: 114
- Script: {instanceID: 12128}
+ Script: {instanceID: 11860}
- Class: 114
- Script: {instanceID: 12164}
+ Script: {instanceID: 12130}
- Class: 114
- Script: {instanceID: 12330}
+ Script: {instanceID: 12166}
- Class: 114
- Script: {instanceID: 12344}
+ Script: {instanceID: 12332}
- Class: 114
- Script: {instanceID: 12592}
+ Script: {instanceID: 12346}
+ - Class: 114
+ Script: {instanceID: 12594}
- Class: 114
Script: {instanceID: 12708}
- Class: 114
@@ -186,23 +187,25 @@ ScriptsOnlyBuild:
- Class: 114
Script: {instanceID: 14060}
- Class: 114
- Script: {instanceID: 14140}
+ Script: {instanceID: 14142}
- Class: 114
- Script: {instanceID: 14154}
+ Script: {instanceID: 14156}
- Class: 114
- Script: {instanceID: 14302}
+ Script: {instanceID: 14304}
- Class: 114
- Script: {instanceID: 14474}
+ Script: {instanceID: 14450}
- Class: 114
- Script: {instanceID: 14506}
+ Script: {instanceID: 14478}
- Class: 114
- Script: {instanceID: 14528}
+ Script: {instanceID: 14510}
- Class: 114
- Script: {instanceID: 14530}
+ Script: {instanceID: 14532}
- Class: 114
- Script: {instanceID: 14570}
+ Script: {instanceID: 14534}
- Class: 114
- Script: {instanceID: 14576}
+ Script: {instanceID: 14574}
+ - Class: 114
+ Script: {instanceID: 14580}
- Class: 115
Script: {instanceID: 0}
- Class: 128
@@ -800,7 +803,7 @@ ScriptsOnlyBuild:
className: TMP_StyleSheet
- hash:
serializedVersion: 2
- Hash: 155fa65a94dae986077e1915a319a469
+ Hash: d0af3b54d34686d4fe1d5fd42b74380d
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: ApplicationManager
@@ -846,6 +849,12 @@ ScriptsOnlyBuild:
assemblyName: Unity.TextMeshPro.dll
namespaceName: TMPro
className: TMP_SubMesh
+ - hash:
+ serializedVersion: 2
+ Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
+ assemblyName: Assembly-CSharp.dll
+ namespaceName: RimWorldAnimationStudio
+ className: InputManager
- hash:
serializedVersion: 2
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
index 437c14e8..5b1cf6fb 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 d121c94b..d5f90c55 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 7b7c9194..84e4d8de 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 4092ae21..9cfafc21 100644
Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ
diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache
index a9f80ddd..444007a6 100644
Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f82af9c5..2eda3809 100644
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ