diff --git a/Assets/Aseprite Projects/tree02.aseprite b/Assets/Aseprite Projects/tree02.aseprite index 98ea8b1..da8382f 100644 Binary files a/Assets/Aseprite Projects/tree02.aseprite and b/Assets/Aseprite Projects/tree02.aseprite differ diff --git a/Assets/Prefabs/tree02.prefab b/Assets/Prefabs/tree02.prefab index 08b2400..9a66248 100644 --- a/Assets/Prefabs/tree02.prefab +++ b/Assets/Prefabs/tree02.prefab @@ -85,7 +85,7 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 --- !u!114 &134544697275079105 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 3286087..aa33e70 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -900,7 +900,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 8 + orthographic size: 10 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -977,11 +977,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} propertyPath: m_LocalPosition.x - value: -13.410806 + value: -4.2408047 objectReference: {fileID: 0} - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} propertyPath: m_LocalPosition.y - value: 4.33799 + value: -2.35201 objectReference: {fileID: 0} - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} propertyPath: m_LocalPosition.z @@ -27965,11 +27965,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} propertyPath: m_LocalPosition.x - value: -15.89 + value: -3.63 objectReference: {fileID: 0} - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} propertyPath: m_LocalPosition.y - value: 4.81 + value: 2.68 objectReference: {fileID: 0} - target: {fileID: 1909482199139559713, guid: a51034cd9a84299479d24128aec330e6, type: 3} propertyPath: m_LocalPosition.z @@ -28266,11 +28266,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5128193789106105257, guid: 4ca350a347d8520448f562297fbf46d4, type: 3} propertyPath: m_LocalPosition.x - value: -13.892635 + value: -4.7226343 objectReference: {fileID: 0} - target: {fileID: 5128193789106105257, guid: 4ca350a347d8520448f562297fbf46d4, type: 3} propertyPath: m_LocalPosition.y - value: -2.803417 + value: -9.493417 objectReference: {fileID: 0} - target: {fileID: 5128193789106105257, guid: 4ca350a347d8520448f562297fbf46d4, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Sprites/tree02.png b/Assets/Sprites/tree02.png index 1bfe0b1..4f62a7e 100644 Binary files a/Assets/Sprites/tree02.png and b/Assets/Sprites/tree02.png differ diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index d215b0b..fa71001 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -8,7 +8,7 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 331 + x: 305 y: 73 - width: 1033 - height: 536 + width: 1168 + height: 594 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1033, y: 515} + m_TargetSize: {x: 1168, y: 573} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -516.5 - m_HBaseRangeMax: 516.5 - m_VBaseRangeMin: -257.5 - m_VBaseRangeMax: 257.5 + m_HBaseRangeMin: -584 + m_HBaseRangeMax: 584 + m_VBaseRangeMin: -286.5 + m_VBaseRangeMax: 286.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1033 - height: 515 + width: 1168 + height: 573 m_Scale: {x: 1, y: 1} - m_Translation: {x: 516.5, y: 257.5} + m_Translation: {x: 584, y: 286.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -516.5 - y: -257.5 - width: 1033 - height: 515 + x: -584 + y: -286.5 + width: 1168 + height: 573 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1033, y: 536} + m_LastWindowPixelSize: {x: 1168, y: 594} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,7 +136,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 + width: 1475 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} @@ -161,8 +161,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1366 - height: 557 + width: 1475 + height: 615 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -184,8 +184,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 331 - height: 557 + width: 305 + height: 615 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 330 - height: 536 + width: 304 + height: 594 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -224,23 +224,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a66a0000 - m_LastClickedID: 27302 - m_ExpandedIDs: 2efbffffce6a0000 + m_SelectedIDs: e26a0000 + m_LastClickedID: 27362 + m_ExpandedIDs: 2efbffffc06a0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: InteractionText - m_OriginalName: InteractionText + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 27302 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 4 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -265,10 +265,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 331 + x: 305 y: 0 - width: 1035 - height: 557 + width: 1170 + height: 615 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -297,10 +297,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 331 + x: 305 y: 73 - width: 1033 - height: 536 + width: 1168 + height: 594 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -371,17 +371,6 @@ MonoBehaviour: id: Scene View/Tilemap Focus index: 3 layout: 4 - - dockPosition: 0 - containerId: overlay-container--left - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-transform-toolbar - index: 0 - layout: 2 - dockPosition: 0 containerId: overlay-container--right floating: 0 @@ -393,6 +382,17 @@ MonoBehaviour: id: Orientation index: 0 layout: 4 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 26} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 1 + layout: 2 - dockPosition: 1 containerId: overlay-container--right floating: 0 @@ -524,9 +524,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 479.0747, y: 297.06244, z: -1.6418004} + m_Target: {x: -3.7845664, y: 2.0261996, z: -0.0358802} speed: 2 - m_Value: {x: 479.0747, y: 297.06244, z: -1.6418004} + m_Value: {x: -3.7845664, y: 2.0261996, z: -0.0358802} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -577,9 +577,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 264.67877 + m_Target: 8.932131 speed: 2 - m_Value: 264.67877 + m_Value: 8.932131 m_Ortho: m_Target: 1 speed: 2 @@ -620,9 +620,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 557 - width: 1366 - height: 382 + y: 615 + width: 1475 + height: 324 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 10} @@ -652,9 +652,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 630 - width: 1365 - height: 361 + y: 688 + width: 1474 + height: 303 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -672,22 +672,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 74 m_LastFolders: - - Assets/Scripts + - Assets/Prefabs m_LastFoldersGridSize: 74 - m_LastProjectPath: M:\UnityProjects\2D-Top-Down + m_LastProjectPath: M:\UnityProjects\2d-top-down m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: ce700000 - m_LastClickedID: 28878 - m_ExpandedIDs: 00000000c26e000000ca9a3bffffff7f + m_SelectedIDs: 8a6f0000 + m_LastClickedID: 28554 + m_ExpandedIDs: 000000006e6f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -715,7 +715,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c26e0000 + m_ExpandedIDs: 000000006e6f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -740,9 +740,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: a66a0000 - m_LastClickedInstanceID: 27302 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: e26a0000 + m_LastClickedInstanceID: 27362 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300006a8e0000f25e000088610000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -792,9 +792,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 630 - width: 1365 - height: 361 + y: 688 + width: 1473 + height: 303 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -807,16 +807,16 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1366 + x: 1475 y: 0 - width: 554 + width: 445 height: 939 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} @@ -845,9 +845,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1366 + x: 1475 y: 73 - width: 553 + width: 444 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: