diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9b06c74..2b21ba1 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -4411,8 +4411,9 @@ MonoBehaviour: holdDuration: 1 radius: 3 centerPoint: {fileID: 1335747188} - harvestDuration: 3 + harvestDuration: 1 toolType: 0 + drops: [] --- !u!1 &1523942491 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Inventory/Items/Wood.asset b/Assets/Scripts/Inventory/Items/Wood.asset index 3a25e38..5995072 100644 --- a/Assets/Scripts/Inventory/Items/Wood.asset +++ b/Assets/Scripts/Inventory/Items/Wood.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fae7bba50a98204883e78d8d6c96fc2, type: 3} m_Name: Wood m_EditorClassIdentifier: - name: - id: 0 - isStackable: 0 - sprite: {fileID: 0} + name: wood + id: 2 + isStackable: 1 + sprite: {fileID: 21300000, guid: 30728ae26107dfe438d180ab175fdaca, type: 3} isSelected: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index fa71001..1c6b2a4 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -47,8 +47,8 @@ MonoBehaviour: serializedVersion: 2 x: 305 y: 73 - width: 1168 - height: 594 + width: 1174 + height: 588 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: 1168, y: 573} + m_TargetSize: {x: 1174, y: 567} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -584 - m_HBaseRangeMax: 584 - m_VBaseRangeMin: -286.5 - m_VBaseRangeMax: 286.5 + m_HBaseRangeMin: -587 + m_HBaseRangeMax: 587 + m_VBaseRangeMin: -283.5 + m_VBaseRangeMax: 283.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1168 - height: 573 + width: 1174 + height: 567 m_Scale: {x: 1, y: 1} - m_Translation: {x: 584, y: 286.5} + m_Translation: {x: 587, y: 283.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -584 - y: -286.5 - width: 1168 - height: 573 + x: -587 + y: -283.5 + width: 1174 + height: 567 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1168, y: 594} + m_LastWindowPixelSize: {x: 1174, y: 588} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,7 +136,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1475 + width: 1481 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: 1475 - height: 615 + width: 1481 + height: 609 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -185,7 +185,7 @@ MonoBehaviour: x: 0 y: 0 width: 305 - height: 615 + height: 609 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -216,7 +216,7 @@ MonoBehaviour: x: 0 y: 73 width: 304 - height: 594 + height: 588 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -224,9 +224,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e26a0000 - m_LastClickedID: 27362 - m_ExpandedIDs: 2efbffffc06a0000 + m_SelectedIDs: 209fffff + m_LastClickedID: -24800 + m_ExpandedIDs: 729fffff2efbffffe66a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -242,7 +242,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -267,8 +267,8 @@ MonoBehaviour: serializedVersion: 2 x: 305 y: 0 - width: 1170 - height: 615 + width: 1176 + height: 609 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -299,8 +299,8 @@ MonoBehaviour: serializedVersion: 2 x: 305 y: 73 - width: 1168 - height: 594 + width: 1174 + height: 588 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -524,9 +524,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -3.7845664, y: 2.0261996, z: -0.0358802} + m_Target: {x: 4.8067207, y: 1.9289383, z: 0.49497953} speed: 2 - m_Value: {x: -3.7845664, y: 2.0261996, z: -0.0358802} + m_Value: {x: 4.8067207, y: 1.9289383, z: 0.49497953} 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: 8.932131 + m_Target: 9.60569 speed: 2 - m_Value: 8.932131 + m_Value: 9.60569 m_Ortho: m_Target: 1 speed: 2 @@ -620,9 +620,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 615 - width: 1475 - height: 324 + y: 609 + width: 1481 + height: 330 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: 688 - width: 1474 - height: 303 + y: 682 + width: 1480 + height: 309 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -672,22 +672,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scripts/Inventory m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 74 m_LastFolders: - - Assets/Prefabs + - Assets/Scripts/Inventory m_LastFoldersGridSize: 74 m_LastProjectPath: M:\UnityProjects\2d-top-down m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8a6f0000 - m_LastClickedID: 28554 - m_ExpandedIDs: 000000006e6f000000ca9a3bffffff7f + m_SelectedIDs: fc6f0000 + m_LastClickedID: 28668 + m_ExpandedIDs: 00000000ae6f0000b06f0000c06f0000fc6f0000fe6f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -715,7 +715,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000006e6f0000 + m_ExpandedIDs: 00000000ae6f0000b06f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -740,9 +740,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e26a0000 - m_LastClickedInstanceID: 27362 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: 209fffff + m_LastClickedInstanceID: -24800 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300006a8e0000f25e000088610000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -791,10 +791,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 688 - width: 1473 - height: 303 + x: -1920 + y: 713 + width: 1480 + height: 326 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -814,12 +814,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1475 + x: 1481 y: 0 - width: 445 + width: 439 height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -845,9 +845,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1475 + x: 1481 y: 73 - width: 444 + width: 438 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 2b233f4..881c3dc 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -1912 - y: 51 - width: 1904 + x: 0 + y: 43 + width: 1920 height: 989 m_ShowMode: 4 - m_Title: Inspector + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,7 +44,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1904 + width: 1920 height: 989 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1904 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -91,7 +91,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 969 - width: 1904 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1904 + width: 1920 height: 939 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 58 + controlID: 6066 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1469 + width: 1481 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 77 + controlID: 6071 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1469 - height: 615 + width: 1481 + height: 609 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 64 + controlID: 6072 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +187,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 302 - height: 615 + width: 305 + height: 609 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} @@ -211,10 +211,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 302 + x: 305 y: 0 - width: 1167 - height: 615 + width: 1176 + height: 609 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} @@ -239,9 +239,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 615 - width: 1469 - height: 324 + y: 609 + width: 1481 + height: 330 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 15} @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1469 + x: 1481 y: 0 - width: 435 + width: 439 height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1616 + x: 305 y: 73 - width: 1170 - height: 625 + width: 1174 + height: 588 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -310,7 +310,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1170, y: 604} + m_TargetSize: {x: 1174, y: 567} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,10 +325,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -585 - m_HBaseRangeMax: 585 - m_VBaseRangeMin: -302 - m_VBaseRangeMax: 302 + m_HBaseRangeMin: -587 + m_HBaseRangeMax: 587 + m_VBaseRangeMin: -283.5 + m_VBaseRangeMax: 283.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -337,7 +337,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1170 - height: 604 + width: 1174 + height: 567 m_Scale: {x: 1, y: 1} - m_Translation: {x: 585, y: 302} + m_Translation: {x: 587, y: 283.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -585 - y: -302 - width: 1170 - height: 604 + x: -587 + y: -283.5 + width: 1174 + height: 567 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1170, y: 625} + m_LastWindowPixelSize: {x: 1174, y: 588} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -388,10 +388,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1912 - y: 81 - width: 301 - height: 594 + x: 0 + y: 73 + width: 304 + height: 588 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -401,7 +401,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 48e2ffff9ae3ffff2efbffff + m_ExpandedIDs: 729fffff2efbffffe66a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -417,7 +417,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -445,10 +445,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1610 - y: 81 - width: 1165 - height: 594 + x: 305 + y: 73 + width: 1174 + height: 588 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -672,9 +672,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 4.236046, y: 1.978678, z: 0.2763816} + m_Target: {x: 5.74292, y: 2.1610928, z: 0.50210136} speed: 2 - m_Value: {x: 4.236046, y: 1.978678, z: 0.2763816} + m_Value: {x: 5.5028133, y: 2.2863657, z: 0.49791065} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -725,9 +725,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.5358753 + m_Target: 8.893561 speed: 2 - m_Value: 7.5358753 + m_Value: 9.31263 m_Ortho: m_Target: 1 speed: 2 @@ -772,10 +772,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1912 - y: 696 - width: 1468 - height: 303 + x: 0 + y: 682 + width: 1480 + height: 309 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -806,9 +806,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0e700000 - m_LastClickedID: 28686 - m_ExpandedIDs: 000000009a6f00009c6f0000c66f00000e7000001270000000ca9a3bffffff7f + m_SelectedIDs: fc6f0000 + m_LastClickedID: 28668 + m_ExpandedIDs: 00000000ae6f0000b06f0000c06f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -836,7 +836,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a6f00009c6f0000 + m_ExpandedIDs: 00000000ae6f0000b06f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -913,9 +913,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: -1920 - y: 719 - width: 1475 - height: 320 + y: 713 + width: 1480 + height: 326 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -940,9 +940,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -443 - y: 81 - width: 434 + x: 1481 + y: 73 + width: 438 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: