tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into DamianBranch and solved conflicts

Browse Source
This commit is contained in:
Damian-Fools
2025-11-27 17:10:51 +01:00
parent 47b04ceebc
commit d1f1416025
54 changed files with 30903 additions and 30294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/AddressableAssetsData/AddressableAssetSettings.asset
View File

@@ -15,7 +15,7 @@ MonoBehaviour:
m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 6b76033e7133e66ec9deade638c45cba
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0
@@ -65,6 +65,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: efe7e1728e73e9546ac5dfee2eff524f, type: 2}
- {fileID: 11400000, guid: 6e4927e7e19eef34b93dc2baa9e9e8e2, type: 2}
- {fileID: 11400000, guid: 4186fdd83f912a14b97fbf4644266b0d, type: 2}
- {fileID: 11400000, guid: fd8b6934620e3a54a818495e62a103e0, type: 2}
- {fileID: 11400000, guid: e25c7672a65b5974bb354fcfb2a8400c, type: 2}
- {fileID: 11400000, guid: 7fcc03e584505ed4381983b6ebb1179d, type: 2}
m_BuildSettings: