Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

# Conflicts: # Assets/Scenes/03_DarkWoods/DarkForest.unity
2025-12-19 11:42:11 +01:00
parent f624eeeeb6 e93d4a748d
commit 5759b6e4c1
3 changed files with 675 additions and 59 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -26,6 +26,9 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/Old_Levels!/Portal/Portal.unity
    guid: cf1147d8227221747a9f5884efeaeab3
+  - enabled: 1
+    path: Assets/Scenes/01_Wasteland/Wasteland_Arenas.unity
+    guid: c4c18449baafe5d459c11608c40b2904
  m_configObjects:
    com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7,
      type: 2}