diff --git a/Assets/Prefabs/Ladder.prefab b/Assets/Prefabs/Ladder.prefab new file mode 100644 index 0000000..5735ff9 --- /dev/null +++ b/Assets/Prefabs/Ladder.prefab @@ -0,0 +1,163 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8000970721633820985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8000970721633820988} + - component: {fileID: 8000970721633820987} + - component: {fileID: 8000970721633820986} + m_Layer: 0 + m_Name: Ladder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8000970721633820988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000970721633820985} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.908, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7531022465049058937} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8000970721633820987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000970721633820985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7be605e9d134b742b0269485b577d6a, type: 3} + m_Name: + m_EditorClassIdentifier: + objectType: 3 + detailSign: {fileID: 0} + MovePoints: [] +--- !u!65 &8000970721633820986 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000970721633820985} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 4, z: 1} + m_Center: {x: 0, y: 2, z: 0} +--- !u!1001 &8000970719968180626 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8000970721633820988} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 49025a60961b95a43986697748175308, type: 2} + - target: {fileID: 919132149155446097, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + propertyPath: m_Name + value: Ladder + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b7c63dcf00c14d4f8d50746541ddaec, type: 3} +--- !u!4 &7531022465049058937 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6b7c63dcf00c14d4f8d50746541ddaec, + type: 3} + m_PrefabInstance: {fileID: 8000970719968180626} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Ladder.prefab.meta b/Assets/Prefabs/Ladder.prefab.meta new file mode 100644 index 0000000..6a81172 --- /dev/null +++ b/Assets/Prefabs/Ladder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f1921397dd03b054c87b4ce2e3d72adc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 2d2ae96..bdb7edb 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -736,11 +736,13 @@ MonoBehaviour: health: 100 actualHealth: 100 onGround: 1 + onLadder: 0 activeAbility: 00000000 PowerPrefabs: - {fileID: 200189416050843931, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} - {fileID: 2644881069278570743, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} - {fileID: 7945524436670112111, guid: 2d077f1b027540045b6833e51a067855, type: 3} + - {fileID: 7411583397803452420, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} dashPower: 40 dashTime: 0.2 --- !u!95 &7009705026125325791 diff --git a/Assets/Prefabs/PowerLadder.prefab b/Assets/Prefabs/PowerLadder.prefab new file mode 100644 index 0000000..0c4e290 --- /dev/null +++ b/Assets/Prefabs/PowerLadder.prefab @@ -0,0 +1,164 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7411583397803452420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2199064835177506788} + - component: {fileID: 5464565265953175567} + - component: {fileID: 7214839183656753460} + m_Layer: 0 + m_Name: PowerLadder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2199064835177506788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411583397803452420} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -10.03, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6493111389015250895} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5464565265953175567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411583397803452420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08fe7369accc1464499b2f2a75559298, type: 3} + m_Name: + m_EditorClassIdentifier: + powerType: 8 + powerTime: 0 + powerUnit: 0 + nextSceneName: +--- !u!65 &7214839183656753460 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411583397803452420} + 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 &6743739212516913188 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2199064835177506788} + 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 &6493111389015250895 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a2c33b905bb71c74aacdeca187b58abf, + type: 3} + m_PrefabInstance: {fileID: 6743739212516913188} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PowerLadder.prefab.meta b/Assets/Prefabs/PowerLadder.prefab.meta new file mode 100644 index 0000000..962c6ad --- /dev/null +++ b/Assets/Prefabs/PowerLadder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d42abe5652faa4543b100c9bf55091a7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Filip.unity b/Assets/Scenes/Filip.unity index 810a584..c703ccd 100644 --- a/Assets/Scenes/Filip.unity +++ b/Assets/Scenes/Filip.unity @@ -141,7 +141,7 @@ PrefabInstance: - target: {fileID: 9203772316689128559, guid: a81c7869040fbef4f8d5acf2c1499c42, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 9203772316689128559, guid: a81c7869040fbef4f8d5acf2c1499c42, type: 3} @@ -195,6 +195,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a81c7869040fbef4f8d5acf2c1499c42, type: 3} +--- !u!1001 &157925291 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_Name + value: Ladder (1) + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.x + value: -5.13 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} --- !u!1 &253619331 GameObject: m_ObjectHideFlags: 0 @@ -308,7 +377,7 @@ PrefabInstance: - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} @@ -362,75 +431,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597897b562955934fae65d62e0a8e3cd, type: 3} ---- !u!1001 &488560107 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2445808756126767684, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_Name - value: HideSpikes - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.3399206 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.055500984 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4248534433455483926, guid: 474f8c28a83eb5f428704b0e53c4e039, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 474f8c28a83eb5f428704b0e53c4e039, type: 3} --- !u!1001 &515298013 PrefabInstance: m_ObjectHideFlags: 0 @@ -441,7 +441,7 @@ PrefabInstance: - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e, type: 3} @@ -500,86 +500,36 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 75a5dff38607d264bbf318173d359a5e, 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: 7120608647080996502, guid: 597897b562955934fae65d62e0a8e3cd, - type: 3} - propertyPath: m_Mass - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 7120608647080996506, guid: 597897b562955934fae65d62e0a8e3cd, - type: 3} - propertyPath: m_RootOrder - value: 8 - 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} - 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!1 &952701062 stripped +--- !u!1 &594617475 GameObject: - m_CorrespondingSourceObject: {fileID: 5921576287932412887, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - m_PrefabInstance: {fileID: 6840056971477016067} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 594617476} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &594617476 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594617475} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.5253737, y: 2.142317, z: -0.89260405} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &964739489 GameObject: m_ObjectHideFlags: 0 @@ -670,77 +620,101 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1158902025 -PrefabInstance: +--- !u!1 &1663971021 +GameObject: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1663971025} + - component: {fileID: 1663971024} + - component: {fileID: 1663971023} + - component: {fileID: 1663971022} + m_Layer: 0 + m_Name: Cube + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1663971022 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663971021} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.813418 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalPosition.y - value: 2.95 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827164, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224448297729827165, guid: 08d7423eab725344da0bad3b29f907dd, - type: 3} - propertyPath: m_Name - value: SawRiding - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 08d7423eab725344da0bad3b29f907dd, type: 3} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1663971023 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663971021} + 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} + 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 +--- !u!33 &1663971024 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663971021} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1663971025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1663971021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.51, y: 1.5, z: 0} + m_LocalScale: {x: 2, y: 3, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2549885454013026912 PrefabInstance: m_ObjectHideFlags: 0 @@ -751,7 +725,7 @@ PrefabInstance: - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} propertyPath: m_RootOrder - value: 12 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1593063039033634447, guid: 2d077f1b027540045b6833e51a067855, type: 3} @@ -825,12 +799,12 @@ PrefabInstance: - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} propertyPath: m_RootOrder - value: 9 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} propertyPath: m_LocalPosition.x - value: 2.58 + value: 11.01 objectReference: {fileID: 0} - target: {fileID: 8833996703784759035, guid: 3ddcad8db762bdf41b5b49fff6fb6a3b, type: 3} @@ -894,12 +868,12 @@ PrefabInstance: - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} propertyPath: m_RootOrder - value: 10 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} propertyPath: m_LocalPosition.x - value: -2.302 + value: -10.03 objectReference: {fileID: 0} - target: {fileID: 6695479724104099607, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} @@ -948,80 +922,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 94642d7ef8c97e544af1d5ca3596a37f, type: 3} ---- !u!1001 &5732701482027561366 +--- !u!1001 &5075004910662975950 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4850319959489979102, guid: c6f393d12d7dd6b43a2ec2840cb89b97, - type: 3} - propertyPath: m_Name - value: Sign - objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalPosition.x - value: 1.299 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalPosition.z - value: 0.913 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5189304429820737636, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 2199064835177506788, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5732701482242678669, guid: c6f393d12d7dd6b43a2ec2840cb89b97, + - target: {fileID: 7411583397803452420, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} - propertyPath: detailSign - value: - objectReference: {fileID: 952701062} + propertyPath: m_Name + value: PowerLadder + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c6f393d12d7dd6b43a2ec2840cb89b97, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d42abe5652faa4543b100c9bf55091a7, type: 3} --- !u!1001 &6840056971477016067 PrefabInstance: m_ObjectHideFlags: 0 @@ -1037,7 +1006,7 @@ PrefabInstance: - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7094923891560833917, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} @@ -1089,13 +1058,77 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7094923891560833918, guid: e4d82994b58b7304b91c915c597b71f8, - type: 3} - propertyPath: m_Drag - value: 0.05 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4d82994b58b7304b91c915c597b71f8, type: 3} +--- !u!1001 &8000970720691840184 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8000970721633820985, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_Name + value: Ladder + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.908 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8000970721633820988, guid: f1921397dd03b054c87b4ce2e3d72adc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f1921397dd03b054c87b4ce2e3d72adc, type: 3} --- !u!1001 &8125994354024151814 PrefabInstance: m_ObjectHideFlags: 0 @@ -1106,7 +1139,7 @@ PrefabInstance: - target: {fileID: 8125994354137083922, guid: 0d7691d0b9091aa4dba16f262d8daf1b, type: 3} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8125994354137083922, guid: 0d7691d0b9091aa4dba16f262d8daf1b, type: 3} diff --git a/Assets/Scripts/ObjectManager.cs b/Assets/Scripts/ObjectManager.cs index 70fd7b9..4555883 100644 --- a/Assets/Scripts/ObjectManager.cs +++ b/Assets/Scripts/ObjectManager.cs @@ -5,13 +5,14 @@ using UnityEngine.UI; public class ObjectManager : MonoBehaviour { - public enum ObjectType {Nothing, PushPull, Sign}; + public enum ObjectType {Nothing, PushPull, Sign, Ladder}; public ObjectType objectType = ObjectType.Nothing; private Rigidbody rigidBody; private MeshRenderer meshRenderer; private PlayerManager playerManager; private bool interact = false; public GameObject detailSign; + public List MovePoints = new List(); // Start is called before the first frame update void Start() @@ -26,6 +27,10 @@ public class ObjectManager : MonoBehaviour meshRenderer = meshR[1]; } } + else if (objectType == ObjectType.Ladder) + { + meshRenderer = GetComponentInChildren(); + } else { meshRenderer = GetComponent(); @@ -67,7 +72,6 @@ public class ObjectManager : MonoBehaviour { detailSign.SetActive(false); } - } } else @@ -76,12 +80,15 @@ public class ObjectManager : MonoBehaviour { meshRenderer.materials[1].SetColor("_OutlineColor", new Color(0.5276349f, 0.5566038f, 0.118147f)); } - if (Input.GetKeyUp(KeyCode.E)) + if (objectType == ObjectType.PushPull) { - if (playerManager != null) + if (Input.GetKeyUp(KeyCode.E)) { - playerManager.RemovePushPullObject(); - playerManager = null; + if (playerManager != null) + { + playerManager.RemovePushPullObject(); + playerManager = null; + } } } } @@ -97,6 +104,16 @@ public class ObjectManager : MonoBehaviour meshRenderer.materials[1].SetFloat("_Outline", 2.5f); interact = true; } + + if (objectType == ObjectType.Ladder) + { + playerManager = other.gameObject.GetComponent(); + playerManager.onLadder = true; + if (playerManager.activeAbility.Count > 0 && playerManager.activeAbility[0] == 4) { + playerManager.GetComponent().useGravity = false; + } + interact = true; + } } } @@ -104,7 +121,14 @@ public class ObjectManager : MonoBehaviour { if (other.gameObject.tag == "Player") { - meshRenderer.materials[1].SetFloat("_Outline", 0.0f); + if (objectType == ObjectType.Ladder) + { + playerManager.onLadder = false; + playerManager.GetComponent().useGravity = true; + } + if (meshRenderer != null) { + meshRenderer.materials[1].SetFloat("_Outline", 0.0f); + } interact = false; } } diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 3e71e1e..5bee4f1 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -13,14 +13,15 @@ public class PlayerManager : MonoBehaviour public float actualHealth; private float[] actualPowerTimes = new float[] { 0f, 0f, 0f }; public bool onGround = true; + public bool onLadder = false; private bool run = false; private Animator playerAnimator; private Rigidbody rigidBody; private PowerCubeManager powerCubeManager; 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 + public List activeAbility = new List(); //without ability=0 or null, dubleJump = 1, push/pull = 2, dash = 3, ladder = 4 + public List PowerPrefabs = new List(); //dubleJump = 0, push/pull = 1, dash = 2, ladder = 3 private bool dubleJump = true; private GameObject pushPullObject; public float dashPower = 40f; @@ -70,7 +71,8 @@ public class PlayerManager : MonoBehaviour powerCubeManager.powerType == PowerCubeManager.PowerType.Artefact || powerCubeManager.powerType == PowerCubeManager.PowerType.DubleJump || powerCubeManager.powerType == PowerCubeManager.PowerType.PushPull || - powerCubeManager.powerType == PowerCubeManager.PowerType.Dash + powerCubeManager.powerType == PowerCubeManager.PowerType.Dash || + powerCubeManager.powerType == PowerCubeManager.PowerType.Ladder )) { if (Input.GetKeyUp(KeyCode.E)) { @@ -118,7 +120,8 @@ public class PlayerManager : MonoBehaviour } else if (activeAbility.Count > 0 && activeAbility[0] == 3) { - if (Input.GetKeyUp(KeyCode.D) || Input.GetKeyUp(KeyCode.A) && !dash) { + if (Input.GetKeyUp(KeyCode.D) || Input.GetKeyUp(KeyCode.A) && !dash) + { if (actualDashTime < Time.time) { if (Input.GetKeyUp(KeyCode.D)) @@ -133,7 +136,8 @@ public class PlayerManager : MonoBehaviour } else { - if (dashButton == 1 && Input.GetKeyUp(KeyCode.D)) { + if (dashButton == 1 && Input.GetKeyUp(KeyCode.D)) + { rigidBody.AddForce( (transform.right * dashPower * 10 * 5 * 1 * Time.deltaTime) + (transform.up * 1 * 10 * Time.deltaTime), @@ -142,7 +146,7 @@ public class PlayerManager : MonoBehaviour dash = true; dashButton = 0; actualDashTime = Time.time - 1f; - } + } else if (dashButton == 2 && Input.GetKeyUp(KeyCode.A)) { rigidBody.AddForce( @@ -227,11 +231,12 @@ public class PlayerManager : MonoBehaviour void Move() { - if (onGround) { + if (onGround || (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4)) { rigidBody.MovePosition( transform.position + + (onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) + (transform.right * (run ? runSpeed : speed) * Input.GetAxis("Horizontal") * Time.deltaTime) - ); + );; } } @@ -287,6 +292,12 @@ public class PlayerManager : MonoBehaviour //dash activeAbility[0] = 3; } + else if ((powerType.GetHashCode() - 1) == 7) + { + DropPower(); + //ladder + activeAbility[0] = 4; + } else if (actualPowerTimes.Length <= (powerType.GetHashCode()) || actualPowerTimes[powerType.GetHashCode() - 1] < Time.time) { actualPowerTimes[powerType.GetHashCode() - 1] = Time.time + powerTime; @@ -370,14 +381,25 @@ public class PlayerManager : MonoBehaviour { if (other.tag == "Ground" || other.tag == "Objects") { - rigidBody.AddForce( - (transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) + - (transform.up * 10 * Time.deltaTime), - ForceMode.VelocityChange - ); + if (!onLadder) { + rigidBody.AddForce( + (transform.right * (run ? runSpeed : speed) * 5 * Input.GetAxis("Horizontal") * Time.deltaTime) + + (transform.up * 10 * Time.deltaTime), + ForceMode.VelocityChange + ); + } onGround = false; dash = false; } + if (other.gameObject.GetComponent() != null) + { + if (other.gameObject.GetComponent().objectType == ObjectManager.ObjectType.Ladder) { + rigidBody.AddForce( + (transform.right * (run ? runSpeed : speed) * 2.5f * Input.GetAxis("Horizontal") * Time.deltaTime), + ForceMode.VelocityChange + ); + } + } if (other.gameObject.GetComponent() != null) { interact = false; diff --git a/Assets/Scripts/PowerCubeManager.cs b/Assets/Scripts/PowerCubeManager.cs index bd74448..4f31157 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, DubleJump, PushPull, Dash}; + public enum PowerType {Nothing, Bigger, Faster, Jumper, Artefact, DubleJump, PushPull, Dash, Ladder}; public PowerType powerType = PowerType.Nothing; public float powerTime = 5f; public float powerUnit = 10f; @@ -26,6 +26,10 @@ public class PowerCubeManager : MonoBehaviour { GetComponentInChildren().material.color = Color.white; } + if (powerType == PowerType.Ladder) + { + GetComponentInChildren().material.color = Color.black; + } if (powerType == PowerType.Bigger) { GetComponentInChildren().material.color = Color.blue; } @@ -37,7 +41,7 @@ public class PowerCubeManager : MonoBehaviour { GetComponentInChildren().material.color = Color.green; } - else if (powerType == PowerType.Artefact || powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash) + else if (powerType == PowerType.Artefact || powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder) { meshRenderer = GetComponentInChildren(); meshRenderer.materials[1].SetFloat("_Outline", 0.0f); @@ -59,7 +63,7 @@ public class PowerCubeManager : MonoBehaviour { meshRenderer.materials[1].SetFloat("_Outline", 0.4f); } - else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash) + else if (powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder) { meshRenderer.materials[1].SetFloat("_Outline", 0.01f); } @@ -69,7 +73,7 @@ public class PowerCubeManager : MonoBehaviour { if (other.gameObject.tag == "Player") { - if (powerType == PowerType.Artefact || powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash) + if (powerType == PowerType.Artefact || powerType == PowerType.DubleJump || powerType == PowerType.PushPull || powerType == PowerType.Dash || powerType == PowerType.Ladder) { meshRenderer.materials[1].SetFloat("_Outline", 0.0f); }