Merge remote-tracking branch 'origin/NewStory' into NewStory

# Conflicts: # Assets/Meshes/Terrain/Terrain_Land01.asset # Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset # Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset # Packages/packages-lock.json
2025-02-10 13:56:45 +01:00
parent 218c289e4e 543aaf71a6
commit f20d52edb0
169 changed files with 16819 additions and 826 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -47,4 +47,9 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/Portal/Portal.unity
    guid: cf1147d8227221747a9f5884efeaeab3
-  m_configObjects: {}
+  m_configObjects:
+    com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7,
+      type: 2}
+    com.unity.localization.settings: {fileID: 11400000, guid: 7039fd3a9545544ffa35741a5b2a3aaa,
+      type: 2}
+  m_UseUCBPForAssetBundles: 0
--- a/ProjectSettings/Packages/com.unity.services.core/Settings.json
+++ b/ProjectSettings/Packages/com.unity.services.core/Settings.json