From 4d8cec88655afab66275135921c04a46d0e5c4c7 Mon Sep 17 00:00:00 2001 From: happy44300 Date: Thu, 1 Nov 2018 17:37:42 +0100 Subject: [PATCH] Cleaned my mess (but made another one) polygons, polygons everywere --- Assets/Prefabs/Falling Dirt.prefab | 91 +++++++-------- Assets/Prefabs/{Quad.mat => Falling dirt.mat} | 19 +--- .../{Quad.mat.meta => Falling dirt.mat.meta} | 2 +- ...alling-dirt.png => Falling-dirt-Image.png} | Bin ...t.png.meta => Falling-dirt-Image.png.meta} | 4 +- .../Prefabs/New Render Texture.renderTexture | 33 ------ .../New Render Texture.renderTexture.meta | 8 -- Assets/Prefabs/RenderTexture2D.png | Bin 78 -> 0 bytes Assets/Prefabs/RenderTexture2D.png.meta | 107 ------------------ Assets/Scenes/Level 1.unity | 78 +++++++++---- Assets/Scenes/Main Menu.unity | 56 ++------- Assets/Tiles/Dirt/DirtPile.psd.meta | 2 +- 12 files changed, 120 insertions(+), 280 deletions(-) rename Assets/Prefabs/{Quad.mat => Falling dirt.mat} (84%) rename Assets/Prefabs/{Quad.mat.meta => Falling dirt.mat.meta} (79%) rename Assets/Prefabs/{Falling-dirt.png => Falling-dirt-Image.png} (100%) rename Assets/Prefabs/{Falling-dirt.png.meta => Falling-dirt-Image.png.meta} (98%) delete mode 100644 Assets/Prefabs/New Render Texture.renderTexture delete mode 100644 Assets/Prefabs/New Render Texture.renderTexture.meta delete mode 100644 Assets/Prefabs/RenderTexture2D.png delete mode 100644 Assets/Prefabs/RenderTexture2D.png.meta diff --git a/Assets/Prefabs/Falling Dirt.prefab b/Assets/Prefabs/Falling Dirt.prefab index f0cffb6..24e8897 100644 --- a/Assets/Prefabs/Falling Dirt.prefab +++ b/Assets/Prefabs/Falling Dirt.prefab @@ -19,10 +19,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4816062612851216} - - component: {fileID: 212601370762509522} - component: {fileID: 50547850849535880} - component: {fileID: 61082912475822452} - component: {fileID: 114843954174791342} + - component: {fileID: 33920004542521370} + - component: {fileID: 23045669994946660} m_Layer: 0 m_Name: Falling Dirt m_TagString: FallingBlock @@ -43,6 +44,48 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23045669994946660 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1400916412662404} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: e92afe3e5f5a41240bf07a5732756a37, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33920004542521370 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1400916412662404} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!50 &50547850849535880 Rigidbody2D: serializedVersion: 4 @@ -99,49 +142,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 46bda74c4a1e5524a923babddbcd28b7, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &212601370762509522 -SpriteRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1400916412662404} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100000, guid: f54ecd960bd1b61458955deb94c11589, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: fd166c745c8b9cd4faf0b411262f69ae, type: 3} - m_Color: {r: 1, g: 0, b: 0.5209384, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Quad.mat b/Assets/Prefabs/Falling dirt.mat similarity index 84% rename from Assets/Prefabs/Quad.mat rename to Assets/Prefabs/Falling dirt.mat index d49cd73..e17cb4f 100644 --- a/Assets/Prefabs/Quad.mat +++ b/Assets/Prefabs/Falling dirt.mat @@ -6,9 +6,9 @@ Material: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: Quad - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Name: Falling dirt + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -39,7 +39,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fd166c745c8b9cd4faf0b411262f69ae, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,29 +55,22 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _Amount: 1 - - _Amplitude: 1 - _BumpScale: 1 - _Cutoff: 0.5 - - _CutoutThresh: 0.2 - _DetailNormalMapScale: 1 - - _Distance: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _Speed: 1 - _SrcBlend: 1 - - _Transparency: 0.25 - _UVSec: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _TintColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Prefabs/Quad.mat.meta b/Assets/Prefabs/Falling dirt.mat.meta similarity index 79% rename from Assets/Prefabs/Quad.mat.meta rename to Assets/Prefabs/Falling dirt.mat.meta index 6eb9840..930d1c9 100644 --- a/Assets/Prefabs/Quad.mat.meta +++ b/Assets/Prefabs/Falling dirt.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 72c90f056b2b0ba40a91c45341814b18 +guid: e92afe3e5f5a41240bf07a5732756a37 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Prefabs/Falling-dirt.png b/Assets/Prefabs/Falling-dirt-Image.png similarity index 100% rename from Assets/Prefabs/Falling-dirt.png rename to Assets/Prefabs/Falling-dirt-Image.png diff --git a/Assets/Prefabs/Falling-dirt.png.meta b/Assets/Prefabs/Falling-dirt-Image.png.meta similarity index 98% rename from Assets/Prefabs/Falling-dirt.png.meta rename to Assets/Prefabs/Falling-dirt-Image.png.meta index 6a1de7b..47da7b3 100644 --- a/Assets/Prefabs/Falling-dirt.png.meta +++ b/Assets/Prefabs/Falling-dirt-Image.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 7 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -51,7 +51,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 diff --git a/Assets/Prefabs/New Render Texture.renderTexture b/Assets/Prefabs/New Render Texture.renderTexture deleted file mode 100644 index 9c83e14..0000000 --- a/Assets/Prefabs/New Render Texture.renderTexture +++ /dev/null @@ -1,33 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: New Render Texture - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 1024 - m_Height: 1024 - m_AntiAliasing: 1 - m_DepthFormat: 0 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 0 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/Prefabs/New Render Texture.renderTexture.meta b/Assets/Prefabs/New Render Texture.renderTexture.meta deleted file mode 100644 index 0f0f46d..0000000 --- a/Assets/Prefabs/New Render Texture.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e9c06bd0737f9d24fbcd096fe6eec897 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/RenderTexture2D.png b/Assets/Prefabs/RenderTexture2D.png deleted file mode 100644 index 8eb1b1ecc13b6e1d2375151866134cd7a040340c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=L_J*`LpWrU|M0W$cr!i aF)*;jval%k