diff options
| author | Andrew Lee <alee14498@protonmail.com> | 2021-05-24 21:58:21 -0400 |
|---|---|---|
| committer | Andrew Lee <alee14498@protonmail.com> | 2021-05-24 21:58:21 -0400 |
| commit | 41885dd0301b47137f0b4f6a6a3e2a3354a0563e (patch) | |
| tree | 8b1f4a141e2d57c990b0bfc380ec66293ff486d3 /Assets | |
| parent | 618d3ba27ac276b53a5a32dc51cfc1c313686902 (diff) | |
| download | prototype-a-41885dd0301b47137f0b4f6a6a3e2a3354a0563e.tar.gz prototype-a-41885dd0301b47137f0b4f6a6a3e2a3354a0563e.tar.bz2 prototype-a-41885dd0301b47137f0b4f6a6a3e2a3354a0563e.zip | |
Updated Readme, Selection and Scene
Diffstat (limited to 'Assets')
| -rw-r--r-- | Assets/Scenes/SampleScene.unity | 17 | ||||
| -rw-r--r-- | Assets/Scripts/Selector.cs | 21 |
2 files changed, 36 insertions, 2 deletions
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 73b3289..1c1e1c1 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1262,8 +1262,9 @@ GameObject: - component: {fileID: 1547366302} - component: {fileID: 1547366301} - component: {fileID: 1547366300} + - component: {fileID: 1547366303} m_Layer: 6 - m_Name: Cube + m_Name: CineCamera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1277,7 +1278,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547366298} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.038, y: -0.12, z: -0.215} + m_LocalPosition: {x: 0.004, y: 0, z: 0.092} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 963194228} @@ -1345,6 +1346,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547366298} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1547366303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547366298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7718b950bcd0d2919b3e063a4d7afa73, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1640945938 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Selector.cs b/Assets/Scripts/Selector.cs index e59d3ea..9d2b3c6 100644 --- a/Assets/Scripts/Selector.cs +++ b/Assets/Scripts/Selector.cs @@ -5,8 +5,10 @@ using UnityEngine; public class Selector : MonoBehaviour { public GameObject physGun; + public GameObject cineCamera; private bool oneSelected = false; + private bool twoSelected = false; // Update is called once per frame void Update() { @@ -25,5 +27,24 @@ public class Selector : MonoBehaviour Debug.Log("PhysGun deselected"); } } + if (Input.GetKeyDown(KeyCode.Alpha2)) + { + if (twoSelected == false) + { + physGun.SetActive(true); + twoSelected = true; + if (oneSelected == true) + { + oneSelected = false; + } + Debug.Log("PhysGun selected"); + } + else + { + physGun.SetActive(false); + twoSelected = false; + Debug.Log("PhysGun deselected"); + } + } } } |