diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index 802aaae91525e91b667f60654cc048a22b1e2ffc..d3d26b0d0d952f297dc26b279e036bcaf3fa70ab 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -3373,7 +3373,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -3625420} + m_AnchoredPosition: {x: 0, y: -3637228} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &435589487 @@ -3476,13 +3476,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} - insertIndex: -1 - addedObject: {fileID: 1359862600} - - targetCorrespondingSourceObject: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} - insertIndex: -1 - addedObject: {fileID: 1359862599} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} --- !u!1 &456337178 GameObject: @@ -10521,39 +10515,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1358361850} m_Mesh: {fileID: 4300000, guid: 83ce4d1897bf5de438ba201190387a04, type: 3} ---- !u!1 &1359862598 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} - m_PrefabInstance: {fileID: 449742293} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1359862599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1359862598} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc59709211b6a7647a3e4d32a89a0844, type: 3} - m_Name: - m_EditorClassIdentifier: - projectile: {fileID: 0} - chaseRadius: 5 ---- !u!114 &1359862600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1359862598} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d123db8bad4f0004e92ce093196c8b23, type: 3} - m_Name: - m_EditorClassIdentifier: - Damageables: [] - closestDamageable: {fileID: 0} --- !u!1 &1368760590 GameObject: m_ObjectHideFlags: 0 @@ -12851,6 +12812,10 @@ PrefabInstance: propertyPath: m_Name value: HealingWizard objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Radius + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 6565987977077161826, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} - {fileID: 6565987977077161836, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} diff --git a/Assets/Scenes/Level02.unity b/Assets/Scenes/Level02.unity index a4f1a122e5a90f14d391b33ed0485e9e88269ace..c98ff66c59110c6f2b365e1d43275f20e04661a9 100644 --- a/Assets/Scenes/Level02.unity +++ b/Assets/Scenes/Level02.unity @@ -3507,7 +3507,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -1775336} + m_AnchoredPosition: {x: 0, y: -1787308} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &435589487 @@ -11952,6 +11952,117 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1512961169} m_CullTransparentMesh: 1 +--- !u!1001 &1523135702 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Name + value: HealingWizard + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Speed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_StoppingDistance + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 6565987977077161826, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161836, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161839, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161838, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_RemovedGameObjects: + - {fileID: 3876139547675789168, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + insertIndex: -1 + addedObject: {fileID: 1523135705} + - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + insertIndex: -1 + addedObject: {fileID: 1523135704} + m_SourcePrefab: {fileID: 100100000, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} +--- !u!1 &1523135703 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_PrefabInstance: {fileID: 1523135702} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1523135704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523135703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8919b27e153cc6e408932cca7b79e7e3, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + timeBetweenHeal: 10 + healAmount: 10 +--- !u!114 &1523135705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523135703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b778cfa4099b7d42b5e015ee4c225f2, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + player: {fileID: 0} + speed: 6 --- !u!1 &1529723108 GameObject: m_ObjectHideFlags: 0 @@ -14364,6 +14475,63 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 20, y: 3, z: 1} m_Center: {x: 14, y: -13.5, z: -0.6} +--- !u!1001 &1761828029 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_Name + value: PetDragon + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} --- !u!1 &1762411323 GameObject: m_ObjectHideFlags: 0 @@ -16775,3 +16943,5 @@ SceneRoots: - {fileID: 706766591} - {fileID: 307935225} - {fileID: 840882477} + - {fileID: 1523135702} + - {fileID: 1761828029} diff --git a/Assets/Scenes/Level03.unity b/Assets/Scenes/Level03.unity index fa648e260298347f5b9fccdc852caa7c72599fce..654820173919afe9f06eb9184abd8b470f9ca1b8 100644 --- a/Assets/Scenes/Level03.unity +++ b/Assets/Scenes/Level03.unity @@ -3583,7 +3583,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -1847332} + m_AnchoredPosition: {x: 0, y: -1863076} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &435589487 @@ -10645,6 +10645,63 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.3733764, y: 1.4543643, z: 4.1455235} m_Center: {x: -1.5906677, y: 0.6735184, z: 0.40840718} +--- !u!1001 &1268714444 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_Name + value: PetDragon + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} --- !u!1 &1273166028 GameObject: m_ObjectHideFlags: 0 @@ -15017,6 +15074,117 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.47538227, y: 1.7488923, z: 0.45545995} m_Center: {x: 0.6942558, y: 0.0026117912, z: -0.0072852913} +--- !u!1001 &1858955576 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Name + value: HealingWizard + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Speed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_StoppingDistance + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 6565987977077161826, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161836, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161839, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161838, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_RemovedGameObjects: + - {fileID: 3876139547675789168, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + insertIndex: -1 + addedObject: {fileID: 1858955579} + - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + insertIndex: -1 + addedObject: {fileID: 1858955578} + m_SourcePrefab: {fileID: 100100000, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} +--- !u!1 &1858955577 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_PrefabInstance: {fileID: 1858955576} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1858955578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858955577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8919b27e153cc6e408932cca7b79e7e3, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + timeBetweenHeal: 10 + healAmount: 10 +--- !u!114 &1858955579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858955577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b778cfa4099b7d42b5e015ee4c225f2, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + player: {fileID: 0} + speed: 6 --- !u!1 &1862892887 GameObject: m_ObjectHideFlags: 0 @@ -17017,3 +17185,5 @@ SceneRoots: - {fileID: 706766591} - {fileID: 307935225} - {fileID: 840882477} + - {fileID: 1268714444} + - {fileID: 1858955576} diff --git a/Assets/Scenes/Level04.unity b/Assets/Scenes/Level04.unity index 0d4fd33648ee8b7844efa4c8986ea64602fb9a23..01b001028faa26890ae7945f3f9b60efd7fd4daf 100644 --- a/Assets/Scenes/Level04.unity +++ b/Assets/Scenes/Level04.unity @@ -3502,7 +3502,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -3844688} + m_AnchoredPosition: {x: 0, y: -3853872} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &435589487 @@ -5263,6 +5263,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 637973997} m_CullTransparentMesh: 1 +--- !u!1001 &645057249 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6562163028296039410, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Name + value: HealingWizard + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Speed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_Radius + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6565987977077161824, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + propertyPath: m_StoppingDistance + value: 0.3 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 6565987977077161826, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161836, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161839, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + - {fileID: 6565987977077161838, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + insertIndex: -1 + addedObject: {fileID: 1560023140} + - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + insertIndex: -1 + addedObject: {fileID: 1560023139} + m_SourcePrefab: {fileID: 100100000, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} --- !u!1 &653488546 GameObject: m_ObjectHideFlags: 0 @@ -11988,6 +12067,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557367703} m_Mesh: {fileID: 4300000, guid: a6ec141e423c0ef46a377ffd284c2e2a, type: 3} +--- !u!1 &1560023138 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} + m_PrefabInstance: {fileID: 645057249} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1560023139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560023138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8919b27e153cc6e408932cca7b79e7e3, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + timeBetweenHeal: 10 + healAmount: 10 +--- !u!114 &1560023140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560023138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b778cfa4099b7d42b5e015ee4c225f2, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 0} + player: {fileID: 0} + speed: 6 --- !u!1 &1570447205 GameObject: m_ObjectHideFlags: 0 @@ -12774,6 +12888,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1652776653} m_CullTransparentMesh: 1 +--- !u!1001 &1681781994 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_Name + value: PetDragon + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3878630058993967862, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} --- !u!1 &1683328810 GameObject: m_ObjectHideFlags: 0 @@ -16444,3 +16615,5 @@ SceneRoots: - {fileID: 307935225} - {fileID: 840882477} - {fileID: 744905641} + - {fileID: 645057249} + - {fileID: 1681781994} diff --git a/Assets/Scripts/Pet/PetHealth.cs b/Assets/Scripts/Pet/PetHealth.cs index 992600033eafc5e1262187361a77213ccf403f5d..2a10d094a3b8047aa8ee6061b5b23d6b5cc424e2 100644 --- a/Assets/Scripts/Pet/PetHealth.cs +++ b/Assets/Scripts/Pet/PetHealth.cs @@ -5,10 +5,16 @@ using UnityEngine; public class PetHealth : MonoBehaviour { - public int maxHealth = 100; + public int startingHealth = 100; public int currentHealth; + public AudioClip deathClip; + public float flashSpeed = 5f; + public Color flashColour = new Color(1f, 0f, 0f, 0.1f); public float sinkSpeed = 2.5f; - + Animator anim; + AudioSource playerAudio; + bool isDead; + bool damaged; void Start(){ currentHealth = 1; } diff --git a/Assets/Scripts/Pet/PetWizardHealth.cs b/Assets/Scripts/Pet/PetWizardHealth.cs index 7406f87afdadc5fb7f377e4613c6723f3715eab1..6c0053cdb7ea38c39b4ea3117d03c4512b370b0f 100644 --- a/Assets/Scripts/Pet/PetWizardHealth.cs +++ b/Assets/Scripts/Pet/PetWizardHealth.cs @@ -4,100 +4,77 @@ using UnityEngine; public class PetWizardHealth : PetHealth, IDamageableFriendly { - private static readonly int Dead = Animator.StringToHash("Dead"); public int startingHealth = 100; - public float sinkSpeed = 2.5f; - public GameObject spellEffect; + public int currentHealth; public AudioClip deathClip; - private PetWizardMovement _petWizardMovement; - private PetWizardHeal _petWizardHeal; - private PetWizardAuraBuff _petWizardAuraBuff; - private Animator _anim; - public bool _isDead; + public float flashSpeed = 5f; + public Color flashColour = new Color(1f, 0f, 0f, 0.1f); + public float sinkSpeed = 2.5f; + Animator anim; + AudioSource petAudio; + PetWizardMovement petWizardMovement; + PetWizardHeal petWizardHeal; + bool isDead; + bool damaged; private bool _isSinking; private bool _immortal; private void Awake() { // Mendapatkan reference komponen - _isDead = false; - _anim = GetComponent<Animator>(); - _petWizardMovement = GetComponent<PetWizardMovement>(); - _petWizardHeal = GetComponent<PetWizardHeal>(); - _petWizardAuraBuff = GetComponent<PetWizardAuraBuff>(); + anim = GetComponent<Animator>(); + petAudio = GetComponent<AudioSource>(); + petWizardMovement = GetComponent<PetWizardMovement>(); + + ResetPlayer(); + } + public void ResetPlayer() + { + // Set the initial health of the player. currentHealth = startingHealth; - _immortal = false; + petWizardMovement.enabled = true; } private void Update() { - //if (manager == null) - //{ - // Debug.Log("Manager == null"); - //} - //else - //{ - // Debug.Log("Manager =! null"); - //} - - if (CurrentStateData.GetCurrentPethealth() != -1 && currentHealth > CurrentStateData.GetCurrentPethealth()) - { - Debug.Log("reduce"); - TakeDamage(startingHealth - CurrentStateData.GetCurrentPethealth()); - } - - if (_isSinking) + if (IsDead()) { - // Memindahkan object kebawah - transform.Translate(Vector3.down * (sinkSpeed * Time.deltaTime)); + transform.Translate (-Vector3.up * sinkSpeed * Time.deltaTime); + if (transform.position.y < -10f) + { + Destroy(this.gameObject); + } } } - - private void Death() + public bool IsDead() { - _isDead = true; - _petWizardMovement.enabled = false; - if (_petWizardHeal != null) - { - _petWizardHeal.enabled = false; - } - - if (_petWizardAuraBuff != null) - { - _petWizardAuraBuff.enabled = false; - } - - // Mentrigger animasi Die - _anim.SetTrigger(Dead); - - // Memainkan suara ketika mati - //_petWizardAudio.clip = deathClip; - //_petWizardAudio.Play(); - - // Mematikan script petWizard movement - - spellEffect.SetActive(false); + return (currentHealth <= 0f); } - - // Fungsi untuk mendapatkan damage public void TakeDamage(int amount) { - if (!_immortal) - { - // Mengurangi health - currentHealth -= amount; - CurrentStateData.SetCurrentPethealth(currentHealth); - } - - // Memainkan suara ketika terkena damage - //_petWizardAudio.Play(); + damaged = true; + if (!IsDead()) + { + petAudio.Play(); + currentHealth -= amount; + + if (IsDead()) + { + Death(); + } + } + } - // Memanggil method Death() jika health <= 0 dan belum mati - if (currentHealth <= 0 && !_isDead) + private void Death() + { + isDead = true; + petWizardMovement.enabled = false; + if (petWizardHeal != null) { - CurrentStateData.SetCurrentPethealth(-1); - Death(); + petWizardHeal.enabled = false; } + // Mentrigger animasi Die + // anim.SetTrigger(d); } public void StartSinking() diff --git a/Assets/Scripts/Pet/PetWizardMovement.cs b/Assets/Scripts/Pet/PetWizardMovement.cs index 72afd98c5f0491611a6692d37284cadb455c4371..4407abc8cc22ea3a9faca885e74e45ee9f4ed1df 100644 --- a/Assets/Scripts/Pet/PetWizardMovement.cs +++ b/Assets/Scripts/Pet/PetWizardMovement.cs @@ -26,12 +26,6 @@ public class PetWizardMovement : MonoBehaviour _wizardRigidBody = GetComponent<Rigidbody>(); } - // Update is called once per frame - void Update() - { - - } - private void FixedUpdate() { if ((player.transform.position - transform.position).magnitude >= 4.5) @@ -46,54 +40,4 @@ public class PetWizardMovement : MonoBehaviour _anim.SetBool(IsWalking, false); } } - - //private void Turning() - //{ - // // Mendapatkan vector dari posisi player dan posisi floorHit - // var wizardToEnemy = enemyPosition - transform.position; - // wizardToEnemy.y = 0f; - - // // Mendapatkan look rotation baru ke hit position - // var newRotation = Quaternion.LookRotation(wizardToEnemy); - - // // Rotasi player - // _wizardRigidBody.MoveRotation(newRotation); - //} - - //private void Move(float h, float v) - //{ - // // Set nilai x dan y - // _movement.Set(h, 0f, v); - - // // Menormalisasi nilai vector agar total panjang dari vector adalah 1 - // _movement = _movement.normalized * (speed * Time.deltaTime); - - // // Move to position - // _wizardRigidBody.MovePosition(transform.position + _movement); - //} - - //private void OnTriggerEnter(Collider other) - //{ - // if ( - // other.gameObject.CompareTag("ZomBunny") - // || other.gameObject.CompareTag("ZomBear") - // || other.gameObject.CompareTag("Hellephant") - // ) - // { - // enemyPosition = other.gameObject.transform.position; - // _enemyInRange = true; - // } - //} - - //private void OnTriggerExit(Collider other) - //{ - // if ( - // other.gameObject.CompareTag("ZomBunny") - // || other.gameObject.CompareTag("ZomBear") - // || other.gameObject.CompareTag("Hellephant") - // ) - // { - // _enemyInRange = false; - // } - //} }