diff --git a/Assets/Prefabs/Spikes/Spikes.prefab b/Assets/Prefabs/Spikes/Spikes.prefab index f3c3f49..e9524f4 100644 --- a/Assets/Prefabs/Spikes/Spikes.prefab +++ b/Assets/Prefabs/Spikes/Spikes.prefab @@ -11,7 +11,9 @@ GameObject: - component: {fileID: 2172507398257870361} - component: {fileID: 3621604445211857766} - component: {fileID: 7463455317757358294} - m_Layer: 0 + - component: {fileID: 3405519188989230593} + - component: {fileID: 8387740507729246250} + m_Layer: 7 m_Name: Spikes m_TagString: Untagged m_Icon: {fileID: 0} @@ -83,3 +85,31 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3405519188989230593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6738309508136280111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a94b6c0021fca74ba1778a83054fbe8, type: 3} + m_Name: + m_EditorClassIdentifier: + duration: 2 + knockback: 1 + stunDir: {x: 0, y: 0} +--- !u!65 &8387740507729246250 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6738309508136280111} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.011787202, y: 0.010620317, z: 0.010000003} + m_Center: {x: 0.002028052, y: -0.004496035, z: 0.0050000013} diff --git a/Assets/Scenes/LevelDesign.meta b/Assets/Scenes/LevelDesign.meta new file mode 100644 index 0000000..fd7962d --- /dev/null +++ b/Assets/Scenes/LevelDesign.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2273f0173c7e821409aee9459ca6bbbc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelDesign.unity b/Assets/Scenes/LevelDesign.unity index a796af3..8a7c857 100644 --- a/Assets/Scenes/LevelDesign.unity +++ b/Assets/Scenes/LevelDesign.unity @@ -97,7 +97,8 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: ced7eaa8868133d49ad9b67359352537, + type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -259,7 +260,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -9246, y: 1018} + m_AnchoredPosition: {x: -9246, y: 1249} m_SizeDelta: {x: 744.86, y: 208.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &248300952 @@ -282,10 +283,18 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "- WASD or Left joystick\n to move!" + m_text: 'Hello Lad! + + + Use A and D to move left and right. + + + Or your left + stick for controller chads.' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -952,7 +961,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &921826481 MonoBehaviour: @@ -1009,7 +1018,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -142.47, y: -79.45} + m_AnchoredPosition: {x: -250, y: 52} m_SizeDelta: {x: 957.92, y: 208.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1149000623 @@ -1032,12 +1041,15 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Hook: Left click or R2/RT + m_text: 'To hook: Left click or R2/RT - Boost: Right click or L2/LT' + + To boost yourself while hooking: Right + click or L2/LT' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1097,7 +1109,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -232.53082, w: -112.36601} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1440,7 +1452,7 @@ PrefabInstance: - target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b, type: 3} propertyPath: m_RootOrder - value: 24 + value: 23 objectReference: {fileID: 0} - target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b, type: 3} @@ -1746,7 +1758,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530935835} m_LocalRotation: {x: 0.03457181, y: -0.0000000021495121, z: 7.435697e-11, w: 0.9994022} - m_LocalPosition: {x: -74, y: 23.28, z: -22.81} + m_LocalPosition: {x: -76.3, y: 25.78, z: -22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2072,6 +2084,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 59330103dad98c94396074641d78fa68, type: 3} +--- !u!224 &1679939821 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + m_PrefabInstance: {fileID: 2015005168} + m_PrefabAsset: {fileID: 0} --- !u!1 &1866383020 GameObject: m_ObjectHideFlags: 3 @@ -2252,8 +2270,127 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0.594, y: -8.713, z: 22.434} +--- !u!1001 &2015005168 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2033433423} + m_Modifications: + - target: {fileID: 2817070760641160522, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_Name + value: PauseMenu + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalPosition.z + value: -14.5 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03d6a1d3e6c7efe48929be016d25b63b, type: 3} --- !u!1 &2033433419 GameObject: m_ObjectHideFlags: 0 @@ -2266,6 +2403,8 @@ GameObject: - component: {fileID: 2033433422} - component: {fileID: 2033433421} - component: {fileID: 2033433420} + - component: {fileID: 2033433425} + - component: {fileID: 2033433424} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -2348,6 +2487,7 @@ RectTransform: m_Children: - {fileID: 248300951} - {fileID: 1149000622} + - {fileID: 1679939821} m_Father: {fileID: 0} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2356,6 +2496,31 @@ RectTransform: m_AnchoredPosition: {x: 24.04, y: 10.34} m_SizeDelta: {x: 1488, y: 697} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2033433424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033433419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 681a55dd3deb2d74d929c98c9e6bfa69, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenu: {fileID: 0} +--- !u!114 &2033433425 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2033433419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06cd37efca880db4c897922a3b05a3d9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2129712287 GameObject: m_ObjectHideFlags: 0 @@ -2419,7 +2584,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129712287} m_LocalRotation: {x: 0.03457181, y: -0.0000000021495121, z: 7.435697e-11, w: 0.9994022} - m_LocalPosition: {x: -74, y: 23.28, z: -22.81} + m_LocalPosition: {x: -76.3, y: 25.78, z: -22.81} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2434,6 +2599,66 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 12894911606570312, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 225597321148627847, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 781961958677165776, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 960766374343662790, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 1321553861414085104, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 1421510262855856719, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 1487877879867019803, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 1536336824769663870, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1830443382149794577, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 1981289548626792364, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 2060011442931439250, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2236921395175629756, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} - target: {fileID: 2443025573520650965, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, type: 3} propertyPath: m_RootOrder @@ -2489,11 +2714,66 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2652665920720996260, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 3544977207861809887, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3918607135200847744, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4003339583460953210, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4131917018981728989, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 4308047174900456599, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, type: 3} propertyPath: m_Name value: Level2 objectReference: {fileID: 0} + - target: {fileID: 4896490996547095793, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 4945001932622543278, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 4994251471522386516, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 5446569113280257267, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 6201937151664265610, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6959899118273757150, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 7018029034115268623, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, type: 3} propertyPath: playerPos @@ -2509,6 +2789,66 @@ PrefabInstance: propertyPath: targetLightOutside value: objectReference: {fileID: 921826478} + - target: {fileID: 7024389936257920097, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7379038515675368501, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7379537631393436743, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7463510564188998992, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 7619924798998253954, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7757054454551270719, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7911339428973985170, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7950889764096837820, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 8205812448816850345, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 8281084772669399910, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 8654664084696934654, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: stunDir.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 9193199848693154536, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0e12bf23a882b9d47b6b9b68e4e7a062, type: 3} --- !u!1001 &893636036601257466 @@ -2521,7 +2861,7 @@ PrefabInstance: - target: {fileID: 808831785093953574, guid: 0b9d694cefc9b6848acfaff4bed8cc65, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: 808831785093953574, guid: 0b9d694cefc9b6848acfaff4bed8cc65, type: 3} @@ -2580,80 +2920,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b9d694cefc9b6848acfaff4bed8cc65, type: 3} ---- !u!1001 &934850289875368483 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_RootOrder - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalPosition.x - value: -74.2 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalPosition.y - value: 17.891605 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.032423317 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1418671164770919128, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4094901255911055533, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_audioClip - value: - objectReference: {fileID: 8300000, guid: ca051ddfd9879bb4783087293eb7e5a4, type: 3} - - target: {fileID: 8571589110344635516, guid: 92a7b11ea4b35924a9caf2ab6d443449, - type: 3} - propertyPath: m_Name - value: Music - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 92a7b11ea4b35924a9caf2ab6d443449, type: 3} --- !u!1001 &1772573267671239019 PrefabInstance: m_ObjectHideFlags: 0 @@ -2742,17 +3008,17 @@ PrefabInstance: - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} propertyPath: m_RootOrder - value: 25 + value: 24 objectReference: {fileID: 0} - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} propertyPath: m_LocalPosition.x - value: -74 + value: -76.3 objectReference: {fileID: 0} - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} propertyPath: m_LocalPosition.y - value: 17.1 + value: 19.6 objectReference: {fileID: 0} - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} diff --git a/Assets/Scenes/LevelDesign/LightingData.asset b/Assets/Scenes/LevelDesign/LightingData.asset new file mode 100644 index 0000000..fc06ca0 Binary files /dev/null and b/Assets/Scenes/LevelDesign/LightingData.asset differ diff --git a/Assets/Scenes/LevelDesign/LightingData.asset.meta b/Assets/Scenes/LevelDesign/LightingData.asset.meta new file mode 100644 index 0000000..932fe11 --- /dev/null +++ b/Assets/Scenes/LevelDesign/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ced7eaa8868133d49ad9b67359352537 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelDesign/Lightmap-0_comp_dir.png b/Assets/Scenes/LevelDesign/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..49341dc Binary files /dev/null and b/Assets/Scenes/LevelDesign/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/LevelDesign/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/LevelDesign/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000..94c2fb7 --- /dev/null +++ b/Assets/Scenes/LevelDesign/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 7e180aac82118bb40b02f6968c34f233 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 12 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelDesign/Lightmap-0_comp_light.exr b/Assets/Scenes/LevelDesign/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..57745bf Binary files /dev/null and b/Assets/Scenes/LevelDesign/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/LevelDesign/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/LevelDesign/Lightmap-0_comp_light.exr.meta new file mode 100644 index 0000000..3930232 --- /dev/null +++ b/Assets/Scenes/LevelDesign/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 0c4f48bea6632f34fb962521a8442141 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelDesign/ReflectionProbe-0.exr b/Assets/Scenes/LevelDesign/ReflectionProbe-0.exr new file mode 100644 index 0000000..40a1c62 Binary files /dev/null and b/Assets/Scenes/LevelDesign/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/LevelDesign/ReflectionProbe-0.exr.meta b/Assets/Scenes/LevelDesign/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..224efe3 --- /dev/null +++ b/Assets/Scenes/LevelDesign/ReflectionProbe-0.exr.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 1fe47b7234cfdc945a946c3001330964 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index aa4bf41..c1002e8 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -25,9 +25,9 @@ public class PlayerController : MonoBehaviour } public void Stun(float duration){ + soundPlayer.PlaySound("PlayerHurt"); grappleScript.Stun(duration); movementScript.Stun(duration); - soundPlayer.PlaySound("PlayerHurt"); } public void Knockback(Vector2 dir){ diff --git a/Assets/Scripts/Stunning.cs b/Assets/Scripts/Stunning.cs index 9f984b6..5b2d868 100644 --- a/Assets/Scripts/Stunning.cs +++ b/Assets/Scripts/Stunning.cs @@ -13,7 +13,7 @@ public class Stunning : MonoBehaviour private void OnCollisionEnter(Collision other) { - if(other.gameObject.tag.Equals("Player")){//Collided w/ player, stun him + if (other.gameObject.tag.Equals("Player")){//Collided w/ player, stun him PlayerController player = other.gameObject.GetComponent(); player.Stun(duration); if(knockback){ diff --git a/Assets/Sounds/SoundTemplates/PlayerKnockback.asset b/Assets/Sounds/SoundTemplates/PlayerKnockback.asset index 74bb88f..058b759 100644 --- a/Assets/Sounds/SoundTemplates/PlayerKnockback.asset +++ b/Assets/Sounds/SoundTemplates/PlayerKnockback.asset @@ -16,5 +16,9 @@ MonoBehaviour: clips: - {fileID: 8300000, guid: da4afe3ef2d097c4abc58f57e426349e, type: 3} - {fileID: 8300000, guid: 4d94827de12177541a3b28f4da568dfd, type: 3} - volume: 0.4 + - {fileID: 8300000, guid: 4b2fc4c37ed6cf64b9b43038e5590b6d, type: 3} + - {fileID: 8300000, guid: fffd2736c3773b64ab6f7d37cf00bb2b, type: 3} + - {fileID: 8300000, guid: 9994f50a5a8e4984aa40821163d9064c, type: 3} + - {fileID: 8300000, guid: 1ad0766c5abf3ee47ab39417ef1be17b, type: 3} + volume: 0.1 maxRandomPitchChange: 0.02