conflict resolved

This commit is contained in:
2026-05-31 20:10:39 +02:00
636 changed files with 62750 additions and 3458 deletions

View File

@@ -54,5 +54,7 @@ EditorBuildSettings:
path: Assets/Scenes/MiniGame-Satelit.unity
guid: 070c4a89027b6e9a28e16859d55f8c66
m_configObjects:
com.unity.adaptiveperformance.loader_settings: {fileID: 11400000, guid: c9714da258e57d94d92e55804d2101b1, type: 2}
com.unity.adaptiveperformance.simulator.provider_settings: {fileID: 11400000, guid: 082b513fca8796a488f9d39e3c4be326, type: 2}
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
m_UseUCBPForAssetBundles: 0