diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index 96bd3ae8..5658e120 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/Actor.cs b/Assets/Scripts/AnimationComponents/Actor.cs index c23147a4..623eebd4 100644 --- a/Assets/Scripts/AnimationComponents/Actor.cs +++ b/Assets/Scripts/AnimationComponents/Actor.cs @@ -87,6 +87,13 @@ namespace RimWorldAnimationStudio raceOffset.SetOffset(offset); } + public Vector3 GetFinalTransformOffset() + { + Vector3 offset = bodyTypeOffset.GetOffset(bodyType) + GetAlienRaceOffset(); + + return new Vector3(offset.x, offset.z, offset.y); + } + public void ValidateData() { bodyDefTypes = bodyDefTypes.Intersect(Tags.bodyDefTypes.Concat(CustomTags.bodyDefTypes))?.ToList(); diff --git a/Assets/Scripts/GUI/ActorBody.cs b/Assets/Scripts/GUI/ActorBody.cs index 5d8dd97f..db672931 100644 --- a/Assets/Scripts/GUI/ActorBody.cs +++ b/Assets/Scripts/GUI/ActorBody.cs @@ -59,8 +59,8 @@ namespace RimWorldAnimationStudio if (Workspace.actorManipulationMode == ActorManipulationMode.Pan) { - keyframe.bodyOffsetX = mousePosition.x - delta.x - Workspace.animationDef.actors[actorID].GetAlienRaceOffset().x; - keyframe.bodyOffsetZ = mousePosition.y - delta.y - Workspace.animationDef.actors[actorID].GetAlienRaceOffset().z; + keyframe.bodyOffsetX = mousePosition.x - delta.x - Workspace.animationDef.actors[actorID].GetFinalTransformOffset().x; + keyframe.bodyOffsetZ = mousePosition.y - delta.y - Workspace.animationDef.actors[actorID].GetFinalTransformOffset().y; } else if (Workspace.actorManipulationMode == ActorManipulationMode.Rotate) diff --git a/Assets/Scripts/Managers/AnimationController.cs b/Assets/Scripts/Managers/AnimationController.cs index e7dff556..f1213a5c 100644 --- a/Assets/Scripts/Managers/AnimationController.cs +++ b/Assets/Scripts/Managers/AnimationController.cs @@ -151,7 +151,6 @@ namespace RimWorldAnimationStudio string bodyType = alienRaceDef.isHumanoid ? actor.bodyType : "None"; Vector3 deltaPos = new Vector3(clip.BodyOffsetX.Evaluate(clipPercent), 0, clip.BodyOffsetZ.Evaluate(clipPercent)); - deltaPos += actor.bodyTypeOffset.GetOffset(bodyType) + actor.GetAlienRaceOffset(); float bodyAngle = clip.BodyAngle.Evaluate(clipPercent); float headAngle = clip.HeadAngle.Evaluate(clipPercent); @@ -177,14 +176,14 @@ namespace RimWorldAnimationStudio Vector3 appendagePos = PawnUtility.AppendageOffsetAt(bodyType, bodyFacing); float appendageRotation = clip.GenitalAngle.Evaluate(clipPercent); - actorBody.transform.position = bodyPos; + actorBody.transform.position = bodyPos + actor.GetFinalTransformOffset(); actorBody.transform.eulerAngles = new Vector3(0, 0, -bodyAngle); actorBody.headRenderer.transform.localPosition = headPos; actorBody.headRenderer.transform.eulerAngles = new Vector3(0, 0, -headAngle); actorBody.appendageRenderer.transform.localPosition = new Vector3(appendagePos.x, appendagePos.z, 0f); - actorBody.appendageRenderer.transform.eulerAngles = new Vector3(0, 0, -appendageRotation); + actorBody.appendageRenderer.transform.localEulerAngles = new Vector3(0, 0, -appendageRotation); actorBody.bodyRenderer.sprite = alienRaceDef.GetBodyTypeGraphic((CardinalDirection)bodyFacing, bodyType); actorBody.headRenderer.sprite = alienRaceDef.isHumanoid ? alienRaceDef.GetHeadGraphic((CardinalDirection)headFacing) : null; diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 163dfe80..a87f28f5 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 1585341d..2f3e77f5 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 f0186435..9e10fcc5 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 528acd98..c70e8ea3 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 693e7257..38db81cd 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 94d87c61..b66f2735 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 b51f840d..3d750202 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 e64bb7b6..f963b5c5 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 2e67076b..06ebae6e 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 db2746dc..0e0b5168 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 3bb9be24..c44b1f73 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 9a1f2d1e..bc57b276 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 de287a37..0ca52138 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/05/051722fd07f3017ac8b094ed58a250e9 b/Library/Artifacts/05/051722fd07f3017ac8b094ed58a250e9 deleted file mode 100644 index 457d4b4e..00000000 Binary files a/Library/Artifacts/05/051722fd07f3017ac8b094ed58a250e9 and /dev/null differ diff --git a/Library/Artifacts/06/06668db1199dee6ea8720de447dd3a38 b/Library/Artifacts/06/06668db1199dee6ea8720de447dd3a38 deleted file mode 100644 index 155c8d70..00000000 Binary files a/Library/Artifacts/06/06668db1199dee6ea8720de447dd3a38 and /dev/null differ diff --git a/Library/Artifacts/11/113e4ccb70ba5c697203a4c3d1458b63 b/Library/Artifacts/11/113e4ccb70ba5c697203a4c3d1458b63 deleted file mode 100644 index 09d51799..00000000 Binary files a/Library/Artifacts/11/113e4ccb70ba5c697203a4c3d1458b63 and /dev/null differ diff --git a/Library/Artifacts/1b/1b6ad8af475fa440d8d28e0427f47e63 b/Library/Artifacts/1b/1b6ad8af475fa440d8d28e0427f47e63 deleted file mode 100644 index 92f7e52a..00000000 Binary files a/Library/Artifacts/1b/1b6ad8af475fa440d8d28e0427f47e63 and /dev/null differ diff --git a/Library/Artifacts/20/20bf5c601a799818a42489704c2f63c0 b/Library/Artifacts/20/20bf5c601a799818a42489704c2f63c0 deleted file mode 100644 index a1249fe8..00000000 Binary files a/Library/Artifacts/20/20bf5c601a799818a42489704c2f63c0 and /dev/null differ diff --git a/Library/Artifacts/f1/f1c18b94edc32d716b484465d5da5d05 b/Library/Artifacts/26/260af44b31942969773d17e079740f9e similarity index 95% rename from Library/Artifacts/f1/f1c18b94edc32d716b484465d5da5d05 rename to Library/Artifacts/26/260af44b31942969773d17e079740f9e index e6919bf2..f0cbd09e 100644 Binary files a/Library/Artifacts/f1/f1c18b94edc32d716b484465d5da5d05 and b/Library/Artifacts/26/260af44b31942969773d17e079740f9e differ diff --git a/Library/Artifacts/32/32e57cb8edb270973585a735b5b18a14 b/Library/Artifacts/3d/3d0d47805a6e66a116ed61e0c9c0d654 similarity index 94% rename from Library/Artifacts/32/32e57cb8edb270973585a735b5b18a14 rename to Library/Artifacts/3d/3d0d47805a6e66a116ed61e0c9c0d654 index ed90d0fd..f4ac4e04 100644 Binary files a/Library/Artifacts/32/32e57cb8edb270973585a735b5b18a14 and b/Library/Artifacts/3d/3d0d47805a6e66a116ed61e0c9c0d654 differ diff --git a/Library/Artifacts/47/47f7cc4b0b8ad1c8a52910cb19498416 b/Library/Artifacts/47/47f7cc4b0b8ad1c8a52910cb19498416 deleted file mode 100644 index 5a78f5ef..00000000 Binary files a/Library/Artifacts/47/47f7cc4b0b8ad1c8a52910cb19498416 and /dev/null differ diff --git a/Library/Artifacts/48/48d56a7c0a395548e0f8caecd66cfa27 b/Library/Artifacts/48/48d56a7c0a395548e0f8caecd66cfa27 deleted file mode 100644 index d6be35fa..00000000 Binary files a/Library/Artifacts/48/48d56a7c0a395548e0f8caecd66cfa27 and /dev/null differ diff --git a/Library/Artifacts/49/4948cf76e130424c36dbfbc2711ed0ae b/Library/Artifacts/49/4948cf76e130424c36dbfbc2711ed0ae deleted file mode 100644 index d5e57ad4..00000000 Binary files a/Library/Artifacts/49/4948cf76e130424c36dbfbc2711ed0ae and /dev/null differ diff --git a/Library/Artifacts/4b/4b8e5b8f20cfb02ef79e75f1fdbb4bd1 b/Library/Artifacts/4b/4b8e5b8f20cfb02ef79e75f1fdbb4bd1 deleted file mode 100644 index 4651e2ac..00000000 Binary files a/Library/Artifacts/4b/4b8e5b8f20cfb02ef79e75f1fdbb4bd1 and /dev/null differ diff --git a/Library/Artifacts/4f/4f44bd1ede1e6233e121b046b0f7b619 b/Library/Artifacts/4f/4f44bd1ede1e6233e121b046b0f7b619 deleted file mode 100644 index a6a3daac..00000000 Binary files a/Library/Artifacts/4f/4f44bd1ede1e6233e121b046b0f7b619 and /dev/null differ diff --git a/Library/Artifacts/62/62a1fc8e38e50712cf38eb1042dd0c95 b/Library/Artifacts/62/62a1fc8e38e50712cf38eb1042dd0c95 deleted file mode 100644 index 4a26b5ae..00000000 Binary files a/Library/Artifacts/62/62a1fc8e38e50712cf38eb1042dd0c95 and /dev/null differ diff --git a/Library/Artifacts/67/6752e626ef193e2d9b97e6d03598807f b/Library/Artifacts/67/6752e626ef193e2d9b97e6d03598807f deleted file mode 100644 index ee364060..00000000 Binary files a/Library/Artifacts/67/6752e626ef193e2d9b97e6d03598807f and /dev/null differ diff --git a/Library/Artifacts/6b/6b254df2affb88356d7ee39f0bce3a3d b/Library/Artifacts/6b/6b254df2affb88356d7ee39f0bce3a3d deleted file mode 100644 index 8d8850ef..00000000 Binary files a/Library/Artifacts/6b/6b254df2affb88356d7ee39f0bce3a3d and /dev/null differ diff --git a/Library/Artifacts/6f/6fad0396e56c301524c924d76a454a22 b/Library/Artifacts/6f/6fad0396e56c301524c924d76a454a22 deleted file mode 100644 index 98b3db91..00000000 Binary files a/Library/Artifacts/6f/6fad0396e56c301524c924d76a454a22 and /dev/null differ diff --git a/Library/Artifacts/88/88b01d3d3060bb253bd5b41b33e727bd b/Library/Artifacts/88/88b01d3d3060bb253bd5b41b33e727bd deleted file mode 100644 index 86f4eb1d..00000000 Binary files a/Library/Artifacts/88/88b01d3d3060bb253bd5b41b33e727bd and /dev/null differ diff --git a/Library/Artifacts/89/896a1cd6a4c6ab4063a0185c7226fb45 b/Library/Artifacts/89/896a1cd6a4c6ab4063a0185c7226fb45 deleted file mode 100644 index 30b90b1e..00000000 Binary files a/Library/Artifacts/89/896a1cd6a4c6ab4063a0185c7226fb45 and /dev/null differ diff --git a/Library/Artifacts/db/db03cb6342b0502d3338319aa56c34bc b/Library/Artifacts/8b/8b7519565aa2631e503a0b2e7c6f7a8b similarity index 96% rename from Library/Artifacts/db/db03cb6342b0502d3338319aa56c34bc rename to Library/Artifacts/8b/8b7519565aa2631e503a0b2e7c6f7a8b index f713cea0..8e0222f5 100644 Binary files a/Library/Artifacts/db/db03cb6342b0502d3338319aa56c34bc and b/Library/Artifacts/8b/8b7519565aa2631e503a0b2e7c6f7a8b differ diff --git a/Library/Artifacts/8c/8c3e1220044d4fd6d168de3b9ed7db96 b/Library/Artifacts/8c/8c3e1220044d4fd6d168de3b9ed7db96 deleted file mode 100644 index 3a20524d..00000000 Binary files a/Library/Artifacts/8c/8c3e1220044d4fd6d168de3b9ed7db96 and /dev/null differ diff --git a/Library/Artifacts/15/1524547221e5c1bc009dab4127bc1286 b/Library/Artifacts/8e/8e038cdf39da7a92e16ab5d716c65fb4 similarity index 67% rename from Library/Artifacts/15/1524547221e5c1bc009dab4127bc1286 rename to Library/Artifacts/8e/8e038cdf39da7a92e16ab5d716c65fb4 index 352d00d4..4b3344cd 100644 Binary files a/Library/Artifacts/15/1524547221e5c1bc009dab4127bc1286 and b/Library/Artifacts/8e/8e038cdf39da7a92e16ab5d716c65fb4 differ diff --git a/Library/Artifacts/9c/9c6a19dfda9d9a3b7295a92b74a51329 b/Library/Artifacts/93/935eb96db0d42ada09a45b097bcdc10b similarity index 97% rename from Library/Artifacts/9c/9c6a19dfda9d9a3b7295a92b74a51329 rename to Library/Artifacts/93/935eb96db0d42ada09a45b097bcdc10b index 211d1144..47497f7a 100644 Binary files a/Library/Artifacts/9c/9c6a19dfda9d9a3b7295a92b74a51329 and b/Library/Artifacts/93/935eb96db0d42ada09a45b097bcdc10b differ diff --git a/Library/Artifacts/4f/4fc8be743ac8808534569996d6629ade b/Library/Artifacts/9d/9dec074eae076b77f4f4e24c77c77e5a similarity index 55% rename from Library/Artifacts/4f/4fc8be743ac8808534569996d6629ade rename to Library/Artifacts/9d/9dec074eae076b77f4f4e24c77c77e5a index 29f58279..572cdc3e 100644 Binary files a/Library/Artifacts/4f/4fc8be743ac8808534569996d6629ade and b/Library/Artifacts/9d/9dec074eae076b77f4f4e24c77c77e5a differ diff --git a/Library/Artifacts/ae/ae899dfd4575a5e43b265a39199dc69b b/Library/Artifacts/a0/a041a0cb559d59aaf131a425e6a2a329 similarity index 96% rename from Library/Artifacts/ae/ae899dfd4575a5e43b265a39199dc69b rename to Library/Artifacts/a0/a041a0cb559d59aaf131a425e6a2a329 index c0f33cfe..bc673de1 100644 Binary files a/Library/Artifacts/ae/ae899dfd4575a5e43b265a39199dc69b and b/Library/Artifacts/a0/a041a0cb559d59aaf131a425e6a2a329 differ diff --git a/Library/Artifacts/fd/fda2ada0cef7ed99b10eaeb97755bf9c b/Library/Artifacts/b7/b720e530980223f61d49950e72698e75 similarity index 96% rename from Library/Artifacts/fd/fda2ada0cef7ed99b10eaeb97755bf9c rename to Library/Artifacts/b7/b720e530980223f61d49950e72698e75 index 1352444e..a43f290b 100644 Binary files a/Library/Artifacts/fd/fda2ada0cef7ed99b10eaeb97755bf9c and b/Library/Artifacts/b7/b720e530980223f61d49950e72698e75 differ diff --git a/Library/Artifacts/c3/c31368da8264b9daa02de6c27d2d6c65 b/Library/Artifacts/c3/c31368da8264b9daa02de6c27d2d6c65 deleted file mode 100644 index 159d00ce..00000000 Binary files a/Library/Artifacts/c3/c31368da8264b9daa02de6c27d2d6c65 and /dev/null differ diff --git a/Library/Artifacts/c6/c6801ff290a3a0cb61ec1c591f095dd1 b/Library/Artifacts/c6/c6801ff290a3a0cb61ec1c591f095dd1 deleted file mode 100644 index cbac14b7..00000000 Binary files a/Library/Artifacts/c6/c6801ff290a3a0cb61ec1c591f095dd1 and /dev/null differ diff --git a/Library/Artifacts/db/db1437d5a2bea1f7b63ac0ddb9be27f6 b/Library/Artifacts/db/db1437d5a2bea1f7b63ac0ddb9be27f6 deleted file mode 100644 index 4b0a56f7..00000000 Binary files a/Library/Artifacts/db/db1437d5a2bea1f7b63ac0ddb9be27f6 and /dev/null differ diff --git a/Library/Artifacts/ec/ec5ee4f0dd0aa2d078214bada57aa572 b/Library/Artifacts/ec/ec5ee4f0dd0aa2d078214bada57aa572 deleted file mode 100644 index 5cf6c2fb..00000000 Binary files a/Library/Artifacts/ec/ec5ee4f0dd0aa2d078214bada57aa572 and /dev/null differ diff --git a/Library/Artifacts/ee/eec7e4f06e1260185a2a58dda13512d4 b/Library/Artifacts/ee/eec7e4f06e1260185a2a58dda13512d4 deleted file mode 100644 index 023dc8b0..00000000 Binary files a/Library/Artifacts/ee/eec7e4f06e1260185a2a58dda13512d4 and /dev/null differ diff --git a/Library/Artifacts/f6/f65e5114a0bed8bb6c722c5c56b0040f b/Library/Artifacts/f6/f65e5114a0bed8bb6c722c5c56b0040f deleted file mode 100644 index 78ceb4be..00000000 Binary files a/Library/Artifacts/f6/f65e5114a0bed8bb6c722c5c56b0040f and /dev/null differ diff --git a/Library/Artifacts/fe/fee708e52f007becb70a9ddb6b9e58b1 b/Library/Artifacts/fe/fee708e52f007becb70a9ddb6b9e58b1 deleted file mode 100644 index d313c92f..00000000 Binary files a/Library/Artifacts/fe/fee708e52f007becb70a9ddb6b9e58b1 and /dev/null differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 918a7386..24a75c82 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -115,7 +115,7 @@ MonoBehaviour: m_MinSize: {x: 678, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 12962 + controlID: 1188 --- !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: 12963 + controlID: 1189 --- !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: 12964 + controlID: 1190 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -398,7 +398,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c6a4faffdaa4faff78a5faff9095ffff62fbffff6a3a0000463c0000323d00009a3f0000dc3f0000cc410000 + m_ExpandedIDs: e0d2fffff4d2ffff92d3ffff62fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1115,9 +1115,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 20480000 - m_LastClickedID: 18464 - m_ExpandedIDs: 00000000fc470000fe4700000048000002480000044800001848000000ca9a3b + m_SelectedIDs: 22480000 + m_LastClickedID: 18466 + m_ExpandedIDs: 00000000fc470000fe4700000048000002480000044800001a48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 6d998eeb..4ac5acfc 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 678, y: 492} m_MaxSize: {x: 14001, y: 14042} vertical: 0 - controlID: 12636 + controlID: 1062 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,7 +141,7 @@ MonoBehaviour: m_MinSize: {x: 403, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 12600 + controlID: 1063 --- !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: 12601 + controlID: 1038 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c6a4faffdaa4faff78a5faff9095ffff62fbffff6a3a0000463c0000323d00009a3f0000dc3f0000cc410000 + m_ExpandedIDs: 62fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -998,9 +998,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 20480000 - m_LastClickedID: 18464 - m_ExpandedIDs: 00000000fc470000fe4700000048000002480000044800001848000000ca9a3b + m_SelectedIDs: 22480000 + m_LastClickedID: 18466 + m_ExpandedIDs: 00000000fc470000fe4700000048000002480000044800001a48000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 013062d1..cce9d843 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 163dfe80..a87f28f5 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 1585341d..2f3e77f5 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 f0186435..9e10fcc5 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 528acd98..c70e8ea3 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 693e7257..38db81cd 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 94d87c61..b66f2735 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 b51f840d..3d750202 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 e64bb7b6..f963b5c5 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 2e67076b..06ebae6e 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 db2746dc..0e0b5168 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 3bb9be24..c44b1f73 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 9a1f2d1e..bc57b276 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 21f4db24..a5859fca 100644 --- a/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -37,7 +37,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 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 02b4e134..083a6d73 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 d18affb5..247d0959 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 b4ea1482..03c3d3e2 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 6d5027e2..587aacc9 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ec0d4139..6ff694be 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -124,7 +124,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.1.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0