From 149bd76007f3c1edcda05ae6bc9bf0b48cf28aae Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Sat, 30 Sep 2017 23:12:37 +0200 Subject: Started with towerPlacements --- td/Assets/Prefabs/Enemies.meta | 9 +++++++ td/Assets/Prefabs/Enemies/Enemy.prefab | Bin 0 -> 7824 bytes td/Assets/Prefabs/Enemies/Enemy.prefab.meta | 9 +++++++ td/Assets/Prefabs/Enemy.prefab | Bin 7752 -> 0 bytes td/Assets/Prefabs/Enemy.prefab.meta | 9 ------- td/Assets/Prefabs/Grass-dirt.prefab | Bin 7776 -> 6828 bytes td/Assets/Prefabs/Path straigth.prefab | Bin 9096 -> 7900 bytes td/Assets/Prefabs/Path turn.prefab | Bin 10392 -> 8972 bytes td/Assets/Prefabs/UI/GUI.prefab | Bin 0 -> 37856 bytes td/Assets/Prefabs/UI/GUI.prefab.meta | 9 +++++++ td/Assets/Prefabs/grassPart.prefab | Bin 6848 -> 6004 bytes td/Assets/Scenes/Level 1.unity | Bin 86048 -> 54344 bytes td/Assets/Scripts/touchScript.cs | 37 ++++++++++++++++++++++++++++ td/Assets/Scripts/touchScript.cs.meta | 12 +++++++++ 14 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 td/Assets/Prefabs/Enemies.meta create mode 100644 td/Assets/Prefabs/Enemies/Enemy.prefab create mode 100644 td/Assets/Prefabs/Enemies/Enemy.prefab.meta delete mode 100644 td/Assets/Prefabs/Enemy.prefab delete mode 100644 td/Assets/Prefabs/Enemy.prefab.meta create mode 100644 td/Assets/Prefabs/UI/GUI.prefab create mode 100644 td/Assets/Prefabs/UI/GUI.prefab.meta create mode 100644 td/Assets/Scripts/touchScript.cs create mode 100644 td/Assets/Scripts/touchScript.cs.meta (limited to 'td/Assets') diff --git a/td/Assets/Prefabs/Enemies.meta b/td/Assets/Prefabs/Enemies.meta new file mode 100644 index 0000000..1ce4814 --- /dev/null +++ b/td/Assets/Prefabs/Enemies.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8ff814333a59b4fd7a4b225615761cc5 +folderAsset: yes +timeCreated: 1506804364 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/Enemies/Enemy.prefab b/td/Assets/Prefabs/Enemies/Enemy.prefab new file mode 100644 index 0000000..5d65c2c Binary files /dev/null and b/td/Assets/Prefabs/Enemies/Enemy.prefab differ diff --git a/td/Assets/Prefabs/Enemies/Enemy.prefab.meta b/td/Assets/Prefabs/Enemies/Enemy.prefab.meta new file mode 100644 index 0000000..f39477f --- /dev/null +++ b/td/Assets/Prefabs/Enemies/Enemy.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f46c18e8539e0474e9e6e164212d57e3 +timeCreated: 1506607135 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/Enemy.prefab b/td/Assets/Prefabs/Enemy.prefab deleted file mode 100644 index e2f8a96..0000000 Binary files a/td/Assets/Prefabs/Enemy.prefab and /dev/null differ diff --git a/td/Assets/Prefabs/Enemy.prefab.meta b/td/Assets/Prefabs/Enemy.prefab.meta deleted file mode 100644 index f39477f..0000000 --- a/td/Assets/Prefabs/Enemy.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f46c18e8539e0474e9e6e164212d57e3 -timeCreated: 1506607135 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/td/Assets/Prefabs/Grass-dirt.prefab b/td/Assets/Prefabs/Grass-dirt.prefab index 5952387..d943f20 100644 Binary files a/td/Assets/Prefabs/Grass-dirt.prefab and b/td/Assets/Prefabs/Grass-dirt.prefab differ diff --git a/td/Assets/Prefabs/Path straigth.prefab b/td/Assets/Prefabs/Path straigth.prefab index cb8cac2..75c688d 100644 Binary files a/td/Assets/Prefabs/Path straigth.prefab and b/td/Assets/Prefabs/Path straigth.prefab differ diff --git a/td/Assets/Prefabs/Path turn.prefab b/td/Assets/Prefabs/Path turn.prefab index fc78ac9..28d95c1 100644 Binary files a/td/Assets/Prefabs/Path turn.prefab and b/td/Assets/Prefabs/Path turn.prefab differ diff --git a/td/Assets/Prefabs/UI/GUI.prefab b/td/Assets/Prefabs/UI/GUI.prefab new file mode 100644 index 0000000..b7a47fa Binary files /dev/null and b/td/Assets/Prefabs/UI/GUI.prefab differ diff --git a/td/Assets/Prefabs/UI/GUI.prefab.meta b/td/Assets/Prefabs/UI/GUI.prefab.meta new file mode 100644 index 0000000..856ac47 --- /dev/null +++ b/td/Assets/Prefabs/UI/GUI.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: fd69470eb7f824e3bbf2f6bac2d09ec7 +timeCreated: 1506804183 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/grassPart.prefab b/td/Assets/Prefabs/grassPart.prefab index b525984..442bbc5 100644 Binary files a/td/Assets/Prefabs/grassPart.prefab and b/td/Assets/Prefabs/grassPart.prefab differ diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity index 80bebb6..44a726e 100644 Binary files a/td/Assets/Scenes/Level 1.unity and b/td/Assets/Scenes/Level 1.unity differ diff --git a/td/Assets/Scripts/touchScript.cs b/td/Assets/Scripts/touchScript.cs new file mode 100644 index 0000000..c8cdd6a --- /dev/null +++ b/td/Assets/Scripts/touchScript.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class touchScript : MonoBehaviour { + + + private RuntimePlatform platform = Application.platform; + + void Update(){ + if(platform == RuntimePlatform.Android || platform == RuntimePlatform.IPhonePlayer){ + if(Input.touchCount > 0) { + if(Input.GetTouch(0).phase == TouchPhase.Began){ + checkTouch(Input.GetTouch(0).position); + } + } + }else if(platform == RuntimePlatform.WindowsEditor){ + if(Input.GetMouseButtonDown(0)) { + checkTouch(Input.mousePosition); + } + } + } + + void checkTouch(Vector3 pos){ + Vector3 wp = Camera.main.ScreenToWorldPoint(pos); + Vector2 touchPos = new Vector2(wp.x, wp.y); + Collider2D hit = Physics2D.OverlapPoint(touchPos); + Debug.Log("Checking"); + if(hit){ + //hit.transform.gameObject.SendMessage("Clicked",0,SendMessageOptions.DontRequireReceiver); + Debug.Log("CLICKED"); + } + } + + + +} diff --git a/td/Assets/Scripts/touchScript.cs.meta b/td/Assets/Scripts/touchScript.cs.meta new file mode 100644 index 0000000..ab0ba6c --- /dev/null +++ b/td/Assets/Scripts/touchScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8b15d2b1b4d2f4f7fadf48b92f7edec2 +timeCreated: 1506804974 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.2.3