From 1282b4c8cb6b819620e6f33f4a5003caf187fc24 Mon Sep 17 00:00:00 2001 From: GamerClassN7 Date: Sun, 30 Jan 2022 11:56:32 +0100 Subject: [PATCH 1/4] Renames --- Assets/Prefabs/platforms/Platform_Blue.prefab | 2 +- .../Prefabs/platforms/Platform_Green.prefab | 2 +- Assets/Prefabs/platforms/Platform_Red.prefab | 2 +- Assets/Scenes/Vasek.unity | 22 +++++++++++-------- Assets/Scripts/ProceduralGeneration.cs | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Assets/Prefabs/platforms/Platform_Blue.prefab b/Assets/Prefabs/platforms/Platform_Blue.prefab index cb79eef..962192b 100644 --- a/Assets/Prefabs/platforms/Platform_Blue.prefab +++ b/Assets/Prefabs/platforms/Platform_Blue.prefab @@ -101,7 +101,7 @@ GameObject: - component: {fileID: 2527761051471871889} - component: {fileID: 4240483973579556787} m_Layer: 0 - m_Name: platform_blue + m_Name: platform_Blue m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/platforms/Platform_Green.prefab b/Assets/Prefabs/platforms/Platform_Green.prefab index 24c9161..02ee2f9 100644 --- a/Assets/Prefabs/platforms/Platform_Green.prefab +++ b/Assets/Prefabs/platforms/Platform_Green.prefab @@ -116,7 +116,7 @@ GameObject: - component: {fileID: -7597049073915248875} - component: {fileID: 3278078638141404736} m_Layer: 0 - m_Name: platform_green + m_Name: platform_Green m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/platforms/Platform_Red.prefab b/Assets/Prefabs/platforms/Platform_Red.prefab index b35bccc..b805d7c 100644 --- a/Assets/Prefabs/platforms/Platform_Red.prefab +++ b/Assets/Prefabs/platforms/Platform_Red.prefab @@ -117,7 +117,7 @@ GameObject: - component: {fileID: 5862113707430629064} - component: {fileID: -6889792310482815023} m_Layer: 0 - m_Name: platform_red + m_Name: platform_Red m_TagString: platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/Vasek.unity b/Assets/Scenes/Vasek.unity index 1bd5643..684a160 100644 --- a/Assets/Scenes/Vasek.unity +++ b/Assets/Scenes/Vasek.unity @@ -184,13 +184,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: levelBlocks: - - {fileID: 8768991388683709947, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} - - {fileID: 8768991388683709947, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} - - {fileID: 6650340373999088090, guid: 76b3e3235b07ca04f91c9b020603e1dd, type: 3} - - {fileID: 7678802340880963262, guid: c7b1510ab2ab8e349bfaafa501cecb1f, type: 3} - {fileID: 8768991388683709947, guid: 97d4c453fb5affa448968cb5ce9ca2f4, type: 3} - - {fileID: 8768991388683709947, guid: 1e3f34788e0cb3f49a0bef285d5b059a, type: 3} - {fileID: 8768991388683709947, guid: 2e18815c9b04872428df50ccfc059d03, type: 3} + - {fileID: 8768991388683709947, guid: 99c4e582c7358f346ab00dae4ae956f9, type: 3} + - {fileID: 7308296215773848360, guid: 9d0c33f32140d6b4da45d7ecaa694f1b, type: 3} + - {fileID: 1560962678462888388, guid: 8f7d93327dfedaf419b7f63ddb78c6bb, type: 3} + - {fileID: 7678802340880963262, guid: c7b1510ab2ab8e349bfaafa501cecb1f, type: 3} + - {fileID: 8768991388683709947, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} + - {fileID: 6650340373999088090, guid: 76b3e3235b07ca04f91c9b020603e1dd, type: 3} + - {fileID: 7834549091241900869, guid: 085af51cf1ada0a4fa8a290eba8b0fd5, type: 3} + - {fileID: 2628890434173161082, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3} + - {fileID: 8768991388683709947, guid: 1e3f34788e0cb3f49a0bef285d5b059a, type: 3} - {fileID: 1316835597118596560, guid: 685c607395b2cfa46a548c481d178540, type: 3} - {fileID: 1316835597118596560, guid: edd9e993fa2520f4095e33c7552ecd54, type: 3} - {fileID: 1316835597118596560, guid: b140cd85c7d7ba64cbc9ab71d92e349e, type: 3} @@ -294,7 +298,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1253020012 GameObject: @@ -320,12 +324,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1253020012} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.7466898, y: 11.656877, z: 19.668505} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1287430439 PrefabInstance: @@ -431,7 +435,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8134012580551448073 PrefabInstance: diff --git a/Assets/Scripts/ProceduralGeneration.cs b/Assets/Scripts/ProceduralGeneration.cs index 408f5bc..51ade37 100644 --- a/Assets/Scripts/ProceduralGeneration.cs +++ b/Assets/Scripts/ProceduralGeneration.cs @@ -158,7 +158,7 @@ public class ProceduralGeneration : MonoBehaviour int blockToSpawn = Random.Range(0, (levelBlocks.Count + 1)); - if (blockToSpawn > 31 && (blockToSpawn < levelBlocks.Count) && levelBlocks[blockToSpawn].name == lastBlockPrefab.name) + if (levelBlocks[blockToSpawn].name == lastBlockPrefab.name) { Debug.Log("Same Block"); if (blockToSpawn > levelBlocks.Count || blockToSpawn < 0) From 91c0fc68d780b87e9fdeaeb97a4d19a7e0989b61 Mon Sep 17 00:00:00 2001 From: GamerClassN7 Date: Sun, 30 Jan 2022 11:57:52 +0100 Subject: [PATCH 2/4] Bug Fix --- Assets/Scripts/ProceduralGeneration.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Assets/Scripts/ProceduralGeneration.cs b/Assets/Scripts/ProceduralGeneration.cs index 51ade37..5adf886 100644 --- a/Assets/Scripts/ProceduralGeneration.cs +++ b/Assets/Scripts/ProceduralGeneration.cs @@ -109,6 +109,12 @@ public class ProceduralGeneration : MonoBehaviour // Update is called once per frame void Update() { + + // if (playerControlsSript.isFalling) + // { + // return; + // } + Vector3 playerPosition = this.player.transform.position; PlayerController playerControlsSript = this.player.GetComponent(); @@ -120,11 +126,6 @@ public class ProceduralGeneration : MonoBehaviour } } - if (playerControlsSript.isFalling) - { - return; - } - for (var i = 0; i < this.backgroundLevelBlocks.Count; i++) { float distance = Vector3.Distance(this.backgroundLevelBlocks[i].transform.position, playerPosition); From 533463a95a5f8e864cdc6c203271571de3c31eff Mon Sep 17 00:00:00 2001 From: SanderSwi Date: Sun, 30 Jan 2022 12:04:10 +0100 Subject: [PATCH 3/4] added platform 5 --- Assets/Prefabs/platforms/Platform 5.prefab | 188 +++++++++++++++ .../Prefabs/platforms/Platform 5.prefab.meta | 7 + Assets/models/platform 5.meta | 8 + Assets/models/platform 5/platform 5 base.meta | 8 + .../platform 5 base/platform 5 base.obj | 135 +++++++++++ .../platform 5 base/platform 5 base.obj.meta | 99 ++++++++ .../platform 5/platform 5 emission.meta | 8 + .../platform 5 emission.obj | 220 ++++++++++++++++++ .../platform 5 emission.obj.meta | 99 ++++++++ UserSettings/EditorUserSettings.asset | 6 +- 10 files changed, 775 insertions(+), 3 deletions(-) create mode 100644 Assets/Prefabs/platforms/Platform 5.prefab create mode 100644 Assets/Prefabs/platforms/Platform 5.prefab.meta create mode 100644 Assets/models/platform 5.meta create mode 100644 Assets/models/platform 5/platform 5 base.meta create mode 100644 Assets/models/platform 5/platform 5 base/platform 5 base.obj create mode 100644 Assets/models/platform 5/platform 5 base/platform 5 base.obj.meta create mode 100644 Assets/models/platform 5/platform 5 emission.meta create mode 100644 Assets/models/platform 5/platform 5 emission/platform 5 emission.obj create mode 100644 Assets/models/platform 5/platform 5 emission/platform 5 emission.obj.meta diff --git a/Assets/Prefabs/platforms/Platform 5.prefab b/Assets/Prefabs/platforms/Platform 5.prefab new file mode 100644 index 0000000..fdb00b0 --- /dev/null +++ b/Assets/Prefabs/platforms/Platform 5.prefab @@ -0,0 +1,188 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2227050844824631485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1444217836988950975} + - component: {fileID: 5630518594187711293} + - component: {fileID: 2350969271261890594} + m_Layer: 2 + m_Name: Emission + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1444217836988950975 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2227050844824631485} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.001, y: 1.001, z: 1.001} + m_Children: [] + m_Father: {fileID: 2448110616132624592} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5630518594187711293 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2227050844824631485} + m_Mesh: {fileID: 4300000, guid: 0d1a8ff32287bd4498268d0d23bd28df, type: 3} +--- !u!23 &2350969271261890594 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2227050844824631485} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a7fd394a85158734e9c5317abd59001b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &5738561865814715326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4004768572291123662} + - component: {fileID: 811784983630901289} + - component: {fileID: 1636092699106224965} + m_Layer: 0 + m_Name: Base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4004768572291123662 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5738561865814715326} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2448110616132624592} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &811784983630901289 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5738561865814715326} + m_Mesh: {fileID: 4300000, guid: 09ac1c7e04512c543a940f9bfc62abba, type: 3} +--- !u!23 &1636092699106224965 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5738561865814715326} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e964da8af4e60c0418a523797c8cc478, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!1 &6736808733118194127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2448110616132624592} + m_Layer: 0 + m_Name: Platform 5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2448110616132624592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6736808733118194127} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4004768572291123662} + - {fileID: 1444217836988950975} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/platforms/Platform 5.prefab.meta b/Assets/Prefabs/platforms/Platform 5.prefab.meta new file mode 100644 index 0000000..cea6438 --- /dev/null +++ b/Assets/Prefabs/platforms/Platform 5.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab2d135bcffd2ab47be4fc93bca8fbc2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/platform 5.meta b/Assets/models/platform 5.meta new file mode 100644 index 0000000..fecf063 --- /dev/null +++ b/Assets/models/platform 5.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f55cc29409a4e546b7a11f3e1c2fe5a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/platform 5/platform 5 base.meta b/Assets/models/platform 5/platform 5 base.meta new file mode 100644 index 0000000..04ebee2 --- /dev/null +++ b/Assets/models/platform 5/platform 5 base.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f676c8713c3bffa4087a53f135d8d6ed +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/platform 5/platform 5 base/platform 5 base.obj b/Assets/models/platform 5/platform 5 base/platform 5 base.obj new file mode 100644 index 0000000..e3fa10c --- /dev/null +++ b/Assets/models/platform 5/platform 5 base/platform 5 base.obj @@ -0,0 +1,135 @@ +mtllib ./platform 5 base.mtl +o UModeler Object (2) +v 1.5 -0.25 -2.5 +v 1.5 -0.25 2.5 +v 2.5 0 2.5 +v 2.5 0 -2.5 +v 1.5 0.25 2.5 +v 1.5 0.25 -2.5 +v 2.5 0.5 -2.5 +v 2.5 0.5 2.5 +v 2.6875 0.34375 -2.5 +v 2.6875 0.15625 -2.5 +v 2.6875 0.15625 2.5 +v 2.6875 0.34375 2.5 +v -2.6875 0.15625 -0.0625 +v -2.6875 0.34375 -0.0625 +v -2.6875 0.34375 4.9375 +v -2.6875 0.15625 4.9375 +v -2.5 0 4.9375 +v -2.5 0 -0.0625 +v -2.5 0.5 -0.0625 +v -2.5 0.5 4.9375 +v -1.5 0.25 -0.0625 +v -1.5 0.25 4.9375 +v -1.5 -0.25 -0.0625 +v -1.5 -0.25 4.9375 + +vt 1.5 2.5 +vt 1.5 -2.5 +vt 2.5 -2.5 +vt 2.5 2.5 +vt -1.5 2.5 +vt -1.5 -2.5 +vt -2.5 -2.5 +vt -2.5 2.5 +vt 2.5 0.34375 +vt 2.5 0.15625 +vt -2.5 0.15625 +vt -2.5 0.34375 +vt -2.6875 2.5 +vt -2.6875 -2.5 +vt 2.6875 2.5 +vt 2.6875 -2.5 +vt -2.5 0.5 +vt -1.5 0.25 +vt -1.5 -0.25 +vt -2.5 0 +vt -2.6875 0.15625 +vt -2.6875 0.34375 +vt 2.5 0.5 +vt 2.6875 0.34375 +vt 2.6875 0.15625 +vt 2.5 0 +vt 1.5 -0.25 +vt 1.5 0.25 +vt -0.0625 0.15625 +vt -0.0625 0.34375 +vt 4.9375 0.34375 +vt 4.9375 0.15625 +vt -2.6875 -4.9375 +vt -2.5 -4.9375 +vt -2.5 0.0625 +vt -2.6875 0.0625 +vt 2.6875 -0.0625 +vt 2.5 -0.0625 +vt 2.5 4.9375 +vt 2.6875 4.9375 +vt 1.5 -0.0625 +vt 1.5 4.9375 +vt -1.5 -4.9375 +vt -1.5 0.0625 + +vn 0.2425356 -0.9701425 0 +vn -0.2425356 0.9701425 0 +vn 1 0 0 +vn 0.6401844 0.7682213 0 +vn 0.6401844 -0.7682213 0 +vn 0 0 -1 +vn 0 0 1 +vn -1 0 0 +vn -0.6401844 -0.7682213 0 +vn -0.6401844 0.7682213 0 +vn 0.2425356 0.9701425 0 +vn 0 1 0 +vn -0.6305926 0 -0.776114 +vn 0.6305926 0 0.776114 +vn -0.2425356 -0.9701425 0 +vn 0 -1 0 + +usemtl M_YMMR_11 +f 3/3/1 2/2/1 1/1/1 +f 4/4/1 3/3/1 1/1/1 +f 7/7/2 6/6/2 5/5/2 +f 8/8/2 7/7/2 5/5/2 +f 11/11/3 10/10/3 9/9/3 +f 12/12/3 11/11/3 9/9/3 +f 7/7/4 8/8/4 12/13/4 +f 9/14/4 7/7/4 12/13/4 +f 3/3/5 4/4/5 10/15/5 +f 11/16/5 3/3/5 10/15/5 +f 1/19/6 6/18/6 7/17/6 +f 4/20/6 1/19/6 7/17/6 +f 9/22/6 10/21/6 4/20/6 +f 7/17/6 9/22/6 4/20/6 +f 11/25/7 12/24/7 8/23/7 +f 3/26/7 11/25/7 8/23/7 +f 5/28/7 2/27/7 3/26/7 +f 8/23/7 5/28/7 3/26/7 +f 15/31/8 14/30/8 13/29/8 +f 16/32/8 15/31/8 13/29/8 +f 18/35/9 17/34/9 16/33/9 +f 13/36/9 18/35/9 16/33/9 +f 13/25/6 14/24/6 19/23/6 +f 18/26/6 13/25/6 19/23/6 +f 20/39/10 19/38/10 14/37/10 +f 15/40/10 20/39/10 14/37/10 +f 15/22/7 16/21/7 17/20/7 +f 20/17/7 15/22/7 17/20/7 +f 20/39/11 22/42/11 21/41/11 +f 19/38/11 20/39/11 21/41/11 +f 21/28/6 23/27/6 18/26/6 +f 19/23/6 21/28/6 18/26/6 +f 24/19/7 22/18/7 20/17/7 +f 17/20/7 24/19/7 20/17/7 +f 6/6/12 21/41/12 22/42/12 +f 5/5/12 6/6/12 22/42/12 +f 6/18/13 1/19/13 23/27/13 +f 21/28/13 6/18/13 23/27/13 +f 22/18/14 24/19/14 2/27/14 +f 5/28/14 22/18/14 2/27/14 +f 18/35/15 23/44/15 24/43/15 +f 17/34/15 18/35/15 24/43/15 +f 1/1/16 2/2/16 24/43/16 +f 23/44/16 1/1/16 24/43/16 + diff --git a/Assets/models/platform 5/platform 5 base/platform 5 base.obj.meta b/Assets/models/platform 5/platform 5 base/platform 5 base.obj.meta new file mode 100644 index 0000000..6fcc9d4 --- /dev/null +++ b/Assets/models/platform 5/platform 5 base/platform 5 base.obj.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 09ac1c7e04512c543a940f9bfc62abba +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: default + 100002: //RootNode + 400000: default + 400002: //RootNode + 2100000: defaultMat + 2300000: default + 3300000: default + 4300000: default + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + 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: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/platform 5/platform 5 emission.meta b/Assets/models/platform 5/platform 5 emission.meta new file mode 100644 index 0000000..ee2d489 --- /dev/null +++ b/Assets/models/platform 5/platform 5 emission.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31d6dd3b2132d0748b3e7e4262cd83b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/models/platform 5/platform 5 emission/platform 5 emission.obj b/Assets/models/platform 5/platform 5 emission/platform 5 emission.obj new file mode 100644 index 0000000..b25e634 --- /dev/null +++ b/Assets/models/platform 5/platform 5 emission/platform 5 emission.obj @@ -0,0 +1,220 @@ +mtllib ./platform 5 emission.mtl +o UModeler Object (3) +v 2.6875 0.3447499 2.5 +v 2.5 0.5009995 2.5 +v 2.5 0.5009995 -2.5 +v 2.6875 0.3447499 -2.5 +v 2.6875 0.1572499 -2.5 +v 2.6875 0.1572499 2.5 +v 2.5 0.0009999275 -2.5 +v 2.5 0.0009999275 2.5 +v 2.5 0.09365642 -2.5 +v 2.5 0.4058442 -2.5 +v 2.622377 0.3121879 -2.5 +v 2.622377 0.1873127 -2.5 +v 2.5 0.4058442 2.5 +v 2.5 0.09365641 2.5 +v 2.622377 0.1873127 2.5 +v 2.622377 0.3121879 2.5 +v -2.716034 0.3434066 -0.09365633 +v -2.528721 0.4995005 -0.09365633 +v -2.528721 0.4995005 4.932567 +v -2.716034 0.3434066 4.932567 +v -2.716034 0.1560939 -0.09365633 +v -2.716034 0.1560939 4.932567 +v -2.528721 0.4058441 -0.09365633 +v -2.528721 0 -0.09365633 +v -2.528721 0.09365633 -0.09365633 +v -2.653596 0.1873127 -0.09365633 +v -2.653596 0.3121878 -0.09365633 +v -2.528721 0.09365633 4.932567 +v -2.528721 0 4.932567 +v -2.528721 0.4058441 4.932567 +v -2.653596 0.3121878 4.932567 +v -2.653596 0.1873127 4.932567 +v 2.310189 0.4692306 -1.904346 +v 2.310189 0.4692306 -1.654595 +v 1.685814 0.3131367 -1.092657 +v 1.685814 0.3131367 -1.342407 +v 2.310189 0.4692306 -0.9053445 +v 2.310189 0.4692306 -0.6555943 +v 1.685814 0.3131367 -0.09365633 +v 1.685814 0.3131367 -0.3434066 +v 2.310189 0.4692306 0.09365633 +v 2.310189 0.4692306 0.3434066 +v 1.685814 0.3131367 0.9053445 +v 1.685814 0.3131367 0.6555943 +v 2.310189 0.4692306 1.092657 +v 2.310189 0.4692306 1.342407 +v 1.685814 0.3131367 1.904346 +v 1.685814 0.3131367 1.654595 +v -2.310189 0.4682817 3.777472 +v -2.310189 0.4682817 3.527722 +v -1.685814 0.3121878 4.08966 +v -1.685814 0.3121878 4.33941 +v -2.310189 0.4682817 2.778471 +v -2.310189 0.4682817 2.528721 +v -1.685814 0.3121878 3.090659 +v -1.685814 0.3121878 3.340409 +v -2.310189 0.4682817 1.77947 +v -2.310189 0.4682817 1.52972 +v -1.685814 0.3121878 2.091658 +v -1.685814 0.3121878 2.341408 +v -2.310189 0.4682817 0.7804695 +v -2.310189 0.4682817 0.5307192 +v -1.685814 0.3121878 1.092657 +v -1.685814 0.3121878 1.342407 + +vt -2.6875 2.5 +vt -2.5 2.5 +vt -2.5 -2.5 +vt -2.6875 -2.5 +vt 2.5 0.3447499 +vt 2.5 0.1572499 +vt -2.5 0.1572499 +vt -2.5 0.3447499 +vt 2.6875 2.5 +vt 2.5 2.5 +vt 2.5 -2.5 +vt 2.6875 -2.5 +vt -2.5 0.09365642 +vt -2.5 0.0009999275 +vt -2.6875 0.1572499 +vt -2.6875 0.3447499 +vt -2.5 0.5009995 +vt -2.5 0.4058442 +vt -2.622377 0.3121879 +vt -2.622377 0.1873127 +vt 2.5 0.4058442 +vt 2.5 0.5009995 +vt 2.6875 0.3447499 +vt 2.6875 0.1572499 +vt 2.5 0.0009999275 +vt 2.5 0.09365642 +vt 2.622377 0.1873127 +vt 2.622377 0.3121879 +vt 2.716034 -0.0936563 +vt 2.528721 -0.0936563 +vt 2.528721 4.932567 +vt 2.716034 4.932567 +vt -0.0936563 0.1560939 +vt -0.0936563 0.3434066 +vt 4.932567 0.3434066 +vt 4.932567 0.1560939 +vt 2.528721 0.4058441 +vt 2.528721 0.4995005 +vt 2.716034 0.3434066 +vt 2.716034 0.1560939 +vt 2.528721 0 +vt 2.528721 0.09365633 +vt 2.653596 0.1873127 +vt 2.653596 0.3121878 +vt -2.528721 0.09365633 +vt -2.528721 0 +vt -2.716034 0.1560939 +vt -2.716034 0.3434066 +vt -2.528721 0.4995005 +vt -2.528721 0.4058441 +vt -2.653596 0.3121878 +vt -2.653596 0.1873127 +vt -2.716034 -4.932567 +vt -2.528721 -4.932567 +vt -2.716034 0.09365633 +vt -2.310189 -1.904346 +vt -2.310189 -1.654595 +vt -1.685814 -1.092657 +vt -1.685814 -1.342407 +vt -2.310189 -0.9053445 +vt -2.310189 -0.6555943 +vt -1.685814 -0.0936563 +vt -1.685814 -0.3434066 +vt -2.310189 0.09365633 +vt -2.310189 0.3434066 +vt -1.685814 0.9053445 +vt -1.685814 0.6555943 +vt -2.310189 1.092657 +vt -2.310189 1.342407 +vt -1.685814 1.904346 +vt -1.685814 1.654595 +vt 2.310189 3.777472 +vt 2.310189 3.527722 +vt 1.685814 4.08966 +vt 1.685814 4.33941 +vt 2.310189 2.778471 +vt 2.310189 2.528721 +vt 1.685814 3.090659 +vt 1.685814 3.340409 +vt 2.310189 1.77947 +vt 2.310189 1.52972 +vt 1.685814 2.091658 +vt 1.685814 2.341408 +vt 2.310189 0.7804695 +vt 2.310189 0.5307192 +vt 1.685814 1.092657 +vt 1.685814 1.342407 + +vn 0.6401833 0.7682223 0 +vn 1 0 0 +vn 0.6401844 -0.7682213 0 +vn 0 0 -1 +vn 0 0 1 +vn -0.6401846 0.7682212 0 +vn -1 0 0 +vn -0.6401846 -0.7682212 0 +vn -0.2425357 0.9701425 0 +vn 0.2425357 0.9701425 0 + +usemtl red_glow +f 3/3/1 2/2/1 1/1/1 +f 4/4/1 3/3/1 1/1/1 +f 6/7/2 5/6/2 4/5/2 +f 1/8/2 6/7/2 4/5/2 +f 8/11/3 7/10/3 5/9/3 +f 6/12/3 8/11/3 5/9/3 +f 7/14/4 9/13/4 5/15/4 +f 5/15/4 9/13/4 12/20/4 +f 5/15/4 12/20/4 11/19/4 +f 5/15/4 11/19/4 4/16/4 +f 4/16/4 11/19/4 10/18/4 +f 4/16/4 10/18/4 3/17/4 +f 14/26/5 8/25/5 6/24/5 +f 14/26/5 6/24/5 15/27/5 +f 15/27/5 6/24/5 16/28/5 +f 16/28/5 6/24/5 1/23/5 +f 16/28/5 1/23/5 13/21/5 +f 13/21/5 1/23/5 2/22/5 +f 19/31/6 18/30/6 17/29/6 +f 20/32/6 19/31/6 17/29/6 +f 20/35/7 17/34/7 21/33/7 +f 22/36/7 20/35/7 21/33/7 +f 25/42/4 24/41/4 21/40/4 +f 25/42/4 21/40/4 26/43/4 +f 26/43/4 21/40/4 27/44/4 +f 27/44/4 21/40/4 17/39/4 +f 27/44/4 17/39/4 23/37/4 +f 23/37/4 17/39/4 18/38/4 +f 29/46/5 28/45/5 22/47/5 +f 22/47/5 28/45/5 32/52/5 +f 22/47/5 32/52/5 31/51/5 +f 22/47/5 31/51/5 20/48/5 +f 20/48/5 31/51/5 30/50/5 +f 20/48/5 30/50/5 19/49/5 +f 24/45/8 29/54/8 22/53/8 +f 21/55/8 24/45/8 22/53/8 +f 35/58/9 34/57/9 33/56/9 +f 36/59/9 35/58/9 33/56/9 +f 39/62/9 38/61/9 37/60/9 +f 40/63/9 39/62/9 37/60/9 +f 43/66/9 42/65/9 41/64/9 +f 44/67/9 43/66/9 41/64/9 +f 47/70/9 46/69/9 45/68/9 +f 48/71/9 47/70/9 45/68/9 +f 51/74/10 50/73/10 49/72/10 +f 52/75/10 51/74/10 49/72/10 +f 55/78/10 54/77/10 53/76/10 +f 56/79/10 55/78/10 53/76/10 +f 59/82/10 58/81/10 57/80/10 +f 60/83/10 59/82/10 57/80/10 +f 63/86/10 62/85/10 61/84/10 +f 64/87/10 63/86/10 61/84/10 + diff --git a/Assets/models/platform 5/platform 5 emission/platform 5 emission.obj.meta b/Assets/models/platform 5/platform 5 emission/platform 5 emission.obj.meta new file mode 100644 index 0000000..fbb3c77 --- /dev/null +++ b/Assets/models/platform 5/platform 5 emission/platform 5 emission.obj.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 0d1a8ff32287bd4498268d0d23bd28df +ModelImporter: + serializedVersion: 23 + fileIDToRecycleName: + 100000: default + 100002: //RootNode + 400000: default + 400002: //RootNode + 2100000: defaultMat + 2300000: default + 3300000: default + 4300000: default + externalObjects: {} + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + 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: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + preserveHierarchy: 0 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + previousCalculatedGlobalScale: 1 + hasPreviousCalculatedGlobalScale: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7fbf7c2..9a87294 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,13 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5150040003515f5f585f552011755e4446154e2e2a2a7e347c2c4965b1b4366a + value: 5b53500307070b0b0b0f5a2648735a4412154f737d2b2536782f1e32e0b86c3a flags: 0 RecentlyUsedSceneGuid-1: - value: 50080c5756540a5e095b0d7a11210644154f1b7f782922642f281b35b0b86c6d + value: 5150040003515f5f585f552011755e4446154e2e2a2a7e347c2c4965b1b4366a flags: 0 RecentlyUsedSceneGuid-2: - value: 5b53500307070b0b0b0f5a2648735a4412154f737d2b2536782f1e32e0b86c3a + value: 50080c5756540a5e095b0d7a11210644154f1b7f782922642f281b35b0b86c6d flags: 0 RecentlyUsedSceneGuid-3: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a From a3d6123e5920b5f310c5866ffbefb90bdf197301 Mon Sep 17 00:00:00 2001 From: GamerClassN7 Date: Sun, 30 Jan 2022 12:12:24 +0100 Subject: [PATCH 4/4] Fixes --- Assets/Scenes/Vasek.unity | 2 -- Assets/Scripts/BGRotation.cs | 4 ++++ Assets/Scripts/ProceduralGeneration.cs | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/Scenes/Vasek.unity b/Assets/Scenes/Vasek.unity index 684a160..ef9c632 100644 --- a/Assets/Scenes/Vasek.unity +++ b/Assets/Scenes/Vasek.unity @@ -193,7 +193,6 @@ MonoBehaviour: - {fileID: 8768991388683709947, guid: 32d2ba4971e4c7e4ab98a1f9c37dcffc, type: 3} - {fileID: 6650340373999088090, guid: 76b3e3235b07ca04f91c9b020603e1dd, type: 3} - {fileID: 7834549091241900869, guid: 085af51cf1ada0a4fa8a290eba8b0fd5, type: 3} - - {fileID: 2628890434173161082, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3} - {fileID: 8768991388683709947, guid: 1e3f34788e0cb3f49a0bef285d5b059a, type: 3} - {fileID: 1316835597118596560, guid: 685c607395b2cfa46a548c481d178540, type: 3} - {fileID: 1316835597118596560, guid: edd9e993fa2520f4095e33c7552ecd54, type: 3} @@ -203,7 +202,6 @@ MonoBehaviour: - {fileID: 5287741263160770601, guid: 7a596fa177a8fd34face58d8f58e0e41, type: 3} - {fileID: 2394897577413455488, guid: 1348a4eeda762ae4db83cd873efb4c44, type: 3} backgroundLevelBlocks: [] - bgParrent: {fileID: 1253020012} player: {fileID: 250075900} lastBlock: {fileID: 126480931} --- !u!1 &705507993 diff --git a/Assets/Scripts/BGRotation.cs b/Assets/Scripts/BGRotation.cs index 6ab3572..f0e5854 100644 --- a/Assets/Scripts/BGRotation.cs +++ b/Assets/Scripts/BGRotation.cs @@ -5,10 +5,12 @@ using UnityEngine; public class BGRotation : MonoBehaviour { private Vector3 rotation; + private ProceduralGeneration bgParrentScript; private void Start() { rotation = new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360)) * 0.009f; + bgParrentScript = GameObject.Find("Level").GetComponent(); } void FixedUpdate() @@ -20,7 +22,9 @@ public class BGRotation : MonoBehaviour { if (other.tag == "platform") { + this.bgParrentScript.backgroundLevelBlocks.Remove(this.gameObject); Destroy(this.gameObject); } + } } diff --git a/Assets/Scripts/ProceduralGeneration.cs b/Assets/Scripts/ProceduralGeneration.cs index 5adf886..78cac6c 100644 --- a/Assets/Scripts/ProceduralGeneration.cs +++ b/Assets/Scripts/ProceduralGeneration.cs @@ -15,7 +15,7 @@ public class ProceduralGeneration : MonoBehaviour public List backgroundBlocks = new List(); public List backgroundLevelBlocks = new List(); private float maximumDistanceOfPlatformFromPlayerBg = 600.0f; - public GameObject bgParrent = null; + private GameObject bgParrent = null; public GameObject player = null; public GameObject lastBlock; @@ -103,13 +103,16 @@ public class ProceduralGeneration : MonoBehaviour levelParrent = this.gameObject; lastBlockPrefab = this.gameObject.transform.GetChild(0).gameObject; lastBlock = this.gameObject.transform.GetChild(0).gameObject; + if (bgParrent == null) + { + bgParrent = GameObject.Find("Background"); + } this.spawnedLevelBlocks.Add(lastBlock); } // Update is called once per frame void Update() { - // if (playerControlsSript.isFalling) // { // return; @@ -159,7 +162,10 @@ public class ProceduralGeneration : MonoBehaviour int blockToSpawn = Random.Range(0, (levelBlocks.Count + 1)); - if (levelBlocks[blockToSpawn].name == lastBlockPrefab.name) + if ( + (blockToSpawn > -1 && (blockToSpawn < levelBlocks.Count)) && + (levelBlocks[blockToSpawn].name == lastBlockPrefab.name) + ) { Debug.Log("Same Block"); if (blockToSpawn > levelBlocks.Count || blockToSpawn < 0)