diff --git a/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll b/Build/RimWorld-Animation-Studio_Data/Managed/Assembly-CSharp.dll index 9622079e..9f8a76fc 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 2de96dd9..a71e7916 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 03c50116..3bd4c210 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 5f2ba6bb..1d656e67 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 a95901ca..83c286e6 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 ab2e0803..12c1a455 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 255b94ae..21a3e302 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 000b9715..6226c9af 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 22142cce..19179840 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 b542f6c0..a33fb553 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 fb55cbdc..63b362c2 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 3d108acb..e03243c5 100644 Binary files a/Build/RimWorld-Animation-Studio_Data/globalgamemanagers and b/Build/RimWorld-Animation-Studio_Data/globalgamemanagers differ diff --git a/Source/.vs/Source/v16/.suo b/Source/.vs/Source/v16/.suo index 9d0f1adc..8eaecd25 100644 Binary files a/Source/.vs/Source/v16/.suo and b/Source/.vs/Source/v16/.suo differ diff --git a/Source/Assets/Scripts/AnimationComponents/AnimationStage.cs b/Source/Assets/Scripts/AnimationComponents/AnimationStage.cs index dcac62a4..7b9a7008 100644 --- a/Source/Assets/Scripts/AnimationComponents/AnimationStage.cs +++ b/Source/Assets/Scripts/AnimationComponents/AnimationStage.cs @@ -175,8 +175,7 @@ namespace RimWorldAnimationStudio public void OnPostLoad() { - foreach (PawnAnimationClip clip in AnimationClips) - { clip.OnPostLoad(); } + } } } diff --git a/Source/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs b/Source/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs index 60044885..a1d1f5cf 100644 --- a/Source/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs +++ b/Source/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs @@ -195,9 +195,17 @@ namespace RimWorldAnimationStudio public int GetOwningActorID() { - if (Workspace.animationDef == null) return -1; + if (Workspace.animationDef == null) + { Debug.Log("Cannot get actor ID - the AnimationDef is invalid"); return -1; } - return Workspace.GetCurrentAnimationStage().AnimationClips.IndexOf(this); + foreach (AnimationStage stage in Workspace.animationDef.animationStages) + { + if (stage.AnimationClips.Contains(this)) + { return stage.AnimationClips.IndexOf(this); } + } + + Debug.Log("Cannot get actor ID - animation clip has been orphaned"); + return -1; } public void AddPawnKeyframe() diff --git a/Source/Assets/Scripts/Data/Constants.cs b/Source/Assets/Scripts/Data/Constants.cs index 61631871..efb829a0 100644 --- a/Source/Assets/Scripts/Data/Constants.cs +++ b/Source/Assets/Scripts/Data/Constants.cs @@ -8,7 +8,7 @@ namespace RimWorldAnimationStudio public static class Constants { // Project data - public static string currentVersion = "1.0.3"; + public static string currentVersion = "1.0.4"; public static string projectHome = "https://gitgud.io/AbstractConcept/rimworld-animation-studio"; public static string projectWiki = "https://gitgud.io/AbstractConcept/rimworld-animation-studio/-/wikis/home"; diff --git a/Source/Assets/Scripts/Managers/AnimationController.cs b/Source/Assets/Scripts/Managers/AnimationController.cs index 00afaaec..9e0edb50 100644 --- a/Source/Assets/Scripts/Managers/AnimationController.cs +++ b/Source/Assets/Scripts/Managers/AnimationController.cs @@ -201,7 +201,7 @@ namespace RimWorldAnimationStudio public void Initialize() { - Debug.Log("Initializing animation preview"); + //Debug.Log("Initializing animation preview"); int actorCount = Workspace.animationDef.Actors.Count; int childCount = animationTimelines.GetComponentsInChildren().Count(); diff --git a/Source/Library/ArtifactDB b/Source/Library/ArtifactDB index 11d4cdd8..6a247765 100644 Binary files a/Source/Library/ArtifactDB and b/Source/Library/ArtifactDB differ diff --git a/Source/Library/Artifacts/20/20a1aba50f8a9b8162122bd872868740 b/Source/Library/Artifacts/20/20a1aba50f8a9b8162122bd872868740 new file mode 100644 index 00000000..16905c8d Binary files /dev/null and b/Source/Library/Artifacts/20/20a1aba50f8a9b8162122bd872868740 differ diff --git a/Source/Library/Artifacts/42/4221d7338497adaf5808947f601d884c b/Source/Library/Artifacts/42/4221d7338497adaf5808947f601d884c new file mode 100644 index 00000000..db7b6965 Binary files /dev/null and b/Source/Library/Artifacts/42/4221d7338497adaf5808947f601d884c differ diff --git a/Source/Library/Artifacts/70/70a9908b9d6dad60efbad4856c9517c5 b/Source/Library/Artifacts/70/70a9908b9d6dad60efbad4856c9517c5 new file mode 100644 index 00000000..662b3a9e Binary files /dev/null and b/Source/Library/Artifacts/70/70a9908b9d6dad60efbad4856c9517c5 differ diff --git a/Source/Library/Artifacts/77/77443df69961398acdd585f8d5152588 b/Source/Library/Artifacts/77/77443df69961398acdd585f8d5152588 new file mode 100644 index 00000000..11f2b860 Binary files /dev/null and b/Source/Library/Artifacts/77/77443df69961398acdd585f8d5152588 differ diff --git a/Source/Library/Artifacts/77/77917c2d997a1fd4442940c60ef55319 b/Source/Library/Artifacts/77/77917c2d997a1fd4442940c60ef55319 new file mode 100644 index 00000000..2e34744e Binary files /dev/null and b/Source/Library/Artifacts/77/77917c2d997a1fd4442940c60ef55319 differ diff --git a/Source/Library/Artifacts/99/9929a607c1f8f4f9a1e5acf55dddac18 b/Source/Library/Artifacts/99/9929a607c1f8f4f9a1e5acf55dddac18 new file mode 100644 index 00000000..ffd806db Binary files /dev/null and b/Source/Library/Artifacts/99/9929a607c1f8f4f9a1e5acf55dddac18 differ diff --git a/Source/Library/Artifacts/a8/a8d6904b1e1d412f2d78c81941a68162 b/Source/Library/Artifacts/a8/a8d6904b1e1d412f2d78c81941a68162 deleted file mode 100644 index dd027670..00000000 Binary files a/Source/Library/Artifacts/a8/a8d6904b1e1d412f2d78c81941a68162 and /dev/null differ diff --git a/Source/Library/Artifacts/ac/ac575c8384d832c9a8175d2298243b18 b/Source/Library/Artifacts/ac/ac575c8384d832c9a8175d2298243b18 new file mode 100644 index 00000000..d09cbce9 Binary files /dev/null and b/Source/Library/Artifacts/ac/ac575c8384d832c9a8175d2298243b18 differ diff --git a/Source/Library/Artifacts/ac/aca175cf28831874e02e64dd78633dcc b/Source/Library/Artifacts/ac/aca175cf28831874e02e64dd78633dcc new file mode 100644 index 00000000..d62d17fa Binary files /dev/null and b/Source/Library/Artifacts/ac/aca175cf28831874e02e64dd78633dcc differ diff --git a/Source/Library/Artifacts/b0/b0b96fe78b324b2f27123ef82efa3d9f b/Source/Library/Artifacts/b2/b2609f8916a27018962f774540db1161 similarity index 99% rename from Source/Library/Artifacts/b0/b0b96fe78b324b2f27123ef82efa3d9f rename to Source/Library/Artifacts/b2/b2609f8916a27018962f774540db1161 index 0eb3b93b..9d430b17 100644 Binary files a/Source/Library/Artifacts/b0/b0b96fe78b324b2f27123ef82efa3d9f and b/Source/Library/Artifacts/b2/b2609f8916a27018962f774540db1161 differ diff --git a/Source/Library/Artifacts/b6/b6d572061868897ded1673f76b24e55d b/Source/Library/Artifacts/b6/b6d572061868897ded1673f76b24e55d deleted file mode 100644 index d1de26c7..00000000 Binary files a/Source/Library/Artifacts/b6/b6d572061868897ded1673f76b24e55d and /dev/null differ diff --git a/Source/Library/Artifacts/ba/ba48c83ac5dc1871035227ec324a4d13 b/Source/Library/Artifacts/ba/ba48c83ac5dc1871035227ec324a4d13 new file mode 100644 index 00000000..30d95149 Binary files /dev/null and b/Source/Library/Artifacts/ba/ba48c83ac5dc1871035227ec324a4d13 differ diff --git a/Source/Library/Artifacts/bd/bdf42256dcffe259313cc856b2918bd5 b/Source/Library/Artifacts/bd/bdf42256dcffe259313cc856b2918bd5 new file mode 100644 index 00000000..449ebcc8 Binary files /dev/null and b/Source/Library/Artifacts/bd/bdf42256dcffe259313cc856b2918bd5 differ diff --git a/Source/Library/Artifacts/c6/c6834eac4e490913ca72d3dcd5418efb b/Source/Library/Artifacts/c6/c6834eac4e490913ca72d3dcd5418efb new file mode 100644 index 00000000..6d78fe79 Binary files /dev/null and b/Source/Library/Artifacts/c6/c6834eac4e490913ca72d3dcd5418efb differ diff --git a/Source/Library/Artifacts/c8/c8654a7b55f3c493e97b4996f5753d66 b/Source/Library/Artifacts/c8/c8654a7b55f3c493e97b4996f5753d66 new file mode 100644 index 00000000..654a4cd2 Binary files /dev/null and b/Source/Library/Artifacts/c8/c8654a7b55f3c493e97b4996f5753d66 differ diff --git a/Source/Library/Artifacts/ce/cee574fe5513f94082d599444425be9f b/Source/Library/Artifacts/ce/cee574fe5513f94082d599444425be9f new file mode 100644 index 00000000..249635e9 Binary files /dev/null and b/Source/Library/Artifacts/ce/cee574fe5513f94082d599444425be9f differ diff --git a/Source/Library/Artifacts/dc/dcbed4baec6440d014502de7124e2631 b/Source/Library/Artifacts/dc/dcbed4baec6440d014502de7124e2631 new file mode 100644 index 00000000..d2241a01 Binary files /dev/null and b/Source/Library/Artifacts/dc/dcbed4baec6440d014502de7124e2631 differ diff --git a/Source/Library/Artifacts/e1/e1c238794325cb8a81201a7ae8620695 b/Source/Library/Artifacts/e1/e1c238794325cb8a81201a7ae8620695 new file mode 100644 index 00000000..702bdfb9 Binary files /dev/null and b/Source/Library/Artifacts/e1/e1c238794325cb8a81201a7ae8620695 differ diff --git a/Source/Library/Artifacts/fa/fa8d0b7c08a2537770d3633c3bb1ad1d b/Source/Library/Artifacts/fa/fa8d0b7c08a2537770d3633c3bb1ad1d new file mode 100644 index 00000000..4cc78aa4 Binary files /dev/null and b/Source/Library/Artifacts/fa/fa8d0b7c08a2537770d3633c3bb1ad1d differ diff --git a/Source/Library/CurrentLayout-default.dwlt b/Source/Library/CurrentLayout-default.dwlt index 2fe3c7f5..a3c0e321 100644 --- a/Source/Library/CurrentLayout-default.dwlt +++ b/Source/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: 677, y: 492} - m_MaxSize: {x: 14001, y: 14042} + m_MinSize: {x: 677, y: 342} + m_MaxSize: {x: 12002, y: 8042} vertical: 0 - controlID: 1183 + controlID: 2744 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -137,10 +137,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 402, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 402, y: 342} + m_MaxSize: {x: 8002, y: 8042} vertical: 1 - controlID: 1184 + controlID: 2745 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,7 +165,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 1185 + controlID: 2746 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,8 +185,8 @@ MonoBehaviour: y: 0 width: 337 height: 671 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -211,8 +211,8 @@ MonoBehaviour: y: 0 width: 1077 height: 671 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -231,7 +231,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -240,15 +240,15 @@ MonoBehaviour: y: 671 width: 1414 height: 276 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,8 +268,8 @@ MonoBehaviour: y: 0 width: 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: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -453.5 - m_VBaseRangeMax: 453.5 + m_HBaseRangeMin: -537.5 + m_HBaseRangeMax: 537.5 + m_VBaseRangeMin: -314.5 + m_VBaseRangeMax: 314.5 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: 1075 + height: 629 m_Scale: {x: 1, y: 1} - m_Translation: {x: 960, y: 453.5} + m_Translation: {x: 537.5, y: 314.5} 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: -537.5 + y: -314.5 + width: 1075 + height: 629 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1920, y: 928} + m_LastWindowPixelSize: {x: 1075, y: 650} 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: 3ef8feff52f8fefff8f8feff62fbffff + m_ExpandedIDs: d619fdffea19fdff901afdffdad9feff00dafeffa6dafeff62fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -460,7 +460,7 @@ MonoBehaviour: m_Position: m_Target: {x: 632.8636, y: 316.5322, z: -264.26733} speed: 2 - m_Value: {x: 557.8876, y: 330.72833, z: -128.25} + m_Value: {x: 632.8636, y: 316.5322, z: -264.26733} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -512,7 +512,7 @@ MonoBehaviour: m_Size: m_Target: 404.75827 speed: 2 - m_Value: 302.3116 + m_Value: 404.75827 m_Ortho: m_Target: 1 speed: 2 @@ -1295,4 +1295,4 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 100 + m_LastVerticalScrollValue: 0 diff --git a/Source/Library/CurrentMaximizeLayout.dwlt b/Source/Library/CurrentMaximizeLayout.dwlt index 4de9fbbd..035ef8a8 100644 --- a/Source/Library/CurrentMaximizeLayout.dwlt +++ b/Source/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 677, y: 492} - m_MaxSize: {x: 14001, y: 14042} + m_MinSize: {x: 677, y: 342} + m_MaxSize: {x: 12002, y: 8042} vertical: 0 - controlID: 1015 + controlID: 2536 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: y: 0 width: 1414 height: 947 - m_MinSize: {x: 402, y: 492} - m_MaxSize: {x: 10001, y: 14042} + m_MinSize: {x: 402, y: 342} + m_MaxSize: {x: 8002, y: 8042} vertical: 1 - controlID: 1016 + controlID: 2488 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,7 +166,7 @@ MonoBehaviour: m_MinSize: {x: 402, y: 221} m_MaxSize: {x: 8002, y: 4021} vertical: 0 - controlID: 1017 + controlID: 2463 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -224,7 +224,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 38d1ffff44d1ffff8c4f0000 + m_ExpandedIDs: dad9feff00dafeffa6dafeff62fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -306,16 +306,16 @@ MonoBehaviour: m_ShowContextualTools: 0 m_WindowGUID: 352ee9c972596684b9fdf9db32bf21bf m_Gizmos: 0 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 557.8876, y: 330.72833, z: -128.25} + m_Target: {x: 632.8636, y: 316.5322, z: -264.26733} speed: 2 - m_Value: {x: 557.8876, y: 330.72833, z: -128.25} + m_Value: {x: 632.8636, y: 316.5322, z: -264.26733} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -328,7 +328,7 @@ MonoBehaviour: m_SceneViewState: showFog: 1 showMaterialUpdate: 0 - showSkybox: 0 + showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -365,9 +365,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 302.3116 + m_Target: 404.75827 speed: 2 - m_Value: 302.3116 + m_Value: 404.75827 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: 671 width: 1414 height: 276 - 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 @@ -1053,8 +1053,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 944f0000 - m_LastClickedInstanceID: 20372 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 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: 20372 - m_LastVerticalScrollValue: 100 + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 diff --git a/Source/Library/LastBuild.buildreport b/Source/Library/LastBuild.buildreport index e3fc39a9..a9f19e92 100644 Binary files a/Source/Library/LastBuild.buildreport and b/Source/Library/LastBuild.buildreport differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll index 9622079e..9f8a76fc 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Assembly-CSharp.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll index 2de96dd9..a71e7916 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll index 03c50116..3bd4c210 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Animation.Triangle.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll index 5f2ba6bb..1d656e67 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.Common.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll index a95901ca..83c286e6 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.PixelPerfect.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll index ab2e0803..12c1a455 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.2D.SpriteShape.Runtime.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll index 255b94ae..21a3e302 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.InternalAPIEngineBridge.001.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll index 000b9715..6226c9af 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Mathematics.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll index 22142cce..19179840 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll index b542f6c0..a33fb553 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/Unity.Timeline.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll b/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll index fb55cbdc..63b362c2 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll and b/Source/Library/PlayerDataCache/Win/Data/Managed/UnityEngine.UI.dll differ diff --git a/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers index 3d108acb..e03243c5 100644 Binary files a/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Source/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml b/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml index b09f7e7e..76ea813a 100644 --- a/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml +++ b/Source/Library/PlayerDataCache/Win/ScriptsOnlyCache.yaml @@ -55,7 +55,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/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index a0cc161b..966aa6e0 100644 Binary files a/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Source/Library/ScriptAssemblies/Assembly-CSharp.dll b/Source/Library/ScriptAssemblies/Assembly-CSharp.dll index 593e2b3f..0b119176 100644 Binary files a/Source/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Source/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb index 50bbcfde..cfd0ade4 100644 Binary files a/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Source/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Source/Library/SourceAssetDB b/Source/Library/SourceAssetDB index 58f09e86..52104161 100644 Binary files a/Source/Library/SourceAssetDB and b/Source/Library/SourceAssetDB differ