From be33a36d71f59f5ea0ee3c60ab03fdb5092339f7 Mon Sep 17 00:00:00 2001 From: "hugo.baldassin@epitech.eu" Date: Fri, 19 Apr 2019 07:33:24 +0200 Subject: [PATCH 1/8] [EDIT] working on network and car runtime instanciation; --- Assets/Prefabs/HeavyCar.prefab | 3 +++ ...1 (3) Variant.prefab.meta => HeavyCar.prefab.meta} | 0 ...scleCar_01 Variant.prefab => HyperDriftCar.prefab} | 0 ... Variant.prefab.meta => HyperDriftCar.prefab.meta} | 0 Assets/Prefabs/LightCar.prefab | 3 +++ ...1 (2) Variant.prefab.meta => LightCar.prefab.meta} | 0 Assets/Prefabs/MediumCar.prefab | 3 +++ ... (1) Variant.prefab.meta => MediumCar.prefab.meta} | 0 Assets/Prefabs/MuscleCar_01 (1) Variant.prefab | 3 --- Assets/Prefabs/MuscleCar_01 (2) Variant.prefab | 3 --- Assets/Prefabs/MuscleCar_01 (3) Variant.prefab | 3 --- Assets/Prefabs/PlayerInstance.prefab | 3 +++ Assets/Prefabs/PlayerInstance.prefab.meta | 7 +++++++ Assets/Scenes/NetworkTest.unity | 3 +++ Assets/Scenes/NetworkTest.unity.meta | 7 +++++++ Assets/Scripts.meta | 8 ++++++++ Assets/Scripts/PlayerInstance.cs | 3 +++ Assets/Scripts/PlayerInstance.cs.meta | 11 +++++++++++ 18 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 Assets/Prefabs/HeavyCar.prefab rename Assets/Prefabs/{MuscleCar_01 (3) Variant.prefab.meta => HeavyCar.prefab.meta} (100%) rename Assets/Prefabs/{MuscleCar_01 Variant.prefab => HyperDriftCar.prefab} (100%) rename Assets/Prefabs/{MuscleCar_01 Variant.prefab.meta => HyperDriftCar.prefab.meta} (100%) create mode 100644 Assets/Prefabs/LightCar.prefab rename Assets/Prefabs/{MuscleCar_01 (2) Variant.prefab.meta => LightCar.prefab.meta} (100%) create mode 100644 Assets/Prefabs/MediumCar.prefab rename Assets/Prefabs/{MuscleCar_01 (1) Variant.prefab.meta => MediumCar.prefab.meta} (100%) delete mode 100644 Assets/Prefabs/MuscleCar_01 (1) Variant.prefab delete mode 100644 Assets/Prefabs/MuscleCar_01 (2) Variant.prefab delete mode 100644 Assets/Prefabs/MuscleCar_01 (3) Variant.prefab create mode 100644 Assets/Prefabs/PlayerInstance.prefab create mode 100644 Assets/Prefabs/PlayerInstance.prefab.meta create mode 100644 Assets/Scenes/NetworkTest.unity create mode 100644 Assets/Scenes/NetworkTest.unity.meta create mode 100644 Assets/Scripts.meta create mode 100644 Assets/Scripts/PlayerInstance.cs create mode 100644 Assets/Scripts/PlayerInstance.cs.meta diff --git a/Assets/Prefabs/HeavyCar.prefab b/Assets/Prefabs/HeavyCar.prefab new file mode 100644 index 0000000..67c024f --- /dev/null +++ b/Assets/Prefabs/HeavyCar.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a6813579a0017d74a31c93b97e2d01e5bb98e53673b1d0154600481606a797e +size 16612 diff --git a/Assets/Prefabs/MuscleCar_01 (3) Variant.prefab.meta b/Assets/Prefabs/HeavyCar.prefab.meta similarity index 100% rename from Assets/Prefabs/MuscleCar_01 (3) Variant.prefab.meta rename to Assets/Prefabs/HeavyCar.prefab.meta diff --git a/Assets/Prefabs/MuscleCar_01 Variant.prefab b/Assets/Prefabs/HyperDriftCar.prefab similarity index 100% rename from Assets/Prefabs/MuscleCar_01 Variant.prefab rename to Assets/Prefabs/HyperDriftCar.prefab diff --git a/Assets/Prefabs/MuscleCar_01 Variant.prefab.meta b/Assets/Prefabs/HyperDriftCar.prefab.meta similarity index 100% rename from Assets/Prefabs/MuscleCar_01 Variant.prefab.meta rename to Assets/Prefabs/HyperDriftCar.prefab.meta diff --git a/Assets/Prefabs/LightCar.prefab b/Assets/Prefabs/LightCar.prefab new file mode 100644 index 0000000..75d2c21 --- /dev/null +++ b/Assets/Prefabs/LightCar.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c3ca33845d0a7a8b859e42f7e9ba2909c4cb9e1188291751026227310aa2dfc +size 14043 diff --git a/Assets/Prefabs/MuscleCar_01 (2) Variant.prefab.meta b/Assets/Prefabs/LightCar.prefab.meta similarity index 100% rename from Assets/Prefabs/MuscleCar_01 (2) Variant.prefab.meta rename to Assets/Prefabs/LightCar.prefab.meta diff --git a/Assets/Prefabs/MediumCar.prefab b/Assets/Prefabs/MediumCar.prefab new file mode 100644 index 0000000..33ef769 --- /dev/null +++ b/Assets/Prefabs/MediumCar.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3dcc3efbd6840c70519c9d2a189252d27d753df05019ad1d6a3ff2c63003459 +size 13837 diff --git a/Assets/Prefabs/MuscleCar_01 (1) Variant.prefab.meta b/Assets/Prefabs/MediumCar.prefab.meta similarity index 100% rename from Assets/Prefabs/MuscleCar_01 (1) Variant.prefab.meta rename to Assets/Prefabs/MediumCar.prefab.meta diff --git a/Assets/Prefabs/MuscleCar_01 (1) Variant.prefab b/Assets/Prefabs/MuscleCar_01 (1) Variant.prefab deleted file mode 100644 index 27e5dda..0000000 --- a/Assets/Prefabs/MuscleCar_01 (1) Variant.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e7f334d0dfd687283cff2c09fa5c65ea363826abcd8ee891a55e7b6415e181d -size 13843 diff --git a/Assets/Prefabs/MuscleCar_01 (2) Variant.prefab b/Assets/Prefabs/MuscleCar_01 (2) Variant.prefab deleted file mode 100644 index 769d136..0000000 --- a/Assets/Prefabs/MuscleCar_01 (2) Variant.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c84e68fa451bb987fecf5e86c43bbf5a0cf7c03e182e20b2facf6e473060b16 -size 14049 diff --git a/Assets/Prefabs/MuscleCar_01 (3) Variant.prefab b/Assets/Prefabs/MuscleCar_01 (3) Variant.prefab deleted file mode 100644 index 741854d..0000000 --- a/Assets/Prefabs/MuscleCar_01 (3) Variant.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d11806432fc8134d96bda59fe551540c18d06bd10e6ee16a3d584a4f30f04a9f -size 16619 diff --git a/Assets/Prefabs/PlayerInstance.prefab b/Assets/Prefabs/PlayerInstance.prefab new file mode 100644 index 0000000..f421218 --- /dev/null +++ b/Assets/Prefabs/PlayerInstance.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0df260561b429c502d51afaeecb5de4408f9d77f1cb7f2a6adba96b6d2efe444 +size 2163 diff --git a/Assets/Prefabs/PlayerInstance.prefab.meta b/Assets/Prefabs/PlayerInstance.prefab.meta new file mode 100644 index 0000000..c297faf --- /dev/null +++ b/Assets/Prefabs/PlayerInstance.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 68cccfcf73953cb4dae90855c9542a46 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/NetworkTest.unity b/Assets/Scenes/NetworkTest.unity new file mode 100644 index 0000000..4608216 --- /dev/null +++ b/Assets/Scenes/NetworkTest.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd06950fade08acaaee7b5742320d2990c8c57ae60b0d0573ed5665e22511a0f +size 13082 diff --git a/Assets/Scenes/NetworkTest.unity.meta b/Assets/Scenes/NetworkTest.unity.meta new file mode 100644 index 0000000..9db1832 --- /dev/null +++ b/Assets/Scenes/NetworkTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aacbdd57e64dc56468ffe6e50f19ec26 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..0cb77b6 --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbea913c9d99f0d4eaa650861f4139b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerInstance.cs b/Assets/Scripts/PlayerInstance.cs new file mode 100644 index 0000000..40a2df8 --- /dev/null +++ b/Assets/Scripts/PlayerInstance.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3de409b2b2b4fdeae0c9898e9dbe9a2944f717cfa450fc0864af4ba4f750350 +size 959 diff --git a/Assets/Scripts/PlayerInstance.cs.meta b/Assets/Scripts/PlayerInstance.cs.meta new file mode 100644 index 0000000..c11d421 --- /dev/null +++ b/Assets/Scripts/PlayerInstance.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c6bd1a9f86f7fb44a9339383b2cd2781 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 86f15fb6533ea53ea6e5654e99b73033e0e99bac Mon Sep 17 00:00:00 2001 From: Julien Date: Fri, 19 Apr 2019 18:16:52 +0900 Subject: [PATCH 2/8] [EDIT] netork beta: can connect cars but it's really laggy; --- .../Scripts/MSSceneControllerFree.cs | 4 ++-- .../Scripts/MSVehicleControllerFree.cs | 4 ++-- Assets/Prefabs/HeavyCar.prefab | 4 ++-- Assets/Prefabs/PlayerInstance.prefab | 4 ++-- Assets/Scenes/NetworkTest.unity | 4 ++-- Assets/Scripts/PlayerInstance.cs | 4 ++-- Assets/Scripts/PlayerNetworkManager.cs | 3 +++ Assets/Scripts/PlayerNetworkManager.cs.meta | 11 +++++++++++ 8 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 Assets/Scripts/PlayerNetworkManager.cs create mode 100644 Assets/Scripts/PlayerNetworkManager.cs.meta diff --git a/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSSceneControllerFree.cs b/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSSceneControllerFree.cs index 2b30c35..b934773 100644 --- a/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSSceneControllerFree.cs +++ b/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSSceneControllerFree.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f819b831444d63d3db9768d574bd836b9064118c649b84252df70154b75eace4 -size 20664 +oid sha256:9bdc066aacc8d16dd2407b81b6d4fadfe292bff05255d9941677bff98d6c9678 +size 28233 diff --git a/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSVehicleControllerFree.cs b/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSVehicleControllerFree.cs index 3c97f29..21d9240 100644 --- a/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSVehicleControllerFree.cs +++ b/Assets/Plugins/MSVehicleSystem(FreeVersion)/Scripts/MSVehicleControllerFree.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a4dd4c1a87df4a918f19cc5735a9208267b946ad416a6354ff97c207923ea38 -size 98838 +oid sha256:6eda21071fe8df20d287974be8192c45bf9636b65d56edf1c13927ffed2d3f9b +size 98855 diff --git a/Assets/Prefabs/HeavyCar.prefab b/Assets/Prefabs/HeavyCar.prefab index 67c024f..1bef4f3 100644 --- a/Assets/Prefabs/HeavyCar.prefab +++ b/Assets/Prefabs/HeavyCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a6813579a0017d74a31c93b97e2d01e5bb98e53673b1d0154600481606a797e -size 16612 +oid sha256:daba195132e3478d2de263b1410318657dc261b54539fa19b80da189263e3f88 +size 25059 diff --git a/Assets/Prefabs/PlayerInstance.prefab b/Assets/Prefabs/PlayerInstance.prefab index f421218..00c1ca6 100644 --- a/Assets/Prefabs/PlayerInstance.prefab +++ b/Assets/Prefabs/PlayerInstance.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0df260561b429c502d51afaeecb5de4408f9d77f1cb7f2a6adba96b6d2efe444 -size 2163 +oid sha256:c661fc6e36e82ec127c0c14ead9094a25648ed30734faaf4f69bc3d312bf65f7 +size 2060 diff --git a/Assets/Scenes/NetworkTest.unity b/Assets/Scenes/NetworkTest.unity index 4608216..279f2fd 100644 --- a/Assets/Scenes/NetworkTest.unity +++ b/Assets/Scenes/NetworkTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd06950fade08acaaee7b5742320d2990c8c57ae60b0d0573ed5665e22511a0f -size 13082 +oid sha256:71ccf7a87fd131dc34a22b68fa19756ea2bbb9a58541b9b15dd7e37d4d559453 +size 21015 diff --git a/Assets/Scripts/PlayerInstance.cs b/Assets/Scripts/PlayerInstance.cs index 40a2df8..6120dd0 100644 --- a/Assets/Scripts/PlayerInstance.cs +++ b/Assets/Scripts/PlayerInstance.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3de409b2b2b4fdeae0c9898e9dbe9a2944f717cfa450fc0864af4ba4f750350 -size 959 +oid sha256:db0481f3e7944fec4d9381a848900ca24848edb922752e16738eb1064fdaefda +size 980 diff --git a/Assets/Scripts/PlayerNetworkManager.cs b/Assets/Scripts/PlayerNetworkManager.cs new file mode 100644 index 0000000..96f3df2 --- /dev/null +++ b/Assets/Scripts/PlayerNetworkManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb4887330075ee921a19275d61fa7f27125f014c863fd45244c39353cc43a661 +size 971 diff --git a/Assets/Scripts/PlayerNetworkManager.cs.meta b/Assets/Scripts/PlayerNetworkManager.cs.meta new file mode 100644 index 0000000..dcfdb57 --- /dev/null +++ b/Assets/Scripts/PlayerNetworkManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 857fc232f8ba812419d48025b79dae8e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From cbcebccbd5353337afcee76e970a7c1896e8204f Mon Sep 17 00:00:00 2001 From: "hugo.baldassin@epitech.eu" Date: Sat, 20 Apr 2019 07:36:17 +0200 Subject: [PATCH 3/8] [EDIT0] drift sound on stop fixed, still triggers some times on collision; --- Assets/Prefabs/HeavyCar.prefab | 4 ++-- Assets/Prefabs/LightCar.prefab | 4 ++-- Assets/Prefabs/MediumCar.prefab | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/HeavyCar.prefab b/Assets/Prefabs/HeavyCar.prefab index 1bef4f3..19d484b 100644 --- a/Assets/Prefabs/HeavyCar.prefab +++ b/Assets/Prefabs/HeavyCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daba195132e3478d2de263b1410318657dc261b54539fa19b80da189263e3f88 -size 25059 +oid sha256:c1ef9811aa82127e44cb78d9c56e67f0a8381eadb9fda120af1e3c8f96358612 +size 25061 diff --git a/Assets/Prefabs/LightCar.prefab b/Assets/Prefabs/LightCar.prefab index 75d2c21..b004b10 100644 --- a/Assets/Prefabs/LightCar.prefab +++ b/Assets/Prefabs/LightCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c3ca33845d0a7a8b859e42f7e9ba2909c4cb9e1188291751026227310aa2dfc -size 14043 +oid sha256:fb73dbcaeab18f4af04da77ae3ddee0b5eb71223ec8dda986dfb6c2a5298b9a9 +size 14029 diff --git a/Assets/Prefabs/MediumCar.prefab b/Assets/Prefabs/MediumCar.prefab index 33ef769..500e5c3 100644 --- a/Assets/Prefabs/MediumCar.prefab +++ b/Assets/Prefabs/MediumCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3dcc3efbd6840c70519c9d2a189252d27d753df05019ad1d6a3ff2c63003459 -size 13837 +oid sha256:4fca8ea4177487a17e0ea405101a74558ad0e60866482f0a9043e01582f6c83d +size 13824 From fd03fd157fbfe6d8de3745d0df85861ff509b2f9 Mon Sep 17 00:00:00 2001 From: "hugo.baldassin@epitech.eu" Date: Sat, 20 Apr 2019 07:59:00 +0200 Subject: [PATCH 4/8] [EDIT] push car prefabs; --- Assets/Prefabs/HeavyCar.prefab | 4 ++-- Assets/Prefabs/HyperDriftCar.prefab | 4 ++-- Assets/Prefabs/LightCar.prefab | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/HeavyCar.prefab b/Assets/Prefabs/HeavyCar.prefab index 19d484b..8c5ea0f 100644 --- a/Assets/Prefabs/HeavyCar.prefab +++ b/Assets/Prefabs/HeavyCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1ef9811aa82127e44cb78d9c56e67f0a8381eadb9fda120af1e3c8f96358612 -size 25061 +oid sha256:72caa4812221f90bf7ec2236a254f028a420ab78b83f483d2c762ee5efd92a0b +size 25249 diff --git a/Assets/Prefabs/HyperDriftCar.prefab b/Assets/Prefabs/HyperDriftCar.prefab index d19384d..3a7a343 100644 --- a/Assets/Prefabs/HyperDriftCar.prefab +++ b/Assets/Prefabs/HyperDriftCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7b3322d6afb0853498ff538bfc5e6ebc2ddc60204fb86aba959ea72b9116a25 -size 2484 +oid sha256:4a0d295c8e5fd6e8ffd99ec6f4a2f32a40af192cf3b47776089730a27ef26c08 +size 3995 diff --git a/Assets/Prefabs/LightCar.prefab b/Assets/Prefabs/LightCar.prefab index b004b10..fe18c0b 100644 --- a/Assets/Prefabs/LightCar.prefab +++ b/Assets/Prefabs/LightCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb73dbcaeab18f4af04da77ae3ddee0b5eb71223ec8dda986dfb6c2a5298b9a9 -size 14029 +oid sha256:c35b9e1fb61c5b4ada8bbddd111ac33bbf260bac8bf9921d714d8c2aeb21cab2 +size 14035 From e7ad60c7809295100842392a9539b18c8e1b5c46 Mon Sep 17 00:00:00 2001 From: Aedanc Date: Sat, 20 Apr 2019 15:08:22 +0900 Subject: [PATCH 5/8] Mashalla le network est ok --- Assets/Menus/Lobby/CarPlatform.blend.meta | 1 + Assets/Plugins/TextMesh Pro/Documentation.meta | 8 -------- Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta | 8 -------- .../TextMesh Pro/Examples & Extras/Materials.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta | 9 --------- .../Resources/Color Gradient Presets.meta | 8 -------- .../Examples & Extras/Resources/Fonts & Materials.meta | 9 --------- .../Examples & Extras/Resources/Sprite Assets.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Scenes.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Scripts.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Sprites.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Textures.meta | 9 --------- Assets/Plugins/TextMesh Pro/Sprites.meta | 8 -------- Assets/Prefabs/HeavyCar.prefab | 4 ++-- Assets/Scenes/NetworkTest.unity | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 ++-- 16 files changed, 6 insertions(+), 109 deletions(-) delete mode 100644 Assets/Plugins/TextMesh Pro/Documentation.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Sprites.meta diff --git a/Assets/Menus/Lobby/CarPlatform.blend.meta b/Assets/Menus/Lobby/CarPlatform.blend.meta index 99b931d..4f08b79 100644 --- a/Assets/Menus/Lobby/CarPlatform.blend.meta +++ b/Assets/Menus/Lobby/CarPlatform.blend.meta @@ -66,6 +66,7 @@ ModelImporter: 4300016: headlight 7400000: Default Take 9500000: //RootNode + 2186277476908879412: ImportLogs externalObjects: {} materials: importMaterials: 1 diff --git a/Assets/Plugins/TextMesh Pro/Documentation.meta b/Assets/Plugins/TextMesh Pro/Documentation.meta deleted file mode 100644 index afa527a..0000000 --- a/Assets/Plugins/TextMesh Pro/Documentation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e7e8f5a82a3a134e91c54efd2274ea9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta deleted file mode 100644 index 37020f0..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b63e0053080646b9819789bf3bf9fa17 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta deleted file mode 100644 index dbedf7c..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5808953df7a24274a851aa6dee52d30e -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta deleted file mode 100644 index 4881085..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5bff2544887143f5807c7d5059d07f79 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta deleted file mode 100644 index 69552ee..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7f422cd1388b01047a58cd07c7a23d9d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta deleted file mode 100644 index 846e80b..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 4f1e85c79acf49968737939ce8b445c7 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta deleted file mode 100644 index 294a767..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3ac6db30e75b49b282a3564110579f27 -folderAsset: yes -timeCreated: 1480573362 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta deleted file mode 100644 index 8520f88..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: db1090641b3241f6995b587eb21637bc -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta deleted file mode 100644 index 225345e..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3979ce59e55144c89a2b3b3f8dcf7fd3 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta deleted file mode 100644 index bafd122..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 701e577af2ba48b689972d42efb95456 -folderAsset: yes -timeCreated: 1488176891 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta deleted file mode 100644 index 2a358f6..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6e5c6d5e25574122a7a12dbdbbeed156 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Sprites.meta b/Assets/Plugins/TextMesh Pro/Sprites.meta deleted file mode 100644 index 8b699e5..0000000 --- a/Assets/Plugins/TextMesh Pro/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d0603b6d5186471b96c778c3949c7ce2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/HeavyCar.prefab b/Assets/Prefabs/HeavyCar.prefab index 8c5ea0f..92250a0 100644 --- a/Assets/Prefabs/HeavyCar.prefab +++ b/Assets/Prefabs/HeavyCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72caa4812221f90bf7ec2236a254f028a420ab78b83f483d2c762ee5efd92a0b -size 25249 +oid sha256:3b0f14216edb2c73455aa86ddc2fe4e1aa4f18a5635851df97603757f1407048 +size 25250 diff --git a/Assets/Scenes/NetworkTest.unity b/Assets/Scenes/NetworkTest.unity index 279f2fd..c1bcab9 100644 --- a/Assets/Scenes/NetworkTest.unity +++ b/Assets/Scenes/NetworkTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71ccf7a87fd131dc34a22b68fa19756ea2bbb9a58541b9b15dd7e37d4d559453 +oid sha256:7cec63abf0dbabdaee18931038e69b151741e7aced2f3f739d0177ef1e38f325 size 21015 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index cfa402e..b7b1bbc 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad8df9bf97dbf28596225b123b57543113458cf4ff2a496c7abc939b2287c28a -size 458 +oid sha256:0a1a448c7c9453e4594bfe680c11c9c838796ccbe8dac3461161bd7b68838174 +size 558 From f034388fbd16b0bdd086072f432ee8e877144791 Mon Sep 17 00:00:00 2001 From: Nathan Scutari Date: Sun, 21 Apr 2019 20:16:16 +0900 Subject: [PATCH 6/8] Objectives / Game management / Stats Scripts --- Assets/Prefabs/SpawnPoint.prefab | 3 +++ Assets/Prefabs/SpawnPoint.prefab.meta | 7 +++++++ Assets/Prefabs/Waypoint.prefab | 3 +++ Assets/Prefabs/Waypoint.prefab.meta | 7 +++++++ Assets/Resources/Waypoint 1.mat | 3 +++ Assets/Resources/Waypoint 1.mat.meta | 8 ++++++++ Assets/Resources/Waypoint.mat | 3 +++ Assets/Resources/Waypoint.mat.meta | 8 ++++++++ Assets/Scenes/NetworkTest.unity | 4 ++-- .../Resources.meta => Scripts/Game Management.meta} | 5 ++--- Assets/Scripts/Game Management/GameManager.cs | 3 +++ Assets/Scripts/Game Management/GameManager.cs.meta | 11 +++++++++++ Assets/Scripts/Game Management/Host Stats Tracker.cs | 3 +++ .../Game Management/Host Stats Tracker.cs.meta | 11 +++++++++++ .../Scripts/{ => Game Management}/PlayerInstance.cs | 0 .../{ => Game Management}/PlayerInstance.cs.meta | 0 Assets/Scripts/Game Management/PlayerStats.cs | 3 +++ Assets/Scripts/Game Management/PlayerStats.cs.meta | 11 +++++++++++ Assets/Scripts/Objectives.meta | 8 ++++++++ Assets/Scripts/Objectives/IObjective.cs | 3 +++ Assets/Scripts/Objectives/IObjective.cs.meta | 11 +++++++++++ Assets/Scripts/Objectives/Ob_Kills.cs | 3 +++ Assets/Scripts/Objectives/Ob_Kills.cs.meta | 11 +++++++++++ Assets/Scripts/Objectives/Ob_Waypoints.cs | 3 +++ Assets/Scripts/Objectives/Ob_Waypoints.cs.meta | 11 +++++++++++ Assets/Scripts/Objectives/ObjectiveManager.cs | 3 +++ Assets/Scripts/Objectives/ObjectiveManager.cs.meta | 11 +++++++++++ Assets/Scripts/Objectives/Waypoint.cs | 3 +++ Assets/Scripts/Objectives/Waypoint.cs.meta | 11 +++++++++++ Assets/SpawnPoint.cs | 3 +++ Assets/SpawnPoint.cs.meta | 11 +++++++++++ ProjectSettings/EditorBuildSettings.asset | 2 +- ProjectSettings/TagManager.asset | 4 ++-- 33 files changed, 183 insertions(+), 8 deletions(-) create mode 100644 Assets/Prefabs/SpawnPoint.prefab create mode 100644 Assets/Prefabs/SpawnPoint.prefab.meta create mode 100644 Assets/Prefabs/Waypoint.prefab create mode 100644 Assets/Prefabs/Waypoint.prefab.meta create mode 100644 Assets/Resources/Waypoint 1.mat create mode 100644 Assets/Resources/Waypoint 1.mat.meta create mode 100644 Assets/Resources/Waypoint.mat create mode 100644 Assets/Resources/Waypoint.mat.meta rename Assets/{Plugins/TextMesh Pro/Examples & Extras/Resources.meta => Scripts/Game Management.meta} (58%) create mode 100644 Assets/Scripts/Game Management/GameManager.cs create mode 100644 Assets/Scripts/Game Management/GameManager.cs.meta create mode 100644 Assets/Scripts/Game Management/Host Stats Tracker.cs create mode 100644 Assets/Scripts/Game Management/Host Stats Tracker.cs.meta rename Assets/Scripts/{ => Game Management}/PlayerInstance.cs (100%) rename Assets/Scripts/{ => Game Management}/PlayerInstance.cs.meta (100%) create mode 100644 Assets/Scripts/Game Management/PlayerStats.cs create mode 100644 Assets/Scripts/Game Management/PlayerStats.cs.meta create mode 100644 Assets/Scripts/Objectives.meta create mode 100644 Assets/Scripts/Objectives/IObjective.cs create mode 100644 Assets/Scripts/Objectives/IObjective.cs.meta create mode 100644 Assets/Scripts/Objectives/Ob_Kills.cs create mode 100644 Assets/Scripts/Objectives/Ob_Kills.cs.meta create mode 100644 Assets/Scripts/Objectives/Ob_Waypoints.cs create mode 100644 Assets/Scripts/Objectives/Ob_Waypoints.cs.meta create mode 100644 Assets/Scripts/Objectives/ObjectiveManager.cs create mode 100644 Assets/Scripts/Objectives/ObjectiveManager.cs.meta create mode 100644 Assets/Scripts/Objectives/Waypoint.cs create mode 100644 Assets/Scripts/Objectives/Waypoint.cs.meta create mode 100644 Assets/SpawnPoint.cs create mode 100644 Assets/SpawnPoint.cs.meta diff --git a/Assets/Prefabs/SpawnPoint.prefab b/Assets/Prefabs/SpawnPoint.prefab new file mode 100644 index 0000000..4604733 --- /dev/null +++ b/Assets/Prefabs/SpawnPoint.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0f26a4c03739c5530e95904b6ffa57942379342789911fdccb58f60f0efaafb +size 5829 diff --git a/Assets/Prefabs/SpawnPoint.prefab.meta b/Assets/Prefabs/SpawnPoint.prefab.meta new file mode 100644 index 0000000..74a4ea7 --- /dev/null +++ b/Assets/Prefabs/SpawnPoint.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d33cdf52097e1e14ca5df08e4def257b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Waypoint.prefab b/Assets/Prefabs/Waypoint.prefab new file mode 100644 index 0000000..7c1ab4e --- /dev/null +++ b/Assets/Prefabs/Waypoint.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aefaa8ed873274f243ea66772a3a9982ddfac5853af80f5213130707bf7fa591 +size 118312 diff --git a/Assets/Prefabs/Waypoint.prefab.meta b/Assets/Prefabs/Waypoint.prefab.meta new file mode 100644 index 0000000..24f95c6 --- /dev/null +++ b/Assets/Prefabs/Waypoint.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2df2b072e3719f949b1bb88534440bef +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Waypoint 1.mat b/Assets/Resources/Waypoint 1.mat new file mode 100644 index 0000000..ab8a673 --- /dev/null +++ b/Assets/Resources/Waypoint 1.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2fe5af6e1aa0bc2f5075138d0f669e1c52b01d93711ae80d0a4b1e6ca7a9125 +size 2059 diff --git a/Assets/Resources/Waypoint 1.mat.meta b/Assets/Resources/Waypoint 1.mat.meta new file mode 100644 index 0000000..28d0d8f --- /dev/null +++ b/Assets/Resources/Waypoint 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d06a927eeb382b4ebae9cf1fe8fd827 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Waypoint.mat b/Assets/Resources/Waypoint.mat new file mode 100644 index 0000000..a5f357c --- /dev/null +++ b/Assets/Resources/Waypoint.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d56676ade169380f3603f7f1323f9fa91d96340ae1ac53b2f7d95b690bcb9bd +size 2030 diff --git a/Assets/Resources/Waypoint.mat.meta b/Assets/Resources/Waypoint.mat.meta new file mode 100644 index 0000000..108ec2c --- /dev/null +++ b/Assets/Resources/Waypoint.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e067896124b483479e7b5cf7c86e55b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/NetworkTest.unity b/Assets/Scenes/NetworkTest.unity index c1bcab9..19f5534 100644 --- a/Assets/Scenes/NetworkTest.unity +++ b/Assets/Scenes/NetworkTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cec63abf0dbabdaee18931038e69b151741e7aced2f3f739d0177ef1e38f325 -size 21015 +oid sha256:bec514546c4628f92fd2d908804adc99c2f4dd56e1de409e3367e96e25a86112 +size 21012 diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources.meta b/Assets/Scripts/Game Management.meta similarity index 58% rename from Assets/Plugins/TextMesh Pro/Examples & Extras/Resources.meta rename to Assets/Scripts/Game Management.meta index 8ba2a4c..945841f 100644 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources.meta +++ b/Assets/Scripts/Game Management.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: d6d3a169ad794942a21da6a552d62f6f +guid: a056e6392d96d6f4e9bea779cd6fba3e folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs new file mode 100644 index 0000000..36e1334 --- /dev/null +++ b/Assets/Scripts/Game Management/GameManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c81782378bebe242a7d7d7ab0bb9aa961e949cf38991273edf335c5a5cab503 +size 1879 diff --git a/Assets/Scripts/Game Management/GameManager.cs.meta b/Assets/Scripts/Game Management/GameManager.cs.meta new file mode 100644 index 0000000..c8d7f8d --- /dev/null +++ b/Assets/Scripts/Game Management/GameManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d2c1b5657bb7a0b4c961a8c81303414b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game Management/Host Stats Tracker.cs b/Assets/Scripts/Game Management/Host Stats Tracker.cs new file mode 100644 index 0000000..a9c6b7a --- /dev/null +++ b/Assets/Scripts/Game Management/Host Stats Tracker.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f640a7aadbe7d4fac95671a75d7d826dd8216d88ea9cc33e7655dd39a850bda8 +size 690 diff --git a/Assets/Scripts/Game Management/Host Stats Tracker.cs.meta b/Assets/Scripts/Game Management/Host Stats Tracker.cs.meta new file mode 100644 index 0000000..88cc5ae --- /dev/null +++ b/Assets/Scripts/Game Management/Host Stats Tracker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 848ff6a5424ad9a4e80efd178fbc6040 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerInstance.cs b/Assets/Scripts/Game Management/PlayerInstance.cs similarity index 100% rename from Assets/Scripts/PlayerInstance.cs rename to Assets/Scripts/Game Management/PlayerInstance.cs diff --git a/Assets/Scripts/PlayerInstance.cs.meta b/Assets/Scripts/Game Management/PlayerInstance.cs.meta similarity index 100% rename from Assets/Scripts/PlayerInstance.cs.meta rename to Assets/Scripts/Game Management/PlayerInstance.cs.meta diff --git a/Assets/Scripts/Game Management/PlayerStats.cs b/Assets/Scripts/Game Management/PlayerStats.cs new file mode 100644 index 0000000..f1dfb23 --- /dev/null +++ b/Assets/Scripts/Game Management/PlayerStats.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:226081674c5c17563f87423ed1f8477d35e17aa8f94969029866b4bba38eeb8f +size 938 diff --git a/Assets/Scripts/Game Management/PlayerStats.cs.meta b/Assets/Scripts/Game Management/PlayerStats.cs.meta new file mode 100644 index 0000000..4ea4036 --- /dev/null +++ b/Assets/Scripts/Game Management/PlayerStats.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2148f7db7bdd7b843a5cb2a0ee6fd343 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives.meta b/Assets/Scripts/Objectives.meta new file mode 100644 index 0000000..fa0cf92 --- /dev/null +++ b/Assets/Scripts/Objectives.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 627590ca914c2e54d89ef83efd4b231c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/IObjective.cs b/Assets/Scripts/Objectives/IObjective.cs new file mode 100644 index 0000000..d61a59d --- /dev/null +++ b/Assets/Scripts/Objectives/IObjective.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3b52db27de92f9a9ec97dfb6487c3bbfabac6f359f15306d453b82ef277210e +size 458 diff --git a/Assets/Scripts/Objectives/IObjective.cs.meta b/Assets/Scripts/Objectives/IObjective.cs.meta new file mode 100644 index 0000000..52ce335 --- /dev/null +++ b/Assets/Scripts/Objectives/IObjective.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 06142e722c3646d4f8ea99a91cdb7179 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Ob_Kills.cs b/Assets/Scripts/Objectives/Ob_Kills.cs new file mode 100644 index 0000000..9214833 --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Kills.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da74bd5f241d1ddf39c14fa7da6d5c8e1851a385c2c6adbc8f96428ae73644a4 +size 638 diff --git a/Assets/Scripts/Objectives/Ob_Kills.cs.meta b/Assets/Scripts/Objectives/Ob_Kills.cs.meta new file mode 100644 index 0000000..3e837a5 --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Kills.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f8ab9b8b82756ff4b81adddd2304b4a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Ob_Waypoints.cs b/Assets/Scripts/Objectives/Ob_Waypoints.cs new file mode 100644 index 0000000..b9df69f --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Waypoints.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c36588675321f627279e3b7bb61041b7eafd6494621a838221cb6dd1bbb28f52 +size 2008 diff --git a/Assets/Scripts/Objectives/Ob_Waypoints.cs.meta b/Assets/Scripts/Objectives/Ob_Waypoints.cs.meta new file mode 100644 index 0000000..67695cb --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Waypoints.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c0ef53be477712040b4ae8d8325ca9ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/ObjectiveManager.cs b/Assets/Scripts/Objectives/ObjectiveManager.cs new file mode 100644 index 0000000..ba0b0b1 --- /dev/null +++ b/Assets/Scripts/Objectives/ObjectiveManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9224a9691e43627a04c216fd040bf298832be7cb127c5317dc6d3ead072fb0f0 +size 1130 diff --git a/Assets/Scripts/Objectives/ObjectiveManager.cs.meta b/Assets/Scripts/Objectives/ObjectiveManager.cs.meta new file mode 100644 index 0000000..e5d4180 --- /dev/null +++ b/Assets/Scripts/Objectives/ObjectiveManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ca8ac0919c0b5e444b3a1febfae5c3d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Waypoint.cs b/Assets/Scripts/Objectives/Waypoint.cs new file mode 100644 index 0000000..1987571 --- /dev/null +++ b/Assets/Scripts/Objectives/Waypoint.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5880a07836f751a1d721d649edf318caa330cfa402bddfb921bd78d942dd7121 +size 683 diff --git a/Assets/Scripts/Objectives/Waypoint.cs.meta b/Assets/Scripts/Objectives/Waypoint.cs.meta new file mode 100644 index 0000000..4d43e40 --- /dev/null +++ b/Assets/Scripts/Objectives/Waypoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2db15edfcbb9b72439d4df026f4eff44 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SpawnPoint.cs b/Assets/SpawnPoint.cs new file mode 100644 index 0000000..d0f705e --- /dev/null +++ b/Assets/SpawnPoint.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3070492bd3c8fef036cd1a3482837137d4a39595ee6d6f3df594f9ac817dcc3 +size 286 diff --git a/Assets/SpawnPoint.cs.meta b/Assets/SpawnPoint.cs.meta new file mode 100644 index 0000000..5b02b7b --- /dev/null +++ b/Assets/SpawnPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9bc0a00d930e6e84bae5638ed9662f1b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b7b1bbc..732603b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a1a448c7c9453e4594bfe680c11c9c838796ccbe8dac3461161bd7b68838174 +oid sha256:46cf77e1c7d4a819696ffa92de1940d8db696c772c823ff423162c1fd306ecb2 size 558 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 4b69f59..68c294b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e18b1c820e9c09e16bbd1f1b7842e9fb3b0158a0921b0964e0b8fa12c6e2c01 -size 378 +oid sha256:fc2613c1c46a4f940868fb2c68d7542496dea9b5c938c12b34c6375a1199ca76 +size 403 From c6bace698abf9892f5bc474e884932225a76c8aa Mon Sep 17 00:00:00 2001 From: Nathan Scutari Date: Sun, 21 Apr 2019 20:17:21 +0900 Subject: [PATCH 7/8] Objectives / Game management / Stats Scripts --- Assets/SpawnPoint.cs | 3 --- Assets/SpawnPoint.cs.meta | 11 ----------- 2 files changed, 14 deletions(-) delete mode 100644 Assets/SpawnPoint.cs delete mode 100644 Assets/SpawnPoint.cs.meta diff --git a/Assets/SpawnPoint.cs b/Assets/SpawnPoint.cs deleted file mode 100644 index d0f705e..0000000 --- a/Assets/SpawnPoint.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3070492bd3c8fef036cd1a3482837137d4a39595ee6d6f3df594f9ac817dcc3 -size 286 diff --git a/Assets/SpawnPoint.cs.meta b/Assets/SpawnPoint.cs.meta deleted file mode 100644 index 5b02b7b..0000000 --- a/Assets/SpawnPoint.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9bc0a00d930e6e84bae5638ed9662f1b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From 219f06b4ae9eca75ae2b61b2495e6ad6f71f555a Mon Sep 17 00:00:00 2001 From: Nathan Scutari Date: Mon, 22 Apr 2019 00:52:30 +0900 Subject: [PATCH 8/8] local simulator with waypoints objective --- Assets/PrefabStock.cs | 3 + Assets/PrefabStock.cs.meta | 11 +++ Assets/Prefabs/Core.meta | 8 ++ Assets/Prefabs/Core/Arrow.prefab | 3 + Assets/Prefabs/Core/Arrow.prefab.meta | 7 ++ Assets/Prefabs/Core/SpawnPoint.prefab | 3 + .../Prefabs/{ => Core}/SpawnPoint.prefab.meta | 0 Assets/Prefabs/Core/Waypoint.prefab | 3 + .../Prefabs/{ => Core}/Waypoint.prefab.meta | 0 Assets/Prefabs/Core/arrow.obj.meta | 99 +++++++++++++++++++ Assets/Prefabs/SpawnPoint.prefab | 3 - Assets/Prefabs/Waypoint.prefab | 3 - Assets/Resources/Waypoint 1.mat | 4 +- Assets/Scenes/Local Simulator.unity | 3 + Assets/Scenes/Local Simulator.unity.meta | 7 ++ Assets/Scripts/Game Management/GameManager.cs | 4 +- .../Game Management/Host Stats Tracker.cs | 4 +- .../Game Management/ObjectiveManager.cs | 3 + .../ObjectiveManager.cs.meta | 0 Assets/Scripts/Game Management/SpawnPoint.cs | 3 + .../Game Management/SpawnPoint.cs.meta | 11 +++ Assets/Scripts/Objectives/IObjective.cs | 4 +- Assets/Scripts/Objectives/Ob_Hold.cs | 3 + Assets/Scripts/Objectives/Ob_Hold.cs.meta | 11 +++ Assets/Scripts/Objectives/Ob_Kills.cs | 4 +- Assets/Scripts/Objectives/Ob_Waypoints.cs | 4 +- Assets/Scripts/Objectives/ObjectiveManager.cs | 3 - Assets/Scripts/Objectives/Prefabs.meta | 8 ++ .../Objectives/Prefabs/Ob_Kills.prefab | 3 + .../Objectives/Prefabs/Ob_Kills.prefab.meta | 7 ++ .../Objectives/Prefabs/Ob_Waypoints.prefab | 3 + .../Prefabs/Ob_Waypoints.prefab.meta | 7 ++ Assets/Scripts/Objectives/Waypoint.cs | 4 +- .../Objectives/arrow-sketchup-yz-y.obj.meta | 99 +++++++++++++++++++ 34 files changed, 319 insertions(+), 23 deletions(-) create mode 100644 Assets/PrefabStock.cs create mode 100644 Assets/PrefabStock.cs.meta create mode 100644 Assets/Prefabs/Core.meta create mode 100644 Assets/Prefabs/Core/Arrow.prefab create mode 100644 Assets/Prefabs/Core/Arrow.prefab.meta create mode 100644 Assets/Prefabs/Core/SpawnPoint.prefab rename Assets/Prefabs/{ => Core}/SpawnPoint.prefab.meta (100%) create mode 100644 Assets/Prefabs/Core/Waypoint.prefab rename Assets/Prefabs/{ => Core}/Waypoint.prefab.meta (100%) create mode 100644 Assets/Prefabs/Core/arrow.obj.meta delete mode 100644 Assets/Prefabs/SpawnPoint.prefab delete mode 100644 Assets/Prefabs/Waypoint.prefab create mode 100644 Assets/Scenes/Local Simulator.unity create mode 100644 Assets/Scenes/Local Simulator.unity.meta create mode 100644 Assets/Scripts/Game Management/ObjectiveManager.cs rename Assets/Scripts/{Objectives => Game Management}/ObjectiveManager.cs.meta (100%) create mode 100644 Assets/Scripts/Game Management/SpawnPoint.cs create mode 100644 Assets/Scripts/Game Management/SpawnPoint.cs.meta create mode 100644 Assets/Scripts/Objectives/Ob_Hold.cs create mode 100644 Assets/Scripts/Objectives/Ob_Hold.cs.meta delete mode 100644 Assets/Scripts/Objectives/ObjectiveManager.cs create mode 100644 Assets/Scripts/Objectives/Prefabs.meta create mode 100644 Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab create mode 100644 Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta create mode 100644 Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab create mode 100644 Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta create mode 100644 Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta diff --git a/Assets/PrefabStock.cs b/Assets/PrefabStock.cs new file mode 100644 index 0000000..12084de --- /dev/null +++ b/Assets/PrefabStock.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:202846e687fb376fe8501ce0d2e7dfa068c64b762d76acf7e96eb0c1dbb1beb7 +size 170 diff --git a/Assets/PrefabStock.cs.meta b/Assets/PrefabStock.cs.meta new file mode 100644 index 0000000..e72a1fe --- /dev/null +++ b/Assets/PrefabStock.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d108ea5449e40394f826491026a514b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Core.meta b/Assets/Prefabs/Core.meta new file mode 100644 index 0000000..bec6f47 --- /dev/null +++ b/Assets/Prefabs/Core.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55d75d195690abe49bb3ce6dfcd3fcdb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Core/Arrow.prefab b/Assets/Prefabs/Core/Arrow.prefab new file mode 100644 index 0000000..2fe5d3e --- /dev/null +++ b/Assets/Prefabs/Core/Arrow.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:787f1745f3a3e510e2d9bb4cfc0107633e177913921011d361a9edc424ec2348 +size 4667 diff --git a/Assets/Prefabs/Core/Arrow.prefab.meta b/Assets/Prefabs/Core/Arrow.prefab.meta new file mode 100644 index 0000000..d71ac6b --- /dev/null +++ b/Assets/Prefabs/Core/Arrow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: be38bed7caf53c140987d5fe0b289a7c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Core/SpawnPoint.prefab b/Assets/Prefabs/Core/SpawnPoint.prefab new file mode 100644 index 0000000..1f96cdd --- /dev/null +++ b/Assets/Prefabs/Core/SpawnPoint.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c19758c231bb76c36185e0d4888dbb765340d0107194a30e2e602cb272565e86 +size 5820 diff --git a/Assets/Prefabs/SpawnPoint.prefab.meta b/Assets/Prefabs/Core/SpawnPoint.prefab.meta similarity index 100% rename from Assets/Prefabs/SpawnPoint.prefab.meta rename to Assets/Prefabs/Core/SpawnPoint.prefab.meta diff --git a/Assets/Prefabs/Core/Waypoint.prefab b/Assets/Prefabs/Core/Waypoint.prefab new file mode 100644 index 0000000..79b256a --- /dev/null +++ b/Assets/Prefabs/Core/Waypoint.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f498f143d9dfb8f3a9c67569aa26b011c5925026783dadc6b3fa1bbe0f98b5ba +size 118321 diff --git a/Assets/Prefabs/Waypoint.prefab.meta b/Assets/Prefabs/Core/Waypoint.prefab.meta similarity index 100% rename from Assets/Prefabs/Waypoint.prefab.meta rename to Assets/Prefabs/Core/Waypoint.prefab.meta diff --git a/Assets/Prefabs/Core/arrow.obj.meta b/Assets/Prefabs/Core/arrow.obj.meta new file mode 100644 index 0000000..3da1490 --- /dev/null +++ b/Assets/Prefabs/Core/arrow.obj.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 0e8d8faeb7386b14689a7745abe865cb +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 100002: default + 400000: //RootNode + 400002: default + 2100000: defaultMat + 2300000: default + 3300000: default + 4300000: default + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/SpawnPoint.prefab b/Assets/Prefabs/SpawnPoint.prefab deleted file mode 100644 index 4604733..0000000 --- a/Assets/Prefabs/SpawnPoint.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0f26a4c03739c5530e95904b6ffa57942379342789911fdccb58f60f0efaafb -size 5829 diff --git a/Assets/Prefabs/Waypoint.prefab b/Assets/Prefabs/Waypoint.prefab deleted file mode 100644 index 7c1ab4e..0000000 --- a/Assets/Prefabs/Waypoint.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aefaa8ed873274f243ea66772a3a9982ddfac5853af80f5213130707bf7fa591 -size 118312 diff --git a/Assets/Resources/Waypoint 1.mat b/Assets/Resources/Waypoint 1.mat index ab8a673..b5e29bb 100644 --- a/Assets/Resources/Waypoint 1.mat +++ b/Assets/Resources/Waypoint 1.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2fe5af6e1aa0bc2f5075138d0f669e1c52b01d93711ae80d0a4b1e6ca7a9125 -size 2059 +oid sha256:ebce9ff9ef02d8909fed8e3c34b5e0488fd9eeb7cbd7f25a1c5edaa24c11a2ad +size 2057 diff --git a/Assets/Scenes/Local Simulator.unity b/Assets/Scenes/Local Simulator.unity new file mode 100644 index 0000000..a8183cf --- /dev/null +++ b/Assets/Scenes/Local Simulator.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beb0b3e011b6bc347e0e10b0e434f172979f17a4b2b6444f32b926a5e9d53087 +size 56814 diff --git a/Assets/Scenes/Local Simulator.unity.meta b/Assets/Scenes/Local Simulator.unity.meta new file mode 100644 index 0000000..ba2196e --- /dev/null +++ b/Assets/Scenes/Local Simulator.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 353465e664c68874fad1ff3f4675237a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index 36e1334..dd03ebd 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:3c81782378bebe242a7d7d7ab0bb9aa961e949cf38991273edf335c5a5cab503 -size 1879 +oid sha256:42356d43cad6396ea918580afcdce9c9dd7814948e96a26d3dd3f4cdb2b4be0c +size 2910 diff --git a/Assets/Scripts/Game Management/Host Stats Tracker.cs b/Assets/Scripts/Game Management/Host Stats Tracker.cs index a9c6b7a..bb3f384 100644 --- a/Assets/Scripts/Game Management/Host Stats Tracker.cs +++ b/Assets/Scripts/Game Management/Host Stats Tracker.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f640a7aadbe7d4fac95671a75d7d826dd8216d88ea9cc33e7655dd39a850bda8 -size 690 +oid sha256:6b26521c11df72d49e7f6aa0a75ee1cbb635856171c1877982977fef745c5a9c +size 835 diff --git a/Assets/Scripts/Game Management/ObjectiveManager.cs b/Assets/Scripts/Game Management/ObjectiveManager.cs new file mode 100644 index 0000000..638b27d --- /dev/null +++ b/Assets/Scripts/Game Management/ObjectiveManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b930f921436653aef446248c9a1bfaba84315c9ba4181e63328e7ad59ee96adb +size 1715 diff --git a/Assets/Scripts/Objectives/ObjectiveManager.cs.meta b/Assets/Scripts/Game Management/ObjectiveManager.cs.meta similarity index 100% rename from Assets/Scripts/Objectives/ObjectiveManager.cs.meta rename to Assets/Scripts/Game Management/ObjectiveManager.cs.meta diff --git a/Assets/Scripts/Game Management/SpawnPoint.cs b/Assets/Scripts/Game Management/SpawnPoint.cs new file mode 100644 index 0000000..d0f705e --- /dev/null +++ b/Assets/Scripts/Game Management/SpawnPoint.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3070492bd3c8fef036cd1a3482837137d4a39595ee6d6f3df594f9ac817dcc3 +size 286 diff --git a/Assets/Scripts/Game Management/SpawnPoint.cs.meta b/Assets/Scripts/Game Management/SpawnPoint.cs.meta new file mode 100644 index 0000000..5b02b7b --- /dev/null +++ b/Assets/Scripts/Game Management/SpawnPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9bc0a00d930e6e84bae5638ed9662f1b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/IObjective.cs b/Assets/Scripts/Objectives/IObjective.cs index d61a59d..4832ffb 100644 --- a/Assets/Scripts/Objectives/IObjective.cs +++ b/Assets/Scripts/Objectives/IObjective.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3b52db27de92f9a9ec97dfb6487c3bbfabac6f359f15306d453b82ef277210e -size 458 +oid sha256:9c1b1bc8101aa90a8dd7b9cfa1b37dfe49fcedb0e4ba12c67d958e91cfad9839 +size 501 diff --git a/Assets/Scripts/Objectives/Ob_Hold.cs b/Assets/Scripts/Objectives/Ob_Hold.cs new file mode 100644 index 0000000..11efdc1 --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Hold.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aae7ee5d1d61d80553d2a1db5c1c06bb17d456487cf84eae738a348d36a3a69b +size 312 diff --git a/Assets/Scripts/Objectives/Ob_Hold.cs.meta b/Assets/Scripts/Objectives/Ob_Hold.cs.meta new file mode 100644 index 0000000..77e6238 --- /dev/null +++ b/Assets/Scripts/Objectives/Ob_Hold.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 877dc5d98d5e46143b38e50d71f457b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Ob_Kills.cs b/Assets/Scripts/Objectives/Ob_Kills.cs index 9214833..f52fa31 100644 --- a/Assets/Scripts/Objectives/Ob_Kills.cs +++ b/Assets/Scripts/Objectives/Ob_Kills.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da74bd5f241d1ddf39c14fa7da6d5c8e1851a385c2c6adbc8f96428ae73644a4 -size 638 +oid sha256:bab928c65c20e904d5b35ae18b4bc8ae178f14594197068fdf0bb85c30918130 +size 728 diff --git a/Assets/Scripts/Objectives/Ob_Waypoints.cs b/Assets/Scripts/Objectives/Ob_Waypoints.cs index b9df69f..2dbdb99 100644 --- a/Assets/Scripts/Objectives/Ob_Waypoints.cs +++ b/Assets/Scripts/Objectives/Ob_Waypoints.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c36588675321f627279e3b7bb61041b7eafd6494621a838221cb6dd1bbb28f52 -size 2008 +oid sha256:c7daa4f57d50bac00028352086f4d302b488baa066c4f96956bd9089f6284dcf +size 2495 diff --git a/Assets/Scripts/Objectives/ObjectiveManager.cs b/Assets/Scripts/Objectives/ObjectiveManager.cs deleted file mode 100644 index ba0b0b1..0000000 --- a/Assets/Scripts/Objectives/ObjectiveManager.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9224a9691e43627a04c216fd040bf298832be7cb127c5317dc6d3ead072fb0f0 -size 1130 diff --git a/Assets/Scripts/Objectives/Prefabs.meta b/Assets/Scripts/Objectives/Prefabs.meta new file mode 100644 index 0000000..f8d997f --- /dev/null +++ b/Assets/Scripts/Objectives/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5846b503ce6859345b887743ec9cb79c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab new file mode 100644 index 0000000..99e8e67 --- /dev/null +++ b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a929d6f4a45b4b4193071216844e8cff7416339958d1a6a9beb188f3796334a +size 1311 diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta new file mode 100644 index 0000000..d4ce302 --- /dev/null +++ b/Assets/Scripts/Objectives/Prefabs/Ob_Kills.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e4278a1b185a6ec4facb3b22f29b909e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab new file mode 100644 index 0000000..32e5847 --- /dev/null +++ b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcadb595d80224e567ae3427dedbb14627252b9b410d96a29f0914297f23bb58 +size 1319 diff --git a/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta new file mode 100644 index 0000000..ca952e5 --- /dev/null +++ b/Assets/Scripts/Objectives/Prefabs/Ob_Waypoints.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 01b3cb5c8e917db428f35e73152deaa9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Objectives/Waypoint.cs b/Assets/Scripts/Objectives/Waypoint.cs index 1987571..4544a79 100644 --- a/Assets/Scripts/Objectives/Waypoint.cs +++ b/Assets/Scripts/Objectives/Waypoint.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5880a07836f751a1d721d649edf318caa330cfa402bddfb921bd78d942dd7121 -size 683 +oid sha256:690bed6dbdf7a2de9cb690a525a8d685657ac36eb77815f24bed0f5220b4324f +size 755 diff --git a/Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta b/Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta new file mode 100644 index 0000000..6d357b0 --- /dev/null +++ b/Assets/Scripts/Objectives/arrow-sketchup-yz-y.obj.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 8df21cc64a497e949ba48920d8d57322 +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: //RootNode + 100002: default + 400000: //RootNode + 400002: default + 2100000: defaultMat + 2300000: default + 3300000: default + 4300000: default + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: