From 4aade582d4b253e106d24525fcc99c1343ef667d Mon Sep 17 00:00:00 2001 From: Hugo Willaume Date: Thu, 13 Jun 2019 14:50:28 +0900 Subject: [PATCH] weapons damage nerf / objective tag --- Assets/Menus/Network/PlayerIdentity.cs | 4 ++-- .../Fonts & Materials.meta} | 2 +- Assets/Prefabs/Core/HeavyCar Manager.prefab | 4 ++-- Assets/Prefabs/Core/LightCar Manager.prefab | 4 ++-- Assets/Prefabs/Core/MediumCar Manager.prefab | 4 ++-- Assets/Scripts/Game Management/ObjectiveManager.cs | 4 ++-- Assets/Scripts/Objectives/ColliderManager.cs | 3 +++ Assets/Scripts/Objectives/ColliderManager.cs.meta | 11 +++++++++++ Assets/Scripts/Objectives/Ob_Tag.cs | 3 +++ Assets/Scripts/Objectives/Ob_Tag.cs.meta | 11 +++++++++++ .../Prefabs/Weapons/Projectiles/bullet_normal.prefab | 4 ++-- .../Prefabs/Weapons/Projectiles/chain_damage.prefab | 2 +- 12 files changed, 42 insertions(+), 14 deletions(-) rename Assets/Plugins/TextMesh Pro/{Examples & Extras.meta => Resources/Fonts & Materials.meta} (77%) create mode 100644 Assets/Scripts/Objectives/ColliderManager.cs create mode 100644 Assets/Scripts/Objectives/ColliderManager.cs.meta create mode 100644 Assets/Scripts/Objectives/Ob_Tag.cs create mode 100644 Assets/Scripts/Objectives/Ob_Tag.cs.meta diff --git a/Assets/Menus/Network/PlayerIdentity.cs b/Assets/Menus/Network/PlayerIdentity.cs index f33df92..f192844 100644 --- a/Assets/Menus/Network/PlayerIdentity.cs +++ b/Assets/Menus/Network/PlayerIdentity.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ad4504f2ad2308e5452cb09bd5d8787b3e2624242ddf40ba6f1c12134d7c495 -size 561 +oid sha256:be8a9f68badc51bf3381772b7efe1142bfb6415935941cb14f37b1d7393d64e1 +size 565 diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras.meta b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta similarity index 77% rename from Assets/Plugins/TextMesh Pro/Examples & Extras.meta rename to Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta index d94c9b5..55df787 100644 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras.meta +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce51c8e33b734b4db6086586558c53a3 +guid: 731f1baa9d144a9897cb1d341c2092b8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Prefabs/Core/HeavyCar Manager.prefab b/Assets/Prefabs/Core/HeavyCar Manager.prefab index a3eccea..e415288 100644 --- a/Assets/Prefabs/Core/HeavyCar Manager.prefab +++ b/Assets/Prefabs/Core/HeavyCar Manager.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d156674578080b78bba0bd0de1243ca3c89525f83bf220579e39084dc7fb82df -size 6883 +oid sha256:da36f74d28a1feeafc91a34d3150c02da572dc68ae146ea73a6f3ab71ae12a2a +size 7501 diff --git a/Assets/Prefabs/Core/LightCar Manager.prefab b/Assets/Prefabs/Core/LightCar Manager.prefab index d38fbb9..a9f3501 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:e7fa94d7357d61957a799d20652ed45026a8502b0f4d3e504f70bce5d4b62dda -size 19552 +oid sha256:eda0b177abcf3c2678b72e88cc54cc328ea6f0528f50f2c8e3f61cf0c035114d +size 20172 diff --git a/Assets/Prefabs/Core/MediumCar Manager.prefab b/Assets/Prefabs/Core/MediumCar Manager.prefab index da55071..ebf9643 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:2c81c4dd44012c58f56b7028c46a9a6a59dd1f7e98265bd96529e7c64dd5d5e3 -size 19546 +oid sha256:30943624b78b842be2471b8e801fc33e4b321f5e2dbd28cabea9427d89865520 +size 20168 diff --git a/Assets/Scripts/Game Management/ObjectiveManager.cs b/Assets/Scripts/Game Management/ObjectiveManager.cs index 450d515..382cbb2 100644 --- a/Assets/Scripts/Game Management/ObjectiveManager.cs +++ b/Assets/Scripts/Game Management/ObjectiveManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2ae3418840de4fa1f432cdb651677285a03d6226ee0c13d1943ed2a3240488d -size 4446 +oid sha256:f3d29cf950beb4954413110c97614bed2eceb93f81d359c611323b62483f9b02 +size 4493 diff --git a/Assets/Scripts/Objectives/ColliderManager.cs b/Assets/Scripts/Objectives/ColliderManager.cs new file mode 100644 index 0000000..6dbebb0 --- /dev/null +++ b/Assets/Scripts/Objectives/ColliderManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:650b175f65097ee38dc816bbcd027932519c0fb2ca01f1ad63947f6eb8b3e88c +size 577 diff --git a/Assets/Scripts/Objectives/ColliderManager.cs.meta b/Assets/Scripts/Objectives/ColliderManager.cs.meta new file mode 100644 index 0000000..87b3e15 --- /dev/null +++ b/Assets/Scripts/Objectives/ColliderManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b80098d594de9b48b0c6fdbb202a1b0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Ob_Tag.cs b/Assets/Scripts/Objectives/Ob_Tag.cs new file mode 100644 index 0000000..d85541b --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Tag.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7de599106a72bee0079ed051b3e59bd809fbc556abe92a899f98884f0137fb28 +size 1318 diff --git a/Assets/Scripts/Objectives/Ob_Tag.cs.meta b/Assets/Scripts/Objectives/Ob_Tag.cs.meta new file mode 100644 index 0000000..d2e184a --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Tag.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 06ccc5641a6074e44ba0fde0b93b3a58 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_normal.prefab b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_normal.prefab index ca80994..cb13a69 100644 --- a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_normal.prefab +++ b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_normal.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2de39998f3853e58de33ff5eadaa9f6cfaaff5cdb5314bdbbea4d8145d3a8f40 -size 118138 +oid sha256:665c4bb95772802cebfd9c1c9694c68f946cd66bab10102c7528ea590b911021 +size 118137 diff --git a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab index ea7fff7..645d772 100644 --- a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab +++ b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd94c602698fa0c0ceddfef1656306d2591c13f28e37d907a404e840c5792480 +oid sha256:ee61d825870625dcc4dc42454f29aa473eb240efd151d4c40ec4bbfae0f79482 size 115827