From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Tue, 31 Aug 2021 11:41:54 +0000 (+0200) Subject: Stampfen v0.2 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=7f68a38d87807743518eae2f4c50b9ff0769bbde;p=SuperMouseAdventure.git Stampfen v0.2 --- 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 fd455e9..7b53b51 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity @@ -1690,7 +1690,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 169271316} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 409.46, y: 24.08, z: 0} + m_LocalPosition: {x: 1143.4, y: 61.6, z: 0} m_LocalScale: {x: 0.3, y: 0.3, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -26826,8 +26826,8 @@ Tilemap: - first: {x: 162, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 12 - m_TileSpriteIndex: 19 + m_TileIndex: 18 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -26836,8 +26836,8 @@ Tilemap: - first: {x: 163, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 11 - m_TileSpriteIndex: 18 + m_TileIndex: 18 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -26846,8 +26846,8 @@ Tilemap: - first: {x: 164, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 13 - m_TileSpriteIndex: 20 + m_TileIndex: 18 + m_TileSpriteIndex: 24 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -27133,36 +27133,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 162, y: 8, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 18 - m_TileSpriteIndex: 24 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 163, y: 8, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 18 - m_TileSpriteIndex: 24 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 164, y: 8, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 18 - m_TileSpriteIndex: 24 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 165, y: 8, z: 0} second: serializedVersion: 2 @@ -27657,11 +27627,11 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 73 + - m_RefCount: 72 m_Data: {fileID: 11400000, guid: 8fe54e2d05d80be45a0b9598f42f6a21, type: 2} - - m_RefCount: 98 + - m_RefCount: 97 m_Data: {fileID: 11400000, guid: 7201c7491cb7ead499f4b6a7610085cc, type: 2} - - m_RefCount: 150 + - m_RefCount: 149 m_Data: {fileID: 11400000, guid: c4089c2ccf3d8e04bbdd742ad16db1d1, type: 2} - m_RefCount: 93 m_Data: {fileID: 11400000, guid: fe6d2d5618c8e514bb516d3d56cea068, type: 2} @@ -27722,11 +27692,11 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 27 m_Data: {fileID: 21300000, guid: a7b9c407c421e2b4ea83338b34872b16, type: 3} - - m_RefCount: 73 + - m_RefCount: 72 m_Data: {fileID: 21300000, guid: 1ae35ac76a816f04b94077ba6e24f643, type: 3} - - m_RefCount: 98 + - m_RefCount: 97 m_Data: {fileID: 21300000, guid: 1b34df7ecd962404584d4d97052a63f6, type: 3} - - m_RefCount: 150 + - m_RefCount: 149 m_Data: {fileID: 21300000, guid: ae35ce289d569994f87494fb21798d51, type: 3} - m_RefCount: 93 m_Data: {fileID: 21300000, guid: 1f3641f182896aa418b38ae1f461f06c, type: 3} @@ -27743,7 +27713,7 @@ Tilemap: - m_RefCount: 3 m_Data: {fileID: 21300000, guid: 1bc886c1b8090fd4ca62d245daf49cfc, type: 3} m_TileMatrixArray: - - m_RefCount: 1268 + - m_RefCount: 1265 m_Data: e00: 1 e01: 0 @@ -27762,7 +27732,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 1268 + - m_RefCount: 1265 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 0 m_Data: {r: 2.3626e-41, g: 2.3626e-41, b: 2.3626e-41, a: 2.3626e-41} @@ -27858,6 +27828,115 @@ MonoBehaviour: m_EditorClassIdentifier: groundCheck: {fileID: 972365581} dustEffect: {fileID: 723835315} +--- !u!1 &1152173203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1152173205} + - component: {fileID: 1152173204} + - component: {fileID: 1152173206} + m_Layer: 6 + m_Name: stamp_block + m_TagString: Stamp + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1152173204 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152173203} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: f52088ec44739e44f8c7138a5680f3e1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7, y: 7} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1152173205 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152173203} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1144.3003, y: 73.27, z: 0} + m_LocalScale: {x: 4.1058, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 135 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1152173206 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1152173203} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 7, y: 7} + newSize: {x: 7, y: 7} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 7, y: 7} + m_EdgeRadius: 0 --- !u!1 &1175764121 GameObject: m_ObjectHideFlags: 0 diff --git a/2DGame/Assets/Scripts/Mouse/Stamping.cs b/2DGame/Assets/Scripts/Mouse/Stamping.cs index ce003c0..7022e67 100644 --- a/2DGame/Assets/Scripts/Mouse/Stamping.cs +++ b/2DGame/Assets/Scripts/Mouse/Stamping.cs @@ -37,4 +37,12 @@ public class Stamping : MonoBehaviour isStamping = false; } } + + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.CompareTag("Stamp") && isStamping) + { + collision.gameObject.SetActive(false); + } + } }