diff --git a/Assets/Resources/Prefabs/Modulok/module3.prefab b/Assets/Resources/Prefabs/Modulok/module3.prefab index 53a747e..a74cd4b 100644 --- a/Assets/Resources/Prefabs/Modulok/module3.prefab +++ b/Assets/Resources/Prefabs/Modulok/module3.prefab @@ -28,7 +28,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 137614797100800554} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -4.22574, y: 4, z: 0} + m_LocalPosition: {x: -4.22574, y: 4.88, z: 0} m_LocalScale: {x: 0.1, y: 4.5, z: 4} m_ConstrainProportionsScale: 0 m_Children: [] @@ -96,8 +96,8 @@ BoxCollider: 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} + m_Size: {x: 8.32321, y: 1.9865742, z: 2.2019603} + m_Center: {x: 0.18196072, y: -0.0018970744, z: -0.07045031} --- !u!114 &5093215872594776011 MonoBehaviour: m_ObjectHideFlags: 0 @@ -495,7 +495,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6256564368226434321} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.3, y: 0, z: 197.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -509,7 +509,7 @@ Transform: - {fileID: 8889605943701180331} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!54 &-7101596656096733156 Rigidbody: m_ObjectHideFlags: 0 @@ -524,7 +524,7 @@ Rigidbody: m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 0 + m_Constraints: 126 m_CollisionDetection: 0 --- !u!65 &6393810734489979964 BoxCollider: diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index eab06f5..9974a21 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -1389,7 +1389,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 601898925} - m_LocalRotation: {x: 0.045581307, y: -0.70516795, z: 0.045520637, w: 0.7061079} + m_LocalRotation: {x: 0.045581304, y: -0.70516795, z: 0.045520633, w: 0.7061079} m_LocalPosition: {x: 2.27, y: 4.16525, z: 3.82} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3704,7 +3704,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513686735} - m_LocalRotation: {x: 0.22590086, y: 0.0030496058, z: -0.0007071928, w: 0.9741453} + m_LocalRotation: {x: 0.22590087, y: 0.0030496197, z: -0.000707196, w: 0.9741453} m_LocalPosition: {x: -0.28647116, y: 6.2664723, z: 2.6748314} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -13958,6 +13958,7 @@ GameObject: - component: {fileID: 7917514869596290071} - component: {fileID: 7917514869596290073} - component: {fileID: 7917514869596290074} + - component: {fileID: 7917514869596290075} m_Layer: 0 m_Name: Boby m_TagString: Player @@ -14665,10 +14666,23 @@ CapsuleCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - m_Radius: 1.7212968 - m_Height: 6.3698125 + m_Radius: 0.84168243 + m_Height: 5.5790653 m_Direction: 1 - m_Center: {x: -0.03604698, y: 3.18, z: -0.06167984} + m_Center: {x: -0.03604698, y: 2.7846265, z: -0.09370422} +--- !u!65 &7917514869596290075 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7398140401948337837} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!4 &7986884067029569574 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GroundController.cs b/Assets/Scripts/GroundController.cs index d23e9d7..f012d0c 100644 --- a/Assets/Scripts/GroundController.cs +++ b/Assets/Scripts/GroundController.cs @@ -80,16 +80,17 @@ public class GroundController : MonoBehaviour } public void changeMaterialIndex(){ - - int materialteszt = UnityEngine.Random.Range(0, materials.Length); - Debug.Log(materialteszt); + + int materialteszt; bool teszteljtovabb = true; while (teszteljtovabb == true) { + materialteszt = UnityEngine.Random.Range(0, materials.Length); + Debug.Log(materialteszt); if (materialteszt == materialIndex) { - + } else { @@ -97,7 +98,9 @@ public class GroundController : MonoBehaviour teszteljtovabb = false; } } - + + teszteljtovabb = true; + } private bool CheckGroundToDestroy(GameObject toCheck){ diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index a1214b2..83d8692 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -1 + x: 0 y: 65 width: 1470 height: 811 m_ShowMode: 4 - m_Title: Inspector + m_Title: Simulator m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -94,8 +94,8 @@ MonoBehaviour: y: 0 width: 278 height: 451 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -111,7 +111,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -120,14 +120,14 @@ MonoBehaviour: y: 451 width: 1122.5 height: 310 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 13} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 13} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,8 +268,8 @@ MonoBehaviour: y: 0 width: 844.5 height: 451 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 16} @@ -296,7 +296,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 277 + x: 278 y: 95 width: 842.5 height: 430 @@ -356,7 +356,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 470 + y: 546 width: 1121.5 height: 289 m_ViewDataDictionary: {fileID: 0} @@ -376,22 +376,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Resources/Materials m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Resources/Materials m_LastFoldersGridSize: -1 m_LastProjectPath: /Users/bance/Documents/GitHub/PuzzleColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 94.000305} - m_SelectedIDs: ec5f0000 - m_LastClickedID: 24556 - m_ExpandedIDs: 00000000c65f0000c85f0000ca5f0000cc5f0000ce5f0000d05f000000ca9a3bffffff7f + m_SelectedIDs: e25f0000 + m_LastClickedID: 24546 + m_ExpandedIDs: 00000000c85f0000ca5f0000cc5f0000ce5f0000d05f0000d25f000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -419,7 +419,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c65f0000c85f0000ca5f0000cc5f0000ce5f0000d05f0000 + m_ExpandedIDs: 00000000c85f0000ca5f0000cc5f0000ce5f0000d05f0000d25f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -444,9 +444,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: fc4f0000 + m_LastClickedInstanceID: 20476 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000038a70000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -495,7 +495,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1121.5 + x: 1122.5 y: 95 width: 346.5 height: 740 @@ -536,7 +536,7 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1 + x: 0 y: 95 width: 277 height: 430 @@ -547,8 +547,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 82500000 - m_LastClickedID: 20610 + m_SelectedIDs: fc4f0000 + m_LastClickedID: 20476 m_ExpandedIDs: 1afbffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -831,9 +831,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 140.75609, y: -172.80418, z: 176.3772} + m_Target: {x: -274.5244, y: -38.133194, z: -64.5328} speed: 2 - m_Value: {x: 140.75609, y: -172.80418, z: 176.3772} + m_Value: {x: -274.5244, y: -38.133194, z: -64.5328} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -880,13 +880,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.2936391, y: 0.6301294, z: -0.27936798, w: 0.66232127} + m_Target: {x: -0.04655205, y: 0.7627115, z: -0.05524802, w: -0.64268506} speed: 2 - m_Value: {x: 0.29363868, y: 0.6301285, z: -0.2793676, w: 0.6623203} + m_Value: {x: -0.04655223, y: 0.76271445, z: -0.05524823, w: -0.6426875} m_Size: - m_Target: 294.14233 + m_Target: 142.08177 speed: 2 - m_Value: 294.14233 + m_Value: 142.08177 m_Ortho: m_Target: 0 speed: 2