diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index 7903e3d592bb79270fccf8d5e892d320e77f0c62..312cdd52cc36446da16ed154884e4a17f26d4ad0 100644
--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -6990,6 +6990,52 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 727212387}
m_CullTransparentMesh: 1
+--- !u!1 &741269548
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 741269549}
+ - component: {fileID: 741269550}
+ m_Layer: 0
+ m_Name: PetManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &741269549
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 741269548}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1165414997}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &741269550
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 741269548}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c8139185249ad5e43b866f13ccdda548, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ healerPet: {fileID: 6842458599697738422, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
+ attackerPet: {fileID: 6182162820492919152, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
--- !u!1 &748826048
GameObject:
m_ObjectHideFlags: 0
@@ -8873,71 +8919,6 @@ Transform:
m_Children: []
m_Father: {fileID: 183304858}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &939754510
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 100002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_Name
- value: ZomBunny
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalPosition.x
- value: 2.8748345
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.00000047683716
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalPosition.z
- value: 4.49745
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 19800002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: InitialModule.startSizeY.minMaxState
- value: 3
- objectReference: {fileID: 0}
- - target: {fileID: 19800002, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
- propertyPath: InitialModule.startSizeZ.minMaxState
- value: 3
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: e5171f72421770240bd7c3989fe351e3, type: 3}
--- !u!1 &943920582
GameObject:
m_ObjectHideFlags: 0
@@ -11350,6 +11331,7 @@ Transform:
- {fileID: 1664473421}
- {fileID: 1494457707}
- {fileID: 1995555714}
+ - {fileID: 741269549}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1171939603
@@ -17296,67 +17278,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -14, y: -4}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!1001 &1926172071
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 645013070751802181, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: healthSlider
- value:
- objectReference: {fileID: 918813968}
- - target: {fileID: 6842458599697738422, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_Name
- value: Gecko
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalPosition.x
- value: 3.8081632
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.00000047683716
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalPosition.z
- value: 1.1404972
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7979196013395532419, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
--- !u!1 &1941167242
GameObject:
m_ObjectHideFlags: 0
@@ -17410,67 +17331,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.7261565, y: 1.1397734, z: 3.1002936}
m_Center: {x: 0.80036193, y: -0.44283915, z: -0.49197662}
---- !u!1001 &1951416162
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 262469637662761712, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: healthSlider
- value:
- objectReference: {fileID: 927042515}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalPosition.x
- value: -1.0720851
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.0000009536743
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalPosition.z
- value: 2.551804
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4992758198669102562, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6182162820492919152, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
- propertyPath: m_Name
- value: Colobus
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
--- !u!1 &1965662091
GameObject:
m_ObjectHideFlags: 0
@@ -19545,6 +19405,3 @@ SceneRoots:
- {fileID: 307935225}
- {fileID: 840882477}
- {fileID: 1043811713}
- - {fileID: 939754510}
- - {fileID: 1951416162}
- - {fileID: 1926172071}
diff --git a/Assets/Scenes/Level02.unity b/Assets/Scenes/Level02.unity
index f4050ea442e061d1d7ffbd9e55a4e6321d3873bc..e37b88bcd104981bdab008886c5058508310e193 100644
--- a/Assets/Scenes/Level02.unity
+++ b/Assets/Scenes/Level02.unity
@@ -11454,6 +11454,7 @@ Transform:
- {fileID: 1664473421}
- {fileID: 1494457707}
- {fileID: 1995555714}
+ - {fileID: 1738484155}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1171939603
@@ -15986,6 +15987,52 @@ Transform:
m_Children: []
m_Father: {fileID: 183304858}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1738484154
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1738484155}
+ - component: {fileID: 1738484156}
+ m_Layer: 0
+ m_Name: PetManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1738484155
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1738484154}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1165414997}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1738484156
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1738484154}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c8139185249ad5e43b866f13ccdda548, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ healerPet: {fileID: 6842458599697738422, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
+ attackerPet: {fileID: 6182162820492919152, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
--- !u!1 &1750752854
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Level03.unity b/Assets/Scenes/Level03.unity
index f86e11ce6c6570fb0bd45dba48e8a49790cf800b..3d0e7bcec95cd8f1bce2f8d5da0b5111cc8b57f2 100644
--- a/Assets/Scenes/Level03.unity
+++ b/Assets/Scenes/Level03.unity
@@ -4022,6 +4022,52 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 60}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &459929934
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 459929935}
+ - component: {fileID: 459929936}
+ m_Layer: 0
+ m_Name: PetManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &459929935
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 459929934}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1165414997}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &459929936
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 459929934}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c8139185249ad5e43b866f13ccdda548, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ healerPet: {fileID: 6842458599697738422, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
+ attackerPet: {fileID: 6182162820492919152, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
--- !u!1 &460004772
GameObject:
m_ObjectHideFlags: 0
@@ -11678,6 +11724,7 @@ Transform:
- {fileID: 1664473421}
- {fileID: 1494457707}
- {fileID: 1995555714}
+ - {fileID: 459929935}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1171939603
diff --git a/Assets/Scenes/Level04.unity b/Assets/Scenes/Level04.unity
index dafc3567ed6aebb3430bdb5ac808263a2ebfc52a..0871d8c93cec0e49302e26b8a136e0f7c09bccf4 100644
--- a/Assets/Scenes/Level04.unity
+++ b/Assets/Scenes/Level04.unity
@@ -6452,6 +6452,52 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &671757218
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 671757219}
+ - component: {fileID: 671757220}
+ m_Layer: 0
+ m_Name: PetManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &671757219
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 671757218}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1165414997}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &671757220
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 671757218}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c8139185249ad5e43b866f13ccdda548, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ healerPet: {fileID: 6842458599697738422, guid: cefda5744f2acb54d8f08973a10bee1e, type: 3}
+ attackerPet: {fileID: 6182162820492919152, guid: 84b7c8441f160174fa5c6f94cf397f0a, type: 3}
--- !u!1 &682336870
GameObject:
m_ObjectHideFlags: 0
@@ -11478,6 +11524,7 @@ Transform:
- {fileID: 1664473421}
- {fileID: 1494457707}
- {fileID: 1995555714}
+ - {fileID: 671757219}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1171939603
diff --git a/Assets/Scripts/Managers/PetManager.cs b/Assets/Scripts/Managers/PetManager.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9e8402d09d260f53aeb10d13d85c9836459818dd
--- /dev/null
+++ b/Assets/Scripts/Managers/PetManager.cs
@@ -0,0 +1,119 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using UnityEngine;
+
+namespace Nightmare
+{
+ public class PetManager : MonoBehaviour
+ {
+ public GameObject healerPet;
+ public GameObject attackerPet;
+ public static bool tryToSpawnNewPet = false;
+ public static Transform nextTransform;
+
+ GameObject player;
+
+ void Start()
+ {
+ player = GameObject.FindGameObjectWithTag("Player");
+ SpawnCurrentPetNearPlayer();
+ }
+
+ void Update()
+ {
+ if (tryToSpawnNewPet)
+ {
+ UnityEngine.Debug.Log("Try to spawn pet");
+ SpawnCurrentPetNearPlayer();
+ tryToSpawnNewPet = false;
+ }
+ }
+
+ public void SpawnCurrentPetNearPlayer()
+ {
+ int petType = CurrentStateData.GetCurrentPet();
+
+ UnityEngine.Debug.Log($"CurrentStateData.GetCurrentPethealth() = {CurrentStateData.GetCurrentPethealth()}");
+ if (petType != -1)
+ {
+ if (CurrentStateData.GetCurrentPethealth() <= 0 && !tryToSpawnNewPet)
+ {
+ CurrentStateData.RemoveCurrentPet();
+ petType = CurrentStateData.GetCurrentPet();
+ if (petType != -1)
+ {
+ GameObject pet = null;
+ if (petType == 1)
+ {
+ pet = Instantiate(healerPet, player.transform.position + Vector3.right, player.transform.rotation);
+ }
+ else if (petType == 2)
+ {
+ pet = Instantiate(attackerPet, player.transform.position + Vector3.right, player.transform.rotation);
+ }
+
+ var petHealth = pet.GetComponent<PetHealth>();
+ if (petHealth != null)
+ {
+ UnityEngine.Debug.Log("Pet summoned");
+ petHealth.SetManager(this);
+ }
+ else
+ {
+ UnityEngine.Debug.Log("Pet is null");
+ }
+ }
+ }
+ else
+ {
+ GameObject pet = null;
+ if (petType == 1)
+ {
+ pet = Instantiate(healerPet, player.transform.position + (Vector3.right * 0.5f), player.transform.rotation);
+ }
+ else if (petType == 2)
+ {
+ pet = Instantiate(attackerPet, player.transform.position + (Vector3.right * 0.5f), player.transform.rotation);
+ }
+
+ var petHealth = pet.GetComponent<PetHealth>();
+ if (petHealth != null)
+ {
+ UnityEngine.Debug.Log("Pet summoned");
+ petHealth.SetManager(this);
+ }
+ else
+ {
+ UnityEngine.Debug.Log("Pet is null");
+ }
+ }
+ }
+ }
+
+ public void TryToSpawnNextPet(Transform transform)
+ {
+ int petType = CurrentStateData.GetCurrentPet();
+
+ if (petType != -1)
+ {
+ GameObject pet = null;
+ if (petType == 1)
+ {
+ pet = Instantiate(healerPet, transform.position, transform.rotation);
+ }
+ else if (petType == 2)
+ {
+ pet = Instantiate(attackerPet, transform.position, transform.rotation);
+ }
+
+ var petHealth = pet.GetComponent<PetHealth>();
+ if (petHealth != null)
+ {
+ UnityEngine.Debug.Log("Pet summoned");
+ petHealth.SetManager(this);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Managers/PetManager.cs.meta b/Assets/Scripts/Managers/PetManager.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..214aadd1763b12e04ed819b0829ad615346e09f6
--- /dev/null
+++ b/Assets/Scripts/Managers/PetManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c8139185249ad5e43b866f13ccdda548
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Pet/PetHealth.cs b/Assets/Scripts/Pet/PetHealth.cs
index 29fabba90deffd265ae6fde662570a05ca5ae8c1..2031f64f5ab7cb24048bbf236b1ded45f17939a8 100644
--- a/Assets/Scripts/Pet/PetHealth.cs
+++ b/Assets/Scripts/Pet/PetHealth.cs
@@ -15,13 +15,14 @@ namespace Nightmare
AudioSource petAudio;
CapsuleCollider capsuleCollider;
PetMovement petMovement;
+ PetManager petManager; // Reference to PetManager
void Awake()
{
anim = GetComponent<Animator>();
petAudio = GetComponent<AudioSource>();
capsuleCollider = GetComponent<CapsuleCollider>();
- petMovement = this.GetComponent<PetMovement>();
+ petMovement = GetComponent<PetMovement>();
}
void OnEnable()
@@ -88,6 +89,12 @@ namespace Nightmare
return currentHealth;
}
+ // Method to set the PetManager reference
+ public void SetManager(PetManager manager)
+ {
+ petManager = manager;
+ }
+
public void Killed()
{
// Set Health to 0
@@ -97,4 +104,4 @@ namespace Nightmare
anim.SetTrigger("Dead");
}
}
-}
\ No newline at end of file
+}
diff --git a/Assets/Scripts/ShopKeeper/ShopTemplate.cs b/Assets/Scripts/ShopKeeper/ShopTemplate.cs
index 5af7af400f94864e465dd6ed475a616915a015e5..07a437033f97640383e710557b043a95623af6ab 100644
--- a/Assets/Scripts/ShopKeeper/ShopTemplate.cs
+++ b/Assets/Scripts/ShopKeeper/ShopTemplate.cs
@@ -36,14 +36,11 @@ namespace Nightmare
petType = 2;
}
- //Debug.Log("Add Pet");
CurrentStateData.AddPet(petType);
- UnityEngine.Debug.Log($"Length = {CurrentStateData.GetPetsLength()}");
if (CurrentStateData.GetPetsLength() == 1)
{
- UnityEngine.Debug.Log($"Pet Type = {petType}");
- /*PetManager.tryToSpawnNewPet = true;*/
+ PetManager.tryToSpawnNewPet = true;
}
shopManager.BroadcastCheckPuchaseable();
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index a7e95d30009c5192b4b6c67b9bd5d817b7a40429..6fa98e01f11dd114b9833f4e3942142b9ad369bd 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -14,6 +14,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Level01.unity
guid: 0c35443dc6f0fab47a5fa12039cfc4af
+ - enabled: 1
+ path: Assets/Scenes/Level01test.unity
+ guid: bfb75afb9c1eee74f8b7c3956927f175
- enabled: 1
path: Assets/Scenes/Level02.unity
guid: 3d626e763a1c9084db63dd8d2c16ff7a