From 6ce00f5f25c8802bfc6fcc48f9af6360acc550f4 Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Tue, 2 Jun 2020 19:41:24 -0400 Subject: [PATCH] Implemented small dirt sprites to randomly generate on the object --- Assets/ObjectScript.cs | 30 ++++- Assets/Prefabs.meta | 8 ++ Assets/Prefabs/CleanerFluid.prefab | 83 ++++++++++++ Assets/Prefabs/CleanerFluid.prefab.meta | 7 + Assets/Prefabs/Dirt.prefab | 83 ++++++++++++ Assets/Prefabs/Dirt.prefab.meta | 7 + Assets/Scenes/Main Scene.unity | 168 +----------------------- Assets/Scripts/GameScript.cs | 14 +- Assets/Textures/CleanerFluid.png | Bin 5828 -> 5828 bytes Assets/Textures/CleanerFluid.png.meta | 48 +++++++ Assets/Textures/Dirt.png | Bin 4061 -> 4061 bytes Assets/Textures/Dirt.png.meta | 48 +++++++ 12 files changed, 326 insertions(+), 170 deletions(-) create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/CleanerFluid.prefab create mode 100644 Assets/Prefabs/CleanerFluid.prefab.meta create mode 100644 Assets/Prefabs/Dirt.prefab create mode 100644 Assets/Prefabs/Dirt.prefab.meta diff --git a/Assets/ObjectScript.cs b/Assets/ObjectScript.cs index 593df59..c82c114 100644 --- a/Assets/ObjectScript.cs +++ b/Assets/ObjectScript.cs @@ -4,7 +4,28 @@ using UnityEngine; public class ObjectScript : MonoBehaviour { - void OnCollisionEnter2D(Collision2D other){ + + /*public GameObject Dirt; + public GameObject Spray; + + void Start(){ + + this.gameObject.AddComponent(); + Vector3 boundary = this.GetComponent().size; + + for(int i = 0; i < 20; i++) + { + float xBound = Random.Range(-boundary.x, boundary.x); + float yBound = Random.Range(-boundary.y, boundary.y); + + Instantiate(Dirt, new Vector2(xBound, yBound), Quaternion.identity); + } + + }*/ + + void OnCollisionStay2D(Collision2D other){ + /*Texture2D dirt = this.transform.GetChild(0).GetComponent().sprite.texture; + Texture2D spray = this.transform.GetChild(1).GetComponent().sprite.texture; if(!this.transform.GetChild(1).gameObject.activeInHierarchy && other.gameObject.name == "SprayBottle") @@ -17,9 +38,12 @@ public class ObjectScript : MonoBehaviour { this.transform.GetChild(0).gameObject.SetActive(false); this.transform.GetChild(1).gameObject.SetActive(false); - } + + //Debug.Log((int)other.transform.position.x + ", " + (int)other.transform.position.y); + + }*/ //Debug.Log("Collision"); - } + } } diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..c30fc1f --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6fca19b355310b4a8d5f9ea192f24df +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CleanerFluid.prefab b/Assets/Prefabs/CleanerFluid.prefab new file mode 100644 index 0000000..12fef7c --- /dev/null +++ b/Assets/Prefabs/CleanerFluid.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1877631211027388265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1877631211027388270} + - component: {fileID: 1877631211027388271} + m_Layer: 0 + m_Name: CleanerFluid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1877631211027388270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877631211027388265} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1877631211027388271 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1877631211027388265} + 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_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: -66892319 + m_SortingLayer: 1 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: 6a48304f2cbdbfb40a4c790eb32945fe, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/CleanerFluid.prefab.meta b/Assets/Prefabs/CleanerFluid.prefab.meta new file mode 100644 index 0000000..805ad90 --- /dev/null +++ b/Assets/Prefabs/CleanerFluid.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cf0e463e9e067dc4680f2204fac7d819 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Dirt.prefab b/Assets/Prefabs/Dirt.prefab new file mode 100644 index 0000000..3918fe3 --- /dev/null +++ b/Assets/Prefabs/Dirt.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5810670192936853663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5810670192936853656} + - component: {fileID: 5810670192936853657} + m_Layer: 0 + m_Name: Dirt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5810670192936853656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5810670192936853663} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5810670192936853657 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5810670192936853663} + 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_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: -66892319 + m_SortingLayer: 1 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: f73377cb334616344b12f4bbe204cf58, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Dirt.prefab.meta b/Assets/Prefabs/Dirt.prefab.meta new file mode 100644 index 0000000..854b718 --- /dev/null +++ b/Assets/Prefabs/Dirt.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6c319566e78e59d4b848e83cbf6cb8c5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main Scene.unity b/Assets/Scenes/Main Scene.unity index a56ac1e..17e72c5 100644 --- a/Assets/Scenes/Main Scene.unity +++ b/Assets/Scenes/Main Scene.unity @@ -121,87 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &19670643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 19670644} - - component: {fileID: 19670645} - m_Layer: 0 - m_Name: Dirt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &19670644 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 19670643} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 317481905} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &19670645 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 19670643} - 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_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: -66892319 - m_SortingLayer: 1 - m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: f73377cb334616344b12f4bbe204cf58, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &317481903 GameObject: m_ObjectHideFlags: 0 @@ -280,9 +199,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 19670644} - - {fileID: 728689084} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -381,87 +298,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &728689083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 728689084} - - component: {fileID: 728689085} - m_Layer: 0 - m_Name: CleanerFluid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &728689084 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728689083} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 317481905} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &728689085 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728689083} - 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_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: -66892319 - m_SortingLayer: 1 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 6a48304f2cbdbfb40a4c790eb32945fe, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1425971015 GameObject: m_ObjectHideFlags: 0 @@ -573,6 +409,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Object: {fileID: 317481903} + Dirt: {fileID: 5810670192936853663, guid: 6c319566e78e59d4b848e83cbf6cb8c5, type: 3} + Spray: {fileID: 1877631211027388265, guid: cf0e463e9e067dc4680f2204fac7d819, type: 3} ObjectSprites: - {fileID: 21300000, guid: f86f46202b4377743b719984d5bb8396, type: 3} --- !u!4 &1664203757 diff --git a/Assets/Scripts/GameScript.cs b/Assets/Scripts/GameScript.cs index 5247cd0..be2633c 100644 --- a/Assets/Scripts/GameScript.cs +++ b/Assets/Scripts/GameScript.cs @@ -6,6 +6,8 @@ public class GameScript : MonoBehaviour { public GameObject Object; + public GameObject Dirt; + public GameObject Spray; public Sprite[] ObjectSprites; private bool clicked = false; @@ -18,9 +20,17 @@ public class GameScript : MonoBehaviour Object.GetComponent().sprite = ObjectSprites[Random.Range(0, ObjectSprites.Length)]; - Object.AddComponent(); + Object.AddComponent(); - Object.transform.GetChild(0).gameObject.SetActive(true); + Vector3 boundary = Object.GetComponent().size * 0.4f; + + for(int i = 0; i < 20; i++) + { + float xBound = Random.Range(-boundary.x, boundary.x); + float yBound = Random.Range(-boundary.y, boundary.y); + + Instantiate(Dirt, new Vector2(xBound, yBound), Quaternion.identity); + } } diff --git a/Assets/Textures/CleanerFluid.png b/Assets/Textures/CleanerFluid.png index 96bae2c83fe1765b923530f6e824e91ae20c54d2..3ba1cbfb90791dadd335379b1bfee0ac1b881b3e 100644 GIT binary patch delta 19 acmX@2dqj6aFb9*ErrCFS>Gd0