diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index da68992b..e5d16856 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Resources/Prefabs/AnimationTimeline.prefab b/Assets/Resources/Prefabs/AnimationTimeline.prefab index 6f47da7d..7b4712e0 100644 --- a/Assets/Resources/Prefabs/AnimationTimeline.prefab +++ b/Assets/Resources/Prefabs/AnimationTimeline.prefab @@ -259,7 +259,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -467,7 +467,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Resources/Prefabs/DialogBox.prefab b/Assets/Resources/Prefabs/DialogBox.prefab index 5aaf89f5..ba70326a 100644 --- a/Assets/Resources/Prefabs/DialogBox.prefab +++ b/Assets/Resources/Prefabs/DialogBox.prefab @@ -436,7 +436,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Resources/Prefabs/KeyframeSlider.prefab b/Assets/Resources/Prefabs/KeyframeSlider.prefab index ef4fd057..37760054 100644 --- a/Assets/Resources/Prefabs/KeyframeSlider.prefab +++ b/Assets/Resources/Prefabs/KeyframeSlider.prefab @@ -196,7 +196,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Resources/Prefabs/OptionButton.prefab b/Assets/Resources/Prefabs/OptionButton.prefab index 2ce5f3e9..d93a1ded 100644 --- a/Assets/Resources/Prefabs/OptionButton.prefab +++ b/Assets/Resources/Prefabs/OptionButton.prefab @@ -168,7 +168,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Resources/Prefabs/OptionField.prefab b/Assets/Resources/Prefabs/OptionField.prefab index c03e5b62..51687ca1 100644 --- a/Assets/Resources/Prefabs/OptionField.prefab +++ b/Assets/Resources/Prefabs/OptionField.prefab @@ -91,7 +91,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Resources/Prefabs/OptionToggle.prefab b/Assets/Resources/Prefabs/OptionToggle.prefab index 8c98fefa..e929c188 100644 --- a/Assets/Resources/Prefabs/OptionToggle.prefab +++ b/Assets/Resources/Prefabs/OptionToggle.prefab @@ -398,7 +398,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Resources/Prefabs/StageCard.prefab b/Assets/Resources/Prefabs/StageCard.prefab index a79ed03d..29cd9b08 100644 --- a/Assets/Resources/Prefabs/StageCard.prefab +++ b/Assets/Resources/Prefabs/StageCard.prefab @@ -168,7 +168,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -475,7 +475,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -810,7 +810,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 446fb3a3..856e9f91 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -188,7 +188,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -854,7 +854,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1018,7 +1018,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1406,7 +1406,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1536,7 +1536,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1944,7 +1944,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2741,7 +2741,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2926,7 +2926,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3069,7 +3069,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -3446,7 +3446,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -4491,7 +4491,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -4710,7 +4710,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -5388,7 +5388,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -5907,7 +5907,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -5993,7 +5993,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -6233,7 +6233,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -6634,7 +6634,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -6675,6 +6675,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 521630782} + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &521630785 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6843,7 +6854,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -8138,7 +8149,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -8487,7 +8498,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -8750,7 +8761,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -10381,7 +10392,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -10671,7 +10682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -11116,7 +11127,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -11446,7 +11457,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -11577,7 +11588,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -11815,7 +11826,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -12311,7 +12322,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -12871,7 +12882,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -13263,7 +13274,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -14168,7 +14179,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -14599,7 +14610,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -15038,7 +15049,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 922060210} m_HandleRect: {fileID: 922060209} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -15315,7 +15326,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -15943,7 +15954,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -16956,7 +16967,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -17214,7 +17225,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -17340,7 +17351,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -18082,7 +18093,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -18249,7 +18260,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -19004,7 +19015,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -19213,7 +19224,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -20036,7 +20047,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -21302,7 +21313,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -21589,7 +21600,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -22634,7 +22645,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -22854,7 +22865,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -23717,7 +23728,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -24037,7 +24048,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -24168,7 +24179,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -25021,7 +25032,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -25701,7 +25712,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -26745,7 +26756,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -26887,7 +26898,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -28823,7 +28834,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -29682,7 +29693,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -30770,7 +30781,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -31633,7 +31644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -32000,7 +32011,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -32232,7 +32243,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -33222,7 +33233,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -33409,7 +33420,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -33804,7 +33815,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -34011,7 +34022,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs index 2a01c2dc..9b669672 100644 --- a/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/AnimationClips/PawnAnimationClip.cs @@ -50,7 +50,7 @@ namespace RimWorldAnimationStudio if (keyframe.atTick.HasValue) { if (keyframe.HasValidKeyframeID() == false) - { keyframe.GenerateKeyframeID(); } + { keyframe.GenerateKeyframeID(Workspace.animationDef.animationStages[Workspace.stageID].animationClips.IndexOf(this)); } BodyAngle.Add((float)keyframe.atTick / (float)duration, keyframe.bodyAngle, true); HeadAngle.Add((float)keyframe.atTick / (float)duration, keyframe.headAngle, true); diff --git a/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs b/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs index fc409915..dc3db273 100644 --- a/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs +++ b/Assets/Scripts/AnimationComponents/KeyFrames/PawnKeyframe.cs @@ -19,6 +19,7 @@ namespace RimWorldAnimationStudio public float genitalAngle; public bool? quiver; [XmlIgnore] public int keyframeID; + [XmlIgnore] public int actorID = -1; public bool ShouldSerializegenitalAngle() { return genitalAngle != 0; } public bool ShouldSerializequiver() { return quiver != null; } @@ -28,13 +29,14 @@ namespace RimWorldAnimationStudio soundEffect = Tags.soundDefs.Concat(CustomTags.soundDefs).Contains(soundEffect) ? soundEffect : null; } - public void GenerateKeyframeID() - { + public void GenerateKeyframeID(int actorID) + { + this.actorID = actorID; int _keyframeID = Random.Range(100000, 1000000); if (Workspace.animationDef.animationStages.Any(x => x.animationClips.Any(y => y.keyframes.Any(z => z.keyframeID == _keyframeID)))) { - GenerateKeyframeID(); + GenerateKeyframeID(actorID); return; } diff --git a/Assets/Scripts/GUI/ActorBody.cs b/Assets/Scripts/GUI/ActorBody.cs index db672931..6d4018b6 100644 --- a/Assets/Scripts/GUI/ActorBody.cs +++ b/Assets/Scripts/GUI/ActorBody.cs @@ -32,7 +32,8 @@ namespace RimWorldAnimationStudio else { bodyRenderer.color = Constants.ColorWhite; } - appendageRenderer.gameObject.SetActive(Workspace.animationDef.actors[actorID].requiredGenitals.Any(x => x == "Penis") || Workspace.animationDef.actors[actorID].isFucking); + //headRenderer.gameObject.SetActive(Workspace.animationDef.actors[actorID].GetAlienRaceDef().isHumanoid); + //appendageRenderer.gameObject.SetActive(Workspace.animationDef.actors[actorID].requiredGenitals.Any(x => x == "Penis") || Workspace.animationDef.actors[actorID].isFucking); } public void OnPointerClick(PointerEventData eventData) diff --git a/Assets/Scripts/GUI/ActorKeyframeCard.cs b/Assets/Scripts/GUI/ActorKeyframeCard.cs index 5be55797..ca3f3c08 100644 --- a/Assets/Scripts/GUI/ActorKeyframeCard.cs +++ b/Assets/Scripts/GUI/ActorKeyframeCard.cs @@ -43,5 +43,66 @@ namespace RimWorldAnimationStudio Workspace.Instance.GetPawnAnimationClip(Workspace.actorID).BuildSimpleCurves(); Workspace.Instance.RecordEvent("Actor position / orientation"); } + + public void AdjustActor(Vector2 deltaOffset) + { + float deltaAngle = -deltaOffset.x * 33.3333f + deltaOffset.y * 33.3333f; + int facing = deltaOffset.x < 0 ? 3 : deltaOffset.y < 0 ? 2 : deltaOffset.x > 0 ? 1 : 0; + + switch (Workspace.actorManipulationMode) + { + case ActorManipulationMode.Pan: MoveActor(deltaOffset); break; + case ActorManipulationMode.Rotate: RotateActor(deltaAngle); break; + case ActorManipulationMode.Face: FaceActor(facing); break; + } + } + + public void MoveActor(Vector2 deltaOffset) + { + PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(true); + + if (Workspace.selectedBodyPart == null) + { + keyframe.bodyOffsetX += deltaOffset.x; + keyframe.bodyOffsetZ += deltaOffset.y; + } + + else if (Workspace.selectedBodyPart.isHead) + { keyframe.headBob += deltaOffset.y; } + + Workspace.Instance.GetCurrentPawnAnimationClip().BuildSimpleCurves(); + Workspace.Instance.RecordEvent("Actor position / orientation"); + } + + public void RotateActor(float deltaAngle) + { + PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(true); + + if (Workspace.selectedBodyPart == null) + { keyframe.bodyAngle += deltaAngle; } + + else if (Workspace.selectedBodyPart.isHead) + { keyframe.headAngle += deltaAngle; } + + else + { keyframe.genitalAngle -= deltaAngle; } + + Workspace.Instance.GetCurrentPawnAnimationClip().BuildSimpleCurves(); + Workspace.Instance.RecordEvent("Actor position / orientation"); + } + + public void FaceActor(int facing) + { + PawnKeyframe keyframe = Workspace.Instance.GetCurrentPawnKeyframe(true); + + if (Workspace.selectedBodyPart == null) + { keyframe.bodyFacing = facing; } + + else if (Workspace.selectedBodyPart.isHead) + { keyframe.headFacing = facing; } + + Workspace.Instance.GetCurrentPawnAnimationClip().BuildSimpleCurves(); + Workspace.Instance.RecordEvent("Actor position / orientation"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/GUI/SelectRaceDropdown.cs b/Assets/Scripts/GUI/SelectRaceDropdown.cs index 0d163ccc..07ca12c3 100644 --- a/Assets/Scripts/GUI/SelectRaceDropdown.cs +++ b/Assets/Scripts/GUI/SelectRaceDropdown.cs @@ -56,6 +56,7 @@ namespace RimWorldAnimationStudio if (Workspace.animationDef == null) return; Workspace.animationDef.actors[Workspace.actorID].SetAlienRaceDef(label.text); + Workspace.selectedBodyPart = null; } } } \ No newline at end of file diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index e27c9ca4..8780b3f0 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -143,6 +143,7 @@ namespace RimWorldAnimationStudio { continue; } bool quiver = isAnimating && Workspace.Instance.GetCurrentOrPreviousKeyframe(actorID).quiver == true; + bool requiresGenitals = actor.requiredGenitals.Any(x => x == "Penis") || Workspace.animationDef.actors[actorID].isFucking; float clipPercent = (float)(stageTick % clip.duration) / clip.duration; if (stageTick == clip.duration) clipPercent = 1f; @@ -184,7 +185,7 @@ namespace RimWorldAnimationStudio actorBody.bodyRenderer.sprite = alienRaceDef.GetBodyTypeGraphic((CardinalDirection)bodyFacing, bodyType); actorBody.headRenderer.sprite = alienRaceDef.isHumanoid ? alienRaceDef.GetHeadGraphic((CardinalDirection)headFacing) : null; - actorBody.appendageRenderer.sprite = alienRaceDef.isHumanoid && bodyFacing != 0 ? Resources.Load("Textures/Humanlike/Appendages/Appendage" + bodyFacing) : null; + actorBody.appendageRenderer.sprite = requiresGenitals && alienRaceDef.isHumanoid && bodyFacing != 0 ? Resources.Load("Textures/Humanlike/Appendages/Appendage" + bodyFacing) : null; actorBody.bodyRenderer.gameObject.SetActive(actorBody.bodyRenderer.sprite != null); actorBody.headRenderer.gameObject.SetActive(actorBody.headRenderer.sprite != null); @@ -352,7 +353,7 @@ namespace RimWorldAnimationStudio { Debug.LogWarning("Cannot clone pawn keyframe - a keyframe already exists at this tick"); return; } PawnKeyframe cloneFrame = keyframe.Copy(); - cloneFrame.GenerateKeyframeID(); + cloneFrame.GenerateKeyframeID(clipID); cloneFrame.atTick = stageTick; PawnKeyframe nextKeyframe = clip.keyframes.FirstOrDefault(x => x.atTick > stageTick); @@ -371,6 +372,48 @@ namespace RimWorldAnimationStudio Workspace.Instance.RecordEvent("Keyframe clone"); } + public void CopyPawnKeyframes() + { + Workspace.copiedKeyframes.Clear(); + + List keyframesToClone = Workspace.Instance.GetPawnKeyframes(Workspace.keyframeID); + + foreach (PawnKeyframe keyframe in keyframesToClone) + { Workspace.copiedKeyframes.Add(keyframe.Copy()); } + } + + public void PastePawnKeyframes() + { + foreach (PawnKeyframe keyframe in Workspace.copiedKeyframes) + { + PawnAnimationClip clip = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[keyframe.actorID]; + + if (Workspace.Instance.DoesPawnKeyframeExistAtTick(Workspace.stageID, keyframe.actorID, stageTick)) + { + PawnKeyframe oldKeyframe = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[keyframe.actorID].keyframes.First(x => x.atTick == stageTick); + + RemovePawnKeyframe(keyframe.actorID, oldKeyframe.keyframeID, true); + } + + keyframe.GenerateKeyframeID(keyframe.actorID); + keyframe.atTick = stageTick; + + PawnKeyframe nextKeyframe = clip.keyframes.FirstOrDefault(x => x.atTick > stageTick); + + if (nextKeyframe != null) + { clip.keyframes.Insert(clip.keyframes.IndexOf(nextKeyframe), keyframe); } + + else + { clip.keyframes.Add(keyframe); } + + clip.BuildSimpleCurves(); + + animationTimelines.GetComponentsInChildren()[keyframe.actorID].AddPawnKeyFrame(keyframe.keyframeID); + + clip.BuildSimpleCurves(); + } + } + public void RemovePawnKeyframe() { foreach (int keyframeID in Workspace.keyframeID) @@ -380,17 +423,17 @@ namespace RimWorldAnimationStudio } } - public void RemovePawnKeyframe(int actorID, int keyframeID) + public void RemovePawnKeyframe(int actorID, int keyframeID, bool force = false) { PawnKeyframe keyframe = Workspace.Instance.GetPawnKeyframe(actorID, keyframeID); PawnAnimationClip clip = Workspace.animationDef.animationStages[Workspace.stageID].animationClips[actorID]; if (keyframe == null || clip == null) return; - if (keyframe.atTick == 1) + if (keyframe.atTick == 1 && force == false) { Debug.LogWarning("Cannot delete key frame - the first key frame of an animation clip cannot be deleted"); return; } - if (clip.keyframes.Count <= 2) + if (clip.keyframes.Count <= 2 && force == false) { Debug.LogWarning("Cannot delete key frame - an animation clip must have two or more keyframes"); return; } animationTimelines.GetComponentsInChildren()[actorID].RemovePawnKeyFrame(keyframe.keyframeID); diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputManager.cs index cb2203ef..75c00059 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputManager.cs @@ -9,34 +9,220 @@ namespace RimWorldAnimationStudio { public class InputManager : Singleton { + private float lastUpdate = -1f; + private float timeBetweenUpdates = 0.15f; + private float largeStep = 0.1f; + private float smallStep = 0.03f; + + public bool CanUpdate() + { + if (Time.unscaledTime > lastUpdate + timeBetweenUpdates) + { + lastUpdate = Time.unscaledTime; + return true; + } + + return false; + } + public void Update() { - if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Z)) + // Make new animation + if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.N)) + { ApplicationManager.Instance.TryToMakeNewAnimation(); } + + // Save animation + else if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.S)) + { ApplicationManager.Instance.TryToSaveAnimation(); } + + // Load animation + else if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) && Input.GetKeyDown(KeyCode.L)) + { ApplicationManager.Instance.TryToLoadAnimation(); } + + // Exit if animationDef has not be loaded + if (Workspace.animationDef == null) return; + + // Play / pause + if (Input.GetKeyDown(KeyCode.Space)) + { AnimationController.Instance.ToggleAnimation(); } + + // Move / switch actors + else if (Input.GetKey(KeyCode.UpArrow) && CanUpdate()) + { + if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) + { + Workspace.selectedBodyPart = null; + Workspace.actorID = Mathf.Clamp(Workspace.actorID - 1, 0, Workspace.animationDef.actors.Count - 1); + } + + else if (Input.GetKey(KeyCode.LeftShift)) + { ActorKeyframeCard.Instance.AdjustActor(Vector2.up * smallStep); } + + else + { ActorKeyframeCard.Instance.AdjustActor(Vector2.up * largeStep); } + } + + else if (Input.GetKey(KeyCode.DownArrow) && CanUpdate()) + { + if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) + { + Workspace.selectedBodyPart = null; + Workspace.actorID = Mathf.Clamp(Workspace.actorID + 1, 0, Workspace.animationDef.actors.Count - 1); + } + + else if (Input.GetKey(KeyCode.LeftShift)) + { ActorKeyframeCard.Instance.AdjustActor(Vector2.down * smallStep); } + + else + { ActorKeyframeCard.Instance.AdjustActor(Vector2.down * largeStep); } + } + + else if (Input.GetKey(KeyCode.LeftArrow) && CanUpdate()) + { + if (Input.GetKey(KeyCode.LeftShift)) + { ActorKeyframeCard.Instance.AdjustActor(Vector2.left * smallStep); } + + else + { ActorKeyframeCard.Instance.AdjustActor(Vector2.left * largeStep); } + } + + else if (Input.GetKey(KeyCode.RightArrow) && CanUpdate()) + { + if (Input.GetKey(KeyCode.LeftShift)) + { ActorKeyframeCard.Instance.AdjustActor(Vector2.right * smallStep); } + + else + { ActorKeyframeCard.Instance.AdjustActor(Vector2.right * largeStep); } + } + + // Switch to actor panning + else if (Input.GetKeyDown(KeyCode.Q)) + { AnimationController.Instance.ToggleActorManipulationMode(0); } + + // Switch to actor rotating + else if (Input.GetKeyDown(KeyCode.W)) + { AnimationController.Instance.ToggleActorManipulationMode(1); } + + // SWitch to actor facing + else if (Input.GetKeyDown(KeyCode.E)) + { AnimationController.Instance.ToggleActorManipulationMode(2); } + + // Switch between body parts + else if (Input.GetKeyDown(KeyCode.Tab)) + { + ActorBody actorBody = AnimationController.Instance.actorBodies.GetChild(Workspace.actorID).GetComponent(); + List actorBodyParts = actorBody.GetComponentsInChildren().Where(x => x.gameObject.activeInHierarchy)?.ToList(); + + foreach(Transform c in actorBody.transform) + { + Debug.Log(c.gameObject + " " + c.gameObject.activeSelf); + } + + if (actorBodyParts.NullOrEmpty()) return; + + if (Workspace.selectedBodyPart == null) + { actorBodyParts[0].Activate(); return; } + + else + { + for (int i = 0; i < actorBodyParts.Count; i++) + { + ActorBodyPart part = actorBodyParts[i]; + + if (part == Workspace.selectedBodyPart) + { + if (i < actorBodyParts.Count - 1) + { actorBodyParts[i + 1].Activate(); return; } + + else + { actorBody.Activate(); return; } + } + } + } + } + + // Move along time lines + else if (Input.GetKey(KeyCode.PageUp) && CanUpdate()) + { + if (Input.GetKey(KeyCode.LeftShift)) + { + PawnKeyframe keyframe = Workspace.Instance.GetPreviousKeyframe(Workspace.actorID); + if (keyframe != null) AnimationController.Instance.stageTick = keyframe.atTick.Value; + } + + else if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) + { AnimationController.Instance.stageTick = 1; } + + else + { AnimationController.Instance.stageTick = Mathf.Clamp(AnimationController.Instance.stageTick - 1, 1, Workspace.StageWindowSize); } + } + + else if (Input.GetKey(KeyCode.PageDown) && CanUpdate()) + { + if (Input.GetKey(KeyCode.LeftShift)) + { + PawnKeyframe keyframe = Workspace.Instance.GetNextKeyframe(Workspace.actorID); + if (keyframe != null) AnimationController.Instance.stageTick = keyframe.atTick.Value; + } + + else if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.LeftCommand)) + { AnimationController.Instance.stageTick = Workspace.StageWindowSize; } + + else + { AnimationController.Instance.stageTick = Mathf.Clamp(AnimationController.Instance.stageTick + 1, 1, Workspace.StageWindowSize); } + } + + // Switch stages + else if (Input.GetKeyDown(KeyCode.Home)) + { + int prevStageID = Workspace.stageID; + Workspace.stageID = Mathf.Clamp(Workspace.stageID - 1, 0, Workspace.animationDef.animationStages.Count - 1); + + if (Workspace.stageID != prevStageID) + { Workspace.Instance.RecordEvent("Stage selected"); } + } + + else if (Input.GetKeyDown(KeyCode.End)) + { + + int prevStageID = Workspace.stageID; + Workspace.stageID = Mathf.Clamp(Workspace.stageID + 1, 0, Workspace.animationDef.animationStages.Count - 1); + + if (Workspace.stageID != prevStageID) + { Workspace.Instance.RecordEvent("Stage selected"); } + } + + // Undo + else 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(); } + // Redo 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(); } + // Copy keyframes + else if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.C)) + { AnimationController.Instance.CopyPawnKeyframes(); } + else if (Input.GetKey(KeyCode.LeftCommand) && Input.GetKeyDown(KeyCode.C)) + { AnimationController.Instance.CopyPawnKeyframes(); } + + // Paste keyframes + else if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.V)) + { AnimationController.Instance.PastePawnKeyframes(); } + + else if (Input.GetKey(KeyCode.LeftCommand) && Input.GetKeyDown(KeyCode.X)) + { AnimationController.Instance.PastePawnKeyframes(); } + + // Delete keyframes 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/Workspace/Workspace.cs b/Assets/Scripts/Workspace/Workspace.cs index d2f25b20..f3914583 100644 --- a/Assets/Scripts/Workspace/Workspace.cs +++ b/Assets/Scripts/Workspace/Workspace.cs @@ -20,7 +20,9 @@ namespace RimWorldAnimationStudio public static ActorManipulationMode actorManipulationMode = ActorManipulationMode.Pan; public static ActorBodyPart selectedBodyPart; - static int _actorID = 0; + public static List copiedKeyframes = new List(); + + private static int _actorID = 0; public static int actorID { get { return Mathf.Clamp(_actorID, 0, animationDef.actors.Count - 1); } set { _actorID = value; } } public static int StageWindowSize @@ -109,6 +111,38 @@ namespace RimWorldAnimationStudio return animationDef.animationStages[stageID].animationClips[actorID].keyframes.Any(x => x.atTick == atTick); } + public PawnKeyframe GetNextKeyframe(int actorID) + { + PawnKeyframe pawnKeyframe = null; + PawnAnimationClip clip = GetPawnAnimationClip(actorID); + + int stageTick = AnimationController.Instance.stageTick; + + foreach (PawnKeyframe keyframe in clip.keyframes) + { + if (keyframe.atTick > stageTick) + { pawnKeyframe = keyframe; break; } + } + + return pawnKeyframe; + } + + public PawnKeyframe GetPreviousKeyframe(int actorID) + { + PawnKeyframe pawnKeyframe = null; + PawnAnimationClip clip = GetPawnAnimationClip(actorID); + + int stageTick = AnimationController.Instance.stageTick; + + foreach (PawnKeyframe keyframe in clip.keyframes) + { + if (keyframe.atTick < stageTick) + { pawnKeyframe = keyframe; } + } + + return pawnKeyframe; + } + public PawnKeyframe GetCurrentOrPreviousKeyframe(int actorID) { PawnKeyframe pawnKeyframe = null; diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index b70b05f9..828701b7 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 82b24bb9..b246bad9 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 c7bef56e..f345b16e 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 52322eb0..e0639b56 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 f0b0b09c..3d1ac389 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 67a1f17b..8ba8f5ee 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 3bea6897..8492be17 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 da1ce1d7..9ba811bb 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 74cfe1a1..0aa86c59 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 0794438c..dd077203 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 df36ec54..3597d1a0 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/customTags.xml b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/customTags.xml index 3dc40f02..aa872a58 100644 --- a/Build/RimWorld-Animation-Studio_Data/StreamingAssets/customTags.xml +++ b/Build/RimWorld-Animation-Studio_Data/StreamingAssets/customTags.xml @@ -3,15 +3,6 @@ - -
  • AnalSex
  • -
  • AnalSexF
  • -
  • AnalRapeF
  • -
  • VaginalSex
  • -
  • VaginalSexF
  • -
  • VaginalRapeF
  • -
    - -
  • Kiss
  • -
    + + \ No newline at end of file diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers index 3748504f..7384e6dd 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/level0 b/Build/RimWorld-Animation-Studio_Data/level0 index 7f5bd4eb..153e048f 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 4617b973..e5306494 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 59e512c0..343a104f 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 fe759b8e..1bc04ec5 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/00/0058e49d2f590bbdef73a878bebfbb0b b/Library/Artifacts/00/0058e49d2f590bbdef73a878bebfbb0b deleted file mode 100644 index 07d98389..00000000 Binary files a/Library/Artifacts/00/0058e49d2f590bbdef73a878bebfbb0b and /dev/null differ diff --git a/Library/Artifacts/01/01076cf8aa0fb87c02b598e8478a36e2 b/Library/Artifacts/01/01076cf8aa0fb87c02b598e8478a36e2 new file mode 100644 index 00000000..01a63ac0 Binary files /dev/null and b/Library/Artifacts/01/01076cf8aa0fb87c02b598e8478a36e2 differ diff --git a/Library/Artifacts/03/037f252297ff40c9cb4d44f1237fe7ec b/Library/Artifacts/03/037f252297ff40c9cb4d44f1237fe7ec deleted file mode 100644 index d76a4dfc..00000000 Binary files a/Library/Artifacts/03/037f252297ff40c9cb4d44f1237fe7ec and /dev/null differ diff --git a/Library/Artifacts/05/05a406e5e7bbc64b2d3c1cab77287dbd b/Library/Artifacts/05/05a406e5e7bbc64b2d3c1cab77287dbd deleted file mode 100644 index ce37a414..00000000 Binary files a/Library/Artifacts/05/05a406e5e7bbc64b2d3c1cab77287dbd and /dev/null differ diff --git a/Library/Artifacts/2e/2eb04eab092690119d6d468048e91667 b/Library/Artifacts/09/09ca70aebe2c96652ec7d70cfe64b434 similarity index 93% rename from Library/Artifacts/2e/2eb04eab092690119d6d468048e91667 rename to Library/Artifacts/09/09ca70aebe2c96652ec7d70cfe64b434 index ea46f1be..ae4e3a86 100644 Binary files a/Library/Artifacts/2e/2eb04eab092690119d6d468048e91667 and b/Library/Artifacts/09/09ca70aebe2c96652ec7d70cfe64b434 differ diff --git a/Library/Artifacts/0a/0a480c9dbd996b5889600da5361667d0 b/Library/Artifacts/0a/0a480c9dbd996b5889600da5361667d0 deleted file mode 100644 index 7d19e437..00000000 Binary files a/Library/Artifacts/0a/0a480c9dbd996b5889600da5361667d0 and /dev/null differ diff --git a/Library/Artifacts/14/148af1c1e4a8e200283de290fe6b1fa5 b/Library/Artifacts/14/148af1c1e4a8e200283de290fe6b1fa5 new file mode 100644 index 00000000..83416362 Binary files /dev/null and b/Library/Artifacts/14/148af1c1e4a8e200283de290fe6b1fa5 differ diff --git a/Library/Artifacts/16/16029695ddc7399dc1b64938a1d31222 b/Library/Artifacts/16/16029695ddc7399dc1b64938a1d31222 deleted file mode 100644 index 8c0cdc9b..00000000 Binary files a/Library/Artifacts/16/16029695ddc7399dc1b64938a1d31222 and /dev/null differ diff --git a/Library/Artifacts/47/472ec072dd2a2fc399e31e16e406c55f b/Library/Artifacts/19/19783616a7e6d343e4170ecc33ac3dd3 similarity index 99% rename from Library/Artifacts/47/472ec072dd2a2fc399e31e16e406c55f rename to Library/Artifacts/19/19783616a7e6d343e4170ecc33ac3dd3 index 58a2f8d4..9a9dbe64 100644 Binary files a/Library/Artifacts/47/472ec072dd2a2fc399e31e16e406c55f and b/Library/Artifacts/19/19783616a7e6d343e4170ecc33ac3dd3 differ diff --git a/Library/Artifacts/c0/c083690e3c22fcaa77fca5ca5b03a99d b/Library/Artifacts/1a/1a3a196b81998bbb82d21877b53fa392 similarity index 99% rename from Library/Artifacts/c0/c083690e3c22fcaa77fca5ca5b03a99d rename to Library/Artifacts/1a/1a3a196b81998bbb82d21877b53fa392 index ec24a63d..aef07280 100644 Binary files a/Library/Artifacts/c0/c083690e3c22fcaa77fca5ca5b03a99d and b/Library/Artifacts/1a/1a3a196b81998bbb82d21877b53fa392 differ diff --git a/Library/Artifacts/e8/e8790d41a725f7300a7f0e24ca9bf50c b/Library/Artifacts/29/2936376342cdccc20d500115bbee6252 similarity index 90% rename from Library/Artifacts/e8/e8790d41a725f7300a7f0e24ca9bf50c rename to Library/Artifacts/29/2936376342cdccc20d500115bbee6252 index 8e5f4f17..dc7d9538 100644 Binary files a/Library/Artifacts/e8/e8790d41a725f7300a7f0e24ca9bf50c and b/Library/Artifacts/29/2936376342cdccc20d500115bbee6252 differ diff --git a/Library/Artifacts/2c/2c33b5adca9ff8791724c61a1f724120 b/Library/Artifacts/2c/2c33b5adca9ff8791724c61a1f724120 deleted file mode 100644 index 0dec2af9..00000000 Binary files a/Library/Artifacts/2c/2c33b5adca9ff8791724c61a1f724120 and /dev/null differ diff --git a/Library/Artifacts/9d/9dec074eae076b77f4f4e24c77c77e5a b/Library/Artifacts/2f/2f0c4bb8c29658c6f86c4cb38143cee7 similarity index 93% rename from Library/Artifacts/9d/9dec074eae076b77f4f4e24c77c77e5a rename to Library/Artifacts/2f/2f0c4bb8c29658c6f86c4cb38143cee7 index 572cdc3e..c1064471 100644 Binary files a/Library/Artifacts/9d/9dec074eae076b77f4f4e24c77c77e5a and b/Library/Artifacts/2f/2f0c4bb8c29658c6f86c4cb38143cee7 differ diff --git a/Library/Artifacts/52/5271e973d5035c1e2c5c282656361035 b/Library/Artifacts/32/3231ed84d86678cb1474e94d0292c541 similarity index 99% rename from Library/Artifacts/52/5271e973d5035c1e2c5c282656361035 rename to Library/Artifacts/32/3231ed84d86678cb1474e94d0292c541 index f628271b..756fe279 100644 Binary files a/Library/Artifacts/52/5271e973d5035c1e2c5c282656361035 and b/Library/Artifacts/32/3231ed84d86678cb1474e94d0292c541 differ diff --git a/Library/Artifacts/36/36db749f13d147ddbb73498598a15c0a b/Library/Artifacts/36/36db749f13d147ddbb73498598a15c0a deleted file mode 100644 index de664315..00000000 Binary files a/Library/Artifacts/36/36db749f13d147ddbb73498598a15c0a and /dev/null differ diff --git a/Library/Artifacts/3b/3be71268f2398b6f1a2a0725e0e32b85 b/Library/Artifacts/3b/3be71268f2398b6f1a2a0725e0e32b85 deleted file mode 100644 index 2654d82c..00000000 Binary files a/Library/Artifacts/3b/3be71268f2398b6f1a2a0725e0e32b85 and /dev/null differ diff --git a/Library/Artifacts/3c/3ca558ce9a8d735b635d36236d196911 b/Library/Artifacts/3c/3ca558ce9a8d735b635d36236d196911 deleted file mode 100644 index b499b776..00000000 Binary files a/Library/Artifacts/3c/3ca558ce9a8d735b635d36236d196911 and /dev/null differ diff --git a/Library/Artifacts/3f/3f6e9beb041c512cc8910f2d3211948a b/Library/Artifacts/3f/3f6e9beb041c512cc8910f2d3211948a deleted file mode 100644 index ce556fca..00000000 Binary files a/Library/Artifacts/3f/3f6e9beb041c512cc8910f2d3211948a and /dev/null differ diff --git a/Library/Artifacts/40/405a3a249ee7e6d3b6e289e645a5d2b5 b/Library/Artifacts/40/405a3a249ee7e6d3b6e289e645a5d2b5 deleted file mode 100644 index 23bd2022..00000000 Binary files a/Library/Artifacts/40/405a3a249ee7e6d3b6e289e645a5d2b5 and /dev/null differ diff --git a/Library/Artifacts/4a/4a09d0ffc33058f9b2b113da32cc10b9 b/Library/Artifacts/4a/4a09d0ffc33058f9b2b113da32cc10b9 deleted file mode 100644 index 9872b23b..00000000 Binary files a/Library/Artifacts/4a/4a09d0ffc33058f9b2b113da32cc10b9 and /dev/null differ diff --git a/Library/Artifacts/f5/f549b40ef34b9e9d7facd81e049f2baf b/Library/Artifacts/4a/4a512b0ed9ac3c315ed70801c7d93ba5 similarity index 99% rename from Library/Artifacts/f5/f549b40ef34b9e9d7facd81e049f2baf rename to Library/Artifacts/4a/4a512b0ed9ac3c315ed70801c7d93ba5 index fdad1c21..656c9ecc 100644 Binary files a/Library/Artifacts/f5/f549b40ef34b9e9d7facd81e049f2baf and b/Library/Artifacts/4a/4a512b0ed9ac3c315ed70801c7d93ba5 differ diff --git a/Library/Artifacts/50/5067ceac21214cac131ff6a414659168 b/Library/Artifacts/50/5067ceac21214cac131ff6a414659168 deleted file mode 100644 index 28139e04..00000000 Binary files a/Library/Artifacts/50/5067ceac21214cac131ff6a414659168 and /dev/null differ diff --git a/Library/Artifacts/54/5455e5ea9140968b438160e5223ad8f0 b/Library/Artifacts/54/5455e5ea9140968b438160e5223ad8f0 deleted file mode 100644 index e49cc9e5..00000000 Binary files a/Library/Artifacts/54/5455e5ea9140968b438160e5223ad8f0 and /dev/null differ diff --git a/Library/Artifacts/54/54a46dac484d48404ada5ea176a0ad7f b/Library/Artifacts/54/54a46dac484d48404ada5ea176a0ad7f deleted file mode 100644 index d567c9f3..00000000 Binary files a/Library/Artifacts/54/54a46dac484d48404ada5ea176a0ad7f and /dev/null differ diff --git a/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 b/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 deleted file mode 100644 index 6ea7ba2c..00000000 Binary files a/Library/Artifacts/56/56377868ca81e67a6dee55b0c46f2f06 and /dev/null differ diff --git a/Library/Artifacts/57/57529a414e2147873d56af3323e9c44c b/Library/Artifacts/57/57529a414e2147873d56af3323e9c44c deleted file mode 100644 index 73b27b12..00000000 Binary files a/Library/Artifacts/57/57529a414e2147873d56af3323e9c44c and /dev/null differ diff --git a/Library/Artifacts/59/59e221fa162e63e68cbf6e50ad789db9 b/Library/Artifacts/59/59e221fa162e63e68cbf6e50ad789db9 deleted file mode 100644 index b2f3445d..00000000 Binary files a/Library/Artifacts/59/59e221fa162e63e68cbf6e50ad789db9 and /dev/null differ diff --git a/Library/Artifacts/7b/7b7ce051cd44ab4b05044d2a7da92cb2 b/Library/Artifacts/63/63e62b597912f7b9ac933b47e731c09c similarity index 91% rename from Library/Artifacts/7b/7b7ce051cd44ab4b05044d2a7da92cb2 rename to Library/Artifacts/63/63e62b597912f7b9ac933b47e731c09c index 40161e0a..83f4d398 100644 Binary files a/Library/Artifacts/7b/7b7ce051cd44ab4b05044d2a7da92cb2 and b/Library/Artifacts/63/63e62b597912f7b9ac933b47e731c09c differ diff --git a/Library/Artifacts/65/65aeb2ffaeb0295203f40caec296a575 b/Library/Artifacts/65/65aeb2ffaeb0295203f40caec296a575 deleted file mode 100644 index 8319fd70..00000000 Binary files a/Library/Artifacts/65/65aeb2ffaeb0295203f40caec296a575 and /dev/null differ diff --git a/Library/Artifacts/65/65e7738fc9d94ea9446f338e5fcc5a41 b/Library/Artifacts/65/65e7738fc9d94ea9446f338e5fcc5a41 deleted file mode 100644 index 4ec3a0c2..00000000 Binary files a/Library/Artifacts/65/65e7738fc9d94ea9446f338e5fcc5a41 and /dev/null differ diff --git a/Library/Artifacts/5f/5fbfa1d9760e35473af6b0ef1c5e5367 b/Library/Artifacts/69/69a964896e6aac57cbc813786e7d250e similarity index 99% rename from Library/Artifacts/5f/5fbfa1d9760e35473af6b0ef1c5e5367 rename to Library/Artifacts/69/69a964896e6aac57cbc813786e7d250e index 2c8fd794..c722eece 100644 Binary files a/Library/Artifacts/5f/5fbfa1d9760e35473af6b0ef1c5e5367 and b/Library/Artifacts/69/69a964896e6aac57cbc813786e7d250e differ diff --git a/Library/Artifacts/6b/6baec19778384f281028b73505908d3e b/Library/Artifacts/6b/6baec19778384f281028b73505908d3e deleted file mode 100644 index c82c6ffa..00000000 Binary files a/Library/Artifacts/6b/6baec19778384f281028b73505908d3e and /dev/null differ diff --git a/Library/Artifacts/77/771322925e5f3dff82d76747b4f1ef21 b/Library/Artifacts/77/771322925e5f3dff82d76747b4f1ef21 deleted file mode 100644 index af10dcc5..00000000 Binary files a/Library/Artifacts/77/771322925e5f3dff82d76747b4f1ef21 and /dev/null differ diff --git a/Library/Artifacts/79/796e66aaa9677f9dd989282ce2869b35 b/Library/Artifacts/79/796e66aaa9677f9dd989282ce2869b35 deleted file mode 100644 index 9e8fefa4..00000000 Binary files a/Library/Artifacts/79/796e66aaa9677f9dd989282ce2869b35 and /dev/null differ diff --git a/Library/Artifacts/7f/7f34a2e454d437475c7e64d16dd94b5c b/Library/Artifacts/7f/7f34a2e454d437475c7e64d16dd94b5c deleted file mode 100644 index 7f2e9856..00000000 Binary files a/Library/Artifacts/7f/7f34a2e454d437475c7e64d16dd94b5c and /dev/null differ diff --git a/Library/Artifacts/7f/7f834f39b12cb1ea64402376d3b2682c b/Library/Artifacts/7f/7f834f39b12cb1ea64402376d3b2682c deleted file mode 100644 index 8e8793d9..00000000 Binary files a/Library/Artifacts/7f/7f834f39b12cb1ea64402376d3b2682c and /dev/null differ diff --git a/Library/Artifacts/3e/3edc00caca3075e7bfcfa27ee7384dd9 b/Library/Artifacts/82/820206ba7491b2d6226334e189a66b52 similarity index 69% rename from Library/Artifacts/3e/3edc00caca3075e7bfcfa27ee7384dd9 rename to Library/Artifacts/82/820206ba7491b2d6226334e189a66b52 index 247f7121..871c6e0b 100644 Binary files a/Library/Artifacts/3e/3edc00caca3075e7bfcfa27ee7384dd9 and b/Library/Artifacts/82/820206ba7491b2d6226334e189a66b52 differ diff --git a/Library/Artifacts/83/83298cde2f067e6bf7b96291a40f1ecf b/Library/Artifacts/83/83298cde2f067e6bf7b96291a40f1ecf deleted file mode 100644 index 9954ef66..00000000 Binary files a/Library/Artifacts/83/83298cde2f067e6bf7b96291a40f1ecf and /dev/null differ diff --git a/Library/Artifacts/85/85a3b8a62badfb4b60e1663e3cd6d998 b/Library/Artifacts/85/85a3b8a62badfb4b60e1663e3cd6d998 deleted file mode 100644 index 0315cc7d..00000000 Binary files a/Library/Artifacts/85/85a3b8a62badfb4b60e1663e3cd6d998 and /dev/null differ diff --git a/Library/Artifacts/90/901b4225796a9f1fde8cf123cdad4076 b/Library/Artifacts/90/901b4225796a9f1fde8cf123cdad4076 deleted file mode 100644 index b4cab5cf..00000000 Binary files a/Library/Artifacts/90/901b4225796a9f1fde8cf123cdad4076 and /dev/null differ diff --git a/Library/Artifacts/94/94d737b1d8865dac42de8f727091dc4f b/Library/Artifacts/94/94d737b1d8865dac42de8f727091dc4f deleted file mode 100644 index 40106c0f..00000000 Binary files a/Library/Artifacts/94/94d737b1d8865dac42de8f727091dc4f and /dev/null differ diff --git a/Library/Artifacts/98/98b46766821abfec808eccb2fdcb2ca6 b/Library/Artifacts/98/98b46766821abfec808eccb2fdcb2ca6 new file mode 100644 index 00000000..dbb85e40 Binary files /dev/null and b/Library/Artifacts/98/98b46766821abfec808eccb2fdcb2ca6 differ diff --git a/Library/Artifacts/9b/9b353a3142f782a0542f61f39acfc2c5 b/Library/Artifacts/9b/9b353a3142f782a0542f61f39acfc2c5 deleted file mode 100644 index 2bca18a4..00000000 Binary files a/Library/Artifacts/9b/9b353a3142f782a0542f61f39acfc2c5 and /dev/null differ diff --git a/Library/Artifacts/ae/ae273eaea99a1f626f5acab6247f3214 b/Library/Artifacts/a9/a9695d4bfb70d83a9936cb3d5fe4de0c similarity index 99% rename from Library/Artifacts/ae/ae273eaea99a1f626f5acab6247f3214 rename to Library/Artifacts/a9/a9695d4bfb70d83a9936cb3d5fe4de0c index 2fc0d9cf..bf848a4d 100644 Binary files a/Library/Artifacts/ae/ae273eaea99a1f626f5acab6247f3214 and b/Library/Artifacts/a9/a9695d4bfb70d83a9936cb3d5fe4de0c differ diff --git a/Library/Artifacts/ad/ade5b7606ff80c1e71cee92507ddaf5b b/Library/Artifacts/ad/ade5b7606ff80c1e71cee92507ddaf5b deleted file mode 100644 index 2ba6d572..00000000 Binary files a/Library/Artifacts/ad/ade5b7606ff80c1e71cee92507ddaf5b and /dev/null differ diff --git a/Library/Artifacts/b0/b03929bc84b38ac99706989321a28dd2 b/Library/Artifacts/b0/b03929bc84b38ac99706989321a28dd2 deleted file mode 100644 index 8ab56997..00000000 Binary files a/Library/Artifacts/b0/b03929bc84b38ac99706989321a28dd2 and /dev/null differ diff --git a/Library/Artifacts/b0/b0fdd9039549e1c182c4379d859e851f b/Library/Artifacts/b0/b0fdd9039549e1c182c4379d859e851f deleted file mode 100644 index bd3a73b5..00000000 Binary files a/Library/Artifacts/b0/b0fdd9039549e1c182c4379d859e851f and /dev/null differ diff --git a/Library/Artifacts/b9/b97918e385b4acf5514ec2a12cedac5e b/Library/Artifacts/b9/b97918e385b4acf5514ec2a12cedac5e deleted file mode 100644 index 3e96aeee..00000000 Binary files a/Library/Artifacts/b9/b97918e385b4acf5514ec2a12cedac5e and /dev/null differ diff --git a/Library/Artifacts/cc/cc17bda9cf2394901bff3ddb24dd8c37 b/Library/Artifacts/cc/cc17bda9cf2394901bff3ddb24dd8c37 deleted file mode 100644 index 630f3076..00000000 Binary files a/Library/Artifacts/cc/cc17bda9cf2394901bff3ddb24dd8c37 and /dev/null differ diff --git a/Library/Artifacts/ce/ce05ba3db1b3a61751c3bc69e18426b5 b/Library/Artifacts/ce/ce05ba3db1b3a61751c3bc69e18426b5 deleted file mode 100644 index 0ae93ca9..00000000 Binary files a/Library/Artifacts/ce/ce05ba3db1b3a61751c3bc69e18426b5 and /dev/null differ diff --git a/Library/Artifacts/cf/cfa197d86d0f4d8f9e6062091c509185 b/Library/Artifacts/cf/cfa197d86d0f4d8f9e6062091c509185 deleted file mode 100644 index 413345e9..00000000 Binary files a/Library/Artifacts/cf/cfa197d86d0f4d8f9e6062091c509185 and /dev/null differ diff --git a/Library/Artifacts/cf/cfe90fe0f68a7c9d857bea2cd2ec3684 b/Library/Artifacts/cf/cfe90fe0f68a7c9d857bea2cd2ec3684 deleted file mode 100644 index 84e7a553..00000000 Binary files a/Library/Artifacts/cf/cfe90fe0f68a7c9d857bea2cd2ec3684 and /dev/null differ diff --git a/Library/Artifacts/d4/d450eb1d10da4536a842fc79ca0b0af7 b/Library/Artifacts/d4/d450eb1d10da4536a842fc79ca0b0af7 new file mode 100644 index 00000000..9926120a Binary files /dev/null and b/Library/Artifacts/d4/d450eb1d10da4536a842fc79ca0b0af7 differ diff --git a/Library/Artifacts/d5/d5722d79e7636edc9fdc19ab72601b7b b/Library/Artifacts/d5/d5722d79e7636edc9fdc19ab72601b7b deleted file mode 100644 index c0d3fa56..00000000 Binary files a/Library/Artifacts/d5/d5722d79e7636edc9fdc19ab72601b7b and /dev/null differ diff --git a/Library/Artifacts/d5/d5f639473352f80ade6a286ba80a2c2f b/Library/Artifacts/d5/d5f639473352f80ade6a286ba80a2c2f deleted file mode 100644 index d20939e2..00000000 Binary files a/Library/Artifacts/d5/d5f639473352f80ade6a286ba80a2c2f and /dev/null differ diff --git a/Library/Artifacts/da/da14ca3fc00e2e0d39ff6fcc60b39f99 b/Library/Artifacts/da/da14ca3fc00e2e0d39ff6fcc60b39f99 deleted file mode 100644 index 113a5e3b..00000000 Binary files a/Library/Artifacts/da/da14ca3fc00e2e0d39ff6fcc60b39f99 and /dev/null differ diff --git a/Library/Artifacts/d6/d6436051b8a42ba033dea40116302987 b/Library/Artifacts/df/dff237e5ee99b1772ce4e3cb7b2dfbed similarity index 96% rename from Library/Artifacts/d6/d6436051b8a42ba033dea40116302987 rename to Library/Artifacts/df/dff237e5ee99b1772ce4e3cb7b2dfbed index ab7289b9..d90d1539 100644 Binary files a/Library/Artifacts/d6/d6436051b8a42ba033dea40116302987 and b/Library/Artifacts/df/dff237e5ee99b1772ce4e3cb7b2dfbed differ diff --git a/Library/Artifacts/dd/dd407df0adcc6b8d9a6d912acd01e29f b/Library/Artifacts/e2/e2adcdc8788e63cb70287eac7d31f8e3 similarity index 99% rename from Library/Artifacts/dd/dd407df0adcc6b8d9a6d912acd01e29f rename to Library/Artifacts/e2/e2adcdc8788e63cb70287eac7d31f8e3 index fdd6d17c..fb48289c 100644 Binary files a/Library/Artifacts/dd/dd407df0adcc6b8d9a6d912acd01e29f and b/Library/Artifacts/e2/e2adcdc8788e63cb70287eac7d31f8e3 differ diff --git a/Library/Artifacts/e5/e51d96ce4df39c8fb6313debe24ac376 b/Library/Artifacts/e5/e51d96ce4df39c8fb6313debe24ac376 deleted file mode 100644 index 27112b4f..00000000 Binary files a/Library/Artifacts/e5/e51d96ce4df39c8fb6313debe24ac376 and /dev/null differ diff --git a/Library/Artifacts/e5/e5ca88f9f6b2e645674007297d93b3ed b/Library/Artifacts/e5/e5ca88f9f6b2e645674007297d93b3ed deleted file mode 100644 index 3dd5a076..00000000 Binary files a/Library/Artifacts/e5/e5ca88f9f6b2e645674007297d93b3ed and /dev/null differ diff --git a/Library/Artifacts/eb/eba648e0aa00e3a89a8de243d66d3df5 b/Library/Artifacts/eb/eba648e0aa00e3a89a8de243d66d3df5 deleted file mode 100644 index 07de3dc6..00000000 Binary files a/Library/Artifacts/eb/eba648e0aa00e3a89a8de243d66d3df5 and /dev/null differ diff --git a/Library/Artifacts/ef/ef767980398b9ccb5fcc94dfed1d1260 b/Library/Artifacts/ef/ef767980398b9ccb5fcc94dfed1d1260 deleted file mode 100644 index 1253d29b..00000000 Binary files a/Library/Artifacts/ef/ef767980398b9ccb5fcc94dfed1d1260 and /dev/null differ diff --git a/Library/Artifacts/f0/f02aec2a40c82d4c65abbcacce2e6e37 b/Library/Artifacts/f0/f02aec2a40c82d4c65abbcacce2e6e37 deleted file mode 100644 index a77b41a9..00000000 Binary files a/Library/Artifacts/f0/f02aec2a40c82d4c65abbcacce2e6e37 and /dev/null differ diff --git a/Library/Artifacts/f5/f5cc6fff9b7ab8026d3bc54cfb05db1f b/Library/Artifacts/f5/f5cc6fff9b7ab8026d3bc54cfb05db1f deleted file mode 100644 index e3589df5..00000000 Binary files a/Library/Artifacts/f5/f5cc6fff9b7ab8026d3bc54cfb05db1f and /dev/null differ diff --git a/Library/Artifacts/f7/f7d0a1b77b8afc902f44dad04cf6e97d b/Library/Artifacts/f7/f7d0a1b77b8afc902f44dad04cf6e97d new file mode 100644 index 00000000..76fef307 Binary files /dev/null and b/Library/Artifacts/f7/f7d0a1b77b8afc902f44dad04cf6e97d differ diff --git a/Library/Artifacts/fd/fd45ddbce65e3124f9880f45f80d2fcc b/Library/Artifacts/fd/fd45ddbce65e3124f9880f45f80d2fcc deleted file mode 100644 index 322e8e52..00000000 Binary files a/Library/Artifacts/fd/fd45ddbce65e3124f9880f45f80d2fcc and /dev/null differ diff --git a/Library/Artifacts/2a/2a45c95f357176b8a9b0b135a6dcfe92 b/Library/Artifacts/fd/fddf626fc47a0bdf40d46cb317e015bf similarity index 95% rename from Library/Artifacts/2a/2a45c95f357176b8a9b0b135a6dcfe92 rename to Library/Artifacts/fd/fddf626fc47a0bdf40d46cb317e015bf index b4107572..27a65d08 100644 Binary files a/Library/Artifacts/2a/2a45c95f357176b8a9b0b135a6dcfe92 and b/Library/Artifacts/fd/fddf626fc47a0bdf40d46cb317e015bf differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index baf36db5..265400ea 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 542} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -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: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + m_MinSize: {x: 677, y: 321} + m_MaxSize: {x: 12002, y: 8021} vertical: 0 - controlID: 10142 + controlID: 108 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 402, y: 321} + m_MaxSize: {x: 8002, y: 8021} vertical: 1 - controlID: 10143 + controlID: 109 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,10 +162,10 @@ MonoBehaviour: y: 0 width: 1414 height: 676 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 402, y: 221} + m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 10144 + controlID: 110 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -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: 1414 height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + 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: 506 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -324,10 +324,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -725.5 - m_HBaseRangeMax: 725.5 - m_VBaseRangeMin: -453.5 - m_VBaseRangeMax: 453.5 + m_HBaseRangeMin: -507 + m_HBaseRangeMax: 507 + 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: 1133 + height: 634 m_Scale: {x: 1, y: 1} - m_Translation: {x: 960, y: 453.5} + m_Translation: {x: 566.5, 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: -566.5 + y: -317 + width: 1133 + height: 634 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1920, y: 928} + m_LastWindowPixelSize: {x: 1133, y: 655} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: d884ffffec84ffff8a85ffff30a7ffff44a7ffffe2a7ffffaccdffff62fbffff563c0000a04400002c4500008c1d0100f6210100 + m_ExpandedIDs: 62f5ffff76f5ffff14f6ffff24f7ffff38f7ffffd6f7ffff62fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -458,9 +458,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 790.24, y: 221.74434, z: -17.972433} + m_Target: {x: 411.67233, y: 372.95667, z: -39.5} speed: 2 - m_Value: {x: 790.24, y: 221.74434, z: -17.972433} + m_Value: {x: 411.67233, y: 372.95667, z: -39.5} 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: 274.369 + m_Target: 464.43442 speed: 2 - m_Value: 274.369 + m_Value: 464.43442 m_Ortho: m_Target: 1 speed: 2 @@ -1104,20 +1104,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Textures/Props + - Assets/Resources/Prefabs m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Textures/Props + - Assets/Resources/Prefabs m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec480000 - m_LastClickedID: 18668 - m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e48000050480000524800006848000000ca9a3b + m_SelectedIDs: e6480000 + m_LastClickedID: 18662 + m_ExpandedIDs: 00000000d2480000d4480000d6480000d8480000da480000dc480000de480000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e480000504800005248000000ca9a3b + m_ExpandedIDs: 00000000d2480000d4480000d6480000d8480000da480000dc480000de480000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1223,9 +1223,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 721 - width: 1523 - height: 278 + y: 749 + width: 1413 + height: 250 m_ViewDataDictionary: {fileID: 0} --- !u!114 &19 MonoBehaviour: diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index d63137b2..fd8c2ee7 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + m_MinSize: {x: 677, y: 321} + m_MaxSize: {x: 12002, y: 8021} vertical: 0 - controlID: 9932 + controlID: 39129 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 402, y: 321} + m_MaxSize: {x: 8002, y: 8021} vertical: 1 - controlID: 9933 + controlID: 39130 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,10 +163,10 @@ MonoBehaviour: y: 0 width: 1414 height: 676 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 402, y: 221} + m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 9898 + controlID: 39077 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,8 @@ MonoBehaviour: y: 0 width: 279 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: 6} m_Panes: - {fileID: 6} @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 30a7ffff44a7ffffe2a7ffffaccdffff62fbffff563c0000a04400002c4500008c1d0100f6210100 + m_ExpandedIDs: c857ffff3062ffffec8dffff3293ffff2e99ffff669fffff3ea5ffffeabdffff98c7ffff5ee5ffff56fbffff883a00008a3c0000ac3c00000a3d00003c3d0000903d0000244000006840000066430000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -313,9 +313,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 790.24, y: 221.74434, z: -17.972433} + m_Target: {x: 411.67233, y: 372.95667, z: -39.5} speed: 2 - m_Value: {x: 790.24, y: 221.74434, z: -17.972433} + m_Value: {x: 411.67233, y: 372.95667, z: -39.5} 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: 274.369 + m_Target: 464.43442 speed: 2 - m_Value: 274.369 + m_Value: 464.43442 m_Ortho: m_Target: 1 speed: 2 @@ -930,7 +930,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: @@ -939,15 +939,15 @@ MonoBehaviour: y: 676 width: 1414 height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 12} - {fileID: 13} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -987,20 +987,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Textures/Props + - Assets/Resources/Prefabs m_ViewMode: 1 m_StartGridSize: 67 m_LastFolders: - - Assets/Resources/Textures/Props + - Assets/Resources/Prefabs m_LastFoldersGridSize: 67 m_LastProjectPath: C:\UnityDev\rimworld-animation-studio m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ec480000 - m_LastClickedID: 18668 - m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e48000050480000524800006848000000ca9a3b + m_SelectedIDs: e6480000 + m_LastClickedID: 18662 + m_ExpandedIDs: 00000000da480000dc480000de480000e0480000e2480000e4480000e648000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000046480000484800004a4800004c4800004e480000504800005248000000ca9a3b + m_ExpandedIDs: 00000000da480000dc480000de480000e0480000e2480000e4480000e648000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 162401009a1c01000c270100701d0100fe1b0100ce230100c61b01005c1e0100a61d0100 - m_LastClickedInstanceID: 73126 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c4300000000000000490000 m_RenameOverlay: @@ -1106,9 +1106,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 721 - width: 1523 - height: 278 + y: 749 + width: 1413 + height: 250 m_ViewDataDictionary: {fileID: 0} --- !u!114 &14 MonoBehaviour: @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: 72646 + m_LastInspectedObjectInstanceID: -1312 m_LastVerticalScrollValue: 0 diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 599fab6b..ef40ffaf 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 8786cce6..88fe3d10 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 b70b05f9..828701b7 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 82b24bb9..b246bad9 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 c7bef56e..f345b16e 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 52322eb0..e0639b56 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 f0b0b09c..3d1ac389 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 67a1f17b..8ba8f5ee 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 3bea6897..8492be17 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 da1ce1d7..9ba811bb 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 74cfe1a1..0aa86c59 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 0794438c..dd077203 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 df36ec54..3597d1a0 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 3748504f..7384e6dd 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/Data/level0 b/Library/PlayerDataCache/Win/Data/level0 index 7f5bd4eb..153e048f 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 4617b973..e5306494 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 59e512c0..343a104f 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 772ba4a8..468daee9 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -40,7 +40,6 @@ ScriptsOnlyBuild: - UnityEditor.U2D.Animation.BoneGizmo Unity.2D.Tilemap.Editor.dll: - UnityEditor.Tilemaps.GridBrush - - UnityEditor.Tilemaps.GridBrushEditor - UnityEditor.Tilemaps.GridPaintPaletteClipboard - UnityEditor.Tilemaps.GridPaintPaletteWindow - UnityEditor.Tilemaps.GridPaintingState @@ -151,67 +150,67 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 12730} - Class: 114 - Script: {instanceID: 12894} + Script: {instanceID: 12854} - Class: 114 - Script: {instanceID: 13140} + Script: {instanceID: 12896} - Class: 114 - Script: {instanceID: 13164} + Script: {instanceID: 13142} - Class: 114 - Script: {instanceID: 13204} + Script: {instanceID: 13166} - Class: 114 - Script: {instanceID: 13222} + Script: {instanceID: 13206} - Class: 114 - Script: {instanceID: 13230} + Script: {instanceID: 13224} - Class: 114 - Script: {instanceID: 13234} + Script: {instanceID: 13232} - Class: 114 - Script: {instanceID: 13352} + Script: {instanceID: 13236} - Class: 114 - Script: {instanceID: 13384} + Script: {instanceID: 13354} - Class: 114 - Script: {instanceID: 13422} + Script: {instanceID: 13386} - Class: 114 - Script: {instanceID: 13440} + Script: {instanceID: 13424} - Class: 114 - Script: {instanceID: 13456} + Script: {instanceID: 13442} - Class: 114 - Script: {instanceID: 13468} + Script: {instanceID: 13458} - Class: 114 - Script: {instanceID: 13472} + Script: {instanceID: 13470} - Class: 114 - Script: {instanceID: 13506} + Script: {instanceID: 13474} - Class: 114 - Script: {instanceID: 13624} + Script: {instanceID: 13508} - Class: 114 - Script: {instanceID: 13638} + Script: {instanceID: 13626} - Class: 114 - Script: {instanceID: 13664} + Script: {instanceID: 13640} - Class: 114 - Script: {instanceID: 13866} + Script: {instanceID: 13666} - Class: 114 - Script: {instanceID: 14060} + Script: {instanceID: 13868} - Class: 114 - Script: {instanceID: 14142} + Script: {instanceID: 14062} - Class: 114 - Script: {instanceID: 14156} + Script: {instanceID: 14144} - Class: 114 - Script: {instanceID: 14304} + Script: {instanceID: 14160} - Class: 114 - Script: {instanceID: 14450} + Script: {instanceID: 14308} - Class: 114 - Script: {instanceID: 14478} + Script: {instanceID: 14454} - Class: 114 - Script: {instanceID: 14510} + Script: {instanceID: 14482} - Class: 114 - Script: {instanceID: 14532} + Script: {instanceID: 14514} - Class: 114 - Script: {instanceID: 14534} + Script: {instanceID: 14536} - Class: 114 - Script: {instanceID: 14574} + Script: {instanceID: 14538} - Class: 114 - Script: {instanceID: 14580} + Script: {instanceID: 14578} - Class: 114 - Script: {instanceID: 26010} + Script: {instanceID: 14584} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -579,6 +578,12 @@ ScriptsOnlyBuild: assemblyName: Unity.2D.Animation.Runtime.dll namespaceName: UnityEngine.U2D.Animation className: SpriteSkinEntity + - hash: + serializedVersion: 2 + Hash: a7e8a0f1f025151d5d79185a8445febd + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: SexPropManager - hash: serializedVersion: 2 Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f @@ -927,12 +932,6 @@ ScriptsOnlyBuild: assemblyName: Unity.Timeline.dll namespaceName: UnityEngine.Timeline className: PlayableTrack - - hash: - serializedVersion: 2 - Hash: a7e8a0f1f025151d5d79185a8445febd - assemblyName: Assembly-CSharp.dll - namespaceName: RimWorldAnimationStudio - className: SexPropManager platform: 5 scenePathNames: - Assets/Scenes/MainScene.unity diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 5d8ad89a..2b16ba4d 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 f035fad1..d382c4db 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 ab507d97..4573fecb 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 c6a78c0d..2baada3d 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json b/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json index 236edfd3..b4b61688 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json +++ b/Library/StateCache/Hierarchy/8cbfdc-2482d1331163f49448.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145,8359461402257861397],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":4658118913435815158,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[4658118913435815158,2751111744579094145,8359461402257861397],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-378b361fe27c31b458.json b/Library/StateCache/Hierarchy/8cbfdc-378b361fe27c31b458.json index dc961cb3..d81beda1 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-378b361fe27c31b458.json +++ b/Library/StateCache/Hierarchy/8cbfdc-378b361fe27c31b458.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[4855549260496161365,6116381454766586175],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[4855549260496161365],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":3016081752107697216,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-8b89f6c9e5f696c499.json b/Library/StateCache/Hierarchy/8cbfdc-8b89f6c9e5f696c499.json new file mode 100644 index 00000000..25dfb2df --- /dev/null +++ b/Library/StateCache/Hierarchy/8cbfdc-8b89f6c9e5f696c499.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[7715503544296011586,7715503544115872494,7715503543609300145,7715503544952922358,7715503544843436708,7715503544597145779,7715503544528335669],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-a29caea8e4b276d4c8.json b/Library/StateCache/Hierarchy/8cbfdc-a29caea8e4b276d4c8.json new file mode 100644 index 00000000..4461fa5f --- /dev/null +++ b/Library/StateCache/Hierarchy/8cbfdc-a29caea8e4b276d4c8.json @@ -0,0 +1 @@ +{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json b/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json index 6b2ec60e..0b5f8edd 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json +++ b/Library/StateCache/Hierarchy/8cbfdc-dc4c8b005322f3b46a.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[7929422520673851210],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[7929422520673851210],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":9122292209377678227,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json b/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json index 8fbae3dd..e9b17bd2 100644 --- a/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json +++ b/Library/StateCache/Hierarchy/8cbfdc-eac2d5e7275f9064fa.json @@ -1 +1 @@ -{"m_ExpandedPrefabGameObjectFileIDs":[3541467645058788217],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":7651278788833778284,"m_LastClickedInstanceID":0} \ No newline at end of file +{"m_ExpandedPrefabGameObjectFileIDs":[3541467645058788217],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-8b89f6c9e5f696c499.json b/Library/StateCache/SceneView/352ee9-8b89f6c9e5f696c499.json new file mode 100644 index 00000000..a7a5136d --- /dev/null +++ b/Library/StateCache/SceneView/352ee9-8b89f6c9e5f696c499.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":507.0,"y":317.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":597.94482421875,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-a29caea8e4b276d4c8.json b/Library/StateCache/SceneView/352ee9-a29caea8e4b276d4c8.json new file mode 100644 index 00000000..5fa0bd99 --- /dev/null +++ b/Library/StateCache/SceneView/352ee9-a29caea8e4b276d4c8.json @@ -0,0 +1 @@ +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.0,"orthographic":true} \ No newline at end of file diff --git a/Library/StateCache/SceneView/352ee9-mainStage.json b/Library/StateCache/SceneView/352ee9-mainStage.json index 0037ddcd..1bb55490 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":790.239990234375,"y":221.7443389892578,"z":-17.97243309020996},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":274.3689880371094,"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":411.6723327636719,"y":372.9566650390625,"z":-39.5},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":464.4344177246094,"orthographic":true} \ No newline at end of file diff --git a/Library/shadercompiler-UnityShaderCompiler.exe10.log b/Library/shadercompiler-UnityShaderCompiler.exe10.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe10.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe10.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe11.log b/Library/shadercompiler-UnityShaderCompiler.exe11.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe11.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe11.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Library/shadercompiler-UnityShaderCompiler.exe5.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/Library/shadercompiler-UnityShaderCompiler.exe9.log b/Library/shadercompiler-UnityShaderCompiler.exe9.log index 57b2c568..9ae621b0 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe9.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe9.log @@ -1,2 +1,4 @@ Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines' Cmd: initializeCompiler + +Quitting shader compiler process diff --git a/quick_start.txt b/quick_start.txt index 0a0f2387..62c1c7b0 100644 --- a/quick_start.txt +++ b/quick_start.txt @@ -18,21 +18,33 @@ LIME: Determines the number of times the animation repeats itself before moving *** Controls *** - Scroll wheel: Zoom in and out on the scene - Middle mouse button: Click and drag to pan about the scene -- Left mouse: Everything else +- Left mouse: Handles everything else *** Keybinds - Left Ctrl + N: New animation - Left Ctrl + S: Save animation - Left Ctrl + L: Load animation - Left Ctrl + left mouse: Add clicked keyframe to the current selection -- Left Ctrl + C: Clone all selected keyframes (can only clone one keyframe per actor at a time) +- Left Ctrl + C: Copy all selected keyframes (can only copy one keyframe per actor at a time) +- Left Ctrl + V: Paste all copied keyframes at the current tick - Left Ctrl + backspace / delete: Delete all selected keyframes - Left Ctrl + Z: Undo last action - Left Ctrl + Y: Redo last action - Left Shift: Hold to enable 'key snapping' - this will snap a dragged key to the same position as another key in an adjacent timeline +- Spacebar: Play / pause animation preview +- Q: Switch to actor movement mode +- W: Switch to actor rotate mode +- E: Switch to actor facing mode +- Arrow keys: Move / rotate / face the actor along the corresponding direction +- Left Ctrl + Up / Down Arrow keys: Change the selected actor +- Tab: Cycle between selecting the current actor's body / head / appendage +- Pgup / Pgdw: Move to the previous / next tick +- Left Shift + Pgup/Pgdw: Jump to previous / next key +- Left Ctrl + Pgup/Pgdw: Jump to first / final tick in the stage +- Home / End: Goto to the previous / next stage *** Tips *** -- If an animation fails to load, check to make sure there are no empty numeric values in the animation file (search for ‘>