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

# Conflicts: # Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
2025-03-18 20:33:13 +01:00
parent 202af35489 970673f75a
commit f95cf6c535
19 changed files with 4235 additions and 2012 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_DefaultGroup: bc074d00982114f0388e9c98de91d44f
  m_currentHash:
    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: ef672e941747c2eb6b19db828d740a6a
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_CatalogRequestsTimeout: 0
--- a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin
+++ b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin