From 09c0b2eed74a77010ba686061b147c9cace88ed6 Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Sat, 7 Oct 2017 22:57:48 +0200 Subject: Trur æ la te VCS, ikke meninga, men æ trur itj de e nå problem egt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- td/Assets/Prefabs/Towers/projectiles/bullet.prefab | Bin 0 -> 7752 bytes td/Assets/Prefabs/Towers/projectiles/bullet.prefab.meta | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 td/Assets/Prefabs/Towers/projectiles/bullet.prefab create mode 100644 td/Assets/Prefabs/Towers/projectiles/bullet.prefab.meta (limited to 'td/Assets/Prefabs/Towers/projectiles') diff --git a/td/Assets/Prefabs/Towers/projectiles/bullet.prefab b/td/Assets/Prefabs/Towers/projectiles/bullet.prefab new file mode 100644 index 0000000..9d02c80 Binary files /dev/null and b/td/Assets/Prefabs/Towers/projectiles/bullet.prefab differ diff --git a/td/Assets/Prefabs/Towers/projectiles/bullet.prefab.meta b/td/Assets/Prefabs/Towers/projectiles/bullet.prefab.meta new file mode 100644 index 0000000..80854b9 --- /dev/null +++ b/td/Assets/Prefabs/Towers/projectiles/bullet.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: cc0aabf9df00e4ec0a1bde5c8f2cb499 +timeCreated: 1507300388 +licenseType: Free +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.2.3 From 2338b4e43c35dd1990db69da5751bb28a9c4122c Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Sat, 7 Oct 2017 23:19:27 +0200 Subject: Fiksa endel feil etter at all variabla fikk navn etter system --- td/Assets/Prefabs/Towers/Guy One.prefab | Bin 12040 -> 12040 bytes td/Assets/Prefabs/Towers/projectiles/bullet.prefab | Bin 7752 -> 7752 bytes td/Assets/Scenes/Level 1.unity | Bin 108444 -> 115708 bytes td/Assets/Scripts/player.cs | 5 +++++ 4 files changed, 5 insertions(+) (limited to 'td/Assets/Prefabs/Towers/projectiles') diff --git a/td/Assets/Prefabs/Towers/Guy One.prefab b/td/Assets/Prefabs/Towers/Guy One.prefab index d0c904b..9736f41 100644 Binary files a/td/Assets/Prefabs/Towers/Guy One.prefab and b/td/Assets/Prefabs/Towers/Guy One.prefab differ diff --git a/td/Assets/Prefabs/Towers/projectiles/bullet.prefab b/td/Assets/Prefabs/Towers/projectiles/bullet.prefab index 9d02c80..75a20be 100644 Binary files a/td/Assets/Prefabs/Towers/projectiles/bullet.prefab and b/td/Assets/Prefabs/Towers/projectiles/bullet.prefab differ diff --git a/td/Assets/Scenes/Level 1.unity b/td/Assets/Scenes/Level 1.unity index 528d41c..1c880c7 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/player.cs b/td/Assets/Scripts/player.cs index 30ad07f..c421720 100644 --- a/td/Assets/Scripts/player.cs +++ b/td/Assets/Scripts/player.cs @@ -43,6 +43,11 @@ public class Player : MonoBehaviour { return _playerHealth; } + public float HealthAsPercentage() + { + return InitialHealth / _playerHealth; + } + public void DecreaseHealth(int hp) { _playerHealth -= hp; } -- cgit v1.2.3