Eda minigame but new branch

2026-05-17 20:44:46 +02:00
parent dfec8df767
commit a15a9790b5
58 changed files with 1594 additions and 15 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,8 +5,14 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: Assets/Scenes/SampleScene.unity
+<<<<<<< HEAD
+    guid: 6a18d9b328b6a794da5d050347950362
+  - enabled: 1
+    path: Assets/pojekt.unity
+    guid: f01e25b5a8e60224fa8643bf4f074a71
+=======
    guid: 8afa6ce05eb7dba4c894b910786e3baf
  - enabled: 1
    path: Assets/Scenes/Client.unity
@@ -53,6 +59,7 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/MiniGame-Satelit.unity
    guid: 070c4a89027b6e9a28e16859d55f8c66
+>>>>>>> origin/main
  m_configObjects:
    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
  m_UseUCBPForAssetBundles: 0