From 2a677068c3a941ebe87094269c636c0a9123e186 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 5 Feb 2023 18:49:13 +1100 Subject: [PATCH 1/3] OBSTACLE PRFFABFS --- Assets/Art Assets/Models/RockPile_obstacle.prefab | 3 +++ Assets/Art Assets/Models/RockPile_obstacle.prefab.meta | 7 +++++++ Assets/Art Assets/Models/Tree1 1.prefab | 2 +- Assets/Art Assets/Models/Tree1 2.prefab | 2 +- Assets/Art Assets/Models/Tree1 3.prefab | 2 +- Assets/Art Assets/Models/Tree1 4.prefab | 3 +++ Assets/Art Assets/Models/Tree1 4.prefab.meta | 7 +++++++ Assets/Art Assets/Models/Tree1.prefab | 2 +- Assets/Prefab/Tile_01_obstacle.prefab | 3 +++ Assets/Prefab/Tile_01_obstacle.prefab.meta | 7 +++++++ Assets/Prefab/Tile_02_obstacle.prefab | 3 +++ Assets/Prefab/Tile_02_obstacle.prefab.meta | 7 +++++++ 12 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 Assets/Art Assets/Models/RockPile_obstacle.prefab create mode 100644 Assets/Art Assets/Models/RockPile_obstacle.prefab.meta create mode 100644 Assets/Art Assets/Models/Tree1 4.prefab create mode 100644 Assets/Art Assets/Models/Tree1 4.prefab.meta create mode 100644 Assets/Prefab/Tile_01_obstacle.prefab create mode 100644 Assets/Prefab/Tile_01_obstacle.prefab.meta create mode 100644 Assets/Prefab/Tile_02_obstacle.prefab create mode 100644 Assets/Prefab/Tile_02_obstacle.prefab.meta diff --git a/Assets/Art Assets/Models/RockPile_obstacle.prefab b/Assets/Art Assets/Models/RockPile_obstacle.prefab new file mode 100644 index 0000000..57aae68 --- /dev/null +++ b/Assets/Art Assets/Models/RockPile_obstacle.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a750b698cc75f7dda308750afd674fa45aad95990df9ab8b6e8586a9d794bb4 +size 29993 diff --git a/Assets/Art Assets/Models/RockPile_obstacle.prefab.meta b/Assets/Art Assets/Models/RockPile_obstacle.prefab.meta new file mode 100644 index 0000000..8325c9c --- /dev/null +++ b/Assets/Art Assets/Models/RockPile_obstacle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8c6aea957cd47ea44bac73fce15ca440 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Models/Tree1 1.prefab b/Assets/Art Assets/Models/Tree1 1.prefab index 58cee14..7cb9d13 100644 --- a/Assets/Art Assets/Models/Tree1 1.prefab +++ b/Assets/Art Assets/Models/Tree1 1.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad45009d67077c0c24b1caef99ee05303afcb3a54f3908b058e086cf0ef42079 +oid sha256:6493e63bf2ef186df878635ba0de5edf753b280fece533d35021f9356c0b389c size 15008 diff --git a/Assets/Art Assets/Models/Tree1 2.prefab b/Assets/Art Assets/Models/Tree1 2.prefab index 5177373..5e465a2 100644 --- a/Assets/Art Assets/Models/Tree1 2.prefab +++ b/Assets/Art Assets/Models/Tree1 2.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c57e22e7200c8232692858b79667584e8bc646389a4dd293f3dcd93be2c00c0 +oid sha256:f75ae3089299c45b6cff4a788206cfdbdb64ecadb89dadb31219176fcf18aa4b size 16139 diff --git a/Assets/Art Assets/Models/Tree1 3.prefab b/Assets/Art Assets/Models/Tree1 3.prefab index 02571c7..0850527 100644 --- a/Assets/Art Assets/Models/Tree1 3.prefab +++ b/Assets/Art Assets/Models/Tree1 3.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94f85a67bb41ee5f9b3ec215399aa4952c16a9d5373c180948f748a028a60684 +oid sha256:9917176645e47b465cbb75a899c38f42b023df9e0053a91954aaa507e402efd4 size 16728 diff --git a/Assets/Art Assets/Models/Tree1 4.prefab b/Assets/Art Assets/Models/Tree1 4.prefab new file mode 100644 index 0000000..5ac7d7c --- /dev/null +++ b/Assets/Art Assets/Models/Tree1 4.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:990310f128c4968e1e2d504c996f7cc7982d152a4f501be474be6b85630fed6c +size 32240 diff --git a/Assets/Art Assets/Models/Tree1 4.prefab.meta b/Assets/Art Assets/Models/Tree1 4.prefab.meta new file mode 100644 index 0000000..adea22d --- /dev/null +++ b/Assets/Art Assets/Models/Tree1 4.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 27e23f110c0eb104ab4d0ce45e81ac31 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Models/Tree1.prefab b/Assets/Art Assets/Models/Tree1.prefab index 2e5a06e..821d166 100644 --- a/Assets/Art Assets/Models/Tree1.prefab +++ b/Assets/Art Assets/Models/Tree1.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd1127969efc14c549a3aa08c973e71c51a33bec1a6c559bdf22547974add860 +oid sha256:1059c0979fed2cb164b7512ff93a07aca68c29feb6eca50eacbf89ab52b6dc6f size 14422 diff --git a/Assets/Prefab/Tile_01_obstacle.prefab b/Assets/Prefab/Tile_01_obstacle.prefab new file mode 100644 index 0000000..a266299 --- /dev/null +++ b/Assets/Prefab/Tile_01_obstacle.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79a16b1c0d48fb1ef1a902e0e67d28789f18a16cf87c991682a8c9a60cf8f9f +size 6657 diff --git a/Assets/Prefab/Tile_01_obstacle.prefab.meta b/Assets/Prefab/Tile_01_obstacle.prefab.meta new file mode 100644 index 0000000..086a46d --- /dev/null +++ b/Assets/Prefab/Tile_01_obstacle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e5beeed0917dd204f8bfcad0337710e9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Tile_02_obstacle.prefab b/Assets/Prefab/Tile_02_obstacle.prefab new file mode 100644 index 0000000..d440f64 --- /dev/null +++ b/Assets/Prefab/Tile_02_obstacle.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c18b7ebf40ab3021e1efc5302ed00cb73345110b73cb2440081ac0af397c047e +size 14194 diff --git a/Assets/Prefab/Tile_02_obstacle.prefab.meta b/Assets/Prefab/Tile_02_obstacle.prefab.meta new file mode 100644 index 0000000..937c90a --- /dev/null +++ b/Assets/Prefab/Tile_02_obstacle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 369339ac2f938b34e998dd187315aa48 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From d13751bf3393594cc65645068c57d35311f144ec Mon Sep 17 00:00:00 2001 From: Joshua Date: Sun, 5 Feb 2023 18:49:37 +1100 Subject: [PATCH 2/3] Main level --- Assets/Scenes/Main.unity | 3 +++ Assets/Scenes/Main.unity.meta | 7 +++++++ Assets/Scripts/Route/TileManager.cs | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 Assets/Scenes/Main.unity create mode 100644 Assets/Scenes/Main.unity.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity new file mode 100644 index 0000000..29a2b04 --- /dev/null +++ b/Assets/Scenes/Main.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:846b79708e8bc05663504fcf3619d214a8ae4f1e380a9fb9049fb5084bc80568 +size 65091 diff --git a/Assets/Scenes/Main.unity.meta b/Assets/Scenes/Main.unity.meta new file mode 100644 index 0000000..1f19bdb --- /dev/null +++ b/Assets/Scenes/Main.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e913910dbb8a03f4aa58bb1712b2e5c2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Route/TileManager.cs b/Assets/Scripts/Route/TileManager.cs index dc661c7..e1009b0 100644 --- a/Assets/Scripts/Route/TileManager.cs +++ b/Assets/Scripts/Route/TileManager.cs @@ -8,7 +8,8 @@ public class TileManager : MonoBehaviour private List m_tileList = new List(); [SerializeField] - private Transform m_camTransform; + private int trackTiles = 10; + private int m_bendProfile = 0; @@ -26,6 +27,13 @@ public class TileManager : MonoBehaviour private void Start() { m_currentTile = FindObjectOfType(); + + for (int i = 0; i < trackTiles; i++) + { + SpawnRandomTile(); + } + + } // Update is called once per frame @@ -43,10 +51,11 @@ public class TileManager : MonoBehaviour } */ - if(Input.GetKeyDown(KeyCode.Space)) + + /*if(Input.GetKeyDown(KeyCode.Space)) { SpawnRandomTile(); - } + }*/ } void SpawnRandomTile() From b8a620e8f7891482a650c058bd336de309ad7fd7 Mon Sep 17 00:00:00 2001 From: Jordan Date: Sun, 5 Feb 2023 18:56:42 +1100 Subject: [PATCH 3/3] Play button works --- Assets/Scenes/{ => Development}/BoatTest.unity | 0 Assets/Scenes/{ => Development}/BoatTest.unity.meta | 0 Assets/Scenes/{ => Development}/SampleScene.unity | 0 .../Scenes/{ => Development}/SampleScene.unity.meta | 0 Assets/Scenes/Menu.unity | 4 ++-- Assets/spin.cs | 13 +++++++++++++ Assets/spin.cs.meta | 11 +++++++++++ 7 files changed, 26 insertions(+), 2 deletions(-) rename Assets/Scenes/{ => Development}/BoatTest.unity (100%) rename Assets/Scenes/{ => Development}/BoatTest.unity.meta (100%) rename Assets/Scenes/{ => Development}/SampleScene.unity (100%) rename Assets/Scenes/{ => Development}/SampleScene.unity.meta (100%) create mode 100644 Assets/spin.cs create mode 100644 Assets/spin.cs.meta diff --git a/Assets/Scenes/BoatTest.unity b/Assets/Scenes/Development/BoatTest.unity similarity index 100% rename from Assets/Scenes/BoatTest.unity rename to Assets/Scenes/Development/BoatTest.unity diff --git a/Assets/Scenes/BoatTest.unity.meta b/Assets/Scenes/Development/BoatTest.unity.meta similarity index 100% rename from Assets/Scenes/BoatTest.unity.meta rename to Assets/Scenes/Development/BoatTest.unity.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/Development/SampleScene.unity similarity index 100% rename from Assets/Scenes/SampleScene.unity rename to Assets/Scenes/Development/SampleScene.unity diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/Development/SampleScene.unity.meta similarity index 100% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Scenes/Development/SampleScene.unity.meta diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 91c59e7..87f4fda 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:586c912ff0c91db2238dfdc49064a0ffd7e98f2b94cea46e9ecefd8217137491 -size 186486 +oid sha256:c1038fb68833982c70b24082562986c08a39197013ce5bbe2c29550bf0281886 +size 690177 diff --git a/Assets/spin.cs b/Assets/spin.cs new file mode 100644 index 0000000..6c7d538 --- /dev/null +++ b/Assets/spin.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class spin : MonoBehaviour +{ + public float turnFactor = 1f; + + private void Update() + { + transform.rotation = Quaternion.Euler(0f, Time.time * turnFactor, 0f); + } +} diff --git a/Assets/spin.cs.meta b/Assets/spin.cs.meta new file mode 100644 index 0000000..b5af540 --- /dev/null +++ b/Assets/spin.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3d31d3628779ac74d99a27de378f05bc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: