Merge branches 'main' and 'main' of https://git.steelants.cz/GJP/GGJ2022

Assets/Prefabs/Platform Start.prefab

@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -1.34375, y: 0, z: 0}
   m_LocalScale: {x: 1.001, y: 1.001, z: 1.006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2628890434173161083}
   m_RootOrder: 1
@@ -51,9 +52,12 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -65,6 +69,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -77,6 +82,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &2628890433674921146
 GameObject:
   m_ObjectHideFlags: 0
@@ -105,6 +111,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.34375, y: 0, z: 0}
   m_LocalScale: {x: 1.001, y: 1.001, z: 1.006}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2628890434173161083}
   m_RootOrder: 2
@@ -128,9 +135,12 @@ MeshRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -142,6 +152,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -154,6 +165,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &2628890433950335203
 GameObject:
   m_ObjectHideFlags: 0
@@ -182,6 +194,7 @@ Transform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2628890434173161083}
   m_RootOrder: 0
@@ -205,9 +218,12 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -219,6 +235,7 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -231,6 +248,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &2628890434173161082
 GameObject:
   m_ObjectHideFlags: 0
@@ -240,9 +258,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2628890434173161083}
+  - component: {fileID: 7045065836637454982}
   m_Layer: 0
   m_Name: Platform Start
-  m_TagString: Untagged
+  m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -257,6 +276,7 @@ Transform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2628890433950335200}
   - {fileID: 2628890433357983123}
@@ -264,3 +284,16 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7045065836637454982
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2628890434173161082}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 5, y: 0.5, z: 5}
+  m_Center: {x: 0, y: 0.25, z: 0}

Assets/Prefabs/Player.prefab

