diff --git a/Assets/Data/Forge/ForgeLevel.asset b/Assets/Data/Forge/ForgeLevel.asset index cb28e7b0..28b6029a 100644 --- a/Assets/Data/Forge/ForgeLevel.asset +++ b/Assets/Data/Forge/ForgeLevel.asset @@ -13,9 +13,12 @@ MonoBehaviour: m_Name: ForgeLevel m_EditorClassIdentifier: waves: - - timeToNextWave: 60 - timeToNextGroup: 5 + - timeToNextWave: 20 + timeToNextGroup: 10 groups: - prefab: {fileID: 9990444235481084, guid: 424e0fbef7cbe1e498d87b70b01f501e, type: 3} - count: 1 - timeToNext: 1 + count: 3 + timeToNext: 2 + - prefab: {fileID: 9990444235481084, guid: 424e0fbef7cbe1e498d87b70b01f501e, type: 3} + count: 5 + timeToNext: 2 diff --git a/Assets/Prefabs/Enemies/Enemy.prefab b/Assets/Prefabs/Enemies/Enemy.prefab index 85097ca9..e6030a91 100644 --- a/Assets/Prefabs/Enemies/Enemy.prefab +++ b/Assets/Prefabs/Enemies/Enemy.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6058054806151542978} + - component: {fileID: 6142833538074553213} - component: {fileID: 2957099991542780378} - component: {fileID: 5199431160857003883} - component: {fileID: 3716950706550494605} @@ -37,6 +38,35 @@ Transform: - {fileID: 1700549123680942451} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6142833538074553213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4528139036750849664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 974d4ceac4eca1b4cb9a6cc199048116, type: 3} + m_Name: + m_EditorClassIdentifier: + enemy: {fileID: 11400000, guid: d69b470386e043a4896f962a85c9346d, type: 2} + isDead: 0 + updateInitialHealth: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2957099991542780378} + m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp + m_MethodName: Setup + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &2957099991542780378 MonoBehaviour: m_ObjectHideFlags: 0 @@ -49,9 +79,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5272ea2f30f4ddb488b557c786c790fa, type: 3} m_Name: m_EditorClassIdentifier: - enemy: {fileID: 11400000, guid: d69b470386e043a4896f962a85c9346d, type: 2} health: 200 - isDead: 0 onDied: m_PersistentCalls: m_Calls: @@ -67,6 +95,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 6142833538074553213} + m_TargetAssemblyTypeName: EnemyComponent, Assembly-CSharp + m_MethodName: Destroy + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &5199431160857003883 MonoBehaviour: m_ObjectHideFlags: 0 @@ -146,7 +186,7 @@ NavMeshAgent: m_Enabled: 1 m_AgentTypeID: 0 m_Radius: 0.5 - m_Speed: 3.5 + m_Speed: 2 m_Acceleration: 8 avoidancePriority: 50 m_AngularSpeed: 120 @@ -1606,6 +1646,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 0} + velocity: 0 --- !u!1 &1696886475133429049 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1235993377340142, guid: cb4ff29f6f657bc4d94ed49c50a70be2, diff --git a/Assets/Prefabs/FinishZone.prefab b/Assets/Prefabs/FinishZone.prefab new file mode 100644 index 00000000..dd4f1058 --- /dev/null +++ b/Assets/Prefabs/FinishZone.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8140364071816770437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7455333795677976837} + - component: {fileID: 9087655749567066908} + - component: {fileID: 3101577918763635034} + - component: {fileID: 4296822337931761309} + m_Layer: 0 + m_Name: FinishZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7455333795677976837 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8140364071816770437} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.6265726, y: -15.68, z: -365.28} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9087655749567066908 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8140364071816770437} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 15.38, y: 6, z: 8.82} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &3101577918763635034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8140364071816770437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0054e40601bd1a044a434b7be1a0602a, type: 3} + m_Name: + m_EditorClassIdentifier: + level: {fileID: 0} +--- !u!114 &4296822337931761309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8140364071816770437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f91e2b638d21b0a4587037236a3f11d0, type: 3} + m_Name: + m_EditorClassIdentifier: + onTriggerEnter: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3101577918763635034} + m_TargetAssemblyTypeName: LevelManager, Assembly-CSharp + m_MethodName: OnEnemyReachedFinish + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onTriggerExit: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Prefabs/FinishZone.prefab.meta b/Assets/Prefabs/FinishZone.prefab.meta new file mode 100644 index 00000000..1157d072 --- /dev/null +++ b/Assets/Prefabs/FinishZone.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6fd3c691802cd744b7c21486dc7a037 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Forge.unity b/Assets/Scenes/Forge.unity index 16a0a0c4..e92b14d7 100644 --- a/Assets/Scenes/Forge.unity +++ b/Assets/Scenes/Forge.unity @@ -7142,111 +7142,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 108647725} m_PrefabAsset: {fileID: 0} ---- !u!1001 &112775802 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 120888407} - m_Modifications: - - target: {fileID: 322754496239818837, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: Size - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818837, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: ScaleGrabbable - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.4952073 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.0187931 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.7016296 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.0010070801 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0.0010070801 - objectReference: {fileID: 0} - - target: {fileID: 322754496239818859, guid: b92df1423cac43545913fee931baaa82, - type: 3} - propertyPath: m_Name - value: BowSocket - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2125923120} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b92df1423cac43545913fee931baaa82, type: 3} ---- !u!114 &112775803 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 322754496239818837, guid: b92df1423cac43545913fee931baaa82, - type: 3} - m_PrefabInstance: {fileID: 112775802} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a27bb777100ada4459dda04ca3779632, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &112775804 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 322754496239818856, guid: b92df1423cac43545913fee931baaa82, - type: 3} - m_PrefabInstance: {fileID: 112775802} - m_PrefabAsset: {fileID: 0} --- !u!1001 &114993772 PrefabInstance: m_ObjectHideFlags: 0 @@ -7734,7 +7629,6 @@ Transform: - {fileID: 1697162915} - {fileID: 851232087} - {fileID: 604746980} - - {fileID: 112775804} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &120939689 @@ -14606,61 +14500,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 251054659} m_PrefabAsset: {fileID: 0} ---- !u!1001 &251686717 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 824150000} - m_Modifications: - - target: {fileID: 1544541841074006, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_RootOrder - value: 1006 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalPosition.x - value: -6.5 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalPosition.y - value: -19.5 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalPosition.z - value: -343.375 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} ---- !u!4 &251686718 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, - type: 3} - m_PrefabInstance: {fileID: 251686717} - m_PrefabAsset: {fileID: 0} --- !u!1001 &252075667 PrefabInstance: m_ObjectHideFlags: 0 @@ -22057,6 +21896,11 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 514016263233289048, guid: 1ef3259331ddc1f4d94b628323ec45f3, + type: 3} + propertyPath: SocketContainer + value: + objectReference: {fileID: 2019985453} - target: {fileID: 1079194777950654091, guid: 1ef3259331ddc1f4d94b628323ec45f3, type: 3} propertyPath: TeleportableLayers.m_Bits @@ -22072,9 +21916,18 @@ PrefabInstance: propertyPath: RaycastLayermask.m_Bits value: 1048577 objectReference: {fileID: 0} + - target: {fileID: 7569684003131515517, guid: 1ef3259331ddc1f4d94b628323ec45f3, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 75161255762383011, guid: 1ef3259331ddc1f4d94b628323ec45f3, + type: 3} + insertIndex: 0 + addedObject: {fileID: 958713361} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1ef3259331ddc1f4d94b628323ec45f3, type: 3} --- !u!1001 &382950077 @@ -32153,7 +32006,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalPosition.x - value: 1.3359826 + value: 1.32 objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalPosition.y @@ -32161,40 +32014,64 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalPosition.z - value: 4.895355 + value: 5.085 objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalRotation.w - value: 0.914523 + value: 0.46174863 objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalRotation.y - value: 0.404534 + value: 0.8870109 objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4222428983503886, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 47.724 + value: 125 objectReference: {fileID: 0} - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_LocalPosition.x + value: -1.219 + objectReference: {fileID: 0} + - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} + propertyPath: m_LocalPosition.y + value: 1.4731522 + objectReference: {fileID: 0} + - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} + propertyPath: m_LocalPosition.z + value: 5.01 + objectReference: {fileID: 0} + - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} + propertyPath: m_LocalRotation.w + value: 0.46174863 + objectReference: {fileID: 0} + - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} + propertyPath: m_LocalRotation.y + value: -0.8870109 + objectReference: {fileID: 0} - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4404986655541210, guid: 4bfb3206d5c8e9549a7546f533ee1c41, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -125 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -47945,7 +47822,6 @@ Transform: - {fileID: 1043222515} - {fileID: 813188141} - {fileID: 41896908} - - {fileID: 2132396417} - {fileID: 695526805} - {fileID: 1004616323} - {fileID: 715847215} @@ -48279,7 +48155,6 @@ Transform: - {fileID: 1196871900} - {fileID: 1355424746} - {fileID: 692858703} - - {fileID: 2043664887} - {fileID: 1591290442} - {fileID: 483173993} - {fileID: 1203958316} @@ -48890,7 +48765,6 @@ Transform: - {fileID: 630729770} - {fileID: 218386653} - {fileID: 1708110833} - - {fileID: 1030329312} - {fileID: 1241266445} - {fileID: 1074074826} - {fileID: 1550877148} @@ -48904,7 +48778,6 @@ Transform: - {fileID: 657081441} - {fileID: 1556324410} - {fileID: 261747309} - - {fileID: 251686718} - {fileID: 125803965} - {fileID: 114993773} - {fileID: 557069733} @@ -53952,6 +53825,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 902643726} m_PrefabAsset: {fileID: 0} +--- !u!114 &903874328 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 514016263233289054, guid: 1ef3259331ddc1f4d94b628323ec45f3, + type: 3} + m_PrefabInstance: {fileID: 382339738} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6953a3149e8e4d1468962577608f0002, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &906786311 PrefabInstance: m_ObjectHideFlags: 0 @@ -55419,11 +55304,11 @@ MonoBehaviour: xyzPosition: {x: 0, y: -5.4797955, z: -81.75009} xyPosition: {x: 0, y: -5.4797955, z: 0} xzPosition: {x: 0, y: 0, z: -81.75009} - - position: {x: 0, y: -4.933069, z: -83.91342} + - position: {x: 0, y: -2.9569683, z: -106.33603} rotation: {x: 0, y: 0, z: 0, w: 1} - xyzPosition: {x: 0, y: -4.933069, z: -83.91342} - xyPosition: {x: 0, y: -4.933069, z: 0} - xzPosition: {x: 0, y: 0, z: -83.91342} + xyzPosition: {x: 0, y: -2.9569683, z: -106.33603} + xyPosition: {x: 0, y: -2.9569683, z: 0} + xzPosition: {x: 0, y: 0, z: -106.33603} --- !u!114 &929169825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57564,6 +57449,93 @@ Transform: type: 3} m_PrefabInstance: {fileID: 958644467} m_PrefabAsset: {fileID: 0} +--- !u!1001 &958713360 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1237247424} + m_Modifications: + - target: {fileID: 4018933675189943078, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_Name + value: Bow_AutoLoad + objectReference: {fileID: 0} + - target: {fileID: 4253499436174411340, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: StartingSocket + value: + objectReference: {fileID: 903874328} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.35389996 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4018933675189943078, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2019985453} + - targetCorrespondingSourceObject: {fileID: 4018933675189943078, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2019985454} + m_SourcePrefab: {fileID: 100100000, guid: ebf2e89a781c1d64a99c26f62cfaecf4, type: 3} +--- !u!4 &958713361 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + m_PrefabInstance: {fileID: 958713360} + m_PrefabAsset: {fileID: 0} --- !u!1001 &961348868 PrefabInstance: m_ObjectHideFlags: 0 @@ -61130,103 +61102,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1025446209} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1030329311 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 824150000} - m_Modifications: - - target: {fileID: 1276019536510848, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 1820854759388786, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 4050062293364138, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4050062293364138, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4050062293364138, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4050062293364138, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_RootOrder - value: 992 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalScale.x - value: 1.3972678 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalScale.y - value: 1.3972682 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalScale.z - value: 1.3972682 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalPosition.x - value: -3.5 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalPosition.y - value: -19.5 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalPosition.z - value: -343.125 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalRotation.y - value: -0.70710677 - objectReference: {fileID: 0} - - target: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 23521253369273428, guid: e3a841b877b2c394195a7e7d1094d22d, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: f161e0c08a3abcf4b901d18f4b9293ec, type: 2} - - target: {fileID: 23882756558597724, guid: e3a841b877b2c394195a7e7d1094d22d, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f161e0c08a3abcf4b901d18f4b9293ec, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e3a841b877b2c394195a7e7d1094d22d, type: 3} ---- !u!4 &1030329312 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4358648699484116, guid: e3a841b877b2c394195a7e7d1094d22d, - type: 3} - m_PrefabInstance: {fileID: 1030329311} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1030334691 PrefabInstance: m_ObjectHideFlags: 0 @@ -73418,6 +73293,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1235976887} m_PrefabAsset: {fileID: 0} +--- !u!4 &1237247424 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 75161255762383011, guid: 1ef3259331ddc1f4d94b628323ec45f3, + type: 3} + m_PrefabInstance: {fileID: 382339738} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1237403728 PrefabInstance: m_ObjectHideFlags: 0 @@ -119607,6 +119488,41 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2019392128} m_PrefabAsset: {fileID: 0} +--- !u!1 &2019985444 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4018933675189943078, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + type: 3} + m_PrefabInstance: {fileID: 958713360} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2019985453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019985444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a720840bf52a6f14e9d5811fae81999e, type: 3} + m_Name: + m_EditorClassIdentifier: + AutoPopulate: 1 + Sockets: [] +--- !u!114 &2019985454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019985444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96785e435f4a7a04d84021e497eeb783, type: 3} + m_Name: + m_EditorClassIdentifier: + Socket: {fileID: 903874328} + ReturnTime: 0 + PlaySocketedSFX: 1 --- !u!1001 &2021066444 PrefabInstance: m_ObjectHideFlags: 0 @@ -120931,65 +120847,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2042557402} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2043664886 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 824150000} - m_Modifications: - - target: {fileID: 1544541841074006, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_Name - value: SM_Prop_Dwarf_Torch_07 (1) - objectReference: {fileID: 0} - - target: {fileID: 1544541841074006, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_RootOrder - value: 381 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalPosition.x - value: -0.5 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalPosition.y - value: -19.5 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalPosition.z - value: -343.375 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.y - value: 0.70710677 - objectReference: {fileID: 0} - - target: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 415fd7ecd8766574ab0722ab33b9c261, type: 3} ---- !u!4 &2043664887 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4906092481666876, guid: 415fd7ecd8766574ab0722ab33b9c261, - type: 3} - m_PrefabInstance: {fileID: 2043664886} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2044169431 PrefabInstance: m_ObjectHideFlags: 0 @@ -126861,12 +126718,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2125171707} m_PrefabAsset: {fileID: 0} ---- !u!4 &2125923120 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, - type: 3} - m_PrefabInstance: {fileID: 5017960930351480744} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2127467558 PrefabInstance: m_ObjectHideFlags: 0 @@ -127157,69 +127008,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2129206745} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2132396416 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 824150000} - m_Modifications: - - target: {fileID: 1236384019484464, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_Name - value: SM_Env_Dust_02 (2) - objectReference: {fileID: 0} - - target: {fileID: 1236384019484464, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_RootOrder - value: 47 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalScale.y - value: 0.66403276 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalPosition.x - value: -4.447 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalPosition.y - value: -19.58 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalPosition.z - value: -343.845 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9010321 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalRotation.y - value: 0.4337524 - objectReference: {fileID: 0} - - target: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0e538f88313dd9e439fd3e5a2379bc31, type: 3} ---- !u!4 &2132396417 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4917893451774618, guid: 0e538f88313dd9e439fd3e5a2379bc31, - type: 3} - m_PrefabInstance: {fileID: 2132396416} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2132417186 PrefabInstance: m_ObjectHideFlags: 0 @@ -128327,79 +128115,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2147288652} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5017960930351480744 +--- !u!1001 &1049447421401506407 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 112775804} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4018933675189943078, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 3101577918763635034, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} - propertyPath: m_Name - value: Bow_AutoLoad - objectReference: {fileID: 0} - - target: {fileID: 4253499436174411340, guid: ebf2e89a781c1d64a99c26f62cfaecf4, - type: 3} - propertyPath: StartingSocket + propertyPath: level value: - objectReference: {fileID: 112775803} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + objectReference: {fileID: 11400000, guid: 5c49530753c78b748aa4dfa919cca8e0, + type: 2} + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -3.6265726 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -15.68 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -365.28 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4363370452676862364, guid: ebf2e89a781c1d64a99c26f62cfaecf4, + - target: {fileID: 7455333795677976837, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8140364071816770437, guid: d6fd3c691802cd744b7c21486dc7a037, + type: 3} + propertyPath: m_Name + value: FinishZone + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebf2e89a781c1d64a99c26f62cfaecf4, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d6fd3c691802cd744b7c21486dc7a037, type: 3} --- !u!1001 &8713033016224012383 PrefabInstance: m_ObjectHideFlags: 0 @@ -128481,3 +128270,4 @@ SceneRoots: - {fileID: 766107838} - {fileID: 1831945567} - {fileID: 1030539047} + - {fileID: 1049447421401506407} diff --git a/Assets/Scenes/Forge/NavMesh-NavMesh Surface.asset b/Assets/Scenes/Forge/NavMesh-NavMesh Surface.asset index 84243468..278ba2b7 100644 Binary files a/Assets/Scenes/Forge/NavMesh-NavMesh Surface.asset and b/Assets/Scenes/Forge/NavMesh-NavMesh Surface.asset differ diff --git a/Assets/Scripts/Components/DetectTriggerComponent.cs b/Assets/Scripts/Components/DetectTriggerComponent.cs new file mode 100644 index 00000000..ac5ea39d --- /dev/null +++ b/Assets/Scripts/Components/DetectTriggerComponent.cs @@ -0,0 +1,20 @@ +using Sirenix.OdinInspector; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class DetectTriggerComponent : MonoBehaviour +{ + public UnityEvent onTriggerEnter; + public UnityEvent onTriggerExit; + + private void OnTriggerEnter(Collider other) + { + onTriggerEnter?.Invoke(other); + } + private void OnTriggerExit(Collider other) + { + onTriggerExit?.Invoke(other); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Components/DetectTriggerComponent.cs.meta b/Assets/Scripts/Components/DetectTriggerComponent.cs.meta new file mode 100644 index 00000000..e2c8d32f --- /dev/null +++ b/Assets/Scripts/Components/DetectTriggerComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f91e2b638d21b0a4587037236a3f11d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Components/EnemyComponent.cs b/Assets/Scripts/Components/EnemyComponent.cs new file mode 100644 index 00000000..07b157c1 --- /dev/null +++ b/Assets/Scripts/Components/EnemyComponent.cs @@ -0,0 +1,36 @@ +using Sirenix.OdinInspector; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class EnemyComponent : MonoBehaviour +{ + [SerializeField] + [Required] + [OnValueChanged("Setup")] + private Enemy enemy; + + [ReadOnly] + [SerializeField] + private bool isDead; + + [SerializeField] + private UnityEvent updateInitialHealth; + + private void Start() + { + Setup(); + } + + private void Setup() + { + updateInitialHealth.Invoke(enemy.health); + } + + public void Destroy() + { + Destroy(gameObject, 3); + } +} diff --git a/Assets/Scripts/Components/EnemyComponent.cs.meta b/Assets/Scripts/Components/EnemyComponent.cs.meta new file mode 100644 index 00000000..51d7b6bf --- /dev/null +++ b/Assets/Scripts/Components/EnemyComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 974d4ceac4eca1b4cb9a6cc199048116 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Components/HealthComponent.cs b/Assets/Scripts/Components/HealthComponent.cs index 9ed538bf..f088b8f7 100644 --- a/Assets/Scripts/Components/HealthComponent.cs +++ b/Assets/Scripts/Components/HealthComponent.cs @@ -7,26 +7,15 @@ using UnityEngine.EventSystems; public class HealthComponent : MonoBehaviour { - [SerializeField] - [Required] - [OnValueChanged("Setup")] - private Enemy enemy; - [ReadOnly] [SerializeField] private int health; - [ReadOnly] - [SerializeField] - private bool isDead; - public UnityEvent onDied; - [Button] - public void Setup() + public void Setup(int health) { - health = enemy.health; - isDead = false; + this.health = health; } public void TakeDamage(int damage) @@ -40,17 +29,10 @@ public class HealthComponent : MonoBehaviour if (health == 0) { - isDead = true; onDied.Invoke(); } } - [Button] - private void Take10Damage() - { - TakeDamage(10); - } - [Button] private void Kill() { diff --git a/Assets/Scripts/Components/NavMeshComponent.cs b/Assets/Scripts/Components/NavMeshComponent.cs index afdb64ae..50d4c040 100644 --- a/Assets/Scripts/Components/NavMeshComponent.cs +++ b/Assets/Scripts/Components/NavMeshComponent.cs @@ -61,7 +61,6 @@ public class NavMeshComponent : MonoBehaviour private bool ReachedDestinationOrGaveUp() { - if (agent.pathPending) return false; diff --git a/Assets/Scripts/Data/Level.cs b/Assets/Scripts/Data/Level.cs index 33b5e8d9..e0e119a2 100644 --- a/Assets/Scripts/Data/Level.cs +++ b/Assets/Scripts/Data/Level.cs @@ -6,6 +6,9 @@ using UnityEngine; [CreateAssetMenu(fileName = "Level", menuName = "Data/Level")] public class Level : ScriptableObject { + [SerializeField] + public int health = 10; + [SerializeField] public Wave[] waves = new Wave[0]; } diff --git a/Assets/Scripts/Managers/LevelManager.cs b/Assets/Scripts/Managers/LevelManager.cs new file mode 100644 index 00000000..13fcbae3 --- /dev/null +++ b/Assets/Scripts/Managers/LevelManager.cs @@ -0,0 +1,39 @@ +using Sirenix.OdinInspector; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +public class LevelManager : MonoBehaviour +{ + [SerializeField] + private Level level; + + [SerializeField] + [ReadOnly] + private int health = 0; + + [SerializeField] + private HashSet finishedEnemies = new HashSet(); + + private void Start() + { + health = level.health; + } + + public void OnEnemyReachedFinish(Collider enemyCollider) + { + var enemy = enemyCollider + .gameObject + .GetComponentInParent(); + + if (finishedEnemies.Contains(enemy)) + { + return; + } + + finishedEnemies.Add(enemy); + enemy.Destroy(); + health--; + } +} diff --git a/Assets/Scripts/Managers/LevelManager.cs.meta b/Assets/Scripts/Managers/LevelManager.cs.meta new file mode 100644 index 00000000..653e5caa --- /dev/null +++ b/Assets/Scripts/Managers/LevelManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0054e40601bd1a044a434b7be1a0602a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/WaveManager.cs b/Assets/Scripts/Managers/WaveManager.cs index 5a1f0576..72ce4856 100644 --- a/Assets/Scripts/Managers/WaveManager.cs +++ b/Assets/Scripts/Managers/WaveManager.cs @@ -77,7 +77,5 @@ public class WaveManager : MonoBehaviour yield return new WaitForSeconds(currentWave.timeToNextGroup); } - - } } diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index 3b0b7c3d..26491fe8 100644 --- a/ProjectSettings/NavMeshAreas.asset +++ b/ProjectSettings/NavMeshAreas.asset @@ -71,12 +71,12 @@ NavMeshProjectSettings: cost: 1 m_LastAgentTypeID: -887442657 m_Settings: - - serializedVersion: 2 + - serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: 0.75 + agentClimb: 1.19 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 minRegionArea: 2 @@ -84,7 +84,9 @@ NavMeshProjectSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_SettingNames: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 25042a32..4f8254f1 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - - Player - DynamicPose - - + - Enemy - - -