resolving conflict

2026-05-17 20:15:06 +02:00
parent d7211e62de 28a81b6014
commit b0945c9bdb
771 changed files with 276633 additions and 10431 deletions
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -7,7 +7,52 @@ EditorBuildSettings:
  m_Scenes:
  - enabled: 1
    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.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
  m_UseUCBPForAssetBundles: 0
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -36,10 +36,8 @@ GraphicsSettings:
  - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
  m_PreloadedShaders: []
  m_PreloadShadersBatchTimeLimit: -1
-  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
-    type: 0}
-  m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd,
-    type: 2}
+  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_CustomRenderPipeline: {fileID: 11400000, guid: 4b83569d67af61e458304325a23e5dfd, type: 2}
  m_TransparencySortMode: 0
  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
  m_DefaultRenderingPath: 1
@@ -60,8 +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: 800007f585dbb8d409bce87a3ccad193, 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
@@ -845,7 +845,7 @@ PlayerSettings:
  m_RenderingPath: 1
  m_MobileRenderingPath: 1
  metroPackageName: Game
-  metroPackageVersion: 
+  metroPackageVersion: 1.0.0.0
  metroCertificatePath: 
  metroCertificatePassword: 
  metroCertificateSubject: 
@@ -853,7 +853,7 @@ PlayerSettings:
  metroCertificateNotAfter: 0000000000000000
  metroApplicationDescription: Game
  wsaImages: {}
-  metroTileShortName: 
+  metroTileShortName: Game
  metroTileShowName: 0
  metroMediumTileShowName: 0
  metroLargeTileShowName: 0
@@ -922,17 +922,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/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