diff --git a/Assets/Resources/Models/World Objects/World 1/haz1.blend b/Assets/Resources/Models/World Objects/World 1/haz1.blend deleted file mode 100644 index fdf7570..0000000 Binary files a/Assets/Resources/Models/World Objects/World 1/haz1.blend and /dev/null differ diff --git a/Assets/Resources/Models/World Objects/World 1/haz1.blend.meta b/Assets/Resources/Models/World Objects/World 1/haz1.blend.meta deleted file mode 100644 index 7047ca7..0000000 --- a/Assets/Resources/Models/World Objects/World 1/haz1.blend.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: 96fc57865274c379c95131f0a424cd26 -ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 1 - 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: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Models/World Objects/World 1/haz2.blend b/Assets/Resources/Models/World Objects/World 1/haz2.blend deleted file mode 100644 index 6005ec5..0000000 Binary files a/Assets/Resources/Models/World Objects/World 1/haz2.blend and /dev/null differ diff --git a/Assets/Resources/Models/World Objects/World 1/haz2.blend.meta b/Assets/Resources/Models/World Objects/World 1/haz2.blend.meta deleted file mode 100644 index 3fe0a33..0000000 --- a/Assets/Resources/Models/World Objects/World 1/haz2.blend.meta +++ /dev/null @@ -1,106 +0,0 @@ -fileFormatVersion: 2 -guid: cd275d6f543d08418b6dae6e6c63301c -ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 1 - 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: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/GroundController.cs b/Assets/Scripts/GroundController.cs index ce2b7cd..2c2228a 100644 --- a/Assets/Scripts/GroundController.cs +++ b/Assets/Scripts/GroundController.cs @@ -6,12 +6,17 @@ public class GroundController : MonoBehaviour { private GameObject[] ground; public GameObject[] loadFrom; + public GameObject[] sideObjects; private float groundMoveSpeed = 10f; private void Awake() { - LoadPrefabs("Prefabs/Modulok"); - Debug.Log(loadFrom.Length); + //Loading modules + loadFrom = LoadPrefabs("Prefabs/Modulok"); + sideObjects = LoadPrefabs("Models/World Objects/World 1"); + Debug.Log("loadFrom length: " + loadFrom.Length); + Debug.Log("sideObjects Length: " + sideObjects.Length); + //getting all of the ground objects by the tag ground = GameObject.FindGameObjectsWithTag("Ground"); if(ground.Length == 0){ @@ -42,8 +47,10 @@ public class GroundController : MonoBehaviour } } - private void LoadPrefabs(string path){ //toltese be a palya objecteket a resources mappabol pl: "Prefabs/Modulok" - loadFrom = Resources.LoadAll(path); + private GameObject[] LoadPrefabs(string path){ //toltese be a palya objecteket a resources mappabol pl: "Prefabs/Modulok" + GameObject[] arr = Resources.LoadAll(path); + + return arr; } private bool CheckGroundToDestroy(GameObject toCheck){ @@ -69,6 +76,8 @@ 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 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 2f54012..bddd46e 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -74,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 16 + controlID: 87 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -249,7 +249,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 17 + controlID: 88 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -275,7 +275,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 18 + controlID: 89 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -343,22 +343,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Resources/Models/World Objects/World 1 m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Resources/Models/World Objects/World 1 m_LastFoldersGridSize: -1 m_LastProjectPath: /home/tom/Documents/dev/zarodolgozat/ColorRunner m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 43} - m_SelectedIDs: ea620000 - m_LastClickedID: 25322 - m_ExpandedIDs: 000000006a600000e66200000069000000ca9a3b + scrollPos: {x: 0, y: 11} + m_SelectedIDs: 20650000 + m_LastClickedID: 25888 + m_ExpandedIDs: 000000006a600000f6640000126500001c65000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -516,7 +516,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 42f8ffffcef8ffff34fbffff + m_ExpandedIDs: 34fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -898,10 +898,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 454 + width: 1030 + height: 233 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/ui design/1.png b/ui design/1.png new file mode 100644 index 0000000..7cff5e0 Binary files /dev/null and b/ui design/1.png differ diff --git a/ui design/2.png b/ui design/2.png new file mode 100644 index 0000000..e4f81bb Binary files /dev/null and b/ui design/2.png differ