From 87b7d9516b8c035790f5292b5be6debc8d1ed701 Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Sun, 1 Oct 2017 21:39:06 +0200 Subject: Added dev mode, just a console dump --- td/Assets/Scripts/developerMode.cs | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 td/Assets/Scripts/developerMode.cs (limited to 'td/Assets/Scripts/developerMode.cs') diff --git a/td/Assets/Scripts/developerMode.cs b/td/Assets/Scripts/developerMode.cs new file mode 100644 index 0000000..b0d7704 --- /dev/null +++ b/td/Assets/Scripts/developerMode.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine.UI; +using UnityEngine; + +public class developerMode : MonoBehaviour { + + public string output = ""; + public string stack = ""; + + bool developerModeActive; + GameObject pnlCanvas; + Text lblConsoleLog; + + void Start () { + pnlCanvas = transform.Find ("Canvas").gameObject; + lblConsoleLog = pnlCanvas.transform.Find ("consoleLog").gameObject.GetComponent (); + + lblConsoleLog.text = ""; + } + + void Update () { + + if (PlayerPrefs.HasKey ("developerMode")) { + if (PlayerPrefs.GetInt ("developerMode") == 1) { developerModeActive = true; } + else { developerModeActive = false; } + } + + if (developerModeActive) { + this.gameObject.transform.GetChild (0).gameObject.SetActive (true); + } else { + this.gameObject.transform.GetChild (0).gameObject.SetActive (false); + } + } + + + void OnEnable() { + Application.logMessageReceived += HandleLog; + } + void OnDisable() { + Application.logMessageReceived -= HandleLog; + } + public void HandleLog(string logString, string stackTrace, LogType type) { + string backLog = lblConsoleLog.text; + lblConsoleLog.text = logString + "\n" + backLog; + } + +} -- cgit v1.2.3 From e13fd4cf1fc0ad9eff857295fd5abc15ab01462c Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Fri, 6 Oct 2017 16:04:38 +0200 Subject: Startet på tårn, fiksa dev-mode, laga stats UI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- td/Assets/Materials/placementIndicatorDanger.mat | Bin 0 -> 5084 bytes .../Materials/placementIndicatorDanger.mat.meta | 9 ++ td/Assets/Materials/placementIndicatorSuccess.mat | Bin 0 -> 5088 bytes .../Materials/placementIndicatorSuccess.mat.meta | 9 ++ td/Assets/Prefabs/Enemies/Enemy.prefab | Bin 7824 -> 7824 bytes td/Assets/Prefabs/Grass-dirt.prefab | Bin 6828 -> 0 bytes td/Assets/Prefabs/Grass-dirt.prefab.meta | 9 -- td/Assets/Prefabs/Path straigth.prefab | Bin 7900 -> 0 bytes td/Assets/Prefabs/Path straigth.prefab.meta | 9 -- td/Assets/Prefabs/Path turn.prefab | Bin 8972 -> 0 bytes td/Assets/Prefabs/Path turn.prefab.meta | 9 -- td/Assets/Prefabs/Towers.meta | 9 ++ td/Assets/Prefabs/Towers/Guy One.prefab | Bin 0 -> 11536 bytes td/Assets/Prefabs/Towers/Guy One.prefab.meta | 9 ++ td/Assets/Prefabs/UI/GUI.prefab | Bin 37856 -> 0 bytes td/Assets/Prefabs/UI/GUI.prefab.meta | 9 -- td/Assets/Prefabs/grassPart.prefab | Bin 6004 -> 0 bytes td/Assets/Prefabs/grassPart.prefab.meta | 9 -- td/Assets/Prefabs/level design.meta | 9 ++ td/Assets/Prefabs/level design/Grass-dirt.prefab | Bin 0 -> 7672 bytes .../Prefabs/level design/Grass-dirt.prefab.meta | 9 ++ .../Prefabs/level design/Path straigth.prefab | Bin 0 -> 8656 bytes .../Prefabs/level design/Path straigth.prefab.meta | 9 ++ td/Assets/Prefabs/level design/Path turn.prefab | Bin 0 -> 8972 bytes .../Prefabs/level design/Path turn.prefab.meta | 9 ++ td/Assets/Prefabs/level design/grassPart.prefab | Bin 0 -> 6004 bytes .../Prefabs/level design/grassPart.prefab.meta | 9 ++ td/Assets/Prefabs/projectiles.meta | 9 ++ td/Assets/Scenes/Level 1.unity | Bin 83072 -> 111964 bytes td/Assets/Scripts/developerMode.cs | 36 +++++- td/Assets/Scripts/gameStats.cs | 43 +++++++ td/Assets/Scripts/gameStats.cs.meta | 12 ++ td/Assets/Scripts/player.cs | 48 ++++++++ td/Assets/Scripts/player.cs.meta | 12 ++ td/Assets/Scripts/touchScript.cs | 37 ------ td/Assets/Scripts/touchScript.cs.meta | 12 -- td/Assets/Scripts/tower.cs | 137 +++++++++++++++++++++ td/Assets/Scripts/tower.cs.meta | 12 ++ td/Assets/Scripts/waveSpawner.cs | 76 ++++++++++++ td/Assets/Scripts/waveSpawner.cs.meta | 12 ++ td/ProjectSettings/ProjectSettings.asset | Bin 52178 -> 52238 bytes td/ProjectSettings/TagManager.asset | Bin 4308 -> 4320 bytes 42 files changed, 474 insertions(+), 98 deletions(-) create mode 100644 td/Assets/Materials/placementIndicatorDanger.mat create mode 100644 td/Assets/Materials/placementIndicatorDanger.mat.meta create mode 100644 td/Assets/Materials/placementIndicatorSuccess.mat create mode 100644 td/Assets/Materials/placementIndicatorSuccess.mat.meta delete mode 100644 td/Assets/Prefabs/Grass-dirt.prefab delete mode 100644 td/Assets/Prefabs/Grass-dirt.prefab.meta delete mode 100644 td/Assets/Prefabs/Path straigth.prefab delete mode 100644 td/Assets/Prefabs/Path straigth.prefab.meta delete mode 100644 td/Assets/Prefabs/Path turn.prefab delete mode 100644 td/Assets/Prefabs/Path turn.prefab.meta create mode 100644 td/Assets/Prefabs/Towers.meta create mode 100644 td/Assets/Prefabs/Towers/Guy One.prefab create mode 100644 td/Assets/Prefabs/Towers/Guy One.prefab.meta delete mode 100644 td/Assets/Prefabs/UI/GUI.prefab delete mode 100644 td/Assets/Prefabs/UI/GUI.prefab.meta delete mode 100644 td/Assets/Prefabs/grassPart.prefab delete mode 100644 td/Assets/Prefabs/grassPart.prefab.meta create mode 100644 td/Assets/Prefabs/level design.meta create mode 100644 td/Assets/Prefabs/level design/Grass-dirt.prefab create mode 100644 td/Assets/Prefabs/level design/Grass-dirt.prefab.meta create mode 100644 td/Assets/Prefabs/level design/Path straigth.prefab create mode 100644 td/Assets/Prefabs/level design/Path straigth.prefab.meta create mode 100644 td/Assets/Prefabs/level design/Path turn.prefab create mode 100644 td/Assets/Prefabs/level design/Path turn.prefab.meta create mode 100644 td/Assets/Prefabs/level design/grassPart.prefab create mode 100644 td/Assets/Prefabs/level design/grassPart.prefab.meta create mode 100644 td/Assets/Prefabs/projectiles.meta create mode 100644 td/Assets/Scripts/gameStats.cs create mode 100644 td/Assets/Scripts/gameStats.cs.meta create mode 100644 td/Assets/Scripts/player.cs create mode 100644 td/Assets/Scripts/player.cs.meta delete mode 100644 td/Assets/Scripts/touchScript.cs delete mode 100644 td/Assets/Scripts/touchScript.cs.meta create mode 100644 td/Assets/Scripts/tower.cs create mode 100644 td/Assets/Scripts/tower.cs.meta create mode 100644 td/Assets/Scripts/waveSpawner.cs create mode 100644 td/Assets/Scripts/waveSpawner.cs.meta (limited to 'td/Assets/Scripts/developerMode.cs') diff --git a/td/Assets/Materials/placementIndicatorDanger.mat b/td/Assets/Materials/placementIndicatorDanger.mat new file mode 100644 index 0000000..37e9e47 Binary files /dev/null and b/td/Assets/Materials/placementIndicatorDanger.mat differ diff --git a/td/Assets/Materials/placementIndicatorDanger.mat.meta b/td/Assets/Materials/placementIndicatorDanger.mat.meta new file mode 100644 index 0000000..ea86123 --- /dev/null +++ b/td/Assets/Materials/placementIndicatorDanger.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: fdaa960eb417543e29a712fa18d4a65f +timeCreated: 1507034809 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Materials/placementIndicatorSuccess.mat b/td/Assets/Materials/placementIndicatorSuccess.mat new file mode 100644 index 0000000..36c1413 Binary files /dev/null and b/td/Assets/Materials/placementIndicatorSuccess.mat differ diff --git a/td/Assets/Materials/placementIndicatorSuccess.mat.meta b/td/Assets/Materials/placementIndicatorSuccess.mat.meta new file mode 100644 index 0000000..6e21620 --- /dev/null +++ b/td/Assets/Materials/placementIndicatorSuccess.mat.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e03c0257685414ec9a62b58f6eb7dbde +timeCreated: 1507039389 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/Enemies/Enemy.prefab b/td/Assets/Prefabs/Enemies/Enemy.prefab index 5d65c2c..fc3e820 100644 Binary files a/td/Assets/Prefabs/Enemies/Enemy.prefab and b/td/Assets/Prefabs/Enemies/Enemy.prefab differ diff --git a/td/Assets/Prefabs/Grass-dirt.prefab b/td/Assets/Prefabs/Grass-dirt.prefab deleted file mode 100644 index d943f20..0000000 Binary files a/td/Assets/Prefabs/Grass-dirt.prefab and /dev/null differ diff --git a/td/Assets/Prefabs/Grass-dirt.prefab.meta b/td/Assets/Prefabs/Grass-dirt.prefab.meta deleted file mode 100644 index 0c2256d..0000000 --- a/td/Assets/Prefabs/Grass-dirt.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: dceb27e95f4d342f4abed553a9a0f5d2 -timeCreated: 1506603189 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/td/Assets/Prefabs/Path straigth.prefab b/td/Assets/Prefabs/Path straigth.prefab deleted file mode 100644 index 75c688d..0000000 Binary files a/td/Assets/Prefabs/Path straigth.prefab and /dev/null differ diff --git a/td/Assets/Prefabs/Path straigth.prefab.meta b/td/Assets/Prefabs/Path straigth.prefab.meta deleted file mode 100644 index 875d25e..0000000 --- a/td/Assets/Prefabs/Path straigth.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a27ee2cf3aa6840dc98f35b567f52e2f -timeCreated: 1506603963 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/td/Assets/Prefabs/Path turn.prefab b/td/Assets/Prefabs/Path turn.prefab deleted file mode 100644 index 28d95c1..0000000 Binary files a/td/Assets/Prefabs/Path turn.prefab and /dev/null differ diff --git a/td/Assets/Prefabs/Path turn.prefab.meta b/td/Assets/Prefabs/Path turn.prefab.meta deleted file mode 100644 index ea595d4..0000000 --- a/td/Assets/Prefabs/Path turn.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5e7563b197d6342e880523cb297bf4d3 -timeCreated: 1506603961 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/td/Assets/Prefabs/Towers.meta b/td/Assets/Prefabs/Towers.meta new file mode 100644 index 0000000..84da145 --- /dev/null +++ b/td/Assets/Prefabs/Towers.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: bcbc671350f2542efb1691d76fa90f9e +folderAsset: yes +timeCreated: 1507213929 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/Towers/Guy One.prefab b/td/Assets/Prefabs/Towers/Guy One.prefab new file mode 100644 index 0000000..de1c753 Binary files /dev/null and b/td/Assets/Prefabs/Towers/Guy One.prefab differ diff --git a/td/Assets/Prefabs/Towers/Guy One.prefab.meta b/td/Assets/Prefabs/Towers/Guy One.prefab.meta new file mode 100644 index 0000000..2747a06 --- /dev/null +++ b/td/Assets/Prefabs/Towers/Guy One.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b3217bd5a74a9409e85e183b0e707047 +timeCreated: 1507213924 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/UI/GUI.prefab b/td/Assets/Prefabs/UI/GUI.prefab deleted file mode 100644 index b7a47fa..0000000 Binary files a/td/Assets/Prefabs/UI/GUI.prefab and /dev/null differ diff --git a/td/Assets/Prefabs/UI/GUI.prefab.meta b/td/Assets/Prefabs/UI/GUI.prefab.meta deleted file mode 100644 index 856ac47..0000000 --- a/td/Assets/Prefabs/UI/GUI.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 442bbc5..0000000 Binary files a/td/Assets/Prefabs/grassPart.prefab and /dev/null differ diff --git a/td/Assets/Prefabs/grassPart.prefab.meta b/td/Assets/Prefabs/grassPart.prefab.meta deleted file mode 100644 index 0c263b8..0000000 --- a/td/Assets/Prefabs/grassPart.prefab.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: d2995460fd67949fba6e21a4fd492692 -timeCreated: 1506603208 -licenseType: Free -NativeFormatImporter: - mainObjectFileID: 100100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/td/Assets/Prefabs/level design.meta b/td/Assets/Prefabs/level design.meta new file mode 100644 index 0000000..5fa139f --- /dev/null +++ b/td/Assets/Prefabs/level design.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f4efb8722711a4322b5c809507092aa6 +folderAsset: yes +timeCreated: 1507240816 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/level design/Grass-dirt.prefab b/td/Assets/Prefabs/level design/Grass-dirt.prefab new file mode 100644 index 0000000..dd9cf57 Binary files /dev/null and b/td/Assets/Prefabs/level design/Grass-dirt.prefab differ diff --git a/td/Assets/Prefabs/level design/Grass-dirt.prefab.meta b/td/Assets/Prefabs/level design/Grass-dirt.prefab.meta new file mode 100644 index 0000000..0c2256d --- /dev/null +++ b/td/Assets/Prefabs/level design/Grass-dirt.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: dceb27e95f4d342f4abed553a9a0f5d2 +timeCreated: 1506603189 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/level design/Path straigth.prefab b/td/Assets/Prefabs/level design/Path straigth.prefab new file mode 100644 index 0000000..78ad75f Binary files /dev/null and b/td/Assets/Prefabs/level design/Path straigth.prefab differ diff --git a/td/Assets/Prefabs/level design/Path straigth.prefab.meta b/td/Assets/Prefabs/level design/Path straigth.prefab.meta new file mode 100644 index 0000000..875d25e --- /dev/null +++ b/td/Assets/Prefabs/level design/Path straigth.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a27ee2cf3aa6840dc98f35b567f52e2f +timeCreated: 1506603963 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/level design/Path turn.prefab b/td/Assets/Prefabs/level design/Path turn.prefab new file mode 100644 index 0000000..28d95c1 Binary files /dev/null and b/td/Assets/Prefabs/level design/Path turn.prefab differ diff --git a/td/Assets/Prefabs/level design/Path turn.prefab.meta b/td/Assets/Prefabs/level design/Path turn.prefab.meta new file mode 100644 index 0000000..ea595d4 --- /dev/null +++ b/td/Assets/Prefabs/level design/Path turn.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5e7563b197d6342e880523cb297bf4d3 +timeCreated: 1506603961 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/level design/grassPart.prefab b/td/Assets/Prefabs/level design/grassPart.prefab new file mode 100644 index 0000000..442bbc5 Binary files /dev/null and b/td/Assets/Prefabs/level design/grassPart.prefab differ diff --git a/td/Assets/Prefabs/level design/grassPart.prefab.meta b/td/Assets/Prefabs/level design/grassPart.prefab.meta new file mode 100644 index 0000000..0c263b8 --- /dev/null +++ b/td/Assets/Prefabs/level design/grassPart.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d2995460fd67949fba6e21a4fd492692 +timeCreated: 1506603208 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Prefabs/projectiles.meta b/td/Assets/Prefabs/projectiles.meta new file mode 100644 index 0000000..b66e7d3 --- /dev/null +++ b/td/Assets/Prefabs/projectiles.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1fd8e4afa918142cf86708ca153cfa3c +folderAsset: yes +timeCreated: 1507240769 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity index cf659ae..fbf4717 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/developerMode.cs b/td/Assets/Scripts/developerMode.cs index b0d7704..4f241cf 100644 --- a/td/Assets/Scripts/developerMode.cs +++ b/td/Assets/Scripts/developerMode.cs @@ -7,16 +7,35 @@ public class developerMode : MonoBehaviour { public string output = ""; public string stack = ""; + public bool cheatsAllowed; - bool developerModeActive; GameObject pnlCanvas; + GameObject pnlCheats; + Button btnToggleCheats; Text lblConsoleLog; + bool developerModeActive; + bool cheatMenuOpen; + void Start () { - pnlCanvas = transform.Find ("Canvas").gameObject; + /* Panels */ + pnlCanvas = this.gameObject.transform.GetChild (0).gameObject; + pnlCheats = pnlCanvas.transform.Find ("cheatMenu").gameObject; + /* Buttons */ + /* Button handlers */ + /* Lablels */ lblConsoleLog = pnlCanvas.transform.Find ("consoleLog").gameObject.GetComponent (); - + /* Do setup */ lblConsoleLog.text = ""; + + if (cheatsAllowed) { + btnToggleCheats = pnlCanvas.transform.Find ("toggleCheats").gameObject.GetComponent