From bdc0c7ec31a51f3f9b44a0f62e386d20ac3a0798 Mon Sep 17 00:00:00 2001 From: haitem Date: Sat, 30 Jan 2021 22:19:31 +0100 Subject: [PATCH] Add pREFABS FOR DoubleJump, pushPull and Dash skills --- Assets/Prefabs/Player.prefab | 1 + Assets/Prefabs/PowerDash.prefab | 164 +++++++++++++++++ Assets/Prefabs/PowerDash.prefab.meta | 7 + Assets/Prefabs/PowerDoubleJump.prefab | 164 +++++++++++++++++ Assets/Prefabs/PowerDoubleJump.prefab.meta | 7 + Assets/Prefabs/PowerPushPull.prefab | 164 +++++++++++++++++ Assets/Prefabs/PowerPushPull.prefab.meta | 7 + Assets/Scenes/Filip.unity | 195 +++++++++++++++++++-- Assets/Scripts/PlayerManager.cs | 51 ++++-- Assets/Scripts/PowerCubeManager.cs | 18 +- 10 files changed, 747 insertions(+), 31 deletions(-) create mode 100644 Assets/Prefabs/PowerDash.prefab create mode 100644 Assets/Prefabs/PowerDash.prefab.meta create mode 100644 Assets/Prefabs/PowerDoubleJump.prefab create mode 100644 Assets/Prefabs/PowerDoubleJump.prefab.meta create mode 100644 Assets/Prefabs/PowerPushPull.prefab create mode 100644 Assets/Prefabs/PowerPushPull.prefab.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 8b718a1..b7c0f73 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -336,6 +336,7 @@ MonoBehaviour: actualHealth: 100 onGround: 1 activeAbility: 00000000 + PowerPrefabs: [] dashPower: 40 dashTime: 0.2 --- !u!95 &7009705026125325791 diff --git a/Assets/Prefabs/PowerDash.prefab b/Assets/Prefabs/PowerDash.prefab new file mode 100644 index 0000000..5aa87a5 --- /dev/null +++ b/Assets/Prefabs/PowerDash.prefab @@ -0,0 +1,164 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7945524436670112111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1593063039033634447} + - component: {fileID: 4848440137421042020} + - component: {fileID: 7836076122151817311} + m_Layer: 0 + m_Name: PowerDash + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1593063039033634447 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7945524436670112111} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.346, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5945663955776413348} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4848440137421042020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7945524436670112111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08fe7369accc1464499b2f2a75559298, type: 3} + m_Name: + m_EditorClassIdentifier: + powerType: 7 + powerTime: 0 + powerUnit: 0 + nextSceneName: +--- !u!65 &7836076122151817311 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7945524436670112111} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.55, z: 1} + m_Center: {x: 0, y: 0.4, z: 0} +--- !u!1001 &6127574593887074639 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1593063039033634447} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + - target: {fileID: 919132149155446097, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Name + value: SkillCube + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a2c33b905bb71c74aacdeca187b58abf, type: 3} +--- !u!4 &5945663955776413348 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + m_PrefabInstance: {fileID: 6127574593887074639} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PowerDash.prefab.meta b/Assets/Prefabs/PowerDash.prefab.meta new file mode 100644 index 0000000..812ea23 --- /dev/null +++ b/Assets/Prefabs/PowerDash.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d077f1b027540045b6833e51a067855 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PowerDoubleJump.prefab b/Assets/Prefabs/PowerDoubleJump.prefab new file mode 100644 index 0000000..9a05adb --- /dev/null +++ b/Assets/Prefabs/PowerDoubleJump.prefab @@ -0,0 +1,164 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &200189416050843931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8833996703784759035} + - component: {fileID: 3443571237732921616} + - component: {fileID: 16975228683882539} + m_Layer: 0 + m_Name: PowerDoubleJump + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8833996703784759035 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200189416050843931} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.58, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4467613211269340880} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3443571237732921616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200189416050843931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08fe7369accc1464499b2f2a75559298, type: 3} + m_Name: + m_EditorClassIdentifier: + powerType: 5 + powerTime: 0 + powerUnit: 0 + nextSceneName: +--- !u!65 &16975228683882539 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 200189416050843931} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.55, z: 1} + m_Center: {x: 0, y: 0.4, z: 0} +--- !u!1001 &4146302289838111035 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8833996703784759035} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + - target: {fileID: 919132149155446097, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Name + value: SkillCube + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a2c33b905bb71c74aacdeca187b58abf, type: 3} +--- !u!4 &4467613211269340880 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + m_PrefabInstance: {fileID: 4146302289838111035} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PowerDoubleJump.prefab.meta b/Assets/Prefabs/PowerDoubleJump.prefab.meta new file mode 100644 index 0000000..b0fad60 --- /dev/null +++ b/Assets/Prefabs/PowerDoubleJump.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3ddcad8db762bdf41b5b49fff6fb6a3b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PowerPushPull.prefab b/Assets/Prefabs/PowerPushPull.prefab new file mode 100644 index 0000000..4f59a79 --- /dev/null +++ b/Assets/Prefabs/PowerPushPull.prefab @@ -0,0 +1,164 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2644881069278570743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6695479724104099607} + - component: {fileID: 700788770895788284} + - component: {fileID: 2760698352146241991} + m_Layer: 0 + m_Name: PowerPushPull + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6695479724104099607 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2644881069278570743} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.58, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1761911225665247036} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &700788770895788284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2644881069278570743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08fe7369accc1464499b2f2a75559298, type: 3} + m_Name: + m_EditorClassIdentifier: + powerType: 6 + powerTime: 0 + powerUnit: 0 + nextSceneName: +--- !u!65 &2760698352146241991 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2644881069278570743} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.55, z: 1} + m_Center: {x: 0, y: 0.4, z: 0} +--- !u!1001 &2303918390432084183 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6695479724104099607} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.x + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalScale.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + - target: {fileID: 919132149155446097, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + propertyPath: m_Name + value: SkillCube + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a2c33b905bb71c74aacdeca187b58abf, type: 3} +--- !u!4 &1761911225665247036 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + m_PrefabInstance: {fileID: 2303918390432084183} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PowerPushPull.prefab.meta b/Assets/Prefabs/PowerPushPull.prefab.meta new file mode 100644 index 0000000..f81cc21 --- /dev/null +++ b/Assets/Prefabs/PowerPushPull.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 94642d7ef8c97e544af1d5ca3596a37f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Filip.unity b/Assets/Scenes/Filip.unity index b3ecf68..cb7da23 100644 --- a/Assets/Scenes/Filip.unity +++ b/Assets/Scenes/Filip.unity @@ -444,75 +444,213 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1313665106 +--- !u!1001 &2549885454013026912 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalPosition.x - value: 3.64 + value: -7.346 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657726, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2773067093461657727, guid: 712671f8cf5fa684cbcb1159d45b0057, + - target: {fileID: 7945524436670112111, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_Name - value: Artifac + value: PowerDash objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 712671f8cf5fa684cbcb1159d45b0057, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2d077f1b027540045b6833e51a067855, type: 3} +--- !u!1001 &2899619782413736478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_Name + value: PowerDoubleJump + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.58 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} +--- !u!1001 &3013606953711284009 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_Name + value: PowerPushPull + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.302 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} --- !u!1001 &6840056971477016067 PrefabInstance: m_ObjectHideFlags: 0 @@ -525,6 +663,29 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: PowerPrefabs.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: PowerPrefabs.Array.data[0] + value: + objectReference: {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, + type: 3} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: PowerPrefabs.Array.data[1] + value: + objectReference: {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f, + type: 3} + - target: {fileID: 7094923891560833916, guid: e4d82994b58b7304b91c915c597b71f8, + type: 3} + propertyPath: PowerPrefabs.Array.data[2] + value: + objectReference: {fileID: 7945524436670112111, guid: 2d077f1b027540045b6833e51a067855, + type: 3} - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index f0e1310..2395355 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -20,6 +20,7 @@ public class PlayerManager : MonoBehaviour private bool interact = false; public List activeAbility = new List(); //without ability=0 or null, dubleJump = 1, push/pull = 2, dash = 3 + public List PowerPrefabs = new List(); //dubleJump = 0, push/pull = 1, dash = 2 private bool dubleJump = true; private GameObject pushPullObject; public float dashPower = 40f; @@ -65,8 +66,12 @@ public class PlayerManager : MonoBehaviour } if (interact) { - if (powerCubeManager.powerType == PowerCubeManager.PowerType.Artefact) - { + if (powerCubeManager != null && ( + powerCubeManager.powerType == PowerCubeManager.PowerType.Artefact || + powerCubeManager.powerType == PowerCubeManager.PowerType.DubleJump || + powerCubeManager.powerType == PowerCubeManager.PowerType.PushPull || + powerCubeManager.powerType == PowerCubeManager.PowerType.Dash + )) { if (Input.GetKeyUp(KeyCode.E)) { playerAnimator.SetTrigger("Eat"); @@ -229,26 +234,52 @@ public class PlayerManager : MonoBehaviour { if (rigidBody.velocity.y <= 1 && (onGround || (dubleJump && activeAbility.Count > 0 && activeAbility[0] == 1))) { - pushPullObject = null; - rigidBody.AddForce( - (transform.right * (run ? runSpeed : speed) * 15 * Input.GetAxis("Horizontal") * Time.deltaTime) + - (transform.up * jump * 10 * Time.deltaTime), - ForceMode.VelocityChange - ); if (!onGround) { dubleJump = false; } + pushPullObject = null; + rigidBody.AddForce( + (transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) + + (transform.up * jump * 10 * Time.deltaTime), + ForceMode.VelocityChange + ); } } } + private void DropPower() + { + if (activeAbility.Count > 0 && activeAbility[0] != 0) + { + Instantiate(PowerPrefabs[activeAbility[0] - 1], new Vector3(transform.position.x, transform.position.y - 0.5f, transform.position.z + 0.5f), PowerPrefabs[activeAbility[0] - 1].transform.rotation); + } + } + public void ActivePowerCube(float power, float powerTime, PowerCubeManager.PowerType powerType, string nextSceneName = "") { if ((powerType.GetHashCode() - 1) == 3) { SceneManager.LoadScene(nextSceneName); } + else if ((powerType.GetHashCode() - 1) == 4) + { + DropPower(); + //doubleJump + activeAbility[0] = 1; + } + else if ((powerType.GetHashCode() - 1) == 5) + { + DropPower(); + //pushpull + activeAbility[0] = 2; + } + else if ((powerType.GetHashCode() - 1) == 6) + { + DropPower(); + //dash + activeAbility[0] = 3; + } else if (actualPowerTimes.Length <= (powerType.GetHashCode()) || actualPowerTimes[powerType.GetHashCode() - 1] < Time.time) { actualPowerTimes[powerType.GetHashCode() - 1] = Time.time + powerTime; @@ -335,7 +366,7 @@ 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.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) + (transform.up * 10 * Time.deltaTime), ForceMode.VelocityChange ); @@ -344,7 +375,7 @@ public class PlayerManager : MonoBehaviour } if (other.gameObject.GetComponent() != null) { - interact = true; + interact = false; } } diff --git a/Assets/Scripts/PowerCubeManager.cs b/Assets/Scripts/PowerCubeManager.cs index 3672943..8623e59 100644 --- a/Assets/Scripts/PowerCubeManager.cs +++ b/Assets/Scripts/PowerCubeManager.cs @@ -5,7 +5,7 @@ using UnityEngine.SceneManagement; public class PowerCubeManager : MonoBehaviour { - public enum PowerType {Nothing, Bigger, Faster, Jumper, Artefact}; + public enum PowerType {Nothing, Bigger, Faster, Jumper, Artefact, DubleJump, PushPull, Dash}; public PowerType powerType = PowerType.Nothing; public float powerTime = 5f; public float powerUnit = 10f; @@ -25,7 +25,7 @@ public class PowerCubeManager : MonoBehaviour { GetComponentInChildren().material.color = Color.green; } - else if (powerType == PowerType.Artefact) + else if (powerType == PowerType.Artefact || powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash) { meshRenderer = GetComponentInChildren(); meshRenderer.materials[1].SetFloat("_Outline", 0.0f); @@ -43,14 +43,24 @@ public class PowerCubeManager : MonoBehaviour { if (other.gameObject.tag == "Player") { - meshRenderer.materials[1].SetFloat("_Outline", 0.4f); + if (powerType == PowerType.Artefact) + { + meshRenderer.materials[1].SetFloat("_Outline", 0.4f); + } + else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash) + { + meshRenderer.materials[1].SetFloat("_Outline", 0.01f); + } } } private void OnTriggerExit(Collider other) { if (other.gameObject.tag == "Player") { - meshRenderer.materials[1].SetFloat("_Outline", 0.0f); + if (powerType == PowerType.Artefact || powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash) + { + meshRenderer.materials[1].SetFloat("_Outline", 0.0f); + } } } }