From 680cd9658da1c2bef188503f713704e504dc1b72 Mon Sep 17 00:00:00 2001 From: Spencer <78666180+SpencerP23@users.noreply.github.com> Date: Wed, 1 Dec 2021 02:30:18 -0500 Subject: [PATCH 1/2] fix crashes --- Assets/Scenes/Level0.unity | 187 ++++++++++++++-------------- Assets/Scenes/Level2.unity | 32 ++--- Assets/Scripts/Enemy/enemyAiPath.cs | 2 +- 3 files changed, 113 insertions(+), 108 deletions(-) diff --git a/Assets/Scenes/Level0.unity b/Assets/Scenes/Level0.unity index 39d2a9c..38b67cf 100644 --- a/Assets/Scenes/Level0.unity +++ b/Assets/Scenes/Level0.unity @@ -17073,7 +17073,7 @@ PrefabInstance: - target: {fileID: 1478793116343536572, guid: eec488e3889462e48ad8f4f3a2be1d8a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1478793116343536572, guid: eec488e3889462e48ad8f4f3a2be1d8a, type: 3} @@ -17223,95 +17223,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &794835872 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 985943439, guid: 0e5b019ea598f76479e0b174c8b2e1f0, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 985943439, guid: 0e5b019ea598f76479e0b174c8b2e1f0, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1660189671, guid: 0e5b019ea598f76479e0b174c8b2e1f0, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1660189671, guid: 0e5b019ea598f76479e0b174c8b2e1f0, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1660189671, guid: 0e5b019ea598f76479e0b174c8b2e1f0, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalPosition.x - value: -7.9448833 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalPosition.y - value: 3.7990978 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643748, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6313181544486643751, guid: 0e5b019ea598f76479e0b174c8b2e1f0, - type: 3} - propertyPath: m_Name - value: pathed enemy - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0e5b019ea598f76479e0b174c8b2e1f0, type: 3} --- !u!114 &891534008 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6084843170089061241, guid: a5406e0841674654bafeac019925f62d, @@ -17597,6 +17508,100 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1899931777 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1357769997402389237, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1357769997402389237, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2522335939916116198, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2522335939916116198, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2522335939916116198, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalPosition.x + value: -6.234394 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.4911788 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089793, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3186187933118089794, guid: 994af1e8971e3f847a5738b2843329f4, + type: 3} + propertyPath: m_Name + value: still enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 994af1e8971e3f847a5738b2843329f4, type: 3} --- !u!1001 &1917865220 PrefabInstance: m_ObjectHideFlags: 0 @@ -17638,7 +17643,7 @@ PrefabInstance: - target: {fileID: 5544524500557056223, guid: 99c87cf372352bb47aeb96307e14665e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5544524500557056223, guid: 99c87cf372352bb47aeb96307e14665e, type: 3} diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index f7e0e88..3c57966 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -1586,16 +1586,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 269576036} m_Modifications: - - target: {fileID: 5806017286969273995, guid: eec488e3889462e48ad8f4f3a2be1d8a, - type: 3} - propertyPath: m_audioClip - value: - objectReference: {fileID: 8300000, guid: c269b01b514d711479a3f17033647bea, type: 3} - - target: {fileID: 5853590780784964041, guid: eec488e3889462e48ad8f4f3a2be1d8a, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 3430587302930332239, guid: cdedc9e5c682e9242b3efd870aa0b7b8, type: 3} propertyPath: m_AnchorMax.x @@ -1701,6 +1691,16 @@ PrefabInstance: propertyPath: m_Name value: patrol enemy (7) objectReference: {fileID: 0} + - target: {fileID: 5806017286969273995, guid: eec488e3889462e48ad8f4f3a2be1d8a, + type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: c269b01b514d711479a3f17033647bea, type: 3} + - target: {fileID: 5853590780784964041, guid: eec488e3889462e48ad8f4f3a2be1d8a, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cdedc9e5c682e9242b3efd870aa0b7b8, type: 3} --- !u!1 &269576035 @@ -119211,7 +119211,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 18 - m_TileSpriteIndex: 63 + m_TileSpriteIndex: 68 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -180444,9 +180444,8 @@ Tilemap: - m_RefCount: 2 m_Data: {fileID: -2396608399911955687, guid: 60efaac6708eccc4abd3d2367484ec82, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -619908947779342177, guid: d2081d359afbb11478a746a2cf12c241, - type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 3 m_Data: {fileID: -8267230082865757935, guid: 60efaac6708eccc4abd3d2367484ec82, type: 3} @@ -180459,8 +180458,9 @@ Tilemap: - m_RefCount: 5 m_Data: {fileID: 6632608522088786688, guid: 60efaac6708eccc4abd3d2367484ec82, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: -619908947779342177, guid: d2081d359afbb11478a746a2cf12c241, + type: 3} - m_RefCount: 8 m_Data: {fileID: 2284087732628589261, guid: d2081d359afbb11478a746a2cf12c241, type: 3} diff --git a/Assets/Scripts/Enemy/enemyAiPath.cs b/Assets/Scripts/Enemy/enemyAiPath.cs index 65c9e2d..09da8bf 100644 --- a/Assets/Scripts/Enemy/enemyAiPath.cs +++ b/Assets/Scripts/Enemy/enemyAiPath.cs @@ -111,7 +111,7 @@ void Update() //check if reached end of path or to closer to player - if (currentWaypoint >= path.vectorPath.Count & stopChase > toTarget) + if (currentWaypoint >= path.vectorPath.Count || stopChase > toTarget) { //deal melee damage (add indicator) //Attack(target.GetComponent()); From 5baa0c279a63d02617e0fa833d8fe25909530434 Mon Sep 17 00:00:00 2001 From: Spencer <78666180+SpencerP23@users.noreply.github.com> Date: Wed, 1 Dec 2021 02:31:55 -0500 Subject: [PATCH 2/2] temp hide controls and about buttons --- Assets/Scenes/StartMenu.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/StartMenu.unity b/Assets/Scenes/StartMenu.unity index 982f821..7a4c70e 100644 --- a/Assets/Scenes/StartMenu.unity +++ b/Assets/Scenes/StartMenu.unity @@ -626,7 +626,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &768171542 RectTransform: m_ObjectHideFlags: 0 @@ -878,7 +878,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &903558290 RectTransform: m_ObjectHideFlags: 0