Some conflicts resolved

2026-05-27 21:32:22 +02:00
parent 2d7b5481c0 e96ce2de20
commit 13f62000b3
909 changed files with 290753 additions and 12158 deletions
--- a/ProjectSettings/AudioManager.asset
+++ b/ProjectSettings/AudioManager.asset
@@ -16,4 +16,4 @@ AudioManager:
  m_AmbisonicDecoderPlugin: 
  m_DisableAudio: 0
  m_VirtualizeEffects: 1
-  m_RequestedDSPBufferSize: 0
+  m_RequestedDSPBufferSize: 1024
--- 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,56 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: Assets/Scenes/SampleScene.unity
-    guid: 99c9720ab356a0642a771bea13969a05
+    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.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
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
@@ -3,7 +3,7 @@
 --- !u!159 &1
 EditorSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 15
+  serializedVersion: 13
  m_SerializationMode: 2
  m_LineEndingsForNewScripts: 0
  m_DefaultBehaviorMode: 0
@@ -33,7 +33,6 @@ EditorSettings:
  m_UseLegacyProbeSampleCount: 0
  m_SerializeInlineMappingsOnOneLine: 1
  m_DisableCookiesInLightmapper: 0
-  m_ShadowmaskStitching: 0
  m_AssetPipelineMode: 1
  m_RefreshImportMode: 0
  m_CacheServerMode: 0
@@ -47,4 +46,3 @@ EditorSettings:
  m_CacheServerDownloadBatchSize: 128
  m_EnableEnlightenBakedGI: 0
  m_ReferencedClipsExactNaming: 1
-  m_ForceAssetUnloadAndGCOnSceneLoad: 1
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -37,7 +37,7 @@ GraphicsSettings:
  m_PreloadedShaders: []
  m_PreloadShadersBatchTimeLimit: -1
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_CustomRenderPipeline: {fileID: 0}
+  m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}
  m_TransparencySortMode: 0
  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
  m_DefaultRenderingPath: 1
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -293,195 +293,3 @@ InputManager:
    type: 0
    axis: 0
    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Enable Debug Button 1
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left ctrl
-    altNegativeButton: 
-    altPositiveButton: joystick button 8
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Enable Debug Button 2
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: backspace
-    altNegativeButton: 
-    altPositiveButton: joystick button 9
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Reset
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left alt
-    altNegativeButton: 
-    altPositiveButton: joystick button 1
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Next
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: page down
-    altNegativeButton: 
-    altPositiveButton: joystick button 5
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Previous
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: page up
-    altNegativeButton: 
-    altPositiveButton: joystick button 4
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Validate
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: return
-    altNegativeButton: 
-    altPositiveButton: joystick button 0
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Persistent
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: right shift
-    altNegativeButton: 
-    altPositiveButton: joystick button 2
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Multiplier
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: left shift
-    altNegativeButton: 
-    altPositiveButton: joystick button 3
-    gravity: 0
-    dead: 0
-    sensitivity: 0
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Horizontal
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: left
-    positiveButton: right
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Vertical
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: down
-    positiveButton: up
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Vertical
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: down
-    positiveButton: up
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 2
-    axis: 6
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Debug Horizontal
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: left
-    positiveButton: right
-    altNegativeButton: 
-    altPositiveButton: 
-    gravity: 1000
-    dead: 0.001
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 2
-    axis: 5
-    joyNum: 0
--- a/ProjectSettings/NotificationsSettings.asset
+++ b/ProjectSettings/NotificationsSettings.asset
@@ -0,0 +1,42 @@
+{
+    "MonoBehaviour": {
+        "m_Enabled": true,
+        "m_EditorHideFlags": 0,
+        "m_Name": "",
+        "m_EditorClassIdentifier": "",
+        "ToolbarIndex": 0,
+        "m_iOSNotificationSettingsValues": {
+            "m_Keys": [
+                "UnityNotificationRequestAuthorizationOnAppLaunch",
+                "UnityNotificationDefaultAuthorizationOptions",
+                "UnityAddRemoteNotificationCapability",
+                "UnityNotificationRequestAuthorizationForRemoteNotificationsOnAppLaunch",
+                "UnityRemoteNotificationForegroundPresentationOptions",
+                "UnityUseAPSReleaseEnvironment",
+                "UnityUseLocationNotificationTrigger"
+            ],
+            "m_Values": [
+                "True",
+                "7",
+                "False",
+                "False",
+                "-1",
+                "False",
+                "False"
+            ]
+        },
+        "m_AndroidNotificationSettingsValues": {
+            "m_Keys": [
+                "UnityNotificationAndroidRescheduleOnDeviceRestart",
+                "UnityNotificationAndroidUseCustomActivity",
+                "UnityNotificationAndroidCustomActivityString"
+            ],
+            "m_Values": [
+                "False",
+                "False",
+                "com.unity3d.player.UnityPlayerActivity"
+            ]
+        },
+        "DrawableResources": []
+    }
+}
--- a/ProjectSettings/PackageManagerSettings.asset
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 61
+  m_ObjectHideFlags: 53
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
@@ -12,11 +12,13 @@ MonoBehaviour:
  m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_EnablePreviewPackages: 0
-  m_EnablePackageDependencies: 0
+  m_EnablePreReleasePackages: 0
  m_AdvancedSettingsExpanded: 1
  m_ScopedRegistriesSettingsExpanded: 1
+  m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
  oneTimeWarningShown: 0
+  oneTimeDeprecatedPopUpShown: 0
  m_Registries:
  - m_Id: main
    m_Name: 
@@ -24,20 +26,12 @@ MonoBehaviour:
    m_Scopes: []
    m_IsDefault: 1
    m_Capabilities: 7
+    m_ConfigSource: 0
  m_UserSelectedRegistryName: 
  m_UserAddingNewScopedRegistry: 0
  m_RegistryInfoDraft:
-    m_ErrorMessage: 
-    m_Original:
-      m_Id: 
-      m_Name: 
-      m_Url: 
-      m_Scopes: []
-      m_IsDefault: 0
-      m_Capabilities: 0
    m_Modified: 0
-    m_Name: 
-    m_Url: 
-    m_Scopes:
-    - 
-    m_SelectedScopeIndex: 0
+    m_ErrorMessage: 
+    m_UserModificationsInstanceId: -884
+    m_OriginalInstanceId: -886
+  m_LoadAssets: 0
--- 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
@@ -4,16 +4,16 @@
 PlayerSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 28
-  productGUID: 8b6033133b36fead4b3d0ff5ee7a9f0d
+  productGUID: 9c5bd737be89cce4e9f6487402c60dd5
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 4
+  defaultScreenOrientation: 0
  targetDevice: 2
  useOnDemandResources: 0
  accelerometerFrequency: 60
  companyName: DefaultCompany
-  productName: Game
+  productName: GeoSus
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -55,7 +55,7 @@ PlayerSettings:
  mipStripping: 0
  numberOfMipsStripped: 0
  numberOfMipsStrippedPerMipmapLimitGroup: {}
-  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
+  m_StackTraceTypes: 010000000100000001000000000000000100000001000000
  iosShowActivityIndicatorOnLoading: -1
  androidShowActivityIndicatorOnLoading: -1
  iosUseCustomAppBackgroundBehavior: 0
@@ -69,9 +69,9 @@ PlayerSettings:
  disableDepthAndStencilBuffers: 0
  androidStartInFullscreen: 1
  androidRenderOutsideSafeArea: 1
-  androidUseSwappy: 0
+  androidUseSwappy: 1
  androidDisplayOptions: 1
-  androidBlitType: 0
+  androidBlitType: 2
  androidResizeableActivity: 1
  androidDefaultWindowWidth: 1920
  androidDefaultWindowHeight: 1080
@@ -79,11 +79,11 @@ PlayerSettings:
  androidMinimumWindowHeight: 300
  androidFullscreenMode: 1
  androidAutoRotationBehavior: 1
-  androidPredictiveBackSupport: 1
+  androidPredictiveBackSupport: 0
  androidApplicationEntry: 2
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
-  runInBackground: 0
+  runInBackground: 1
  muteOtherAudioSources: 0
  Prepare IOS For Recording: 0
  Force IOS Speakers When Recording: 0
@@ -137,14 +137,17 @@ PlayerSettings:
  switchGraphicsJobsSyncAfterKick: 1
  vulkanNumSwapchainBuffers: 3
  vulkanEnableSetSRGBWrite: 0
-  vulkanEnablePreTransform: 1
+  vulkanEnablePreTransform: 0
  vulkanEnableLateAcquireNextImage: 0
  vulkanEnableCommandBufferRecycling: 1
  loadStoreDebugModeEnabled: 0
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
-  bundleVersion: 0.1.0
-  preloadedAssets: []
+  bundleVersion: 1.0.2
+  preloadedAssets:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
  metroInputSource: 0
  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1
@@ -161,14 +164,14 @@ PlayerSettings:
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
  resolutionScalingMode: 0
-  resetResolutionOnWindowResize: 0
+  resetResolutionOnWindowResize: 1
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.4
  androidMinAspectRatio: 1
  applicationIdentifier:
-    Android: com.UnityTechnologies.com.unity.template.urpblank
-    Standalone: com.Unity-Technologies.com.unity.template.urp-blank
-    iPhone: com.Unity-Technologies.com.unity.template.urp-blank
+    Android: com.UnityTechnologies.Mobile3DTemplate
+    Standalone: com.UnityTechnologies.Mobile3DTemplate
+    iPhone: com.UnityTechnologies.Mobile3DTemplate
  buildNumber:
    Standalone: 0
    VisionOS: 0
@@ -188,7 +191,7 @@ PlayerSettings:
  CreateWallpaper: 0
  androidSplitApplicationBinary: 0
  keepLoadedShadersAlive: 0
-  StripUnusedMeshComponents: 0
+  StripUnusedMeshComponents: 1
  strictShaderVariantMatching: 0
  VertexChannelCompressionMask: 4054
  iPhoneSdkVersion: 988
@@ -255,8 +258,8 @@ PlayerSettings:
  iOSAutomaticallyDetectAndAddCapabilities: 1
  appleEnableProMotion: 0
  shaderPrecisionModel: 0
-  clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a
-  templatePackageId: com.unity.template.urp-blank@17.0.14
+  clonedFromGUID: 3df0038eaa8740a438c96d5b01ba661e
+  templatePackageId: com.unity.template.mobile3d@6.0.0
  templateDefaultScene: Assets/Scenes/SampleScene.unity
  useCustomMainManifest: 0
  useCustomLauncherManifest: 0
@@ -533,6 +536,9 @@ PlayerSettings:
  - m_BuildTarget: AndroidPlayer
    m_APIs: 150000000b000000
    m_Automatic: 0
+  - m_BuildTarget: WindowsStandaloneSupport
+    m_APIs: 0200000012000000
+    m_Automatic: 0
  m_BuildTargetVRSettings: []
  m_DefaultShaderChunkSizeInMB: 16
  m_DefaultShaderChunkCount: 0
@@ -558,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: 
@@ -746,7 +755,7 @@ PlayerSettings:
  ps4RemotePlayKeyAssignment: -1
  ps4RemotePlayKeyMappingDir: 
  ps4PlayTogetherPlayerCount: 0
-  ps4EnterButtonAssignment: 2
+  ps4EnterButtonAssignment: 1
  ps4ApplicationParam1: 0
  ps4ApplicationParam2: 0
  ps4ApplicationParam3: 0
@@ -769,7 +778,7 @@ PlayerSettings:
  ps4UseAudio3dBackend: 0
  ps4UseLowGarlicFragmentationMode: 1
  ps4SocialScreenEnabled: 0
-  ps4ScriptOptimizationLevel: 2
+  ps4ScriptOptimizationLevel: 0
  ps4Audio3dVirtualSpeakerCount: 14
  ps4attribCpuUsage: 0
  ps4PatchPkgPath: 
@@ -795,7 +804,7 @@ PlayerSettings:
  splashScreenBackgroundSourcePortrait: {fileID: 0}
  blurSplashScreenBackground: 1
  spritePackerPolicy: 
-  webGLMemorySize: 32
+  webGLMemorySize: 16
  webGLExceptionSupport: 1
  webGLNameFilesAsHashes: 0
  webGLShowDiagnostics: 0
@@ -806,7 +815,7 @@ PlayerSettings:
  webGLTemplate: APPLICATION:Default
  webGLAnalyzeBuildSize: 0
  webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 0
+  webGLCompressionFormat: 1
  webGLWasmArithmeticExceptions: 0
  webGLLinkerTarget: 1
  webGLThreadsSupport: 0
@@ -845,15 +854,15 @@ PlayerSettings:
  m_RenderingPath: 1
  m_MobileRenderingPath: 1
  metroPackageName: Game
-  metroPackageVersion: 
+  metroPackageVersion: 1.0.0.0
  metroCertificatePath: 
  metroCertificatePassword: 
  metroCertificateSubject: 
  metroCertificateIssuer: 
  metroCertificateNotAfter: 0000000000000000
-  metroApplicationDescription: Game
+  metroApplicationDescription: NegrBagrJaromirJagr
  wsaImages: {}
-  metroTileShortName: 
+  metroTileShortName: Game
  metroTileShowName: 0
  metroMediumTileShowName: 0
  metroLargeTileShowName: 0
@@ -900,7 +909,8 @@ PlayerSettings:
  XboxOneOverrideIdentityName: 
  XboxOneOverrideIdentityPublisher: 
  vrEditorSettings: {}
-  cloudServicesEnabled: {}
+  cloudServicesEnabled:
+    UNet: 1
  luminIcon:
    m_Name: 
    m_ModelFolderPath: 
@@ -913,7 +923,7 @@ PlayerSettings:
    m_VersionCode: 1
    m_VersionName: 
  hmiPlayerDataPath: 
-  hmiForceSRGBBlit: 1
+  hmiForceSRGBBlit: 0
  embeddedLinuxEnableGamepadInput: 0
  hmiCpuConfiguration: 
  hmiLogStartupTiming: 0
@@ -922,17 +932,17 @@ PlayerSettings:
  captureStartupLogs: {}
  activeInputHandler: 2
  windowsGamepadBackendHint: 0
-  cloudProjectId: 8feb5b9d-fe4c-4652-bc44-283fb1a29892
+  cloudProjectId: 
  framebufferDepthMemorylessMode: 0
  qualitySettingsNames: []
-  projectName: Game
-  organizationId: unity-tul-du
+  projectName: 
+  organizationId: 
  cloudEnabled: 0
  legacyClampBlendShapeWeights: 0
  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/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -4,7 +4,7 @@
 QualitySettings:
  m_ObjectHideFlags: 0
  serializedVersion: 5
-  m_CurrentQuality: 1
+  m_CurrentQuality: 0
  m_QualitySettings:
  - serializedVersion: 5
    name: Mobile
@@ -102,7 +102,7 @@ QualitySettings:
    asyncUploadBufferSize: 16
    asyncUploadPersistentBuffer: 1
    resolutionScalingFixedDPIFactor: 1
-    customRenderPipeline: {fileID: 0}
+    customRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}
    terrainQualityOverrides: 0
    terrainPixelError: 1
    terrainDetailDensityScale: 1
@@ -117,7 +117,7 @@ QualitySettings:
    - iPhone
  m_TextureMipmapLimitGroupNames: []
  m_PerPlatformDefaultQuality:
-    Android: 0
+    Android: 2
    GameCoreScarlett: 1
    GameCoreXboxOne: 1
    Lumin: 0
@@ -130,5 +130,5 @@ QualitySettings:
    WebGL: 0
    Windows Store Apps: 0
    XboxOne: 0
-    iPhone: 0
-    tvOS: 0
+    iPhone: 2
+    tvOS: 2
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@@ -4,20 +4,16 @@
 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
  m_ConfigUrl: https://config.uca.cloud.unity3d.com
  m_DashboardUrl: https://dashboard.unity3d.com
  m_TestInitMode: 0
-  InsightsSettings:
-    m_EngineDiagnosticsEnabled: 1
-    m_Enabled: 0
  CrashReportingSettings:
-    serializedVersion: 2
    m_EventUrl: https://perf-events.cloud.unity3d.com
-    m_EnableCloudDiagnosticsReporting: 0
+    m_Enabled: 0
    m_LogBufferSize: 10
    m_CaptureEditorExceptions: 1
  UnityPurchasingSettings: