diff --git a/Assets/New Material.mat b/Assets/New Material.mat index fe87a69..b4d89ca 100644 --- a/Assets/New Material.mat +++ b/Assets/New Material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: New Material - m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3} + m_Shader: {fileID: 4800000, guid: 13c02b14c4d048fa9653293d54f6e0e1, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -37,8 +37,19 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - PixelSnap: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Cutoff: 0 - _EnableExternalAlpha: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _Color: {r: 1, g: 1, b: 1, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index aa33e70..3dc4fe0 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -321,7 +321,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &133794447 Transform: m_ObjectHideFlags: 0 @@ -883,7 +883,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.3679245, g: 0.3140595, b: 0.2481755, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -896,7 +896,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.03 far clip plane: 1000 field of view: 60 orthographic: 1 @@ -909,7 +909,7 @@ Camera: m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 m_TargetEye: 0 - m_HDR: 1 + m_HDR: 0 m_AllowMSAA: 0 m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 @@ -27868,6 +27868,90 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a51034cd9a84299479d24128aec330e6, type: 3} +--- !u!1 &1989706823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1989706825} + - component: {fileID: 1989706824} + m_Layer: 0 + m_Name: stone01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1989706824 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989706823} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 15ddf0ee08327984ba18470edb108438, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1989706825 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989706823} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.082241, y: 1.5643656, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2014753552 GameObject: m_ObjectHideFlags: 1 diff --git a/Assets/Universial Pipeline Renderer/Universal Render Pipeline Asset.asset b/Assets/Universial Pipeline Renderer/Universal Render Pipeline Asset.asset index 895ebfa..fd31682 100644 --- a/Assets/Universial Pipeline Renderer/Universal Render Pipeline Asset.asset +++ b/Assets/Universial Pipeline Renderer/Universal Render Pipeline Asset.asset @@ -24,7 +24,7 @@ MonoBehaviour: m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 m_StoreActionsOptimization: 0 - m_SupportsHDR: 1 + m_SupportsHDR: 0 m_MSAA: 1 m_RenderScale: 1 m_MainLightRenderingMode: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 23b640c..a255c55 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Game + m_Title: Scene m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 686 + controlID: 42 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1475 + width: 1476 height: 939 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 687 + controlID: 43 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1475 + width: 1476 height: 615 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 688 + controlID: 44 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 305 + width: 304 height: 615 - 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} @@ -206,23 +206,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 305 + x: 304 y: 0 - width: 1170 + width: 1172 height: 615 - m_MinSize: {x: 102, y: 121} + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,7 +240,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 615 - width: 1475 + width: 1476 height: 324 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -265,12 +265,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1475 + x: 1476 y: 0 - width: 445 + width: 444 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,9 +296,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 305 + x: 304 y: 73 - width: 1168 + width: 1170 height: 594 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -310,7 +310,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: 1170, y: 573} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -325,8 +325,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -584 - m_HBaseRangeMax: 584 + m_HBaseRangeMin: -585 + m_HBaseRangeMax: 585 m_VBaseRangeMin: -286.5 m_VBaseRangeMax: 286.5 m_HAllowExceedBaseRangeMin: 1 @@ -346,23 +346,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1168 + width: 1170 height: 573 m_Scale: {x: 1, y: 1} - m_Translation: {x: 584, y: 286.5} + m_Translation: {x: 585, y: 286.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -584 + x: -585 y: -286.5 - width: 1168 + width: 1170 height: 573 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1168, y: 594} + m_LastWindowPixelSize: {x: 1170, y: 594} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -390,7 +390,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 304 + width: 303 height: 594 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -399,9 +399,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: dcfaffff - m_LastClickedID: -1316 - m_ExpandedIDs: 2efbffffc06a0000 + m_SelectedIDs: 2cfbffff + m_LastClickedID: -1236 + m_ExpandedIDs: 2efbffffa66a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -445,9 +445,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 305 + x: 304 y: 73 - width: 1168 + width: 1170 height: 594 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -672,9 +672,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.9743419, y: -2.072532, z: 0.14881638} + m_Target: {x: 5.149206, y: -2.6883645, z: 0.056333315} speed: 2 - m_Value: {x: -0.9743419, y: -2.072532, z: 0.14881638} + m_Value: {x: 5.149206, y: -2.6883645, z: 0.056333315} 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: 10.193046 + m_Target: 12.813291 speed: 2 - m_Value: 10.193046 + m_Value: 12.813291 m_Ortho: m_Target: 1 speed: 2 @@ -774,7 +774,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 688 - width: 1474 + width: 1475 height: 303 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -793,22 +793,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Sprites m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 74 m_LastFolders: - - Assets + - Assets/Sprites m_LastFoldersGridSize: 74 m_LastProjectPath: M:\UnityProjects\2d-top-down m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 6e6f0000 - m_LastClickedID: 28526 - m_ExpandedIDs: 000000006e6f000000ca9a3bffffff7f + m_SelectedIDs: 906f0000 + m_LastClickedID: 28560 + m_ExpandedIDs: 000000006e6f00005081000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -836,7 +836,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000006e6f000000ca9a3bffffff7f + m_ExpandedIDs: 000000006e6f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -914,7 +914,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 688 - width: 1473 + width: 1474 height: 303 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -940,9 +940,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1475 + x: 1476 y: 73 - width: 444 + width: 443 height: 918 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -955,7 +955,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 41 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: