Assets/Materials/PushPull.mat

@@ -66,7 +66,7 @@ Material:
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
-    - _Outline: 0
+    - _Outline: 0.1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1

Assets/Prefabs/Artifac.prefab

@@ -1,144 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &2773067093461657727
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2773067093461657726}
-  - component: {fileID: 2773067093461657724}
-  - component: {fileID: 2773067093461657725}
-  m_Layer: 0
-  m_Name: Artifac
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2773067093461657726
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2773067093461657727}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3.64, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 2773067093833738001}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &2773067093461657724
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2773067093461657727}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 0.8, y: 0.5, z: 0.8}
-  m_Center: {x: 0, y: 0.25, z: 0}
---- !u!114 &2773067093461657725
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2773067093461657727}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 08fe7369accc1464499b2f2a75559298, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  powerType: 4
-  powerTime: 5
-  powerUnit: 10
-  nextSceneName: Vasek
---- !u!1 &2773067093833738002
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2773067093833738001}
-  - component: {fileID: 2773067093833737999}
-  - component: {fileID: 2773067093833738000}
-  m_Layer: 0
-  m_Name: Cylinder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2773067093833738001
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2773067093833738002}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.25, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 2773067093461657726}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2773067093833737999
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2773067093833738002}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &2773067093833738000
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2773067093833738002}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  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

Assets/Prefabs/Artifac.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 712671f8cf5fa684cbcb1159d45b0057
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Player.prefab

@@ -45,8 +45,8 @@ Light:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Intensity: 1
   m_Range: 10
-  m_SpotAngle: 90
+  m_SpotAngle: 12.049286
-  m_InnerSpotAngle: 9
+  m_InnerSpotAngle: 12.049286
   m_CookieSize: 10
   m_Shadows:
     m_Type: 0

Assets/Scenes/Filip.unity

@@ -214,7 +214,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &374719570
+--- !u!1001 &509978202
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -234,76 +234,7 @@ PrefabInstance:
     - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 5.43
+      value: 4.67
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.76
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3}
---- !u!1001 &822020710
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 7120608647080996497, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_Name
-      value: PushPullCube (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.52
       objectReference: {fileID: 0}
     - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd,
         type: 3}
@@ -456,6 +387,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
+    - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8,
+        type: 3}
+      propertyPath: activeAbility.Array.data[0]
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8,
         type: 3}
       propertyPath: m_RootOrder

Assets/Scripts/PlayerManager.cs

@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 
 public class PlayerManager : MonoBehaviour
 {
@@ -166,7 +165,7 @@ public class PlayerManager : MonoBehaviour
 
     public void Die()
     {
-        SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+        Application.LoadLevel(Application.loadedLevel);
     }
 
     void Animation()
@@ -219,7 +218,7 @@ public class PlayerManager : MonoBehaviour
             {
                 pushPullObject = null;
                 rigidBody.AddForce(
-                    (transform.right * (run ? runSpeed : speed) * 15 * Input.GetAxis("Horizontal") * Time.deltaTime) + 
+                    (transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) + 
                     (transform.up * jump * 10 * Time.deltaTime), 
                     ForceMode.VelocityChange
                 );
@@ -312,11 +311,6 @@ public class PlayerManager : MonoBehaviour
     {
         if (other.tag == "Ground" || other.tag == "Objects")
         {
-            rigidBody.AddForce(
-                (transform.right * (run ? runSpeed : speed) * 10 * Input.GetAxis("Horizontal") * Time.deltaTime) +
-                (transform.up * 10 * Time.deltaTime),
-                ForceMode.VelocityChange
-            );
             onGround = false;
             dash = false;
         }

Assets/Scripts/PowerCubeManager.cs

@@ -1,17 +1,13 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 
 public class PowerCubeManager : MonoBehaviour
 {
-    public enum PowerType {Nothing, Bigger, Faster, Jumper, Artefact};
+    public enum PowerType {Nothing, Bigger, Faster, Jumper};
     public PowerType powerType = PowerType.Nothing;
     public float powerTime = 5f;
     public float powerUnit = 10f;
-    private bool interact = false;
-    public string nextSceneName;
-    private MeshRenderer meshRenderer;
 
     void Start()
     {
@@ -26,42 +22,11 @@ public class PowerCubeManager : MonoBehaviour
         {
             GetComponentInChildren<MeshRenderer>().material.color = Color.green;
         }
-        else if (powerType == PowerType.Artefact)
-        {
-            meshRenderer = GetComponentInChildren<MeshRenderer>();
-            meshRenderer.materials[1].SetFloat("_Outline", 0.0f);
-            meshRenderer.materials[1].SetColor("_OutlineColor", new Color(0.5276349f, 0.5566038f, 0.118147f));
-        }
 
     }
 
     void Update()
     {
-        if (interact) {
-            if (powerType == PowerType.Artefact)
-            {
-                if (Input.GetKeyUp(KeyCode.E))
-                {
-                    SceneManager.LoadScene(nextSceneName);
-                }
-            }
-        }
-    }
         
-    private void OnTriggerEnter(Collider other)
-    {
-        if (other.gameObject.tag == "Player")
-        {
-            meshRenderer.materials[1].SetFloat("_Outline", 0.01f);
-            interact = true;
-        }
-    }
-    private void OnTriggerExit(Collider other)
-    {
-        if (other.gameObject.tag == "Player")
-        {
-            meshRenderer.materials[1].SetFloat("_Outline", 0.0f);
-            interact = false;
-        }
     }
 }

Assets/Shaders/Border.shader

@@ -58,7 +58,7 @@ Shader "Outlined/Silhouette Only" {
 			Name "OUTLINE"
 			Tags { "LightMode" = "Always" }
 			Cull Off
-			Offset 5,5
+			Offset 4,4
 
 
 		// you can choose what kind of blending mode you want for the outline

ProjectSettings/EditorBuildSettings.asset

@@ -5,9 +5,6 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
-    path: Assets/Scenes/Filip.unity
-    guid: 326dea585e0ea574389529eaae8a0ab4
   - enabled: 1
     path: Assets/Scenes/Vasek.unity
     guid: 127deaeaf7712824f83ee4cba639e023