diff --git a/Assets/Prefabs/Camera/Camera.prefab b/Assets/Prefabs/Camera/Camera.prefab index 5330aa6..3606615 100644 --- a/Assets/Prefabs/Camera/Camera.prefab +++ b/Assets/Prefabs/Camera/Camera.prefab @@ -150,7 +150,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 11 + orthographic size: 15 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -225,9 +225,9 @@ MonoBehaviour: m_RefResolutionY: 240 m_UpscaleRT: 0 m_PixelSnapping: 0 - m_CropFrameX: 0 - m_CropFrameY: 0 - m_StretchFill: 0 + m_CropFrameX: 1 + m_CropFrameY: 1 + m_StretchFill: 1 --- !u!1 &2662163039948621855 GameObject: m_ObjectHideFlags: 0 @@ -316,7 +316,7 @@ MonoBehaviour: m_Follow: {fileID: 0} m_Lens: FieldOfView: 60 - OrthographicSize: 11 + OrthographicSize: 15 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 diff --git a/Assets/Prefabs/Playable/Player.prefab b/Assets/Prefabs/Playable/Player.prefab index f7f8663..3783e54 100644 --- a/Assets/Prefabs/Playable/Player.prefab +++ b/Assets/Prefabs/Playable/Player.prefab @@ -1,5 +1,99 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &698768804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 698768805} + - component: {fileID: 698768806} + m_Layer: 6 + m_Name: PlayerWallTriggerLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &698768805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698768804} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.5, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008207192594766311} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &698768806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698768804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} + m_Name: + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967103 +--- !u!1 &2083070160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2083070161} + - component: {fileID: 2083070162} + m_Layer: 6 + m_Name: PlayerWallTriggerRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2083070161 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2083070160} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0} + m_LocalScale: {x: 0.1, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008207192594766311} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2083070162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2083070160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} + m_Name: + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967103 --- !u!1 &7008207192594766305 GameObject: m_ObjectHideFlags: 0 @@ -34,6 +128,8 @@ Transform: m_Children: - {fileID: 7008207193600475140} - {fileID: 3507368432553107122} + - {fileID: 698768805} + - {fileID: 2083070161} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -101,6 +197,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e9f5de2199c4784abce74247804ce87, type: 3} m_Name: m_EditorClassIdentifier: + speed: 0 --- !u!50 &7008207192594766309 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index ac7fb76..b947775 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -5247,53 +5247,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &698768804 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 698768805} - - component: {fileID: 698768806} - m_Layer: 6 - m_Name: PlayerWallTriggerLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &698768805 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698768804} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 2, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1053905692} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &698768806 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 698768804} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} - m_Name: - m_EditorClassIdentifier: - layerMask: - serializedVersion: 2 - m_Bits: 4294967103 --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} @@ -5438,53 +5391,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2083070160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2083070161} - - component: {fileID: 2083070162} - m_Layer: 6 - m_Name: PlayerWallTriggerRight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2083070161 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083070160} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 2, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1053905692} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2083070162 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083070160} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} - m_Name: - m_EditorClassIdentifier: - layerMask: - serializedVersion: 2 - m_Bits: 4294967103 --- !u!1001 &2662163040783957219 PrefabInstance: m_ObjectHideFlags: 0 @@ -5492,10 +5398,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2662163039882375473, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} - propertyPath: orthographic size - value: 15 - objectReference: {fileID: 0} - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_RootOrder value: 2 @@ -5548,10 +5450,6 @@ PrefabInstance: propertyPath: m_Follow value: objectReference: {fileID: 1053905692} - - target: {fileID: 2662163040849090936, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} - propertyPath: m_Lens.OrthographicSize - value: 15 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} --- !u!1001 &7008207193554258683 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 0f5c529..b1a29d6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 9136 + controlID: 509 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 9100 + controlID: 465 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: y: 0 width: 303.2 height: 381.6 - 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: 8ee4ffffd0faffff04fbfffff0620000 + m_ExpandedIDs: 0afbffff0cfbfffff6620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -245,8 +245,8 @@ MonoBehaviour: y: 381.6 width: 303.2 height: 349.19998 - 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} @@ -294,7 +294,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Sprites/Tilemaps/TestTileMap + - Assets m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -308,7 +308,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff0000000032630000686300006c6300006e6300007063000076630000786300007a630000946d0000386f000060760000ea7600006a7d0000328000003a8000003e8000004280000046800000 + m_ExpandedIDs: ffffffff000000004c630000a6630000a8630000aa630000ac630000ae630000b0630000b2630000b4630000b6630000b8630000ba630000bc630000be630000c2630000c4630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -334,9 +334,9 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 88e4ffff + m_SelectedIDs: 06fbffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000032630000686300006c6300006e6300007063000076630000786300007a630000946d0000386f000060760000ea7600006a7d0000328000003a8000003e8000004280000046800000 + m_ExpandedIDs: ffffffff000000004c630000a6630000a8630000aa630000ac630000ae630000b0630000b2630000b4630000b6630000b8630000ba630000bc630000be630000c2630000c4630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 88e4ffff - m_LastClickedInstanceID: -7032 + m_SelectedInstanceIDs: 06fbffff + m_LastClickedInstanceID: -1274 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 9137 + controlID: 510 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -603,7 +603,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -719,9 +719,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -17.311716, y: 1.6540871, z: -0.15957722} + m_Target: {x: -17.629921, y: 0.48958027, z: -0.22409801} speed: 2 - m_Value: {x: -17.311716, y: 1.6540871, z: -0.15957722} + m_Value: {x: -17.629921, y: 0.48958027, z: -0.22409801} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -772,9 +772,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 14.065454 + m_Target: 21.067785 speed: 2 - m_Value: 14.065454 + m_Value: 21.067785 m_Ortho: m_Target: 1 speed: 2 @@ -853,8 +853,8 @@ MonoBehaviour: y: 399.2 width: 879.99994 height: 331.59998 - 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: 2} m_Panes: - {fileID: 2} @@ -920,8 +920,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -7032 - m_LastVerticalScrollValue: 0 + m_LastInspectedObjectInstanceID: -1274 + m_LastVerticalScrollValue: 334.40002 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 593fa08..f78c4d7 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Scene + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} @@ -73,7 +73,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: Main + m_LastLoadedLayoutName: --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 22822 + controlID: 11055 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,12 +140,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 304 + width: 303.2 height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 22852 + controlID: 11008 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,7 +163,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 304 + width: 303.2 height: 381.6 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -189,7 +189,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 381.6 - width: 304 + width: 303.2 height: 349.19998 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -216,14 +216,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 304 + x: 303.2 y: 0 - width: 880 + width: 879.99994 height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 22823 + controlID: 11060 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -241,15 +241,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 880 + width: 879.99994 height: 399.2 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} + - {fileID: 18} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,10 +268,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 399.2 - width: 880 + width: 879.99994 height: 331.59998 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -291,15 +292,15 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1184 + x: 1183.2 y: 0 - width: 352 + width: 352.80005 height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 18} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 --- !u!114 &13 @@ -322,9 +323,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 + x: 303.2 y: 472.80002 - width: 878 + width: 877.99994 height: 310.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -372,10 +373,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 878 + width: 877.99994 height: 289.59998 - m_Scale: {x: 0.3351852, y: 0.33518517} - m_Translation: {x: 439.00003, y: 144.79997} + m_Scale: {x: 0.33518517, y: 0.33518517} + m_Translation: {x: 438.99997, y: 144.79997} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -388,7 +389,7 @@ MonoBehaviour: height: 863.99994 m_MinimalGUI: 1 m_defaultScale: 0.33518517 - m_LastWindowPixelSize: {x: 1097.5, y: 388.24997} + m_LastWindowPixelSize: {x: 1097.4999, y: 388.24997} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000100000100 @@ -416,7 +417,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 303 + width: 302.2 height: 360.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -425,23 +426,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff + m_SelectedIDs: 88e4ffff + m_LastClickedID: -7032 + m_ExpandedIDs: 8ee4ffffd0faffff04fbfffff0620000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: PlayerGroundTrigger - m_OriginalName: PlayerGroundTrigger + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -6764 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 7} m_SearchString: @@ -473,7 +474,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 455.2 - width: 303 + width: 302.2 height: 328.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -492,7 +493,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Sprites/Tilemaps/TestTileMap m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -506,7 +507,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 + m_ExpandedIDs: ffffffff0000000032630000686300006c6300006e6300007063000076630000786300007a630000946d0000386f000060760000ea7600006a7d0000328000003a8000003e8000004280000046800000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -534,7 +535,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 + m_ExpandedIDs: ffffffff0000000032630000686300006c6300006e6300007063000076630000786300007a630000946d0000386f000060760000ea7600006a7d0000328000003a8000003e8000004280000046800000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -638,9 +639,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 + x: 303.2 y: 73.6 - width: 878 + width: 877.99994 height: 378.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -705,7 +706,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -865,9 +866,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.0644355, y: -0.42835724, z: -0.0249797} + m_Target: {x: -17.311716, y: 1.6540871, z: -0.15957722} speed: 2 - m_Value: {x: -4.1086316, y: -0.43103167, z: -0.024579894} + m_Value: {x: -17.311716, y: 1.6540871, z: -0.15957722} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -918,9 +919,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.9284311 + m_Target: 14.065454 speed: 2 - m_Value: 0.8884508 + m_Value: 14.065454 m_Ortho: m_Target: 1 speed: 2 @@ -946,6 +947,41 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &18 +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: 378.2 + 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: 4017893543754070076, guid: 8877a796019eec64dbfa40866abf571c, type: 3} + m_DrawGridGizmo: 1 + m_DrawGizmos: 0 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -965,9 +1001,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1184 + x: 1183.2001 y: 73.6 - width: 351 + width: 351.80005 height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: