conflict resolved

2026-05-24 11:28:32 +02:00
parent 213e894640 dea21e2af5
commit 31522cda01
904 changed files with 345656 additions and 972 deletions
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
@@ -3,10 +3,11 @@
 --- !u!55 &1
 PhysicsManager:
  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_Gravity: {x: 0, y: -9.81, z: 0}
+  serializedVersion: 20
+  m_Gravity: {x: 0, y: -20, z: 0}
  m_DefaultMaterial: {fileID: 0}
  m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
  m_SleepThreshold: 0.005
  m_DefaultContactOffset: 0.01
  m_DefaultSolverIterations: 6
@@ -16,11 +17,11 @@ PhysicsManager:
  m_EnableAdaptiveForce: 0
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
-  m_ContactsGeneration: 1
  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  m_AutoSimulation: 1
+  m_SimulationMode: 0
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 1
+  m_InvokeCollisionCallbacks: 1
  m_ClothInterCollisionSettingsToggle: 0
  m_ClothGravity: {x: 0, y: -9.81, z: 0}
  m_ContactPairsMode: 0
@@ -31,6 +32,10 @@ PhysicsManager:
  m_WorldSubdivisions: 8
  m_FrictionType: 0
  m_EnableEnhancedDeterminism: 0
-  m_EnableUnifiedHeightmaps: 1
+  m_ImprovedPatchFriction: 0
+  m_GenerateOnTriggerStayEvents: 1
  m_SolverType: 0
  m_DefaultMaxAngularSpeed: 50
+  m_ScratchBufferChunkCount: 4
+  m_CurrentBackendId: 4072204805
+  m_FastMotionThreshold: 3.4028235e+38
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,9 +5,54 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
+  - enabled: 0
+    path: Assets/Scenes/SampleScene.unity
+    guid: 8afa6ce05eb7dba4c894b910786e3baf
  - enabled: 1
-    path: Assets/Scenes/happywheelminigamescene.unity
-    guid: 99c9720ab356a0642a771bea13969a05
+    path: Assets/Scenes/Client.unity
+    guid: 99349b837685d91408e5eb5bac237678
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/host a join.unity
+    guid: 7555f1f2ac99b4e4f8a21ad9ca5fc1dc
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/host lobby.unity
+    guid: 2abd1bf51796b0c4ea1347cfd0f5351f
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/join lobby.unity
+    guid: e316ab15407b8d84e96f5b26750db7c6
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/join loading.unity
+    guid: 79aa29a53fbe19d4bbd18b84efde5167
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/create.unity
+    guid: bb0f4b90bb4ebfe47b92da609060694b
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/main menu asi idk lol.unity
+    guid: af78c9ede2fc9c04e9413136f76a9996
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/are u sure.unity
+    guid: 42774ddf02ffd1747898d12625c667b0
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/aus hrac.unity
+    guid: 60b609405d1182342a835866a25ce8ae
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/bubak.unity
+    guid: 2ac55b32f60c0f44691e1588d19d610f
+  - enabled: 1
+    path: Assets/Scenes/Kabely/MiniGame-Kabely V10.unity
+    guid: ae701dd46572ae44faa1c08754c677a1
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-insertkeys.unity
+    guid: a9886d0962880e14fb8072fee41dc9b5
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-FlappyBird.unity
+    guid: 15742d157dfd1e42fb34ae90434eee41
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-ThrowInHole.unity
+    guid: d34a25fb4e1abb111a62c1802c0477d4
+  - enabled: 1
+    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}
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -58,7 +58,7 @@ GraphicsSettings:
  m_FogKeepExp2: 1
  m_AlbedoSwatchInfos: []
  m_RenderPipelineGlobalSettingsMap:
-    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 18dc0cd2c080841dea60987a38ce93fa, type: 2}
+    UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 7bfdf167f826294468ffbde02bb390f1, type: 2}
  m_LightsUseLinearIntensity: 1
  m_LightsUseColorTemperature: 1
  m_LogWhenShaderIsCompiled: 0
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -0,0 +1,5 @@
+{
+    "m_Dictionary": {
+        "m_DictionaryValues": []
+    }
+}
--- a/ProjectSettings/Packages/com.unity.services.core/Settings.json
+++ b/ProjectSettings/Packages/com.unity.services.core/Settings.json
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -8,12 +8,12 @@ PlayerSettings:
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 4
+  defaultScreenOrientation: 0
  targetDevice: 2
  useOnDemandResources: 0
  accelerometerFrequency: 60
  companyName: DefaultCompany
-  productName: NegrBagrJaromirJagr
+  productName: GeoSus
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -164,7 +164,7 @@ PlayerSettings:
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
  resolutionScalingMode: 0
-  resetResolutionOnWindowResize: 0
+  resetResolutionOnWindowResize: 1
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.4
  androidMinAspectRatio: 1
@@ -564,13 +564,16 @@ PlayerSettings:
  - serializedVersion: 3
    m_BuildTarget: Android
    m_Formats: 03000000
+  - serializedVersion: 3
+    m_BuildTarget: iOS
+    m_Formats: 03000000
  playModeTestRunnerEnabled: 0
  runPlayModeTestAsEditModeTest: 0
  actionOnDotNetUnhandledException: 1
  editorGfxJobOverride: 1
  enableInternalProfiler: 0
  logObjCUncaughtExceptions: 1
-  enableCrashReportAPI: 0
+  enableCrashReportAPI: 1
  cameraUsageDescription: 
  locationUsageDescription: 
  microphoneUsageDescription: 
@@ -850,8 +853,8 @@ PlayerSettings:
  editorAssembliesCompatibilityLevel: 1
  m_RenderingPath: 1
  m_MobileRenderingPath: 1
-  metroPackageName: NegrBagrJaromirJagr
-  metroPackageVersion: 
+  metroPackageName: Game
+  metroPackageVersion: 1.0.0.0
  metroCertificatePath: 
  metroCertificatePassword: 
  metroCertificateSubject: 
@@ -859,7 +862,7 @@ PlayerSettings:
  metroCertificateNotAfter: 0000000000000000
  metroApplicationDescription: NegrBagrJaromirJagr
  wsaImages: {}
-  metroTileShortName: 
+  metroTileShortName: Game
  metroTileShowName: 0
  metroMediumTileShowName: 0
  metroLargeTileShowName: 0
@@ -939,7 +942,7 @@ PlayerSettings:
  hmiLoadingImage: {fileID: 0}
  platformRequiresReadableAssets: 0
  virtualTexturingSupportEnabled: 0
-  insecureHttpOption: 0
+  insecureHttpOption: 2
  androidVulkanDenyFilterList: []
  androidVulkanAllowFilterList: []
  androidVulkanDeviceFilterListAsset: {fileID: 0}
--- a/ProjectSettings/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/ProjectSettings/EditorBuildSettings.asset
@@ -0,0 +1,58 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/SampleScene.unity
+    guid: 8afa6ce05eb7dba4c894b910786e3baf
+  - enabled: 1
+    path: Assets/Scenes/Client.unity
+    guid: 99349b837685d91408e5eb5bac237678
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/host a join.unity
+    guid: 7555f1f2ac99b4e4f8a21ad9ca5fc1dc
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/host lobby.unity
+    guid: 2abd1bf51796b0c4ea1347cfd0f5351f
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/join lobby.unity
+    guid: e316ab15407b8d84e96f5b26750db7c6
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/join loading.unity
+    guid: 79aa29a53fbe19d4bbd18b84efde5167
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/create.unity
+    guid: bb0f4b90bb4ebfe47b92da609060694b
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/main menu asi idk lol.unity
+    guid: af78c9ede2fc9c04e9413136f76a9996
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/are u sure.unity
+    guid: 42774ddf02ffd1747898d12625c667b0
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/aus hrac.unity
+    guid: 60b609405d1182342a835866a25ce8ae
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/bubak.unity
+    guid: 2ac55b32f60c0f44691e1588d19d610f
+  - enabled: 1
+    path: Assets/Scenes/Kabely/MiniGame-Kabely V10.unity
+    guid: ae701dd46572ae44faa1c08754c677a1
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-insertkeys.unity
+    guid: a9886d0962880e14fb8072fee41dc9b5
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-FlappyBird.unity
+    guid: 15742d157dfd1e42fb34ae90434eee41
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-ThrowInHole.unity
+    guid: d34a25fb4e1abb111a62c1802c0477d4
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-Satelit.unity
+    guid: 070c4a89027b6e9a28e16859d55f8c66
+  m_configObjects:
+    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
+  m_UseUCBPForAssetBundles: 0
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@@ -4,7 +4,7 @@
 UnityConnectSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
  m_TestMode: 0
  m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events