diff --git a/Assets/Resources/Levels/1.prefab b/Assets/Resources/Levels/1.prefab index b662ccc..b4343fa 100644 --- a/Assets/Resources/Levels/1.prefab +++ b/Assets/Resources/Levels/1.prefab @@ -249,11 +249,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_LocalPosition.x - value: 34.13 + value: 34.55 objectReference: {fileID: 0} - target: {fileID: 1670627767197824294, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_LocalPosition.y - value: -3.36 + value: -22.25 objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_Size.x @@ -5046,7 +5046,7 @@ PrefabInstance: - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[10].m_Data value: - objectReference: {fileID: -2003382281, guid: 70f9149264d244b4dafd9728b074da3f, type: 3} + objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[11].m_Data value: @@ -5074,7 +5074,7 @@ PrefabInstance: - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[17].m_Data value: - objectReference: {fileID: 0} + objectReference: {fileID: -2003382281, guid: 70f9149264d244b4dafd9728b074da3f, type: 3} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[18].m_Data value: @@ -7605,7 +7605,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[10].m_RefCount - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[11].m_RefCount @@ -7633,7 +7633,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[17].m_RefCount - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_TileSpriteArray.Array.data[18].m_RefCount @@ -10113,7 +10113,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_Tiles.Array.data[38].second.m_TileSpriteIndex - value: 10 + value: 17 objectReference: {fileID: 0} - target: {fileID: 1793469087448140271, guid: e701662714d893b4283e4c7e15f945f2, type: 3} propertyPath: m_Tiles.Array.data[39].second.m_TileSpriteIndex diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index ee41b2c..1fcf86a 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -15,7 +15,7 @@ MonoBehaviour: m_Children: - {fileID: 3} - {fileID: 8} - - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 6179 + controlID: 16620 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,7 +49,7 @@ MonoBehaviour: x: 1 y: 19 width: 877.99994 - height: 603.8 + height: 343 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -97,22 +97,22 @@ MonoBehaviour: x: 0 y: 21 width: 877.99994 - height: 582.8 - m_Scale: {x: 0.57161456, y: 0.57161456} - m_Translation: {x: 439, y: 291.4} + height: 322 + m_Scale: {x: 0.3726852, y: 0.3726852} + m_Translation: {x: 438.99997, y: 161} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -768 - y: -509.78406 - width: 1536 - height: 1019.5681 + x: -1177.9377 + y: -432 + width: 2355.8755 + height: 864 m_MinimalGUI: 1 - m_defaultScale: 0.57161456 - m_LastWindowPixelSize: {x: 1097.4999, y: 754.75} + m_defaultScale: 0.3726852 + m_LastWindowPixelSize: {x: 1097.4999, y: 428.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000100000100 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 6106 + controlID: 16570 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: y: 0 width: 303.2 height: 382.4 - 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: 5} m_Panes: - {fileID: 5} @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 74e1ffff9ee1ffff + m_ExpandedIDs: 08cbfdffccba0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -245,8 +245,8 @@ MonoBehaviour: y: 382.4 width: 303.2 height: 348.4 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -293,7 +293,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Levels + - Assets/Resources/Playable m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -307,7 +307,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000fe67000000680000026800000468000006680000a8680000aa6800000a690000 + m_ExpandedIDs: ffffffff00000000fe6700000268000004680000a8680000aa680000b26800000a6900002c690000de7b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -332,10 +332,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 374.6} - m_SelectedIDs: cec7ffff + scrollPos: {x: 0, y: 0} + m_SelectedIDs: ccba0000 m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000fe67000000680000026800000468000006680000a8680000aa680000b66800000a690000de7b0000 + m_ExpandedIDs: ffffffff00000000fe6700000268000004680000a8680000aa680000b26800000a6900002c690000de7b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,8 +360,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: cec7ffff - m_LastClickedInstanceID: -14386 + m_SelectedInstanceIDs: ccba0000 + m_LastClickedInstanceID: 47820 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -405,7 +405,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 9} - - {fileID: 11} + - {fileID: 12} m_Position: serializedVersion: 2 x: 303.2 @@ -415,7 +415,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 6180 + controlID: 16621 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -434,13 +434,14 @@ MonoBehaviour: x: 0 y: 0 width: 879.99994 - height: 624.8 + height: 364 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 10} - {fileID: 2} + - {fileID: 11} m_Selected: 1 m_LastSelected: 0 --- !u!114 &10 @@ -466,7 +467,7 @@ MonoBehaviour: x: 303.2 y: 73.6 width: 877.99994 - height: 603.8 + height: 343 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -487,9 +488,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: 149} + snapOffset: {x: -141, y: -169.4} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 3 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -530,7 +531,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -690,9 +691,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 8.123606, y: -9.267471, z: 0.14368013} + m_Target: {x: -0.09287918, y: -0.4846154, z: -0.008473025} speed: 2 - m_Value: {x: 8.123606, y: -9.267471, z: 0.14368013} + m_Value: {x: -0.09287918, y: -0.4846154, z: -0.008473025} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -743,9 +744,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 18.783352 + m_Target: 1.8480936 speed: 2 - m_Value: 18.783352 + m_Value: 1.8480936 m_Ortho: m_Target: 1 speed: 2 @@ -771,6 +772,41 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 240, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Tile Palette + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 303.2 + y: 73.6 + width: 877.99994 + height: 603.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_PreviewResizer: + m_CachedPref: -50 + m_ControlHash: 1964396721 + m_PrefName: Preview_TilemapBrushInspector + m_Palette: {fileID: 5923046506128307364, guid: f8f8c3704b3a1c6428fcd22de4a1d9e5, type: 3} + m_DrawGridGizmo: 1 + m_DrawGizmos: 0 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -786,17 +822,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 624.8 + y: 364 width: 879.99994 - height: 106 + height: 366.8 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 12} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -817,38 +853,13 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 303.2 - y: 698.4 + y: 437.6 width: 877.99994 - height: 85 + height: 345.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 14} - - {fileID: 16} - m_Position: - serializedVersion: 2 - x: 1183.2 - y: 0 - width: 352.80005 - height: 730.8 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 6143 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -864,10 +875,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 1183.2 y: 0 width: 352.80005 - height: 375.2 + height: 730.8 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} @@ -898,7 +909,7 @@ MonoBehaviour: x: 1183.2001 y: 73.6 width: 351.80005 - height: 354.2 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -909,71 +920,10 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -14386 - m_LastVerticalScrollValue: 594 + m_LastInspectedObjectInstanceID: 47820 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GridPaintPaletteWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 375.2 - width: 352.80005 - height: 355.59998 - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Tile Palette - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1183.2001 - y: 448.80002 - width: 351.80005 - height: 334.59998 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_PreviewResizer: - m_CachedPref: -50 - m_ControlHash: 1964396721 - m_PrefName: Preview_TilemapBrushInspector - m_Palette: {fileID: 5923046506128307364, guid: f8f8c3704b3a1c6428fcd22de4a1d9e5, type: 3} - m_DrawGridGizmo: 1 - m_DrawGizmos: 0