Merge branch 'main' of https://git.xaxa.at/mePixel/ccl4

blueberryPeak/Assets/Scenes/Beach.unity

@@ -2381,6 +2381,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3123357398500628543, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: dialogManagerObject
+      value: 
+      objectReference: {fileID: 1405120884}
     - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: footstepEvent
       value: 
@@ -6310,6 +6314,17 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1272620836}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1070390764 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+  m_PrefabInstance: {fileID: 355138358}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 23256d9e6183ca49ab546e357a0a1717, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1082384625
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7696,6 +7711,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
   m_PrefabInstance: {fileID: 1398503368}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1405120884 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+  m_PrefabInstance: {fileID: 2092541789}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1434359147
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -12613,6 +12633,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3506049021219160777, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: playerMovement
+      value: 
+      objectReference: {fileID: 1070390764}
     - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
       propertyPath: m_Name
       value: Camera

blueberryPeak/Assets/Scripts/Player/PlayerInteraction.cs

@@ -11,11 +11,11 @@ public class PlayerInteraction : MonoBehaviour
     [SerializeField] private InputActionReference DialogAction;
     [SerializeField] private GameObject dialogManagerObject;
     private readonly List<GameObject> interactableObjects = new();
-    private readonly List<InventoryItem> inventory = new();
     private int blueberryCount;
     private int dialogIndex;
 
     private DialogManager dialogManager;
+    private List<InventoryItem> inventory = new();
 
     private bool talking;
 
@@ -126,27 +126,11 @@ public class PlayerInteraction : MonoBehaviour
         }
     }
 
-    private void OnTriggerEnter(Collider other)
-    {
-        print("outside");
-        if (other.gameObject.tag == "Interactable")
-        {
-            print("inside");
-            interactableObjects.Add(other.gameObject);
-        }
-    }
-
-    private void OnTriggerExit(Collider other)
-    {
-        if (other.gameObject.tag == "Interactable")
-        {
-            interactableObjects.Remove(other.gameObject);
-        }
-    }
     public int GetBlueberryCount()
     {
         return blueberryCount;
     }
+
     public void SetBlueberryCount(int count)
     {
         blueberryCount = count;
@@ -193,4 +177,4 @@ public class PlayerInteraction : MonoBehaviour
     {
         inventory = items;
     }
-}
+}