From 1cf316e00c4741ab802468ce0d361a46ee6a69e5 Mon Sep 17 00:00:00 2001 From: playmaker1210 Date: Tue, 28 Feb 2023 13:31:31 +0100 Subject: [PATCH] ground bug fixed --- Assets/Scripts/GroundController.cs | 4 +- Assets/Scripts/WallCollision.cs | 13 ++++++ Assets/Scripts/WallCollision.cs.meta | 11 +++++ UserSettings/Layouts/default-2021.dwlt | 58 +++++++++++++------------- 4 files changed, 55 insertions(+), 31 deletions(-) create mode 100644 Assets/Scripts/WallCollision.cs create mode 100644 Assets/Scripts/WallCollision.cs.meta diff --git a/Assets/Scripts/GroundController.cs b/Assets/Scripts/GroundController.cs index e4e45e1..fa5e2bc 100644 --- a/Assets/Scripts/GroundController.cs +++ b/Assets/Scripts/GroundController.cs @@ -9,7 +9,7 @@ public class GroundController : MonoBehaviour public GameObject[] sideObjects; public float groundMoveSpeed = 10f; - private CollectibleSpawner cs; + //private CollectibleSpawner cs; private void Awake() { //cs = FindObjectOfType(); @@ -83,6 +83,6 @@ public class GroundController : MonoBehaviour private void CreateNewGround(){ int random = UnityEngine.Random.Range(0, loadFrom.Length); //ketto modullal elobb tolt be, annak az iranyanak megfeleloen, +80 a ket modull hossza - Instantiate(loadFrom[random], new Vector3(0,0, ground[ground.Length-2].transform.position.z + 80), ground[ground.Length-2].transform.rotation); + Instantiate(loadFrom[random], new Vector3(0,0, ground[ground.Length-1].transform.position.z + 40), ground[ground.Length-1].transform.rotation); } } \ No newline at end of file diff --git a/Assets/Scripts/WallCollision.cs b/Assets/Scripts/WallCollision.cs new file mode 100644 index 0000000..35d36ea --- /dev/null +++ b/Assets/Scripts/WallCollision.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WallCollision : MonoBehaviour +{ + private void OnTriggerEnter(Collider other) { + if(other.gameObject.tag == "Player"){ + Debug.Log("neki ment a falnak"); + Application.Quit(); + } + } +} diff --git a/Assets/Scripts/WallCollision.cs.meta b/Assets/Scripts/WallCollision.cs.meta new file mode 100644 index 0000000..6fc15fc --- /dev/null +++ b/Assets/Scripts/WallCollision.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c504cad2318bb1e33bb50a99fd60a73f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 05399b3..1438bac 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -39,12 +39,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 737 + x: 736 y: 0 - width: 283 + width: 284 height: 353 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 96 + controlID: 62 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,7 +170,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 97 + controlID: 116 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -196,7 +196,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 98 + controlID: 117 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -214,7 +214,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 174 + width: 173 height: 353 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -238,7 +238,7 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 174 + x: 173 y: 0 width: 563 height: 353 @@ -324,7 +324,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 86 - width: 173 + width: 172 height: 332 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -333,9 +333,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 34fbffff + m_SelectedIDs: 2efbffff + m_LastClickedID: -1234 + m_ExpandedIDs: 30fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -379,7 +379,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 174 + x: 173 y: 86 width: 561 height: 332 @@ -617,9 +617,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -32.442642, y: -21.71618, z: 22.04344} + m_Target: {x: -18.960407, y: -16.204496, z: 42.412453} speed: 2 - m_Value: {x: -32.442642, y: -21.71618, z: 22.04344} + m_Value: {x: -18.960407, y: -16.204496, z: 42.412453} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -666,13 +666,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.23821184, y: 0.468904, z: -0.13296372, w: -0.84006673} + m_Target: {x: -0.22356676, y: 0.33313483, z: -0.08163269, w: -0.91235} speed: 2 - m_Value: {x: -0.23821096, y: 0.46890226, z: -0.13296323, w: -0.84006363} + m_Value: {x: -0.22356595, y: 0.33313364, z: -0.0816324, w: -0.9123467} m_Size: - m_Target: 42.133698 + m_Target: 49.940598 speed: 2 - m_Value: 42.133698 + m_Value: 49.940598 m_Ortho: m_Target: 0 speed: 2 @@ -738,22 +738,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Prefabs/Modulok + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Resources/Prefabs/Modulok + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 748b0000 - m_LastClickedID: 35700 - m_ExpandedIDs: 00000000066200009c6400006c8b000000ca9a3b + scrollPos: {x: 0, y: 12} + m_SelectedIDs: a4640000 + m_LastClickedID: 25764 + m_ExpandedIDs: 0000000008620000a0640000aa64000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -781,7 +781,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000006620000 + m_ExpandedIDs: 0000000008620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,9 +926,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 737 + x: 736 y: 86 - width: 281 + width: 282 height: 332 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: