From a4aa35f554f63e629e9b91670cdfb7260946c08e Mon Sep 17 00:00:00 2001 From: jparent Date: Sat, 22 Aug 2015 01:05:40 -0400 Subject: [PATCH] add basic Pillow and pickup when in proximity --- Assets/Scenes/jp.unity | Bin 0 -> 19836 bytes Assets/Scenes/jp.unity.meta | 8 ++++++++ Assets/Scripts/Child.cs | 15 +++++++++++++++ Assets/Scripts/Pillow.cs | 16 ++++++++++++++++ Assets/Scripts/Pillow.cs.meta | 12 ++++++++++++ 5 files changed, 51 insertions(+) create mode 100644 Assets/Scenes/jp.unity create mode 100644 Assets/Scenes/jp.unity.meta create mode 100644 Assets/Scripts/Pillow.cs create mode 100644 Assets/Scripts/Pillow.cs.meta diff --git a/Assets/Scenes/jp.unity b/Assets/Scenes/jp.unity new file mode 100644 index 0000000000000000000000000000000000000000..d987175411c5caad935d3f235e12296ccd3cedb2 GIT binary patch literal 19836 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 } + + + void OnTriggerEnter(Collider other) { + if (other.tag == "Pillow") { + + pillow = other.GetComponent(); + other.transform.parent = transform; // make the pillow a child of Child + + // TODO: place the pillow correctly or animate or something... + + } + } + public void Move(float xValue, float zValue) { // We move the child depending on the camera orientation diff --git a/Assets/Scripts/Pillow.cs b/Assets/Scripts/Pillow.cs new file mode 100644 index 0000000..61084a4 --- /dev/null +++ b/Assets/Scripts/Pillow.cs @@ -0,0 +1,16 @@ +using UnityEngine; +using System.Collections; + +public class Pillow : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + +} diff --git a/Assets/Scripts/Pillow.cs.meta b/Assets/Scripts/Pillow.cs.meta new file mode 100644 index 0000000..1a9ba40 --- /dev/null +++ b/Assets/Scripts/Pillow.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: e000b2f669ba4344490c42914fbad190 +timeCreated: 1440216742 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: