diff --git a/Assets/Resources/Prefabs/Modulok/module3.prefab b/Assets/Resources/Prefabs/Modulok/module3.prefab index d225d79..53a747e 100644 --- a/Assets/Resources/Prefabs/Modulok/module3.prefab +++ b/Assets/Resources/Prefabs/Modulok/module3.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 8577206648661061247} - component: {fileID: 296936637571506799} - component: {fileID: 5071642881461168817} + - component: {fileID: 7628271141478744373} + - component: {fileID: 5093215872594776011} m_Layer: 0 m_Name: Portal m_TagString: Portal @@ -83,6 +85,31 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &7628271141478744373 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137614797100800554} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.0000005, y: 2.0000002, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &5093215872594776011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137614797100800554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b68b0bafebf84c4ba6c596ae4a3b7d2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &552658199308204885 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index a71a20d..eab06f5 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -2758,7 +2758,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936985375} - m_LocalRotation: {x: 0.27190503, y: 0.6479811, z: -0.26720154, w: 0.65938723} + m_LocalRotation: {x: 0.271905, y: 0.64798117, z: -0.26720163, w: 0.6593872} m_LocalPosition: {x: 4.644, y: 3.69, z: -1.96} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4097,7 +4097,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1615993234} - m_LocalRotation: {x: 0.0010953929, y: 0.9979507, z: -0.061456818, w: 0.017787255} + m_LocalRotation: {x: 0.0010953955, y: 0.9979507, z: -0.061456837, w: 0.017787289} m_LocalPosition: {x: -0.435591, y: 4.16525, z: 13.428191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4743,7 +4743,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.1550819, g: 0.24519156, b: 0.38679248, a: 0} + m_BackGroundColor: {r: 0.15686275, g: 0.29054102, b: 0.3882353, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -4783,7 +4783,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895677325} - m_LocalRotation: {x: 0.0010953929, y: 0.9979507, z: -0.061456818, w: 0.017787255} + m_LocalRotation: {x: 0.0010953955, y: 0.9979507, z: -0.061456837, w: 0.017787289} m_LocalPosition: {x: -0.15911984, y: 2.9687777, z: -12.856641} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -14650,7 +14650,7 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0 - m_UseGravity: 0 + m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 112 @@ -14664,7 +14664,7 @@ CapsuleCollider: m_GameObject: {fileID: 7398140401948337837} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 0 + m_Enabled: 1 m_Radius: 1.7212968 m_Height: 6.3698125 m_Direction: 1 diff --git a/Assets/Scripts/GroundController.cs b/Assets/Scripts/GroundController.cs index ce65a00..d23e9d7 100644 --- a/Assets/Scripts/GroundController.cs +++ b/Assets/Scripts/GroundController.cs @@ -81,6 +81,23 @@ public class GroundController : MonoBehaviour public void changeMaterialIndex(){ + int materialteszt = UnityEngine.Random.Range(0, materials.Length); + Debug.Log(materialteszt); + bool teszteljtovabb = true; + + while (teszteljtovabb == true) + { + if (materialteszt == materialIndex) + { + + } + else + { + materialIndex = materialteszt; + teszteljtovabb = false; + } + } + } private bool CheckGroundToDestroy(GameObject toCheck){ diff --git a/Assets/Scripts/portal.cs b/Assets/Scripts/portal.cs new file mode 100644 index 0000000..5ddf6b1 --- /dev/null +++ b/Assets/Scripts/portal.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class portal : MonoBehaviour +{ + private GroundController gc; + // Start is called before the first frame update + void Awake() + { + gc = FindObjectOfType(); + } + + private void OnTriggerEnter(Collider other) + { + gc.changeMaterialIndex(); + } + +} diff --git a/Assets/Scripts/portal.cs.meta b/Assets/Scripts/portal.cs.meta new file mode 100644 index 0000000..ecd2a38 --- /dev/null +++ b/Assets/Scripts/portal.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8b68b0bafebf84c4ba6c596ae4a3b7d2 +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 bf0c88c..a1214b2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 + x: -1 y: 65 width: 1470 height: 811 m_ShowMode: 4 - m_Title: Project + m_Title: Inspector m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 82 + controlID: 16 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,8 +68,8 @@ MonoBehaviour: y: 0 width: 347.5 height: 761 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -94,8 +94,8 @@ MonoBehaviour: y: 0 width: 278 height: 451 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 27 + controlID: 17 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,7 +248,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 89 + controlID: 18 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -292,11 +292,11 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Simulator - m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 278 + x: 277 y: 95 width: 842.5 height: 430 @@ -351,12 +351,12 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 546 + y: 470 width: 1121.5 height: 289 m_ViewDataDictionary: {fileID: 0} @@ -389,9 +389,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 94.000305} - m_SelectedIDs: e65f0000 - m_LastClickedID: 24550 - m_ExpandedIDs: 00000000c25f0000c45f0000c65f0000c85f0000ca5f0000cc5f000000ca9a3bffffff7f + m_SelectedIDs: ec5f0000 + m_LastClickedID: 24556 + m_ExpandedIDs: 00000000c65f0000c85f0000ca5f0000cc5f0000ce5f0000d05f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -419,7 +419,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c25f0000c45f0000c65f0000c85f0000ca5f0000cc5f0000 + m_ExpandedIDs: 00000000c65f0000c85f0000ca5f0000cc5f0000ce5f0000d05f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -446,7 +446,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000038a70000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -495,7 +495,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1122.5 + x: 1121.5 y: 95 width: 346.5 height: 740 @@ -532,11 +532,11 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: -1 y: 95 width: 277 height: 430 @@ -547,8 +547,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9c0b0000 - m_LastClickedID: 0 + m_SelectedIDs: 82500000 + m_LastClickedID: 20610 m_ExpandedIDs: 1afbffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -589,7 +589,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -882,7 +882,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.2936391, y: 0.6301294, z: -0.27936798, w: 0.66232127} speed: 2 - m_Value: {x: 0.2936391, y: 0.6301294, z: -0.27936795, w: 0.66232127} + m_Value: {x: 0.29363868, y: 0.6301285, z: -0.2793676, w: 0.6623203} m_Size: m_Target: 294.14233 speed: 2 @@ -927,7 +927,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2