diff --git a/.gitignore b/.gitignore index ba1e764dfddaaeeff880c95b939d0c8b57d6fdd0..5eb8cb7543eae201846f20800c0db766070537db 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,9 @@ # Visual Studio cache directory .vs/ +# Visual Studio cache directory +.vscode/ + # Gradle cache directory .gradle/ diff --git a/Assets/Prefabs/Pet/Buff.prefab b/Assets/Prefabs/Pet/Buff.prefab index 6368c11868bc70d17aa54559dec0f2fa9af7e81c..677976de48893b94a6bcae98596a79881225a308 100644 --- a/Assets/Prefabs/Pet/Buff.prefab +++ b/Assets/Prefabs/Pet/Buff.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8965519914382573290, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -48,10 +52,98 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7610179270549850331, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -7583600382906805619, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -7210042144376701812, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -6537480356215464037, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -6334749705845209565, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -5395959557547378802, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -4908429958785032699, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -4431764132733142536, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -4388267885537273899, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -3379251623408565763, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -2816812567446021465, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -2488352103220391384, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -1808578723935383602, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -242519904491898770, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 144950525114070398, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} propertyPath: m_Name value: Buff objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2546548812389723016, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3230944315387377279, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4244468892081224805, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6226328919504926872, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6353792460152575681, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8304414101670435579, guid: 61658b50bcfbe8640ac586f05f6340c4, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Prefabs/Pet/Fighter.prefab b/Assets/Prefabs/Pet/Fighter.prefab index b0fc6363df2ad1c92fa0b8e4cb9899fc1d151b74..c004d5a9269cc18a75cc971bec0625b08235c4cc 100644 --- a/Assets/Prefabs/Pet/Fighter.prefab +++ b/Assets/Prefabs/Pet/Fighter.prefab @@ -5240,7 +5240,7 @@ GameObject: - component: {fileID: 1125665594388806363} m_Layer: 6 m_Name: Fighter - m_TagString: Untagged + m_TagString: Pet m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Prefabs/Pet/Healer.prefab b/Assets/Prefabs/Pet/Healer.prefab index c33e8093ae04cb2c5f8ab57917679737961223a9..64e02caa703275cf6b274156eee14febbb361768 100644 --- a/Assets/Prefabs/Pet/Healer.prefab +++ b/Assets/Prefabs/Pet/Healer.prefab @@ -8,6 +8,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8965519914382573290, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -48,13 +52,101 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7610179270549850331, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -7583600382906805619, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -7210042144376701812, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -6537480356215464037, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -6334749705845209565, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -5395959557547378802, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -4908429958785032699, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -4431764132733142536, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -4388267885537273899, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -3379251623408565763, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -2816812567446021465, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -2488352103220391384, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -1808578723935383602, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -242519904491898770, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 144950525114070398, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} propertyPath: m_Name value: Healer objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} propertyPath: m_TagString - value: Untagged + value: Pet + objectReference: {fileID: 0} + - target: {fileID: 2546548812389723016, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3230944315387377279, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4244468892081224805, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6226328919504926872, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6353792460152575681, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8304414101670435579, guid: 46f311046d2104da8b56be3d0a49a119, type: 3} + propertyPath: m_Layer + value: 6 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity index 895bf87d3938812cd49349e3c2d34b83c423868e..d82aa37f9f3005f92c21d05c02dd9384455a0508 100644 --- a/Assets/Scenes/Level01.unity +++ b/Assets/Scenes/Level01.unity @@ -1109,6 +1109,38 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3740218647392038815, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_SizeDelta.x + value: 1315.5 + objectReference: {fileID: 0} + - target: {fileID: 3740218647392038815, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.000015259 + objectReference: {fileID: 0} + - target: {fileID: 3795666570671213182, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.b + value: 0.96446425 + objectReference: {fileID: 0} + - target: {fileID: 3795666570671213182, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.g + value: 0.96446425 + objectReference: {fileID: 0} + - target: {fileID: 3795666570671213182, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.r + value: 0.98490566 + objectReference: {fileID: 0} + - target: {fileID: 4633438535279026066, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.b + value: 0.9570737 + objectReference: {fileID: 0} + - target: {fileID: 4633438535279026066, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.g + value: 0.9570737 + objectReference: {fileID: 0} + - target: {fileID: 4633438535279026066, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.r + value: 0.97735846 + objectReference: {fileID: 0} - target: {fileID: 4666144892890564226, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -1141,6 +1173,102 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HealHealth objectReference: {fileID: 0} + - target: {fileID: 6547065204472085986, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.b + value: 0.97185475 + objectReference: {fileID: 0} + - target: {fileID: 6547065204472085986, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.g + value: 0.97185475 + objectReference: {fileID: 0} + - target: {fileID: 6547065204472085986, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.r + value: 0.9924528 + objectReference: {fileID: 0} + - target: {fileID: 6904058444859415585, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.a + value: 0.87058824 + objectReference: {fileID: 0} + - target: {fileID: 6904058444859415585, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.b + value: 0.03529412 + objectReference: {fileID: 0} + - target: {fileID: 6904058444859415585, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.g + value: 0.03529412 + objectReference: {fileID: 0} + - target: {fileID: 6904058444859415585, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.r + value: 0.03529412 + objectReference: {fileID: 0} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 614175244} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: fullHpPet + objectReference: {fileID: 0} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cheats, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7402368191687911440, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7922546085505087268, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.b + value: 0.9793307 + objectReference: {fileID: 0} + - target: {fileID: 7922546085505087268, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.g + value: 0.9793307 + objectReference: {fileID: 0} + - target: {fileID: 7922546085505087268, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_Color.r + value: 0.98490566 + objectReference: {fileID: 0} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 614175244} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: killPet + objectReference: {fileID: 0} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: Cheats, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 7941945971624006845, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8375525590454933844, guid: 04ce56e10078c2f40b33d185e8129af5, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: diff --git a/Assets/Scripts/Cheats/Cheats.cs b/Assets/Scripts/Cheats/Cheats.cs index 99096921af959ed7e0e710a779a5cd8978932a5e..f9efd7e2c0e82c4f372ba21aa4ee5fc594ec4871 100644 --- a/Assets/Scripts/Cheats/Cheats.cs +++ b/Assets/Scripts/Cheats/Cheats.cs @@ -28,12 +28,14 @@ public class Cheats : MonoBehaviour if (playerInsideCheatCollider) { if (!isCheatOpened){ + Time.timeScale = 0; cheatCanvas.gameObject.SetActive(true); isCheatOpened = true; } else { cheatCanvas.gameObject.SetActive(false); isCheatOpened = false; + Time.timeScale = 1; } } } @@ -86,6 +88,38 @@ public class Cheats : MonoBehaviour playerMovement.cheatBoost(); } + public void fullHpPet() + { + GameObject player = GameObject.FindGameObjectWithTag ("Player"); + Transform playerTransform = player.transform; + + foreach(Transform child in playerTransform) + { + if (child.CompareTag("Pet")) + { + GameObject pet = child.gameObject; + PetHealth goodPetHealth = pet.GetComponent <PetHealth> (); + goodPetHealth.CheatHeal(); + } + } + } + + public void killPet() + { + GameObject player = GameObject.FindGameObjectWithTag ("Player"); + Transform playerTransform = player.transform; + + foreach(Transform child in playerTransform) + { + if (child.CompareTag("Pet")) + { + GameObject pet = child.gameObject; + PetHealth goodPetHealth = pet.GetComponent <PetHealth> (); + goodPetHealth.CheatKill(); + } + } + } + } diff --git a/Assets/Scripts/Pet/GoodPetHealth.cs b/Assets/Scripts/Pet/GoodPetHealth.cs index 4f8442a3653769baca220d57f80e17ee65c194b4..8d61d145930524540fce69f44447282eb359960b 100644 --- a/Assets/Scripts/Pet/GoodPetHealth.cs +++ b/Assets/Scripts/Pet/GoodPetHealth.cs @@ -42,10 +42,22 @@ public class PetHealth : MonoBehaviour { return (currentHealth <= 0f); } + public void StartSinking() { GetComponent<UnityEngine.AI.NavMeshAgent>().enabled = false; } + + public void CheatHeal() + { + currentHealth = startingHealth; + } + + public void CheatKill() + { + currentHealth = 0; + } + void Update() { if(playerHealth.currentHealth <= 0) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index bd9f76b3fbc095a9fef98241c60a1d87fc15a166..c65f6a552f729f54317fa2f3415532612482a352 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,6 +13,7 @@ TagManager: - PlayerShooting - Sword - WeaponManager + - Pet layers: - Default - TransparentFX