diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 9b5ceaea..25fbbbf1 100644 Binary files a/.vs/RimWorld-Animation-Studio/v16/.suo and b/.vs/RimWorld-Animation-Studio/v16/.suo differ diff --git a/Assets/Scripts/AnimationComponents/AnimationStage.cs b/Assets/Scripts/AnimationComponents/AnimationStage.cs index 9eeffb78..db982d42 100644 --- a/Assets/Scripts/AnimationComponents/AnimationStage.cs +++ b/Assets/Scripts/AnimationComponents/AnimationStage.cs @@ -92,8 +92,8 @@ namespace RimWorldAnimationStudio { foreach (PawnKeyframe keyframe in clip.Keyframes) { - keyframe.TickDuration = Mathf.RoundToInt(keyframe.TickDuration * scale); - keyframe.atTick = null; + keyframe.atTick = Mathf.CeilToInt((float)keyframe.atTick.Value * scale); + keyframe.TickDuration = 0; } clip.BuildSimpleCurves(); diff --git a/Assets/Scripts/GUI/AnimationTimeline.cs b/Assets/Scripts/GUI/AnimationTimeline.cs index 08b930f9..d341b599 100644 --- a/Assets/Scripts/GUI/AnimationTimeline.cs +++ b/Assets/Scripts/GUI/AnimationTimeline.cs @@ -21,6 +21,7 @@ namespace RimWorldAnimationStudio EventsManager.onAnimationTimelinesChanged.AddListener(delegate { UpdateGUI(); }); EventsManager.onKeyframeCountChanged.AddListener(delegate { UpdateGUI(); }); EventsManager.onActorIDChanged.AddListener(delegate { UpdateTimelineSelection(); }); + EventsManager.onStageWindowSizeChanged.AddListener(delegate { UpdateGUI(); }); UpdateTimelineSelection(); UpdateGUI(); diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 7398a6e1..ab65a0d3 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 776b7d84..c8ec883e 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 a117c6d1..e15d7685 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 af95ecf3..b6da0e68 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 0bf096af..3f895154 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 cc007746..bef37809 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 b598c926..cd813ae1 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 92b2dada..19c84600 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 92ef67e4..21313fe7 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 e88f5f88..d7ae17cb 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 1fc8e59a..23cb4b46 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll and b/Build/RimWorld-Animation-Studio_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers index b8ff7af9..2010ce49 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers differ diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 0bd380e9..0ace9208 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/07/07f4bc3c3bb839fa442a216f66757326 b/Library/Artifacts/07/07f4bc3c3bb839fa442a216f66757326 deleted file mode 100644 index b3c2a5a1..00000000 Binary files a/Library/Artifacts/07/07f4bc3c3bb839fa442a216f66757326 and /dev/null differ diff --git a/Library/Artifacts/10/10b65c9b626217ce6e8f17439b9e2b48 b/Library/Artifacts/10/10b65c9b626217ce6e8f17439b9e2b48 deleted file mode 100644 index aa22fcf1..00000000 Binary files a/Library/Artifacts/10/10b65c9b626217ce6e8f17439b9e2b48 and /dev/null differ diff --git a/Library/Artifacts/17/1740b3bf8528c4451dc432548a655382 b/Library/Artifacts/17/1740b3bf8528c4451dc432548a655382 deleted file mode 100644 index e8c7f502..00000000 Binary files a/Library/Artifacts/17/1740b3bf8528c4451dc432548a655382 and /dev/null differ diff --git a/Library/Artifacts/19/19b80652d8467bb110f5a22bcc4de15a b/Library/Artifacts/19/19b80652d8467bb110f5a22bcc4de15a deleted file mode 100644 index a9b4d8c3..00000000 Binary files a/Library/Artifacts/19/19b80652d8467bb110f5a22bcc4de15a and /dev/null differ diff --git a/Library/Artifacts/23/2352a6b3201d58ae5972f254a0868e09 b/Library/Artifacts/23/2352a6b3201d58ae5972f254a0868e09 deleted file mode 100644 index b373e818..00000000 Binary files a/Library/Artifacts/23/2352a6b3201d58ae5972f254a0868e09 and /dev/null differ diff --git a/Library/Artifacts/26/263942c1ab1081ba55526a68b1933fe7 b/Library/Artifacts/26/263942c1ab1081ba55526a68b1933fe7 deleted file mode 100644 index 3b5b16b3..00000000 Binary files a/Library/Artifacts/26/263942c1ab1081ba55526a68b1933fe7 and /dev/null differ diff --git a/Library/Artifacts/3b/3b76d6284585e72ff9f97baaa6490318 b/Library/Artifacts/3b/3b76d6284585e72ff9f97baaa6490318 deleted file mode 100644 index 2f080175..00000000 Binary files a/Library/Artifacts/3b/3b76d6284585e72ff9f97baaa6490318 and /dev/null differ diff --git a/Library/Artifacts/3c/3c3436b7921333ad4c2a1610203b0405 b/Library/Artifacts/3c/3c3436b7921333ad4c2a1610203b0405 deleted file mode 100644 index 53cde90c..00000000 Binary files a/Library/Artifacts/3c/3c3436b7921333ad4c2a1610203b0405 and /dev/null differ diff --git a/Library/Artifacts/3d/3db557fe59f1f6a411897092c13e7918 b/Library/Artifacts/3d/3db557fe59f1f6a411897092c13e7918 deleted file mode 100644 index cf04fc37..00000000 Binary files a/Library/Artifacts/3d/3db557fe59f1f6a411897092c13e7918 and /dev/null differ diff --git a/Library/Artifacts/41/419c332603d4321f4d9a9c366c63e974 b/Library/Artifacts/41/419c332603d4321f4d9a9c366c63e974 deleted file mode 100644 index f0123461..00000000 Binary files a/Library/Artifacts/41/419c332603d4321f4d9a9c366c63e974 and /dev/null differ diff --git a/Library/Artifacts/49/4936c0d5782c5efd70e9e0b905ccf20c b/Library/Artifacts/49/4936c0d5782c5efd70e9e0b905ccf20c deleted file mode 100644 index ac4c817a..00000000 Binary files a/Library/Artifacts/49/4936c0d5782c5efd70e9e0b905ccf20c and /dev/null differ diff --git a/Library/Artifacts/4a/4ac75aec9d8b8186bf8dbe074a5e2252 b/Library/Artifacts/4a/4ac75aec9d8b8186bf8dbe074a5e2252 deleted file mode 100644 index 505d6afc..00000000 Binary files a/Library/Artifacts/4a/4ac75aec9d8b8186bf8dbe074a5e2252 and /dev/null differ diff --git a/Library/Artifacts/4a/4ad4c8b39f89ce3fc46916d64b057c73 b/Library/Artifacts/4a/4ad4c8b39f89ce3fc46916d64b057c73 deleted file mode 100644 index be8373aa..00000000 Binary files a/Library/Artifacts/4a/4ad4c8b39f89ce3fc46916d64b057c73 and /dev/null differ diff --git a/Library/Artifacts/54/54ad02096b177581641499b5fa71a58c b/Library/Artifacts/54/54ad02096b177581641499b5fa71a58c deleted file mode 100644 index beb31d53..00000000 Binary files a/Library/Artifacts/54/54ad02096b177581641499b5fa71a58c and /dev/null differ diff --git a/Library/Artifacts/56/5666c1b63d913a5d4e9b1e453ac8c4df b/Library/Artifacts/56/5666c1b63d913a5d4e9b1e453ac8c4df deleted file mode 100644 index 42a612c7..00000000 Binary files a/Library/Artifacts/56/5666c1b63d913a5d4e9b1e453ac8c4df and /dev/null differ diff --git a/Library/Artifacts/57/57998bdda7e746c1d937ebceb7943aee b/Library/Artifacts/57/57998bdda7e746c1d937ebceb7943aee deleted file mode 100644 index 87d04744..00000000 Binary files a/Library/Artifacts/57/57998bdda7e746c1d937ebceb7943aee and /dev/null differ diff --git a/Library/Artifacts/5d/5d21c1748f4ed258cc916cd8dfed80b2 b/Library/Artifacts/5d/5d21c1748f4ed258cc916cd8dfed80b2 deleted file mode 100644 index d848a750..00000000 Binary files a/Library/Artifacts/5d/5d21c1748f4ed258cc916cd8dfed80b2 and /dev/null differ diff --git a/Library/Artifacts/65/655447b2699aca78f33288fc1cfb1e2d b/Library/Artifacts/65/655447b2699aca78f33288fc1cfb1e2d deleted file mode 100644 index ce8de48d..00000000 Binary files a/Library/Artifacts/65/655447b2699aca78f33288fc1cfb1e2d and /dev/null differ diff --git a/Library/Artifacts/65/656e625a8ac89bb60d279d2af848916b b/Library/Artifacts/65/656e625a8ac89bb60d279d2af848916b deleted file mode 100644 index 7eb3937d..00000000 Binary files a/Library/Artifacts/65/656e625a8ac89bb60d279d2af848916b and /dev/null differ diff --git a/Library/Artifacts/65/65b5d3a4d83f68b1f18a1c907e2cb4f6 b/Library/Artifacts/65/65b5d3a4d83f68b1f18a1c907e2cb4f6 deleted file mode 100644 index c7de1473..00000000 Binary files a/Library/Artifacts/65/65b5d3a4d83f68b1f18a1c907e2cb4f6 and /dev/null differ diff --git a/Library/Artifacts/6c/6c93dd47f0524e2dacaeca212382c166 b/Library/Artifacts/6c/6c93dd47f0524e2dacaeca212382c166 deleted file mode 100644 index 1386c069..00000000 Binary files a/Library/Artifacts/6c/6c93dd47f0524e2dacaeca212382c166 and /dev/null differ diff --git a/Library/Artifacts/7b/7b39cbcd67db4b457f949f2e70f13e87 b/Library/Artifacts/7b/7b39cbcd67db4b457f949f2e70f13e87 deleted file mode 100644 index 77bd3fb6..00000000 Binary files a/Library/Artifacts/7b/7b39cbcd67db4b457f949f2e70f13e87 and /dev/null differ diff --git a/Library/Artifacts/7d/7dca173e2d4f560d0fb5e24a455914c4 b/Library/Artifacts/7d/7dca173e2d4f560d0fb5e24a455914c4 deleted file mode 100644 index 4f7095a2..00000000 Binary files a/Library/Artifacts/7d/7dca173e2d4f560d0fb5e24a455914c4 and /dev/null differ diff --git a/Library/Artifacts/c3/c34f8f43efb4f08cdca3c1316ee7ba6f b/Library/Artifacts/81/81ab542e7c8c9afa968e162d9e4d9589 similarity index 51% rename from Library/Artifacts/c3/c34f8f43efb4f08cdca3c1316ee7ba6f rename to Library/Artifacts/81/81ab542e7c8c9afa968e162d9e4d9589 index cbcb57ac..5397c306 100644 Binary files a/Library/Artifacts/c3/c34f8f43efb4f08cdca3c1316ee7ba6f and b/Library/Artifacts/81/81ab542e7c8c9afa968e162d9e4d9589 differ diff --git a/Library/Artifacts/8b/8b40bfe66aa4b2f892f2b2768b9b16a1 b/Library/Artifacts/8b/8b40bfe66aa4b2f892f2b2768b9b16a1 deleted file mode 100644 index 9ea1ef34..00000000 Binary files a/Library/Artifacts/8b/8b40bfe66aa4b2f892f2b2768b9b16a1 and /dev/null differ diff --git a/Library/Artifacts/8d/8d738b9e4a3a09117da6cbf403f704ea b/Library/Artifacts/8d/8d738b9e4a3a09117da6cbf403f704ea deleted file mode 100644 index 125105c0..00000000 Binary files a/Library/Artifacts/8d/8d738b9e4a3a09117da6cbf403f704ea and /dev/null differ diff --git a/Library/Artifacts/8d/8dfd6cb3f085e20e602df5a2c5b3f0fe b/Library/Artifacts/8d/8dfd6cb3f085e20e602df5a2c5b3f0fe deleted file mode 100644 index 89c944c7..00000000 Binary files a/Library/Artifacts/8d/8dfd6cb3f085e20e602df5a2c5b3f0fe and /dev/null differ diff --git a/Library/Artifacts/ef/ef68db41659941d555ad2787b99c05cd b/Library/Artifacts/8f/8f27f0d7b36315eb1fa10c59cabe8cfd similarity index 50% rename from Library/Artifacts/ef/ef68db41659941d555ad2787b99c05cd rename to Library/Artifacts/8f/8f27f0d7b36315eb1fa10c59cabe8cfd index bcbd79ff..ee358a2d 100644 Binary files a/Library/Artifacts/ef/ef68db41659941d555ad2787b99c05cd and b/Library/Artifacts/8f/8f27f0d7b36315eb1fa10c59cabe8cfd differ diff --git a/Library/Artifacts/93/93012b2391f511b7d59b7d1c90f9c670 b/Library/Artifacts/93/93012b2391f511b7d59b7d1c90f9c670 deleted file mode 100644 index 7fbab763..00000000 Binary files a/Library/Artifacts/93/93012b2391f511b7d59b7d1c90f9c670 and /dev/null differ diff --git a/Library/Artifacts/99/99a80012754637b280a64b57bad668ee b/Library/Artifacts/99/99a80012754637b280a64b57bad668ee deleted file mode 100644 index 917d493a..00000000 Binary files a/Library/Artifacts/99/99a80012754637b280a64b57bad668ee and /dev/null differ diff --git a/Library/Artifacts/9a/9a45dcae272106dfa555457bd5c1f881 b/Library/Artifacts/9a/9a45dcae272106dfa555457bd5c1f881 deleted file mode 100644 index 4edab9ea..00000000 Binary files a/Library/Artifacts/9a/9a45dcae272106dfa555457bd5c1f881 and /dev/null differ diff --git a/Library/Artifacts/9a/9ab1834b20d7db4d9e2781aec3840de2 b/Library/Artifacts/9a/9ab1834b20d7db4d9e2781aec3840de2 deleted file mode 100644 index 14227043..00000000 Binary files a/Library/Artifacts/9a/9ab1834b20d7db4d9e2781aec3840de2 and /dev/null differ diff --git a/Library/Artifacts/9e/9e3fbdc71fe3984a5bba1539c0d8676e b/Library/Artifacts/9e/9e3fbdc71fe3984a5bba1539c0d8676e new file mode 100644 index 00000000..54dc7a9b Binary files /dev/null and b/Library/Artifacts/9e/9e3fbdc71fe3984a5bba1539c0d8676e differ diff --git a/Library/Artifacts/9e/9e6f5f6832fc8447bec838a9f5552f9a b/Library/Artifacts/9e/9e6f5f6832fc8447bec838a9f5552f9a deleted file mode 100644 index cd18cf6a..00000000 Binary files a/Library/Artifacts/9e/9e6f5f6832fc8447bec838a9f5552f9a and /dev/null differ diff --git a/Library/Artifacts/a2/a2d9b437238ac1c77a63ab7d645f30f3 b/Library/Artifacts/a2/a2d9b437238ac1c77a63ab7d645f30f3 deleted file mode 100644 index fba5836c..00000000 Binary files a/Library/Artifacts/a2/a2d9b437238ac1c77a63ab7d645f30f3 and /dev/null differ diff --git a/Library/Artifacts/a3/a3673600d8a76afc30d177668a97160d b/Library/Artifacts/a3/a3673600d8a76afc30d177668a97160d deleted file mode 100644 index 4c0a04c3..00000000 Binary files a/Library/Artifacts/a3/a3673600d8a76afc30d177668a97160d and /dev/null differ diff --git a/Library/Artifacts/a3/a38cc64edb91c31fab3b698e9bf230bf b/Library/Artifacts/a3/a38cc64edb91c31fab3b698e9bf230bf deleted file mode 100644 index b076aab4..00000000 Binary files a/Library/Artifacts/a3/a38cc64edb91c31fab3b698e9bf230bf and /dev/null differ diff --git a/Library/Artifacts/b0/b0808186a00c7dbf3f57db798597e543 b/Library/Artifacts/b0/b0808186a00c7dbf3f57db798597e543 deleted file mode 100644 index b3ba72da..00000000 Binary files a/Library/Artifacts/b0/b0808186a00c7dbf3f57db798597e543 and /dev/null differ diff --git a/Library/Artifacts/b1/b16e1834f4f69c50c79b55a40cc60eb8 b/Library/Artifacts/b1/b16e1834f4f69c50c79b55a40cc60eb8 deleted file mode 100644 index dd91aabb..00000000 Binary files a/Library/Artifacts/b1/b16e1834f4f69c50c79b55a40cc60eb8 and /dev/null differ diff --git a/Library/Artifacts/c6/c683b827db7ed035c6a99b08f75d64c4 b/Library/Artifacts/c6/c683b827db7ed035c6a99b08f75d64c4 deleted file mode 100644 index db0ba9d8..00000000 Binary files a/Library/Artifacts/c6/c683b827db7ed035c6a99b08f75d64c4 and /dev/null differ diff --git a/Library/Artifacts/cd/cd19720c35840268c9e096eb1c3b9a9e b/Library/Artifacts/cd/cd19720c35840268c9e096eb1c3b9a9e deleted file mode 100644 index e6c288c1..00000000 Binary files a/Library/Artifacts/cd/cd19720c35840268c9e096eb1c3b9a9e and /dev/null differ diff --git a/Library/Artifacts/cf/cfc4604826578471db647802ac6cbf0f b/Library/Artifacts/cf/cfc4604826578471db647802ac6cbf0f new file mode 100644 index 00000000..fd359be8 Binary files /dev/null and b/Library/Artifacts/cf/cfc4604826578471db647802ac6cbf0f differ diff --git a/Library/Artifacts/db/dbf16785c63e545d3cb4396ecda96b24 b/Library/Artifacts/db/dbf16785c63e545d3cb4396ecda96b24 deleted file mode 100644 index 29a91d01..00000000 Binary files a/Library/Artifacts/db/dbf16785c63e545d3cb4396ecda96b24 and /dev/null differ diff --git a/Library/Artifacts/e1/e1c62e8e6f416da9ce692a7fa7ba0b4a b/Library/Artifacts/e1/e1c62e8e6f416da9ce692a7fa7ba0b4a new file mode 100644 index 00000000..cf198397 Binary files /dev/null and b/Library/Artifacts/e1/e1c62e8e6f416da9ce692a7fa7ba0b4a differ diff --git a/Library/Artifacts/e2/e2ed719232061daea0031a4d53d29c6e b/Library/Artifacts/e2/e2ed719232061daea0031a4d53d29c6e deleted file mode 100644 index 724e4401..00000000 Binary files a/Library/Artifacts/e2/e2ed719232061daea0031a4d53d29c6e and /dev/null differ diff --git a/Library/Artifacts/e7/e72d741b290640286d95bd46a9f9e139 b/Library/Artifacts/e7/e72d741b290640286d95bd46a9f9e139 deleted file mode 100644 index 3b2ea25b..00000000 Binary files a/Library/Artifacts/e7/e72d741b290640286d95bd46a9f9e139 and /dev/null differ diff --git a/Library/Artifacts/e7/e7bae6498ba15e2f2e4558281c88eaf5 b/Library/Artifacts/e7/e7bae6498ba15e2f2e4558281c88eaf5 deleted file mode 100644 index a9e5008b..00000000 Binary files a/Library/Artifacts/e7/e7bae6498ba15e2f2e4558281c88eaf5 and /dev/null differ diff --git a/Library/Artifacts/ef/efd4fc1b3790f0ec05a9798052551105 b/Library/Artifacts/ef/efd4fc1b3790f0ec05a9798052551105 deleted file mode 100644 index 758ef275..00000000 Binary files a/Library/Artifacts/ef/efd4fc1b3790f0ec05a9798052551105 and /dev/null differ diff --git a/Library/Artifacts/fd/fd4c876fd43aa232a6cb6f8118e557f5 b/Library/Artifacts/fd/fd4c876fd43aa232a6cb6f8118e557f5 deleted file mode 100644 index e1f33513..00000000 Binary files a/Library/Artifacts/fd/fd4c876fd43aa232a6cb6f8118e557f5 and /dev/null differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index ec159644..d92d9da9 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -115,7 +115,7 @@ MonoBehaviour: m_MinSize: {x: 679, y: 492} m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 10829 + controlID: 2473 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,7 +140,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 10830 + controlID: 2478 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,7 +165,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 10831 + controlID: 2479 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 7479fdff8879fdff2a7afdff62fbffff063b0000143c00000c3d00008c3d0000d43d000068400000ac4200008a44000028450000be4500002c460000 + m_ExpandedIDs: 28a2feff3ca2feffe2a2feff62fbffff7a3d0000a83d000010410000b4420000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -460,7 +460,7 @@ MonoBehaviour: m_Position: m_Target: {x: 515.9874, y: 315.84717, z: -105.8125} speed: 2 - m_Value: {x: 168.57666, y: 619.2633, z: -1} + m_Value: {x: 515.9874, y: 315.84717, z: -105.8125} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -512,7 +512,7 @@ MonoBehaviour: m_Size: m_Target: 347.46002 speed: 2 - m_Value: 117.21351 + m_Value: 347.46002 m_Ortho: m_Target: 1 speed: 2 @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 143} - m_SelectedIDs: 3a4e0000 - m_LastClickedID: 20026 - m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b + m_SelectedIDs: 464e0000 + m_LastClickedID: 20038 + m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1145,7 +1145,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b + m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1172,7 +1172,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1295,4 +1295,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 100 diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index b4dad933..808b09d2 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 678, y: 321} - m_MaxSize: {x: 12003, y: 8021} + m_MinSize: {x: 679, y: 492} + m_MaxSize: {x: 14002, y: 14042} vertical: 0 - controlID: 10726 + controlID: 2139 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 403, y: 321} - m_MaxSize: {x: 8003, y: 8021} + m_MinSize: {x: 403, y: 492} + m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 10727 + controlID: 2140 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 221} m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 10728 + controlID: 2141 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -186,8 +186,8 @@ MonoBehaviour: y: 0 width: 337 height: 671 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} 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: 62fbffff063b0000143c00000c3d00008c3d0000d43d000068400000ac4200008a44000028450000be4500002c460000 + m_ExpandedIDs: 62fbffff7a3d0000a83d000010410000b4420000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -930,7 +930,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -939,15 +939,15 @@ MonoBehaviour: y: 671 width: 1414 height: 276 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} - {fileID: 13} - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -998,9 +998,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 143} - m_SelectedIDs: 3a4e0000 - m_LastClickedID: 20026 - m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b + m_SelectedIDs: 464e0000 + m_LastClickedID: 20038 + m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1028,7 +1028,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002e4e0000304e0000324e0000344e0000364e0000384e00003a4e00003c4e00003e4e0000404e0000424e0000444e000000ca9a3b + m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: f882feff - m_LastClickedInstanceID: -97544 + m_SelectedInstanceIDs: ec440000 + m_LastClickedInstanceID: 17644 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100 m_RenameOverlay: @@ -1203,5 +1203,5 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: 17644 + m_LastVerticalScrollValue: 100 diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index 095cc024..fc545419 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index e35161cb..869bb6e6 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 7398a6e1..ab65a0d3 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 776b7d84..c8ec883e 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 a117c6d1..e15d7685 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 af95ecf3..b6da0e68 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 0bf096af..3f895154 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 cc007746..bef37809 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 b598c926..cd813ae1 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 92b2dada..19c84600 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 92ef67e4..21313fe7 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 e88f5f88..d7ae17cb 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 1fc8e59a..23cb4b46 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 b8ff7af9..2010ce49 100644 Binary files a/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index 142c073a..31146eac 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -148,111 +148,111 @@ ScriptsOnlyBuild: - Class: 114 Script: {instanceID: 11734} - Class: 114 - Script: {instanceID: 11758} - - Class: 114 - Script: {instanceID: 11762} + Script: {instanceID: 11760} - Class: 114 Script: {instanceID: 11764} - Class: 114 - Script: {instanceID: 11772} + Script: {instanceID: 11766} - Class: 114 - Script: {instanceID: 11782} + Script: {instanceID: 11774} - Class: 114 - Script: {instanceID: 11804} + Script: {instanceID: 11784} - Class: 114 - Script: {instanceID: 11868} + Script: {instanceID: 11806} - Class: 114 - Script: {instanceID: 11874} + Script: {instanceID: 11870} - Class: 114 - Script: {instanceID: 12142} + Script: {instanceID: 11876} - Class: 114 - Script: {instanceID: 12178} + Script: {instanceID: 12144} - Class: 114 - Script: {instanceID: 12322} + Script: {instanceID: 12180} - Class: 114 - Script: {instanceID: 12346} + Script: {instanceID: 12324} - Class: 114 - Script: {instanceID: 12362} + Script: {instanceID: 12348} - Class: 114 - Script: {instanceID: 12432} + Script: {instanceID: 12364} - Class: 114 - Script: {instanceID: 12612} + Script: {instanceID: 12434} - Class: 114 - Script: {instanceID: 12636} + Script: {instanceID: 12614} - Class: 114 - Script: {instanceID: 12754} + Script: {instanceID: 12638} - Class: 114 - Script: {instanceID: 12878} + Script: {instanceID: 12756} - Class: 114 - Script: {instanceID: 12922} + Script: {instanceID: 12880} - Class: 114 - Script: {instanceID: 13172} + Script: {instanceID: 12924} - Class: 114 - Script: {instanceID: 13198} + Script: {instanceID: 13174} - Class: 114 - Script: {instanceID: 13238} + Script: {instanceID: 13200} - Class: 114 - Script: {instanceID: 13248} + Script: {instanceID: 13240} - Class: 114 - Script: {instanceID: 13258} + Script: {instanceID: 13250} - Class: 114 - Script: {instanceID: 13268} + Script: {instanceID: 13260} - Class: 114 - Script: {instanceID: 13370} + Script: {instanceID: 13270} - Class: 114 - Script: {instanceID: 13388} + Script: {instanceID: 13372} - Class: 114 Script: {instanceID: 13390} - Class: 114 - Script: {instanceID: 13422} + Script: {instanceID: 13392} - Class: 114 - Script: {instanceID: 13462} + Script: {instanceID: 13426} - Class: 114 - Script: {instanceID: 13478} + Script: {instanceID: 13466} - Class: 114 - Script: {instanceID: 13494} + Script: {instanceID: 13482} - Class: 114 - Script: {instanceID: 13506} + Script: {instanceID: 13498} - Class: 114 Script: {instanceID: 13510} - Class: 114 - Script: {instanceID: 13546} + Script: {instanceID: 13514} - Class: 114 - Script: {instanceID: 13678} + Script: {instanceID: 13550} - Class: 114 - Script: {instanceID: 13704} + Script: {instanceID: 13682} - Class: 114 - Script: {instanceID: 13836} + Script: {instanceID: 13708} - Class: 114 - Script: {instanceID: 13910} + Script: {instanceID: 13840} - Class: 114 Script: {instanceID: 13914} - Class: 114 - Script: {instanceID: 14104} + Script: {instanceID: 13918} - Class: 114 - Script: {instanceID: 14200} + Script: {instanceID: 14046} - Class: 114 - Script: {instanceID: 14350} + Script: {instanceID: 14110} - Class: 114 - Script: {instanceID: 14498} + Script: {instanceID: 14206} - Class: 114 - Script: {instanceID: 14524} + Script: {instanceID: 14356} - Class: 114 - Script: {instanceID: 14526} + Script: {instanceID: 14504} - Class: 114 - Script: {instanceID: 14558} + Script: {instanceID: 14530} - Class: 114 - Script: {instanceID: 14580} + Script: {instanceID: 14532} - Class: 114 - Script: {instanceID: 14582} + Script: {instanceID: 14564} - Class: 114 - Script: {instanceID: 14622} + Script: {instanceID: 14586} + - Class: 114 + Script: {instanceID: 14588} - Class: 114 Script: {instanceID: 14628} - Class: 114 - Script: {instanceID: 14670} + Script: {instanceID: 14634} - Class: 114 - Script: {instanceID: 23916} + Script: {instanceID: 14676} - Class: 115 Script: {instanceID: 0} - Class: 128 @@ -896,6 +896,12 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: SelectActorLayerButton + - hash: + serializedVersion: 2 + Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f + assemblyName: Assembly-CSharp.dll + namespaceName: RimWorldAnimationStudio + className: AudioController - hash: serializedVersion: 2 Hash: d8843cd76e941805c38da8b9219529b2 @@ -1046,12 +1052,6 @@ ScriptsOnlyBuild: assemblyName: Assembly-CSharp.dll namespaceName: RimWorldAnimationStudio className: DropdownMenu - - hash: - serializedVersion: 2 - Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f - assemblyName: Assembly-CSharp.dll - namespaceName: RimWorldAnimationStudio - className: AudioController platform: 5 scenePathNames: - Assets/Scenes/MainScene.unity diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 26c5ca5a..3573e6e6 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 a4e81c2e..9af65a6e 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 9fc64a7b..90c6a64e 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 004370eb..1c7709d6 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