@@ -1391,7 +1391,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3244356566819001084}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 4.32, z: 0}
+  m_LocalPosition: {x: 0, y: 4.32, z: 0.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

Assets/Scenes/Haitem.unity

@@ -258,7 +258,9 @@ MonoBehaviour:
   - {fileID: 8768991388683709947, guid: 1e3f34788e0cb3f49a0bef285d5b059a, type: 3}
   - {fileID: 8768991388683709947, guid: 97d4c453fb5affa448968cb5ce9ca2f4, type: 3}
   - {fileID: 7678802340880963262, guid: c7b1510ab2ab8e349bfaafa501cecb1f, type: 3}
+  spawnedLevelBlocks: []
   player: {fileID: 80285248}
+  lastBlock: {fileID: 0}
 --- !u!4 &1643205526
 Transform:
   m_ObjectHideFlags: 0
@@ -267,13 +269,76 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1643205524}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 134.07388, y: 70.72054, z: 101.54051}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 7123742325831853004}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &7123742325831853003
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1643205526}
+    m_Modifications:
+    - target: {fileID: 2628890434173161082, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_Name
+      value: Platform Start
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+--- !u!4 &7123742325831853004 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
+  m_PrefabInstance: {fileID: 7123742325831853003}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9031117423312889080
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/Vasek.unity

@@ -427,17 +427,9 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 3244356566819001073, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3244356566819001085, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 3244356566819001085, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: 0.7
       objectReference: {fileID: 0}
     - target: {fileID: 3244356567786994344, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
       propertyPath: m_Name
@@ -453,11 +445,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 3.18
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.9
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3244356567786994345, guid: ec622cf6f0988bc42a99ba84304c15a9, type: 3}
       propertyPath: m_LocalRotation.w

Assets/Scripts/PlayerController.cs

@@ -12,7 +12,7 @@ public class PlayerController : MonoBehaviour
     public float currentSpeed = 0f;
     private float modifier = 0.0f;
     Vector3 moveDirection = Vector3.zero;
-    bool canMove = true;
+    bool canMove = false;
     Rigidbody rb;
     float moveDirectionY;
     public bool isRunning = false;
@@ -58,13 +58,15 @@ public class PlayerController : MonoBehaviour
         transform.rotation *= Quaternion.Euler(0, Input.GetAxis("Mouse X") * lookSpeed, 0);
 
         isRunning = Input.GetKey(KeyCode.LeftShift);
-        if (currentSpeed < minSpeed)
+        if (canMove && currentSpeed < minSpeed)
         {
             currentSpeed += 0.0005f;
         }
 
-        if (Input.GetAxis("Vertical") > 0 && currentSpeed < maxSpeed)
+        if (Input.GetAxis("Vertical") > 0 && currentSpeed < maxSpeed) {
-        {
+            if (!canMove) {
+                canMove = true;
+            }
             currentSpeed += 0.01f;
         } else if (Input.GetAxis("Vertical") < 0 && currentSpeed > minSpeed) {
             currentSpeed -= 0.01f;

Assets/Scripts/ProceduralGeneration.cs

@@ -7,10 +7,8 @@ public class ProceduralGeneration : MonoBehaviour
     public List<GameObject> levelBlocks = new List<GameObject>();
     public List<GameObject> spawnedLevelBlocks = new List<GameObject>();
     public GameObject player = null;
-    private Vector3 lastBlockSpawnPoint;
     public GameObject lastBlock;
     private GameObject lastBlockPrefab;
-    private int blockIndex = 0;
     private int spavnetobjectIndex = 0;
 
     // Start is called before the first frame update
@@ -18,7 +16,6 @@ public class ProceduralGeneration : MonoBehaviour
     {
         lastBlockPrefab = this.gameObject.transform.GetChild(0).gameObject;
         lastBlock = this.gameObject.transform.GetChild(0).gameObject;
-        lastBlockSpawnPoint = this.gameObject.transform.GetChild(0).gameObject.transform.position;
         this.spawnedLevelBlocks.Add(lastBlock);
     }
 
@@ -33,7 +30,7 @@ public class ProceduralGeneration : MonoBehaviour
         int pieceCount = 10;
         float radius = (pieceCount / 2) * 2;
         float angle = 360f / (float)pieceCount;
-        Vector3 centerPoint = new Vector3(lastObject.transform.position.x, (lastObject.transform.position.y + radius), lastObject.transform.position.z);
+        Vector3 centerPoint = new Vector3(lastObject.transform.position.x, (lastObject.transform.position.y + radius), lastObject.transform.position.z + 2.0f);
 
         float heightOffset = radius;
 
@@ -52,14 +49,14 @@ public class ProceduralGeneration : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        int maxNumberOfBlock = 20;
+        int maxNumberOfBlock = 100;
 
         Vector3 playerPosition = this.player.transform.position;
         float distance = Vector3.Distance(this.spawnedLevelBlocks[0].transform.position, playerPosition);
 
         Debug.Log("Index" + 0);
 
-        if (distance > 20.0f && this.spawnedLevelBlocks.Count > maxNumberOfBlock)
+        if (distance > 10.0f || this.spawnedLevelBlocks.Count >= maxNumberOfBlock + 5)
         {
             Destroy(this.spawnedLevelBlocks[0]);
             this.spawnedLevelBlocks.Remove(this.spawnedLevelBlocks[0]);
@@ -104,9 +101,8 @@ public class ProceduralGeneration : MonoBehaviour
             if ((blockToSpawn > -1 && (blockToSpawn < (levelBlocks.Count - 1))))
             {
                 blockObjToSpawn = levelBlocks[blockToSpawn];
-                instantiatedGameObject = Instantiate(blockObjToSpawn, new Vector3(0, 0, blockIndex * (b.size.z + 1.0f)), (Quaternion.identity));
+                instantiatedGameObject = Instantiate(blockObjToSpawn, new Vector3(lastBlock.transform.position.x, lastBlock.transform.position.y, lastBlock.transform.position.y + (b.size.z + 1.0f)), (Quaternion.identity));
                 this.spawnedLevelBlocks.Add(instantiatedGameObject);
-                blockIndex++;
             }
             else
             {
@@ -114,7 +110,6 @@ public class ProceduralGeneration : MonoBehaviour
                 foreach (var spavnedBlock in instantiatedGameObjectLists)
                 {
                     this.spawnedLevelBlocks.Add(spavnedBlock);
-                    blockIndex++;
                 }
                 instantiatedGameObject = this.spawnedLevelBlocks[this.spawnedLevelBlocks.Count - 1];
                 blockObjToSpawn = levelBlocks[0];
@@ -123,7 +118,6 @@ public class ProceduralGeneration : MonoBehaviour
             Debug.Log("Spawn" + blockToSpawn);
 
             lastBlock = instantiatedGameObject;
-            lastBlockSpawnPoint = instantiatedGameObject.transform.position;
             lastBlockPrefab = blockObjToSpawn;
         }
     }