Merge branch 'main' into DamianBranch

2025-09-26 10:30:12 +02:00
parent a10fb31ada 47d942d176
commit 3e6867ff51
95 changed files with 6801 additions and 1233 deletions
--- a/Assets/Prefabs/Managers/InputManager.prefab
+++ b/Assets/Prefabs/Managers/InputManager.prefab
@@ -72,6 +72,6 @@ MonoBehaviour:
  m_ActionEvents: []
  m_NeverAutoSwitchControlSchemes: 0
  m_DefaultControlScheme: 
-  m_DefaultActionMap: DefaultActionMap
+  m_DefaultActionMap: 53d55b3c-f7c2-4706-a857-c615ecb16ff7
  m_SplitScreenIndex: -1
  m_Camera: {fileID: 0}
--- a/Assets/Prefabs/Minigames/DivingForPictures/FloatingObstacle.prefab
+++ b/Assets/Prefabs/Minigames/DivingForPictures/FloatingObstacle.prefab
@@ -47,7 +47,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  prefabIndex: 0
-  damage: 1
  moveSpeed: 2
  enableMovement: 1
  spawner: {fileID: 0}
--- a/Assets/Prefabs/UI/PauseMenu.prefab
+++ b/Assets/Prefabs/UI/PauseMenu.prefab
--- a/Assets/Prefabs/UI/PauseMenu.prefab.meta
+++ b/Assets/Prefabs/UI/PauseMenu.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6fb0d7fc6faad154b8c3e3cb7abb7c15
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: