From 7dd944f18423ff3d6ae91ae6d2758c981c3cfd0a Mon Sep 17 00:00:00 2001 From: "hugo.baldassin@epitech.eu" Date: Thu, 13 Jun 2019 04:45:03 +0200 Subject: [PATCH] [EDIT] collectables working --- Assets/Prefabs/Collectables/HealthPack.prefab | 3 +++ Assets/Prefabs/Collectables/HealthPack.prefab.meta | 9 +++++++++ Assets/Prefabs/Collectables/HealthPackRoot.prefab | 4 ++-- Assets/Prefabs/Collectables/HealthSpawner.prefab | 4 ++-- Assets/Prefabs/Core/LightCar Manager.prefab | 4 ++-- Assets/Prefabs/Core/MediumCar Manager.prefab | 4 ++-- Assets/Scenes/Local Simulator.unity | 4 ++-- Assets/Scripts/Game Management/GameManager.cs | 4 ++-- Assets/Scripts/Game Management/GameManagerNetwork.cs | 4 ++-- Assets/Scripts/HealthPack.cs | 4 ++-- Assets/Scripts/HealthPackSpawner.cs | 4 ++-- 11 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 Assets/Prefabs/Collectables/HealthPack.prefab create mode 100644 Assets/Prefabs/Collectables/HealthPack.prefab.meta diff --git a/Assets/Prefabs/Collectables/HealthPack.prefab b/Assets/Prefabs/Collectables/HealthPack.prefab new file mode 100644 index 0000000..38e1593 --- /dev/null +++ b/Assets/Prefabs/Collectables/HealthPack.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1bdeeb80f401424885ad469e6b174ff142300db6046c654995de6b33b5a0849a +size 3755 diff --git a/Assets/Prefabs/Collectables/HealthPack.prefab.meta b/Assets/Prefabs/Collectables/HealthPack.prefab.meta new file mode 100644 index 0000000..075dbc0 --- /dev/null +++ b/Assets/Prefabs/Collectables/HealthPack.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c10dce192eb6319479589ded5f0757ff +timeCreated: 1547159152 +licenseType: Store +NativeFormatImporter: + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Collectables/HealthPackRoot.prefab b/Assets/Prefabs/Collectables/HealthPackRoot.prefab index 2ffb81f..4375194 100644 --- a/Assets/Prefabs/Collectables/HealthPackRoot.prefab +++ b/Assets/Prefabs/Collectables/HealthPackRoot.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7de9840d14fcdfbd3ae74d8f0216384618047ae1a378635d520ca1242383e932 -size 4788 +oid sha256:8a618bb938f05138a0e48ebc0c1185b6ef53863d63883d99bff0179c48c19025 +size 6531 diff --git a/Assets/Prefabs/Collectables/HealthSpawner.prefab b/Assets/Prefabs/Collectables/HealthSpawner.prefab index 92919ad..b18adba 100644 --- a/Assets/Prefabs/Collectables/HealthSpawner.prefab +++ b/Assets/Prefabs/Collectables/HealthSpawner.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23e0930cec2a9601fda0729dac6fc710cc9b8a249dabcc1235097f56b700035 -size 2155 +oid sha256:b0a3831617ae123304daf4b24d93a48ab73699d387d19b84dfe70c94a601a2da +size 1487 diff --git a/Assets/Prefabs/Core/LightCar Manager.prefab b/Assets/Prefabs/Core/LightCar Manager.prefab index 28f9f87..d38fbb9 100644 --- a/Assets/Prefabs/Core/LightCar Manager.prefab +++ b/Assets/Prefabs/Core/LightCar Manager.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:106a5550b8ed94084d9ea094174a29ab0117b5619e5a2d63d1614c24ba148f65 -size 23003 +oid sha256:e7fa94d7357d61957a799d20652ed45026a8502b0f4d3e504f70bce5d4b62dda +size 19552 diff --git a/Assets/Prefabs/Core/MediumCar Manager.prefab b/Assets/Prefabs/Core/MediumCar Manager.prefab index 01d9d94..da55071 100644 --- a/Assets/Prefabs/Core/MediumCar Manager.prefab +++ b/Assets/Prefabs/Core/MediumCar Manager.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:820107419ea534a6c5faf053450e5cf163d22882f1b1d5250c6882735bb89eca -size 23017 +oid sha256:2c81c4dd44012c58f56b7028c46a9a6a59dd1f7e98265bd96529e7c64dd5d5e3 +size 19546 diff --git a/Assets/Scenes/Local Simulator.unity b/Assets/Scenes/Local Simulator.unity index ae27fde..521e4e2 100644 --- a/Assets/Scenes/Local Simulator.unity +++ b/Assets/Scenes/Local Simulator.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a96aaad7f3f6f99857ebfb0b2ed050afc3bffa132a441e4390013df1aced3a3e -size 112671 +oid sha256:4c0084c94e09ec17b2d473d0d6ce99add09ba302461914225324bbc0dc21109b +size 113262 diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index 43e5755..aaa256a 100644 --- a/Assets/Scripts/Game Management/GameManager.cs +++ b/Assets/Scripts/Game Management/GameManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:832a7490b76db8980e0855c48315d462b14c553b8f18fdf5f69063bbfc80438d -size 11177 +oid sha256:c05346fd080693b5b4589968307c923c218974d1f1d3170491322143480aa41b +size 11156 diff --git a/Assets/Scripts/Game Management/GameManagerNetwork.cs b/Assets/Scripts/Game Management/GameManagerNetwork.cs index 0c0aeef..e77cdc1 100644 --- a/Assets/Scripts/Game Management/GameManagerNetwork.cs +++ b/Assets/Scripts/Game Management/GameManagerNetwork.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b1f5085523cb55baed3643eac2439556c826a3cdc890e342489ecae2cbd1d22 -size 4959 +oid sha256:8b8cadc390568acf025ff151a98a414b1be4e94181b172f30585f613c41e72fd +size 5569 diff --git a/Assets/Scripts/HealthPack.cs b/Assets/Scripts/HealthPack.cs index b00b957..ff0acaf 100644 --- a/Assets/Scripts/HealthPack.cs +++ b/Assets/Scripts/HealthPack.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b42f2895e4e79c8e95f293a4b5838273ed776e528be625a1d724f67865281b40 -size 704 +oid sha256:5b4924acee83097f1e7bcfbf10347ca428320e556c738ceeb4788e793470232a +size 725 diff --git a/Assets/Scripts/HealthPackSpawner.cs b/Assets/Scripts/HealthPackSpawner.cs index 4892111..07fde38 100644 --- a/Assets/Scripts/HealthPackSpawner.cs +++ b/Assets/Scripts/HealthPackSpawner.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c35a8c47e4360c691225784b15a25c39f35855451bd13e3c5aeba1eab84b09b -size 1342 +oid sha256:f2daeb578537402f9494ef912c3b13c6631ad5969bb9ab3bca74aaa9512c33af +size 1444