diff --git a/Assets/Scenes/Level03.unity b/Assets/Scenes/Level03.unity index 654820173919afe9f06eb9184abd8b470f9ca1b8..6b643835e2bf42544c22bd56caa31447a0aab424 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: -1863076} + m_AnchoredPosition: {x: 0, y: -1865372} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &435589487 @@ -10700,8 +10700,49 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1268714447} + - targetCorrespondingSourceObject: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1268714446} m_SourcePrefab: {fileID: 100100000, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} +--- !u!1 &1268714445 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3878630058993967848, guid: 4e419e9017ae57241a3bb11b099c5d4d, type: 3} + m_PrefabInstance: {fileID: 1268714444} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1268714446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268714445} + 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 &1268714447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268714445} + 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 &1273166028 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level04.unity b/Assets/Scenes/Level04.unity index 01b001028faa26890ae7945f3f9b60efd7fd4daf..64bbf549e504810ed759ff16bc4f046308c858d5 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: -3853872} + m_AnchoredPosition: {x: 0, y: -3888476} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &435589487 @@ -5332,7 +5332,8 @@ PrefabInstance: - {fileID: 6565987977077161836, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} - {fileID: 6565987977077161839, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} - {fileID: 6565987977077161838, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 3876139547675789168, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 6564527777199245118, guid: 104302b61f98b9d4aa8d05d2399da197, type: 3} @@ -6278,6 +6279,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4493914613880827488, guid: 6dc4cf4496348884d8ee27743ae38562, type: 3} m_PrefabInstance: {fileID: 744905641} m_PrefabAsset: {fileID: 0} +--- !u!4 &744905643 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 578376449398627443, guid: 6dc4cf4496348884d8ee27743ae38562, type: 3} + m_PrefabInstance: {fileID: 744905641} + m_PrefabAsset: {fileID: 0} --- !u!1 &748826048 GameObject: m_ObjectHideFlags: 0 @@ -10920,6 +10926,26 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.647829, y: 1.4268932, z: 1.33848} m_Center: {x: 0.76111263, y: -0.5863991, z: 0.38887015} +--- !u!1 &1392831814 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8634337098157262005, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + m_PrefabInstance: {fileID: 2144992214} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1392831815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392831814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b778cfa4099b7d42b5e015ee4c225f2, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 744905643} + player: {fileID: 0} + speed: 6 --- !u!1 &1393078305 GameObject: m_ObjectHideFlags: 0 @@ -16598,6 +16624,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2141552261} m_CullTransparentMesh: 1 +--- !u!1001 &2144992214 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8634337098157262005, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_Name + value: AuraBuffWizard + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8635907162178100909, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4006903749936520789, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + - {fileID: 4006903749936520788, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + - {fileID: 4006903749936520787, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + - {fileID: 4006903749936520786, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + m_RemovedGameObjects: + - {fileID: 6097473850256497615, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8634337098157262005, guid: 28a81099d60193a43a41ac743efd3786, type: 3} + insertIndex: -1 + addedObject: {fileID: 1392831815} + m_SourcePrefab: {fileID: 100100000, guid: 28a81099d60193a43a41ac743efd3786, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -16617,3 +16708,4 @@ SceneRoots: - {fileID: 744905641} - {fileID: 645057249} - {fileID: 1681781994} + - {fileID: 2144992214} diff --git a/Assets/Scripts/Pet/PetWizardAuraBuffMovement.cs b/Assets/Scripts/Pet/PetWizardAuraBuffMovement.cs new file mode 100644 index 0000000000000000000000000000000000000000..f37fbbcea0e7491063bd44a5b56a7e3f93e46ead --- /dev/null +++ b/Assets/Scripts/Pet/PetWizardAuraBuffMovement.cs @@ -0,0 +1,43 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.AI; + +public class PetWizardAuraBuffMovement : MonoBehaviour +{ + private static readonly int IsWalking = Animator.StringToHash("IsWalking"); + public Transform target; + public GameObject ZomBoss; + public float speed = 6f; + NavMeshAgent nav; + Animator _anim; + bool move = false; + bool _enemyInRange = false; + Vector3 enemyPosition; + Rigidbody _wizardRigidBody; + Vector3 _movement; + + // Start is called before the first frame update + void Start() + { + ZomBoss = GameObject.FindGameObjectWithTag("ZomBoss"); + nav = GetComponent<NavMeshAgent>(); + _anim = GetComponent<Animator>(); + _wizardRigidBody = GetComponent<Rigidbody>(); + } + + private void FixedUpdate() + { + if ((ZomBoss.transform.position - transform.position).magnitude >= 4.5) + { + _anim.SetBool(IsWalking, true); + //_anim.SetTrigger("Walk"); + Debug.Log("Move to ZomBoss"); + nav.SetDestination(ZomBoss.transform.position); + } + else + { + _anim.SetBool(IsWalking, false); + } + } +} diff --git a/Assets/Scripts/Pet/PetWizardAuraBuffMovement.cs.meta b/Assets/Scripts/Pet/PetWizardAuraBuffMovement.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..99839f34d85ef1ec23bc71d49b50241b7020ad48 --- /dev/null +++ b/Assets/Scripts/Pet/PetWizardAuraBuffMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3d6c3acf6ae54374fa16847fbc181296 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: