gjcampbell/ICDBWTMAG2020
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Player is now able to pick up and drop the rag and the spray bottle

Browse Source
This commit is contained in:
Gregory Campbell
2020-06-01 20:10:18 -04:00
parent 104e6a0cb1
commit a14c816430
4 changed files with 253 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Main Scene.unity
+183 -5
View File
@@ -131,6 +131,7 @@ GameObject:
m_Component:
- component: {fileID: 19670644}
- component: {fileID: 19670645}
- component: {fileID: 19670646}
m_Layer: 0
m_Name: Dirt
m_TagString: Untagged
@@ -202,6 +203,32 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &19670646
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 19670643}
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: 5.12, y: 5.12}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5.12, y: 5.12}
m_EdgeRadius: 0
--- !u!1 &317481903
GameObject:
m_ObjectHideFlags: 0
@@ -214,7 +241,7 @@ GameObject:
- component: {fileID: 317481904}
m_Layer: 0
m_Name: Object
m_TagString: Untagged
m_TagString: Object
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -378,6 +405,7 @@ GameObject:
m_Component:
- component: {fileID: 728689084}
- component: {fileID: 728689085}
- component: {fileID: 728689086}
m_Layer: 0
m_Name: CleanerFluid
m_TagString: Untagged
@@ -449,6 +477,32 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &728689086
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 728689083}
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: 5.12, y: 5.12}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5.12, y: 5.12}
m_EdgeRadius: 0
--- !u!1 &1038355577
GameObject:
m_ObjectHideFlags: 0
@@ -459,6 +513,7 @@ GameObject:
m_Component:
- component: {fileID: 1038355579}
- component: {fileID: 1038355578}
- component: {fileID: 1038355580}
m_Layer: 0
m_Name: Gem
m_TagString: Untagged
@@ -530,6 +585,32 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1038355580
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038355577}
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: 5.12, y: 5.12}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5.12, y: 5.12}
m_EdgeRadius: 0
--- !u!1 &1425971015
GameObject:
m_ObjectHideFlags: 0
@@ -611,6 +692,49 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1664203755
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1664203757}
- component: {fileID: 1664203756}
m_Layer: 0
m_Name: GM
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1664203756
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1664203755}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 54fe94d557fed4245bd0ad22efbca7b3, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1664203757
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1664203755}
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: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1739945069
GameObject:
m_ObjectHideFlags: 0
@@ -621,9 +745,10 @@ GameObject:
m_Component:
- component: {fileID: 1739945071}
- component: {fileID: 1739945070}
- component: {fileID: 1739945072}
m_Layer: 0
m_Name: SprayBottle
m_TagString: Untagged
m_TagString: Item
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -686,12 +811,38 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1739945069}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.21, y: -2.59, z: 0}
m_LocalPosition: {x: 7.25, y: -2.5, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1739945072
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1739945069}
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: 5.12, y: 5.12}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5.12, y: 5.12}
m_EdgeRadius: 0
--- !u!1 &1885377150
GameObject:
m_ObjectHideFlags: 0
@@ -702,9 +853,10 @@ GameObject:
m_Component:
- component: {fileID: 1885377152}
- component: {fileID: 1885377151}
- component: {fileID: 1885377153}
m_Layer: 0
m_Name: Rag
m_TagString: Untagged
m_TagString: Item
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -767,9 +919,35 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885377150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.2, y: 1.96, z: 0}
m_LocalPosition: {x: 7.25, y: 2.5, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1885377153
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1885377150}
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: 5.12, y: 5.12}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 5.12, y: 5.12}
m_EdgeRadius: 0
Assets/Scripts/GameScript.cs
+56
View File
@@ -0,0 +1,56 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GameScript : MonoBehaviour
{
public GameObject Object;
private bool clicked = false;
private GameObject pickedUpItem;
// Start is called before the first frame update
void Start()
{
clicked = false;
}
// Update is called once per frame
void Update()
{
Vector3 mousePos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y);
if (Input.GetMouseButtonDown(0))
{
RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero);
if (hit.collider != null)
{
if (hit.collider.gameObject.tag == "Item" && !clicked)
{
pickedUpItem = hit.collider.gameObject;
clicked = true;
Cursor.visible = false;
} else if (hit.collider.gameObject.tag == "Item" && clicked)
{
clicked = false;
Cursor.visible = true;
}
Debug.Log("Clicked " + pickedUpItem.name);
}
}
if(clicked)
{
pickedUpItem.transform.position = mousePos2D;
}
}
}
Assets/Scripts/GameScript.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 54fe94d557fed4245bd0ad22efbca7b3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/TagManager.asset
+3 -1
View File
@@ -3,7 +3,9 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
tags: []
tags:
- Object
- Item
layers:
- Default
- TransparentFX