From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Tue, 24 Aug 2021 08:45:24 +0000 (+0200) Subject: Neuer Hintergrund X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=456348cf7afd2999fd5108bc058befe2c2bf69f3;p=SuperMouseAdventure.git Neuer Hintergrund --- diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity index e98d68c..ece23ad 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity @@ -2154,7 +2154,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 3.41, y: 7.05} + oldSize: {x: 3.5, y: 7.09} newSize: {x: 2.36, y: 5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -4268,7 +4268,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: begrenzer: {fileID: 1284463699} - maus: {fileID: 936765968} + mouse: {fileID: 936765968} cameraLock: {fileID: 1790915304} cameraLocked: 0 --- !u!20 &519420031 @@ -10676,7 +10676,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794806973} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1089.9, y: 87.8, z: 0} + m_LocalPosition: {x: 1089.9, y: 91.15, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} @@ -10877,7 +10877,7 @@ SpriteRenderer: m_SortingLayerID: 1907257087 m_SortingLayer: -1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 985bb52a96892ce408438f84b074de8a, type: 3} + m_Sprite: {fileID: 21300000, guid: a3af6f11daedf5143aeb50c76b12f8a2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -11593,7 +11593,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 898175222} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 879.3, y: 25.3, z: 0} + m_LocalPosition: {x: 870.84, y: 25.3, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} @@ -12826,7 +12826,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 985281166} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 653.5, y: 53.3, z: 0} + m_LocalPosition: {x: 646.98, y: 53.3, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} @@ -12956,7 +12956,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 3.41, y: 7.05} + oldSize: {x: 3.5, y: 7.09} newSize: {x: 2.36, y: 5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -13766,7 +13766,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 3.41, y: 7.05} + oldSize: {x: 3.5, y: 7.09} newSize: {x: 2.36, y: 5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -26475,7 +26475,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 3.41, y: 7.05} + oldSize: {x: 3.5, y: 7.09} newSize: {x: 2.36, y: 5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -27802,7 +27802,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1417518803} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1099, y: 90.5, z: 0} + m_LocalPosition: {x: 1099, y: 91.9, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} @@ -29730,6 +29730,88 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 68 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1612255660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1612255662} + - component: {fileID: 1612255661} + m_Layer: 0 + m_Name: warning + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1612255661 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612255660} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 1d0de7fc16f5d2b4a84376bdfdee135f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.5, y: 7.09} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1612255662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612255660} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 654.21075, y: 52.47, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 129 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1620409434 GameObject: m_ObjectHideFlags: 0 @@ -30109,7 +30191,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 3.41, y: 7.05} + oldSize: {x: 3.5, y: 7.09} newSize: {x: 2.36, y: 5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -30922,7 +31004,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1802557754} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1081.5, y: 82.5, z: 0} + m_LocalPosition: {x: 1081.5, y: 83.82, z: 0} m_LocalScale: {x: 0.3772047, y: 0.3772047, z: 0.3772047} m_Children: [] m_Father: {fileID: 0} @@ -33228,6 +33310,88 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2029381605 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029381607} + - component: {fileID: 2029381606} + m_Layer: 0 + m_Name: warning (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &2029381606 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029381605} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 1d0de7fc16f5d2b4a84376bdfdee135f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.5, y: 7.09} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &2029381607 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029381605} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 878.21, y: 24.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 130 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2030985963 GameObject: m_ObjectHideFlags: 0 diff --git a/2DGame/Assets/Scripts/Camera/CameraBehaviour.cs b/2DGame/Assets/Scripts/Camera/CameraBehaviour.cs index f4f6da1..7ef34dd 100644 --- a/2DGame/Assets/Scripts/Camera/CameraBehaviour.cs +++ b/2DGame/Assets/Scripts/Camera/CameraBehaviour.cs @@ -8,7 +8,7 @@ public class CameraBehaviour : MonoBehaviour GameObject begrenzer; [SerializeField] - GameObject maus; + GameObject mouse; [SerializeField] Transform cameraLock; @@ -19,9 +19,9 @@ public class CameraBehaviour : MonoBehaviour // Update is called once per frame void Update() { - if (maus.transform.position.x > begrenzer.transform.position.x) + if (mouse.transform.position.x > begrenzer.transform.position.x) { - transform.position = new Vector3(maus.transform.position.x, maus.transform.position.y, -10); + transform.position = new Vector3(mouse.transform.position.x, mouse.transform.position.y, -10); cameraLocked = false; } else diff --git a/2DGame/Assets/Sprites/checkpoint_0.png b/2DGame/Assets/Sprites/checkpoint_0.png index 2627340..a23d7ca 100644 Binary files a/2DGame/Assets/Sprites/checkpoint_0.png and b/2DGame/Assets/Sprites/checkpoint_0.png differ diff --git a/2DGame/Assets/Sprites/checkpoint_1.png b/2DGame/Assets/Sprites/checkpoint_1.png index 94a2b78..1d2ab55 100644 Binary files a/2DGame/Assets/Sprites/checkpoint_1.png and b/2DGame/Assets/Sprites/checkpoint_1.png differ diff --git a/2DGame/Assets/Sprites/clouds.png b/2DGame/Assets/Sprites/clouds.png new file mode 100644 index 0000000..5d80339 Binary files /dev/null and b/2DGame/Assets/Sprites/clouds.png differ diff --git a/2DGame/Assets/Sprites/clouds.png.meta b/2DGame/Assets/Sprites/clouds.png.meta new file mode 100644 index 0000000..145843c --- /dev/null +++ b/2DGame/Assets/Sprites/clouds.png.meta @@ -0,0 +1,288 @@ +fileFormatVersion: 2 +guid: 2e02cebfe6329bd4aa4e25e3133a80e4 +TextureImporter: + internalIDToNameTable: + - first: + 213: 8287873616420496286 + second: clouds_0 + - first: + 213: 7911139459876737251 + second: clouds_1 + - first: + 213: -1115256706364395465 + second: clouds_2 + - first: + 213: -477254976604553037 + second: clouds_3 + - first: + 213: 5291327898690728900 + second: clouds_4 + - first: + 213: -8294918184612582425 + second: clouds_5 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: clouds_0 + rect: + serializedVersion: 2 + x: 0 + y: 854 + width: 727 + height: 488 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e936312a421740370800000000000000 + internalID: 8287873616420496286 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: clouds_1 + rect: + serializedVersion: 2 + x: 959 + y: 850 + width: 817 + height: 653 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3e0578a7c630acd60800000000000000 + internalID: 7911139459876737251 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: clouds_2 + rect: + serializedVersion: 2 + x: 1933 + y: 790 + width: 913 + height: 691 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 73037c73fefc580f0800000000000000 + internalID: -1115256706364395465 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: clouds_3 + rect: + serializedVersion: 2 + x: 151 + y: 36 + width: 629 + height: 438 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3b0c23c90237069f0800000000000000 + internalID: -477254976604553037 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: clouds_4 + rect: + serializedVersion: 2 + x: 1005 + y: 0 + width: 782 + height: 571 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4c3339f60b29e6940800000000000000 + internalID: 5291327898690728900 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: clouds_5 + rect: + serializedVersion: 2 + x: 1978 + y: 49 + width: 730 + height: 575 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7eb2d350cd782ec80800000000000000 + internalID: -8294918184612582425 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Sprites/hinnagrund.png b/2DGame/Assets/Sprites/hinnagrund.png new file mode 100644 index 0000000..476c60c Binary files /dev/null and b/2DGame/Assets/Sprites/hinnagrund.png differ diff --git a/2DGame/Assets/Sprites/hinnagrund.png.meta b/2DGame/Assets/Sprites/hinnagrund.png.meta new file mode 100644 index 0000000..2ec730e --- /dev/null +++ b/2DGame/Assets/Sprites/hinnagrund.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a3af6f11daedf5143aeb50c76b12f8a2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Sprites/tree.png b/2DGame/Assets/Sprites/tree.png index a8eebc8..ad43682 100644 Binary files a/2DGame/Assets/Sprites/tree.png and b/2DGame/Assets/Sprites/tree.png differ diff --git a/2DGame/Assets/Sprites/warning.png b/2DGame/Assets/Sprites/warning.png new file mode 100644 index 0000000..5424b22 Binary files /dev/null and b/2DGame/Assets/Sprites/warning.png differ diff --git a/2DGame/Assets/Sprites/warning.png.meta b/2DGame/Assets/Sprites/warning.png.meta new file mode 100644 index 0000000..f0bb14a --- /dev/null +++ b/2DGame/Assets/Sprites/warning.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 1d0de7fc16f5d2b4a84376bdfdee135f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/UserSettings/EditorUserSettings.asset b/2DGame/UserSettings/EditorUserSettings.asset index 5477901..47dd126 100644 --- a/2DGame/UserSettings/EditorUserSettings.asset +++ b/2DGame/UserSettings/EditorUserSettings.asset @@ -24,10 +24,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353db7721130082beb flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe721130082beb + value: 22424703114646680e0b0227036c5315001214153f2d2a352e3d143cecae2136ebf32f flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c5315001214153f2d2a352e3d143cecae2136ebf32f + value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe721130082beb flags: 0 vcSharedLogLevel: value: 0d5e400f0650