conflict resolved

Reviewed-on: #27

.vscode/settings.json

@@ -0,0 +1,72 @@
+{
+    "files.exclude": {
+        "**/.DS_Store": true,
+        "**/.git": true,
+        "**/.vs": true,
+        "**/.gitmodules": true,
+        "**/.vsconfig": true,
+        "**/*.booproj": true,
+        "**/*.pidb": true,
+        "**/*.suo": true,
+        "**/*.user": true,
+        "**/*.userprefs": true,
+        "**/*.unityproj": true,
+        "**/*.dll": true,
+        "**/*.exe": true,
+        "**/*.pdf": true,
+        "**/*.mid": true,
+        "**/*.midi": true,
+        "**/*.wav": true,
+        "**/*.gif": true,
+        "**/*.ico": true,
+        "**/*.jpg": true,
+        "**/*.jpeg": true,
+        "**/*.png": true,
+        "**/*.psd": true,
+        "**/*.tga": true,
+        "**/*.tif": true,
+        "**/*.tiff": true,
+        "**/*.3ds": true,
+        "**/*.3DS": true,
+        "**/*.fbx": true,
+        "**/*.FBX": true,
+        "**/*.lxo": true,
+        "**/*.LXO": true,
+        "**/*.ma": true,
+        "**/*.MA": true,
+        "**/*.obj": true,
+        "**/*.OBJ": true,
+        "**/*.asset": true,
+        "**/*.cubemap": true,
+        "**/*.flare": true,
+        "**/*.mat": true,
+        "**/*.meta": true,
+        "**/*.prefab": true,
+        "**/*.unity": true,
+        "build/": true,
+        "Build/": true,
+        "Library/": true,
+        "library/": true,
+        "obj/": true,
+        "Obj/": true,
+        "Logs/": true,
+        "logs/": true,
+        "ProjectSettings/": true,
+        "UserSettings/": true,
+        "temp/": true,
+        "Temp/": true
+    },
+    "files.associations": {
+        "*.asset": "yaml",
+        "*.meta": "yaml",
+        "*.prefab": "yaml",
+        "*.unity": "yaml",
+    },
+    "explorer.fileNesting.enabled": true,
+    "explorer.fileNesting.patterns": {
+        "*.sln": "*.csproj",
+        "*.slnx": "*.csproj"
+    },
+    "dotnet.defaultSolution": "GeoSusGame.slnx",
+    "dotnet.enableWorkspaceBasedDevelopment": false
+}

Assets/2026-04-26 13-58-02.mp3.mkv.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/Scenes/Main Screen Scenes/bubak.unity.meta
-guid: 2ac55b32f60c0f44691e1588d19d610f
+guid: 7a66eff9f177f114799f4d97c3be195c
 ========
 guid: d6a21cbd9c8f68f4fbe65763566ca7c9
 >>>>>>>> origin/main:Assets/2026-04-26 13-58-02.mp3.mkv.meta

Assets/Build Profiles.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 92df50b8fba934144a4c4dcaf506f9b4
+guid: d781b4c807a1e42499c4f584952647d2
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/GameManager/GameManager.cs

@@ -57,12 +57,12 @@ public class GameManager : MonoBehaviour
     // and each one MUST be enabled in EditorBuildSettings, or LoadSceneAsync
     // will silently fail and the task button will appear dead.
     [SerializeField] public string[] minigameScenes = {
-        "MiniGame-Kabely V10",
+        "MiniGame-Kabely",
-        "MiniGame-insertkeys",
+        //"MiniGame-insertkeys", Obsolete ?
-        "MiniGame-FlappyBird",
+        "MiniGame-KeyInsert",
-        "MiniGame-ThrowInHole",
+        //"MiniGame-FlappyBird", Out Of Order, Not assigned prefabs
-        "MiniGame-Satelit"
+        //"MiniGame-ThrowInHole", Not pushed into main branch
-        // Add minigame scene name here
+        //"MiniGame-Satelit", No assets, just placeholder task
     };
 
     [Header("Debug")]

Assets/Materials.meta

@@ -1,16 +1,32 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
+<<<<<<<< HEAD:Assets/Materials.meta
+guid: 744e54cd6d3cca64fb2cc6df4ba2e8db
+========
+<<<<<<< HEAD
+guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
+=======
+guid: c5ada28132037dc49b25799cd085863a
+>>>>>>> origin/main
+>>>>>>>> origin/main:Assets/TutorialInfo/Icons.meta
+=======
+<<<<<<< HEAD
 guid: 6cf6ace151aa0204c9a7cb5e00164105
 =======
 guid: 6b37670de43269e4f984694475e75510
 >>>>>>> origin/main
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
+<<<<<<< HEAD
+  assetBundleVariant: 
+=======
 <<<<<<< HEAD
   assetBundleVariant: 
 =======
   assetBundleVariant: 
 >>>>>>> origin/main
+>>>>>>> origin/main

Assets/Materials/Blue.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Blue
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0, g: 0.4953575, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Materials/Blue.mat.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Blue.mat.meta
+guid: 151c2d5ead486e14f84805c05457ef7f
+========
+guid: 0ac383cb888b6814d8432e6ec14f49cd
+>>>>>>>> origin/main:Assets/Materials/image.mat.meta
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/Green.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Green
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.042894993, g: 0.8773585, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Materials/Green.mat.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Green.mat.meta
+guid: 0fb69fc17dec90a41803db19eb400738
+NativeFormatImporter:
+========
+guid: a8455b5835249e44d931c30790f60381
+DefaultImporter:
+>>>>>>>> origin/main:Assets/Scenes/Lobby.unity.meta
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/Magenta.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Magenta
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8326988, g: 0, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Materials/Magenta.mat.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta
+guid: f5b74b605e2aedd42a9e4e8a40046cf5
+NativeFormatImporter:
+========
+guid: 070c4a89027b6e9a28e16859d55f8c66
+DefaultImporter:
+>>>>>>>> origin/main:Assets/Scenes/MiniGame-Satelit.unity.meta
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/Red.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Red
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 0.010550636, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Materials/Red.mat.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 55b6abf6106d3da4d9a6d0550a804f3b
+guid: 4282dda966150b248a1745211444fa91
-DefaultImporter:
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Materials/Yellow.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Yellow
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 0.959195, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Materials/Yellow.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 078ea16f7b9620d4f839c1d44f968b45
+guid: 4a654876946382b44a3e59745d85b328
-folderAsset: yes
+NativeFormatImporter:
-DefaultImporter:
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Materials/image.mat.meta

@@ -1,8 +1,12 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Blue.mat.meta
+guid: 151c2d5ead486e14f84805c05457ef7f
+========
 guid: 0ac383cb888b6814d8432e6ec14f49cd
+>>>>>>>> origin/main:Assets/Materials/image.mat.meta
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 0
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Models/TrashDebris/Marerials/Bottles.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/BrickWheel.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/Cans.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/CardboardPaper.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/ChipBag.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/FastFoodTrash.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/FlatCans.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/GlassBottles.mat

@@ -139,4 +139,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/Glass_Shards_1.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/Litter_1.mat

@@ -138,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/Litter_2.mat

@@ -138,4 +138,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/MiscTrash1.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/MiscTrash2.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/Newspaper.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

Assets/Models/TrashDebris/Marerials/RustyCans.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/TrashBag.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Models/TrashDebris/Marerials/WoodMetal.mat

@@ -135,4 +135,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 9
+  version: 10

Assets/Scenes/ButtonsMemoryMinigame.unity.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/ButtonsMemoryMinigame.unity.meta
+guid: 5f8ea27ba7c86044e9192a63e6e3b6db
+========
+guid: 99349b837685d91408e5eb5bac237678
+>>>>>>>> origin/main:Assets/Scenes/Client.unity.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Client.unity

@@ -1509,7 +1509,6 @@ MonoBehaviour:
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -2194,96 +2193,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1304493835}
   m_CullTransparentMesh: 1
---- !u!1 &1353866370
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1353866371}
-  - component: {fileID: 1353866372}
-  m_Layer: 0
-  m_Name: Game
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1353866371
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1353866370}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 56.6539, y: 0, z: 0.06448}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1353866372
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1353866370}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 22bf82e679cf6e1419440d236360ba3b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::GameManager
-  displayName: 
-  JoinCreateLobby: {fileID: 1403738864}
-  InLobby: {fileID: 12226903}
-  LoadingScreen: {fileID: 247614966}
-  GameScreen: {fileID: 1631266632}
-  MapCenterPoint: {fileID: 216559629}
-  buildingSettings:
-    ResidentialBuildingsMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
-    ResidentialBuildingHeight: 0
-    CommercialBuildingsMat: {fileID: 2100000, guid: d7a2ebf8eb383bc43a5203bcaf1b63e2, type: 2}
-    CommercialBuildingHeight: 8
-    IndustrialBuildingsMat: {fileID: 2100000, guid: 30078b48eb864694dbcb63ce7a222fc4, type: 2}
-    IndustrialBuildingHeight: 15
-    DefaultBuildingMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
-    DefaultBuildingHeight: 30
-  pathwaySettings:
-    FootwayMat: {fileID: 2100000, guid: fbe49e8a4c50f024989408f62bfdcb33, type: 2}
-    FootwayWidth: 3
-    PathMat: {fileID: 2100000, guid: f745f6d4b3e89844aadf9e01fcf41cf3, type: 2}
-    PathWidth: 3
-    StepsMat: {fileID: 2100000, guid: e5e090726056f374dbbd3a626772822f, type: 2}
-    StepsWidth: 4
-    CyclewayMat: {fileID: 2100000, guid: a83875b5ebf7d7b42a074d07e791fee7, type: 2}
-    CyclewayWidth: 4
-    PedestrianMat: {fileID: 2100000, guid: c4c816c88b520f649a38ab2b4e1716f4, type: 2}
-    PedestrianWidth: 4
-    RoadMat: {fileID: 2100000, guid: 616bfa229ebc56548ae11df790a4cf12, type: 2}
-    RoadWidth: 5
-    ServiceMat: {fileID: 2100000, guid: 2faa8c507cbdf4e44bda99e39e5ee03d, type: 2}
-    ServiceWidth: 5
-    ResidentialMat: {fileID: 2100000, guid: 1848627499bdc424fa11b913e3aa2c1d, type: 2}
-    ResidentialWidth: 6
-    TrackMat: {fileID: 2100000, guid: 33108960a53974744ae1f1f329275c9d, type: 2}
-    TrackWidth: 6
-    DefaultMat: {fileID: 2100000, guid: 8be50db4bd8c0aa4e884602af1bdccbc, type: 2}
-    DefaultWidth: 5
-  areaSettings:
-    ParkMat: {fileID: 0}
-    GardenMat: {fileID: 0}
-    PlaygroundMat: {fileID: 0}
-    ForestMat: {fileID: 0}
-    GrassMat: {fileID: 0}
-    WaterMat: {fileID: 0}
-    DefaultMat: {fileID: 0}
-  Player: {fileID: 1161233721}
-  testMode: 1
 --- !u!1 &1403738861
 GameObject:
   m_ObjectHideFlags: 0
@@ -3425,7 +3334,6 @@ SceneRoots:
   m_Roots:
   - {fileID: 442151208}
   - {fileID: 1403738865}
-  - {fileID: 1353866371}
   - {fileID: 157221436}
   - {fileID: 12226904}
   - {fileID: 247614967}

Assets/Scenes/Client.unity.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/ButtonsMemoryMinigame.unity.meta
+guid: 5f8ea27ba7c86044e9192a63e6e3b6db
+========
 guid: 99349b837685d91408e5eb5bac237678
+>>>>>>>> origin/main:Assets/Scenes/Client.unity.meta
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/Lobby.unity.meta

@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Green.mat.meta
+guid: 0fb69fc17dec90a41803db19eb400738
+NativeFormatImporter:
+========
 guid: a8455b5835249e44d931c30790f60381
 DefaultImporter:
+>>>>>>>> origin/main:Assets/Scenes/Lobby.unity.meta
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/MainScene.unity

@@ -85,8 +85,8 @@ LightmapSettings:
     m_PVREnvironmentMIS: 1
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
-    m_PVRFilteringGaussRadiusAO: 1
+    m_PVRFilteringGaussRadiusAO: 2
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
@@ -119,7 +119,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &564375757
+--- !u!1 &90211612
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -127,9 +127,106 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 564375760}
+  - component: {fileID: 90211614}
-  - component: {fileID: 564375759}
+  - component: {fileID: 90211613}
-  - component: {fileID: 564375758}
+  m_Layer: 0
+  m_Name: GameManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &90211613
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 90211612}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 22bf82e679cf6e1419440d236360ba3b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::GameManager
+  displayName: Hrac
+  firstMenuScene: main menu asi idk lol
+  buildingSettings:
+    ResidentialBuildingsMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
+    ResidentialBuildingHeight: 2
+    CommercialBuildingsMat: {fileID: 2100000, guid: d7a2ebf8eb383bc43a5203bcaf1b63e2, type: 2}
+    CommercialBuildingHeight: 8
+    IndustrialBuildingsMat: {fileID: 2100000, guid: 30078b48eb864694dbcb63ce7a222fc4, type: 2}
+    IndustrialBuildingHeight: 15
+    DefaultBuildingMat: {fileID: 2100000, guid: 43a59ce0be297c44a94d4266bc86174d, type: 2}
+    DefaultBuildingHeight: 30
+  pathwaySettings:
+    FootwayMat: {fileID: 2100000, guid: fbe49e8a4c50f024989408f62bfdcb33, type: 2}
+    FootwayWidth: 3
+    PathMat: {fileID: 2100000, guid: f745f6d4b3e89844aadf9e01fcf41cf3, type: 2}
+    PathWidth: 3
+    StepsMat: {fileID: 2100000, guid: e5e090726056f374dbbd3a626772822f, type: 2}
+    StepsWidth: 4
+    CyclewayMat: {fileID: 2100000, guid: a83875b5ebf7d7b42a074d07e791fee7, type: 2}
+    CyclewayWidth: 4
+    PedestrianMat: {fileID: 2100000, guid: c4c816c88b520f649a38ab2b4e1716f4, type: 2}
+    PedestrianWidth: 4
+    RoadMat: {fileID: 2100000, guid: 616bfa229ebc56548ae11df790a4cf12, type: 2}
+    RoadWidth: 5
+    ServiceMat: {fileID: 2100000, guid: 2faa8c507cbdf4e44bda99e39e5ee03d, type: 2}
+    ServiceWidth: 5
+    ResidentialMat: {fileID: 2100000, guid: 1848627499bdc424fa11b913e3aa2c1d, type: 2}
+    ResidentialWidth: 6
+    TrackMat: {fileID: 2100000, guid: 33108960a53974744ae1f1f329275c9d, type: 2}
+    TrackWidth: 6
+    DefaultMat: {fileID: 2100000, guid: 8be50db4bd8c0aa4e884602af1bdccbc, type: 2}
+    DefaultWidth: 5
+  areaSettings:
+    ParkMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    GardenMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    PlaygroundMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    ForestMat: {fileID: 2100000, guid: ef4ea3212671d276649ca366ed6e7f0c, type: 2}
+    GrassMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
+    WaterMat: {fileID: 2100000, guid: eff7cc5b4e29f7918320d3979c3d0cb1, type: 2}
+    DefaultMat: {fileID: 2100000, guid: 57c69638d7afff039a48123e7b4ade7b, type: 2}
+  pendingRadius: 500
+  pendingImpostorCount: 1
+  pendingTaskCount: 5
+  minigameScenes:
+  - MiniGame-Kabely V10
+  - MiniGame-insertkeys
+  - MiniGame-FlappyBird
+  - MiniGame-ThrowInHole
+  - MiniGame-Satelit
+  testMode: 0
+  showGPSDebugOverlay: 1
+  testClientCount: 3
+--- !u!4 &90211614
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 90211612}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.21709, y: 0, z: 3.25431}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &330585543
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 330585546}
+  - component: {fileID: 330585545}
+  - component: {fileID: 330585544}
+  - component: {fileID: 330585547}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -137,21 +234,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!81 &564375758
+--- !u!81 &330585544
 AudioListener:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 564375757}
+  m_GameObject: {fileID: 330585543}
   m_Enabled: 1
---- !u!20 &564375759
+--- !u!20 &330585545
 Camera:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 564375757}
+  m_GameObject: {fileID: 330585543}
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
@@ -196,13 +293,13 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!4 &564375760
+--- !u!4 &330585546
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 564375757}
+  m_GameObject: {fileID: 330585543}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
@@ -211,7 +308,51 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1274200469
+--- !u!114 &330585547
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 330585543}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 0
+  m_RequiresOpaqueTextureOption: 0
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+  m_Version: 2
+--- !u!1 &410087039
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -219,237 +360,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1274200471}
+  - component: {fileID: 410087041}
-  - component: {fileID: 1274200473}
+  - component: {fileID: 410087040}
-  - component: {fileID: 1274200472}
+  - component: {fileID: 410087042}
-  - component: {fileID: 1274200474}
-  m_Layer: 0
-  m_Name: APIManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1274200471
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &1274200472
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 283cf727b4c3ac64c94d59598e221b10, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &1274200473
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
-  m_Mesh: {fileID: 0}
---- !u!114 &1274200474
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1274200469}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a58b19ca2646e434ea88b8112260362b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::MapRenderer
-  queryRadiusMeters: 1000
-  gpsManager: {fileID: 1539417978}
-  buildingMaterial: {fileID: 2100000, guid: 283cf727b4c3ac64c94d59598e221b10, type: 2}
-  defaultFloorHeight: 3
-  defaultBuildingHeight: 6
-  roadMaterial: {fileID: 2100000, guid: 283cf727b4c3ac64c94d59598e221b10, type: 2}
-  defaultRoadWidth: 4
-  motorwayWidth: 10
-  primaryWidth: 8
-  secondaryWidth: 6
-  tertiaryWidth: 5
-  metersPerUnit: 1
---- !u!1 &1539417977
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1539417979}
-  - component: {fileID: 1539417978}
-  m_Layer: 0
-  m_Name: currentGPS
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1539417978
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1539417977}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6b892bed07e5c4d45ad23b4a9b108e08, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::GPSManager
-  Accuracy: 10
-  UpdateDistance: 5
-  MaxWait: 20
---- !u!4 &1539417979
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1539417977}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -18.75082, y: 0, z: 46.79584}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1865882987
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1865882990}
-  - component: {fileID: 1865882989}
-  - component: {fileID: 1865882988}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1865882988
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865882987}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.StandaloneInputModule
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &1865882989
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865882987}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &1865882990
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1865882987}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1896274046
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1896274048}
-  - component: {fileID: 1896274047}
   m_Layer: 0
   m_Name: Directional Light
   m_TagString: Untagged
@@ -457,18 +370,18 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!108 &1896274047
+--- !u!108 &410087040
 Light:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1896274046}
+  m_GameObject: {fileID: 410087039}
   m_Enabled: 1
   serializedVersion: 11
   m_Type: 1
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
+  m_Intensity: 2
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -511,8 +424,8 @@ Light:
   m_LightShadowCasterMode: 0
   m_AreaSize: {x: 1, y: 1}
   m_BounceIntensity: 1
-  m_ColorTemperature: 6570
+  m_ColorTemperature: 5000
-  m_UseColorTemperature: 0
+  m_UseColorTemperature: 1
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
   m_UseViewFrustumForShadowCasterCull: 1
@@ -522,13 +435,13 @@ Light:
   m_LightUnit: 1
   m_LuxAtDistance: 1
   m_EnableSpotReflector: 1
---- !u!4 &1896274048
+--- !u!4 &410087041
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1896274046}
+  m_GameObject: {fileID: 410087039}
   serializedVersion: 2
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 3, z: 0}
@@ -537,12 +450,89 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!114 &410087042
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 410087039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UsePipelineSettings: 1
+  m_AdditionalLightsShadowResolutionTier: 2
+  m_CustomShadowLayers: 0
+  m_LightCookieSize: {x: 1, y: 1}
+  m_LightCookieOffset: {x: 0, y: 0}
+  m_SoftShadowQuality: 1
+  m_RenderingLayersMask:
+    serializedVersion: 0
+    m_Bits: 1
+  m_ShadowRenderingLayersMask:
+    serializedVersion: 0
+    m_Bits: 1
+  m_Version: 4
+  m_LightLayerMask: 1
+  m_ShadowLayerMask: 1
+  m_RenderingLayers: 1
+  m_ShadowRenderingLayers: 1
+--- !u!1 &832575517
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 832575519}
+  - component: {fileID: 832575518}
+  m_Layer: 0
+  m_Name: Global Volume
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &832575518
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832575517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IsGlobal: 1
+  priority: 0
+  blendDistance: 0
+  weight: 1
+  sharedProfile: {fileID: 0}
+--- !u!4 &832575519
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 832575517}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
-  - {fileID: 564375760}
+  - {fileID: 330585546}
-  - {fileID: 1896274048}
+  - {fileID: 410087041}
-  - {fileID: 1865882990}
+  - {fileID: 832575519}
-  - {fileID: 1274200471}
+  - {fileID: 90211614}
-  - {fileID: 1539417979}

Assets/Scenes/MainScene.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3909e36074a570d4c9ec7d4c324d811f
+guid: cdfb65858f841a2499da19ddd01416df
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/MiniGame-Kabely.unity

@@ -419,8 +419,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

Assets/Scenes/MiniGame-Satelit.unity.meta

@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta
+guid: f5b74b605e2aedd42a9e4e8a40046cf5
+NativeFormatImporter:
+========
 guid: 070c4a89027b6e9a28e16859d55f8c66
 DefaultImporter:
+>>>>>>>> origin/main:Assets/Scenes/MiniGame-Satelit.unity.meta
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/New Scene.unity

@@ -1,316 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 10
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 0
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 0
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 1
-    m_PVRFilteringGaussRadiusAO: 1
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 3
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    buildHeightMesh: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &229298603
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 229298606}
-  - component: {fileID: 229298605}
-  - component: {fileID: 229298604}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &229298604
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 229298603}
-  m_Enabled: 1
---- !u!20 &229298605
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 229298603}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &229298606
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 229298603}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1382320966
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1382320968}
-  - component: {fileID: 1382320967}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!108 &1382320967
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1382320966}
-  m_Enabled: 1
-  serializedVersion: 11
-  m_Type: 1
-  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 2
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ForceVisible: 0
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
-  m_LightUnit: 1
-  m_LuxAtDistance: 1
-  m_EnableSpotReflector: 1
---- !u!4 &1382320968
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1382320966}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1660057539 &9223372036854775807
-SceneRoots:
-  m_ObjectHideFlags: 0
-  m_Roots:
-  - {fileID: 229298606}
-  - {fileID: 1382320968}

Assets/Scenes/New Scene.unity.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ea777d1556aec75449ed545a887613d2
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/ButtonScript.cs

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+public class ButtonScript : MonoBehaviour
+{
+    public int buttonIndex;
+    public ButtonsMinigame game;
+
+    void OnMouseDown()
+    {
+        game.OnButtonClicked(buttonIndex);
+    }
+
+   
+}
+    

Assets/Scripts/ButtonScript.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3ddbb77eddbb18d4aa26a61ef9cdadb1

Assets/Scripts/ButtonsMinigame.cs

@@ -0,0 +1,154 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data.SqlTypes;
+using System.Threading.Tasks;
+using TMPro;
+using UnityEditor;
+using UnityEngine;
+
+public enum GameState
+{
+    Idle,
+    ShowingSequance,
+    PlayerTurn,
+    GameOver,
+    MinigameWon
+}
+
+public class ButtonsMinigame : MonoBehaviour, ITask
+{
+    public Light[] lights;
+    public int round = 1;
+    public float glowDuration = 0.4f;
+    public float gapBetween = 0.15f;
+    public float delayBeforeSequence = 0.8f;
+    public int winRound = 5;
+    public TMP_Text statusText;
+    public GameObject startButton;
+    private int playerStep = 0;
+    private GameState state = GameState.Idle;
+    private List<int> sequence = new List<int>();
+
+    public string TaskID { get; set; }
+
+    public TaskType TaskType { get; set; }
+
+    public string TaskName { get; set; }
+
+    public (double, double) TaskLocation { get; set; }
+
+    public bool IsCompleted { get; private set; }
+    private System.Action<ITask> _onComplete;
+    private Action<ITask> _onExit;
+    void GenerateSequence()
+    {
+        sequence.Clear();
+        for (int i = 0; i < round; i++)
+        {
+            int randomButton = UnityEngine.Random.Range(0,5);
+            sequence.Add(randomButton);
+        }
+    }
+
+    IEnumerator PlaySequence()
+    {
+
+        SetState(GameState.ShowingSequance);
+        yield return new WaitForSeconds(delayBeforeSequence);
+
+        for (int i = 0; i < sequence.Count; i++)
+        {
+            int buttonIndex = sequence[i];
+            lights[buttonIndex].gameObject.SetActive(true);
+            yield return new WaitForSeconds (glowDuration);
+            lights[buttonIndex].gameObject.SetActive(false);
+            yield return new WaitForSeconds (gapBetween);
+        }
+
+        playerStep = 0;
+        SetState(GameState.PlayerTurn);
+    }
+
+    void Start()
+    {
+       SetState(GameState.Idle);
+    }
+
+    public void StartGame()
+    {
+        round = 1;
+        playerStep = 0;
+        GenerateSequence();
+        StartCoroutine(PlaySequence());
+    }
+
+    void SetState(GameState newState)
+    {
+        state = newState;
+
+        switch (newState)
+        {
+            case GameState.Idle:
+                statusText.text = "Get Ready!";
+                break; 
+            case GameState.ShowingSequance:
+                statusText.text = "Watch the sequence";
+                break; 
+            case GameState.PlayerTurn:
+                statusText.text = "Your turn!";
+                break;   
+            case GameState.GameOver:
+                statusText.text = "Gameover";
+                break; 
+            case GameState.MinigameWon:
+                statusText.text = "Task Completed";
+                break; 
+        }
+
+        startButton.SetActive(state == GameState.Idle || state == GameState.GameOver);
+    }
+    public void OnButtonClicked(int buttonIndex)
+    {
+        if (state != GameState.PlayerTurn) return;
+        if (buttonIndex == sequence[playerStep])
+        {
+            playerStep++;
+            if (playerStep >= sequence.Count)
+            {
+                if (round >= winRound)
+                {
+                    SetState(GameState.MinigameWon);
+                    Complete();
+                }
+                else
+                {
+                round++;
+                GenerateSequence();
+                StartCoroutine(PlaySequence());
+                }
+                
+            }
+        }
+        else
+        {
+            SetState(GameState.GameOver);
+            Debug.Log("GameOver");        
+        }
+    }
+
+    public void Initialize(System.Action<ITask> onCompleted)
+    {
+        _onComplete = onCompleted;
+    }
+
+    public void ExitTask(System.Action<ITask> onExit)
+    {
+        onExit.Invoke(this);
+    }
+
+    public void Complete()
+    {
+        _onComplete?.Invoke(this);
+    }
+}

Assets/Scripts/ButtonsMinigame.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8f3e0b0291a66dd4f8e11122ae23813e

Assets/Scripts/TiltHoleMiniGameManager.cs

@@ -7,10 +7,10 @@ public class TiltHoleMiniGameManager : MonoBehaviour, ITask
     // ITask PROPERTIES
     // =========================
 
-    public string TaskID { get; private set; } = "TILT_HOLE_01";
+    public string TaskID { get;  set; } = "TILT_HOLE_01";
-    public TaskType TaskType { get; private set; } = TaskType.Task;
+    public TaskType TaskType { get;  set; } = TaskType.Task;
-    public string TaskName { get; private set; } = "Tilt Ball Into Hole";
+    public string TaskName { get;  set; } = "Tilt Ball Into Hole";
-    public (double, double) TaskLocation { get; private set; } = (0, 0);
+    public (double, double) TaskLocation { get;  set; } = (0, 0);
     public bool IsCompleted { get; private set; }
 
     private Action<ITask> _onCompletedCallback;

Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs

@@ -2,10 +2,8 @@ using System;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using TMPro;
-<<<<<<< HEAD
 using GeoSus.Client;
-=======
+
->>>>>>> origin/main
 
 public class FlappyBirdAllInOne : MonoBehaviour, ITask
 {
@@ -39,17 +37,6 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
     public string TaskID { get; set; }
     public TaskType TaskType { get; set; }
     public string TaskName { get; set; }
-<<<<<<< HEAD
-    public Position TaskLocation { get; set; }
-    public bool IsCompleted { get; private set; }
-
-
-    void Start()
-    {
-        Time.timeScale = 1f;
-        score = 0;
-        UpdateScore();
-=======
     public (double, double) TaskLocation { get; set; }
     public bool IsCompleted { get; private set; }
 
@@ -60,17 +47,11 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
         _isPaused = false;
         score = 0;
         if (scoreText != null) UpdateScore();
->>>>>>> origin/main
     }
 
     void Update()
     {
-<<<<<<< HEAD
         if (isDead) return;
-=======
-        if (isDead || _isPaused) return;
->>>>>>> origin/main
-
         HandleInput();
         HandleSpawning();
     }
@@ -120,13 +101,11 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
     {
         score++;
         UpdateScore();
-<<<<<<< HEAD
+
-=======
         if (score >= 10)
         {
             Complete();
         }
->>>>>>> origin/main
     }
 
     void UpdateScore()
@@ -138,26 +117,20 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
     public void GameOver()
     {
         isDead = true;
-<<<<<<< HEAD
+
-        gameOverPanel.SetActive(true);
-        Time.timeScale = 0f;
-=======
         _isPaused = true;
         if (gameOverPanel != null) gameOverPanel.SetActive(true);
         // NOTE: do NOT set Time.timeScale — GPS and network must keep running
->>>>>>> origin/main
     }
 
     public void Restart()
     {
-<<<<<<< HEAD
         Time.timeScale = 1f;
         SceneManager.LoadScene(SceneManager.GetActiveScene().name);
-=======
+
         // TaskManager will unload and reload via additive loading
         // Calling ExitTask lets TaskManager handle scene lifecycle
         ExitTask(_onExit);
->>>>>>> origin/main
     }
 
 

Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 19096191e142d154e956c7169cca9a1e

Assets/Scripts/hod_veci_do_diry.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9bee8d2d15f48de4c86e3b983e5d1ca6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/hod_veci_do_diry/DraggableObject.cs

@@ -1,38 +1,26 @@
 using UnityEngine;
 
-<<<<<<< HEAD
+
 [RequireComponent(typeof(Rigidbody))]
 [RequireComponent(typeof(Collider))]
-=======
-[RequireComponent(typeof(Rigidbody2D))]
-[RequireComponent(typeof(Collider2D))]
->>>>>>> origin/main
 public class DraggableObject : MonoBehaviour
 {
     [Header("Přetahování")]
     public float dragSmoothness = 15f;
 
     [Header("Vizuální zpětná vazba")]
-<<<<<<< HEAD
     public Renderer Renderer;
-=======
-    public SpriteRenderer spriteRenderer;
->>>>>>> origin/main
     public Color normalColor = Color.white;
     public Color dragColor = new Color(1f, 1f, 0.5f);
     public float scaleOnDrag = 1.15f;
 
-<<<<<<< HEAD
     private Rigidbody rb;
-=======
-    private Rigidbody2D rb;
->>>>>>> origin/main
     private Camera mainCamera;
     private bool isDragging = false;
     private Vector3 targetPosition;
     private Vector3 originalScale;
     private bool hasBeenScored = false;
-<<<<<<< HEAD
+
     private Plane _dragPlane;
     private Collider col;
 
@@ -44,35 +32,19 @@ public class DraggableObject : MonoBehaviour
         originalScale = transform.localScale;
         if (Renderer == null)
             Renderer = GetComponent<Renderer>();
-=======
-
-    void Awake()
-    {
-        rb = GetComponent<Rigidbody2D>();
-        mainCamera = Camera.main;
-        originalScale = transform.localScale;
-
-        if (spriteRenderer == null)
-            spriteRenderer = GetComponent<SpriteRenderer>();
->>>>>>> origin/main
     }
 
     void Start()
     {
-<<<<<<< HEAD
+
         rb.useGravity = true;
         rb.constraints = RigidbodyConstraints.FreezeRotation;
-=======
-        rb.gravityScale = 0f;
-        rb.constraints = RigidbodyConstraints2D.FreezeRotation;
->>>>>>> origin/main
         targetPosition = transform.position;
     }
 
     void Update()
     {
         HandleInput();
-<<<<<<< HEAD
     }
     void FixedUpdate()  
     {
@@ -81,16 +53,11 @@ public class DraggableObject : MonoBehaviour
             Vector3 newPos = Vector3.Lerp(rb.position, targetPosition, Time.fixedDeltaTime * dragSmoothness);
             rb.MovePosition(newPos);
         }
-=======
 
-        if (isDragging)
-            transform.position = Vector3.Lerp(transform.position, targetPosition, Time.deltaTime * dragSmoothness);
->>>>>>> origin/main
     }
 
     void HandleInput()
     {
-<<<<<<< HEAD
         if (Input.touchCount > 0)
         {
             Touch touch = Input.GetTouch(0);
@@ -169,75 +136,15 @@ public class DraggableObject : MonoBehaviour
         if (Renderer != null)
         {
             Renderer.material.color = normalColor;
-=======
-
-        if (Input.touchCount > 0)
-        {
-            Touch touch = Input.GetTouch(0);
-            Vector3 worldPos = mainCamera.ScreenToWorldPoint(new Vector3(touch.position.x, touch.position.y, 10f));
-
-            if (touch.phase == TouchPhase.Began)           TryStartDrag(worldPos);
-            else if (touch.phase == TouchPhase.Moved ||
-                     touch.phase == TouchPhase.Stationary) { if (isDragging) targetPosition = worldPos; }
-            else if (touch.phase == TouchPhase.Ended ||
-                     touch.phase == TouchPhase.Canceled)   { if (isDragging) EndDrag(); }
-        }
-        // na twest pro myŠ
-        else
-        {
-            Vector3 worldPos = mainCamera.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, 10f));
-
-            if (Input.GetMouseButtonDown(0))      TryStartDrag(worldPos);
-            else if (Input.GetMouseButton(0) && isDragging) targetPosition = worldPos;
-            else if (Input.GetMouseButtonUp(0) && isDragging) EndDrag();
-        }
-    }
-
-    void TryStartDrag(Vector3 worldPos)
-    {
-        if (GetComponent<Collider2D>().OverlapPoint(worldPos))
-            StartDrag(worldPos);
-    }
-
-    void StartDrag(Vector3 worldPos)
-    {
-        isDragging = true;
-        rb.linearVelocity = Vector2.zero;
-        targetPosition = worldPos;
-
-        transform.localScale = originalScale * scaleOnDrag;
-        if (spriteRenderer != null)
-        {
-            spriteRenderer.color = dragColor;
-            spriteRenderer.sortingOrder = 10;
-        }
-    }
-
-    void EndDrag()
-    {
-        isDragging = false;
-        transform.localScale = originalScale;
-        if (spriteRenderer != null)
-        {
-            spriteRenderer.color = normalColor;
-            spriteRenderer.sortingOrder = 0;
->>>>>>> origin/main
         }
     }
 
     public void OnScored()
     {
-<<<<<<< HEAD
         Debug.Log("Object scored");
         if (hasBeenScored) return;
         hasBeenScored = true;
         isDragging = false;
-=======
-        if (hasBeenScored) return;
-        hasBeenScored = true;
-        isDragging = false;
-
->>>>>>> origin/main
         StartCoroutine(SinkIntoHole());
     }
 
@@ -252,24 +159,12 @@ public class DraggableObject : MonoBehaviour
             elapsed += Time.deltaTime;
             float t = elapsed / duration;
             transform.localScale = Vector3.Lerp(startScale, Vector3.zero, t);
-<<<<<<< HEAD
             if (Renderer != null)
                 Renderer.material.color = new Color(normalColor.r, normalColor.g, normalColor.b, 1f - t);
-=======
-            if (spriteRenderer != null)
-                spriteRenderer.color = new Color(normalColor.r, normalColor.g, normalColor.b, 1f - t);
->>>>>>> origin/main
             yield return null;
         }
 
         gameObject.SetActive(false);
-<<<<<<< HEAD
         LevelManager.Instance?.RegisterItem();
     }
 }
-=======
-
-        LevelManager.Instance?.RegisterItem();
-    }
-}
->>>>>>> origin/main

Assets/Scripts/hod_veci_do_diry/DraggableObject.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: fb5157d7cd78450439c40cd6f5afe6ac

Assets/Scripts/hod_veci_do_diry/Hole.cs

@@ -1,13 +1,9 @@
-<<<<<<< HEAD
+
 using System.Collections;
 using UnityEngine;
 
 [RequireComponent(typeof(CapsuleCollider))]
-=======
-using UnityEngine;
-using System.Collections;
 
->>>>>>> origin/main
 public class Hole : MonoBehaviour
 {
     [Header("Nastavení")]
@@ -17,19 +13,9 @@ public class Hole : MonoBehaviour
     [Tooltip("Síla vtahování itemu k díře")]
     public float pullForce = 4f;
 
-<<<<<<< HEAD
-
     [Header("Vizuál")]
     public Renderer glowRenderer;
-=======
-    [Header("Pohyb díry (volitelné)")]
-    public bool hasMovement = false;
-    public float moveSpeed = 2f;
-    public Vector2 moveRange = new Vector2(1.5f, 0f);
 
-    [Header("Vizuál")]
-    public SpriteRenderer glowRenderer;
->>>>>>> origin/main
 
     private Vector3 startPosition;
     private bool isGlowing = false;
@@ -48,7 +34,6 @@ public class Hole : MonoBehaviour
 
     void Update()
     {
-<<<<<<< HEAD
 
     }
 
@@ -67,29 +52,6 @@ public class Hole : MonoBehaviour
             Debug.Log($"Rigidbody detected: {other.gameObject.name}, distance: {dist}");
             Vector3 dir = (transform.position - rb.position).normalized;
             rb.AddForce(dir * pullForce * Time.fixedDeltaTime, ForceMode.Impulse);
-=======
-        if (hasMovement)
-        {
-            float x = startPosition.x + Mathf.Sin(Time.time * moveSpeed) * moveRange.x;
-            float y = startPosition.y + Mathf.Cos(Time.time * moveSpeed * 0.7f) * moveRange.y;
-            transform.position = new Vector3(x, y, transform.position.z);
-        }
-    }
-
-    void OnTriggerStay2D(Collider2D other)
-    {
-        DraggableObject draggable = other.GetComponent<DraggableObject>();
-        if (draggable == null) return;
-
-        float dist = Vector2.Distance(transform.position, other.transform.position);
-
-
-        Rigidbody2D rb = other.GetComponent<Rigidbody2D>();
-        if (rb != null)
-        {
-            Vector2 dir = ((Vector2)transform.position - rb.position).normalized;
-            rb.AddForce(dir * pullForce * Time.fixedDeltaTime, ForceMode2D.Impulse);
->>>>>>> origin/main
         }
 
 
@@ -100,7 +62,7 @@ public class Hole : MonoBehaviour
         }
     }
 
-<<<<<<< HEAD
+
     void OnTriggerEnter(Collider other)
     {
         Debug.Log($"Collider entered: {other.gameObject.name}");
@@ -110,24 +72,14 @@ public class Hole : MonoBehaviour
     void OnTriggerExit(Collider other)
     {
         Debug.Log($"Collider exited: {other.gameObject.name}");
-=======
-    void OnTriggerEnter2D(Collider2D other)
-    {
-        if (other.GetComponent<DraggableObject>() != null) SetGlow(true);
-    }
-
-    void OnTriggerExit2D(Collider2D other)
-    {
->>>>>>> origin/main
         if (other.GetComponent<DraggableObject>() != null) SetGlow(false);
     }
 
     void SetGlow(bool active)
     {
-<<<<<<< HEAD
+
         Debug.Log($"SetGlow: {active}");
-=======
+
->>>>>>> origin/main
         isGlowing = active;
         if (glowRenderer == null) return;
         glowRenderer.enabled = active;
@@ -139,13 +91,9 @@ public class Hole : MonoBehaviour
         while (isGlowing && glowRenderer != null)
         {
             float t = Mathf.PingPong(Time.time * 3f, 1f);
-<<<<<<< HEAD
             Color c = glowRenderer.sharedMaterial.color;
             glowRenderer.sharedMaterial.color = new Color(c.r, c.g, c.b, Mathf.Lerp(0.3f, 0.9f, t));
-=======
+
-            Color c = glowRenderer.color;
-            glowRenderer.color = new Color(c.r, c.g, c.b, Mathf.Lerp(0.3f, 0.9f, t));
->>>>>>> origin/main
             yield return null;
         }
     }

Assets/Scripts/hod_veci_do_diry/Hole.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: ca7423fcca5f83249a2574cd84b7f806

Assets/Scripts/hod_veci_do_diry/LevelManager.cs

@@ -1,13 +1,7 @@
-<<<<<<< HEAD
+
-using System;
-using UnityEngine;
-using UnityEngine.Events;
-using GeoSus.Client;
-=======
 using UnityEngine;
 using UnityEngine.Events;
 using System;
->>>>>>> origin/main
 
 public class LevelManager : MonoBehaviour, ITask
 {
@@ -15,68 +9,24 @@ public class LevelManager : MonoBehaviour, ITask
 
     [Header("Nastavení levelu")]
     [Tooltip("Kolik itemů musí hráč trefit pro splnění levelu")]
-<<<<<<< HEAD
+
-    public int itemsToScore = 2;
-=======
     public int itemsToScore = 3;
->>>>>>> origin/main
 
     [Header("Event – vyvolá se po trefení všech itemů")]
     public UnityEvent OnAllItemsScored;
 
     private int scoredCount = 0;
 
-<<<<<<< HEAD
     public string TaskID { get; set; }
 
     public TaskType TaskType { get; set; }
     public string TaskName { get; set; }
 
-    public Position TaskLocation { get; set; }
+    public (double, double) TaskLocation { get; set; }
 
     public bool IsCompleted { get; private set; } = false;
     protected Action<ITask> OnCompleted;
-=======
-    // ── ITask ────────────────────────────────────────────────────────────────
-    public string TaskID { get; set; }
-    public TaskType TaskType { get; set; }
-    public string TaskName { get; set; }
-    public (double, double) TaskLocation { get; set; }
-    public bool IsCompleted { get; private set; }
 
-    private Action<ITask> _onCompleted;
-    private Action<ITask> _onExit;
-
-    public void Initialize(Action<ITask> onCompleted)
-    {
-        IsCompleted = false;
-        _onCompleted = onCompleted;
-        ResetCounter();
-        // Wire OnAllItemsScored to Complete() if not already wired
-        OnAllItemsScored.AddListener(Complete);
-    }
-
-    public void Complete()
-    {
-        if (IsCompleted) return;
-        IsCompleted = true;
-        Debug.Log("[LevelManager] Task complete!");
-        _onCompleted?.Invoke(this);
-        ExitTask(_onExit);
-    }
-
-    public void ExitTask(Action<ITask> onExit)
-    {
-        onExit?.Invoke(this);
-    }
-    // ─────────────────────────────────────────────────────────────────────────
-
-    void Awake()
-    {
-        if (Instance == null) Instance = this;
-        else Destroy(gameObject);
-    }
->>>>>>> origin/main
 
     public void RegisterItem()
     {
@@ -96,7 +46,6 @@ public class LevelManager : MonoBehaviour, ITask
 
     public int GetScoredCount() => scoredCount;
     public int GetTotalCount() => itemsToScore;
-<<<<<<< HEAD
 
     public void Initialize(Action<ITask> onCompleted)
     {
@@ -119,7 +68,3 @@ public class LevelManager : MonoBehaviour, ITask
         OnCompleted?.Invoke(this);
     }
 }
-=======
-}
-
->>>>>>> origin/main

Assets/Scripts/hod_veci_do_diry/LevelManager.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: a819c02c3679b5a449b41052d2e6b3c9

Assets/Scripts/hod_veci_do_diry/ObjectSpawner.cs

@@ -7,18 +7,11 @@ using System.Collections.Generic;
 public class ObjectSpawner : MonoBehaviour
 {
     public static ObjectSpawner Instance;
-<<<<<<< HEAD
     [SerializeField]
     private List<GameObject> spawnedHoles = new List<GameObject>();
 
     [Header("Prefaby")]
     public GameObject[] objectPrefabs;
-=======
-
-    [Header("Prefaby")]
-    public GameObject[] objectPrefabs;
-    public GameObject holePrefab;
->>>>>>> origin/main
 
     [Header("Počty")]
     [Tooltip("Kolik předmětů spawnovat")]
@@ -31,7 +24,7 @@ public class ObjectSpawner : MonoBehaviour
     public float holeMoveSpeed = 2f;
 
     [Header("Spawn hranice (odpovídají kameře)")]
-<<<<<<< HEAD
+
     public float minX = 1f;
     public float maxX = 1f;
     public float minY = 0f;
@@ -39,20 +32,6 @@ public class ObjectSpawner : MonoBehaviour
 
 
     private List<GameObject> spawnedObjects = new List<GameObject>();
-    
-=======
-    public float minX = -3.5f;
-    public float maxX = 3.5f;
-    public float minY = -5f;
-    public float maxY = 4f;
-
-    [Header("Rodiče pro přehlednost (volitelné)")]
-    public Transform objectParent;
-    public Transform holeParent;
-
-    private List<GameObject> spawnedObjects = new List<GameObject>();
-    private List<GameObject> spawnedHoles = new List<GameObject>();
->>>>>>> origin/main
 
     void Awake()
     {
@@ -76,7 +55,6 @@ public class ObjectSpawner : MonoBehaviour
             LevelManager.Instance.ResetCounter();
         }
 
-<<<<<<< HEAD
         //SpawnHoles();
         SpawnObjects();
     }
@@ -117,52 +95,11 @@ public class ObjectSpawner : MonoBehaviour
             spawnedObjects.Add(obj);
         }
         Time.timeScale = 1f;
-=======
-        SpawnHoles();
-        SpawnObjects();
-    }
-
-    void SpawnHoles()
-    {
-        for (int i = 0; i < holeCount; i++)
-        {
-            Vector2 pos = RandomPos(1f);
-            GameObject hole = Instantiate(holePrefab, pos, Quaternion.identity, holeParent);
-
-            Hole h = hole.GetComponent<Hole>();
-            if (h != null && holesMove)
-            {
-                h.hasMovement = true;
-                h.moveSpeed = holeMoveSpeed;
-                h.moveRange = new Vector2(Random.Range(0.8f, 1.8f), 0f);
-            }
-
-            spawnedHoles.Add(hole);
-        }
-    }
-
-    void SpawnObjects()
-    {
-        for (int i = 0; i < objectCount; i++)
-        {
-            GameObject prefab = objectPrefabs[Random.Range(0, objectPrefabs.Length)];
-            Vector2 pos = RandomPos(0.5f);
-            GameObject obj = Instantiate(prefab, pos, Quaternion.identity, objectParent);
-
-            // Náhodná barva
-            SpriteRenderer sr = obj.GetComponent<SpriteRenderer>();
-            if (sr != null)
-                sr.color = Random.ColorHSV(0f, 1f, 0.7f, 1f, 0.9f, 1f);
-
-            spawnedObjects.Add(obj);
-        }
->>>>>>> origin/main
     }
 
     public void Clear()
     {
         foreach (var o in spawnedObjects) if (o != null) Destroy(o);
-<<<<<<< HEAD
         //foreach (var h in spawnedHoles) if (h != null) Destroy(h);
         //spawnedObjects.Clear();
         spawnedHoles.Clear();
@@ -176,16 +113,5 @@ public class ObjectSpawner : MonoBehaviour
             Random.Range(-2f, 1.5f)
         );
     }
-=======
-        foreach (var h in spawnedHoles) if (h != null) Destroy(h);
-        spawnedObjects.Clear();
-        spawnedHoles.Clear();
-    }
 
-    Vector2 RandomPos(float margin) =>
-        new Vector2(
-            Random.Range(minX + margin, maxX - margin),
-            Random.Range(minY + margin, maxY - margin)
-        );
->>>>>>> origin/main
 }

Assets/Scripts/hod_veci_do_diry/ObjectSpawner.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 071f79f81861c2741a92d8b044457d94

Assets/Scripts/insert key.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 25326dbbba644974d81eaf9bddc8f76b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/insert key/insertkeys.cs

@@ -28,7 +28,7 @@ public class DraggableKey : MonoBehaviour,
     public string TaskID { get; set; }
     public TaskType TaskType { get; set; }
     public string TaskName { get; set; }
-    public Position TaskLocation { get; set; }
+    public (double, double) TaskLocation { get; set; }
     public bool IsCompleted { get; private set; }
 
     private Action<ITask> _onCompleted;

Assets/Scripts/insert key/insertkeys.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 21dc5fa96a2ceec428d7b0332e55cbe5

Assets/Scripts/insert key/keyslot.cs

@@ -1,28 +0,0 @@
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.SceneManagement;
-
-public class KeySlot : MonoBehaviour, IDropHandler
-{
-    public string correctKeyID;
-
-    public void OnDrop(PointerEventData eventData)
-    {
-        DraggableKey key = eventData.pointerDrag.GetComponent<DraggableKey>();
-
-        if (key != null)
-        {
-            if (key.keyID == correctKeyID)
-            {
-                key.transform.position = transform.position;
-                key.enabled = false;
-
-                KeyminigameManager.Instance.CheckWin();
-            }
-            else
-            {
-                KeyminigameManager.Instance.Fail();
-            }
-        }
-    }
-}

Assets/Scripts/insert key/keyslot.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 4f5eef97f16bb6b47ba88f96f9d051e9

Assets/Scripts/insert key/keysminiigamemanager.cs

@@ -8,12 +8,11 @@ public class KeyminigameManager : MonoBehaviour
     private int correctCount = 0;
     public int totalKeys = 3;
 
-<<<<<<< HEAD
+
-=======
     /// <summary>Set by DraggableKey.Initialize() so CheckWin can fire Complete().</summary>
     [HideInInspector] public ITask taskRef;
 
->>>>>>> origin/main
+
     private void Awake()
     {
         Instance = this;
@@ -22,32 +21,22 @@ public class KeyminigameManager : MonoBehaviour
     public void CheckWin()
     {
         correctCount++;
-<<<<<<< HEAD
-
-        if (correctCount >= totalKeys)
-        {
-            Debug.Log("WIN");
-=======
         Debug.Log($"Keys inserted: {correctCount}/{totalKeys}");
 
         if (correctCount >= totalKeys)
         {
             Debug.Log("All keys inserted — task complete!");
             taskRef?.Complete();
->>>>>>> origin/main
+
         }
     }
 
     public void Fail()
     {
-<<<<<<< HEAD
+
-        SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex - 1);
-    }
-}
-=======
         Debug.Log("Wrong slot — exiting task.");
         taskRef?.ExitTask(null);
         // TaskManager handles unloading; no SceneManager.LoadScene here
     }
 }
->>>>>>> origin/main
+

Assets/Scripts/insert key/keysminiigamemanager.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 0ef083a6749a8ce459b724dafa1eb08f

Assets/Scripts/kabely.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 488d6eb84e65aa94b8b3c77dcb2e21a3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/kabely/kabely.cs

@@ -3,10 +3,8 @@ using System.Collections;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.SceneManagement;
-<<<<<<< HEAD
 using GeoSus.Client;
-=======
+
->>>>>>> origin/main
 
 public class CableMiniGame : MonoBehaviour, ITask
 {
@@ -16,31 +14,24 @@ public class CableMiniGame : MonoBehaviour, ITask
         public string colorName;
         public Button sourceButton;
         public Button targetButton;
-<<<<<<< HEAD
         public Image cableImage;
 
         [HideInInspector] public bool connected;
-    }
 
-=======
 
-        [HideInInspector] public bool connected;
 
         // Line UI
         [HideInInspector] public GameObject lineObject;
         [HideInInspector] public RectTransform lineRect;
         [HideInInspector] public Image lineImage;
     }
->>>>>>> origin/main
+
 
     public string TaskID { get; set; }
     public TaskType TaskType { get; set; }
     public string TaskName { get; set; }
-<<<<<<< HEAD
-    public Position TaskLocation { get; set; }
-=======
     public (double, double) TaskLocation { get; set; }
->>>>>>> origin/main
+
     public bool IsCompleted { get; private set; }
 
     private Action<ITask> _onCompleted;
@@ -48,17 +39,7 @@ public class CableMiniGame : MonoBehaviour, ITask
 
     [Header("MiniGame Settings")]
     public Cable[] cables;
-<<<<<<< HEAD
-    public string previousSceneName;
-    public Color wrongAttemptColor = Color.white;
-    public float blinkDuration = 0.2f;
 
-    private string selectedColor = null;
-
-
-    public void Initialize(Action<ITask> onCompleted)
-    {
-=======
     public Canvas canvas; // Assign your Canvas here in the inspector
     public string previousSceneName;
     public Color wrongAttemptColor = Color.white;
@@ -74,20 +55,18 @@ public class CableMiniGame : MonoBehaviour, ITask
     public void Initialize(Action<ITask> onCompleted)
     {
         Debug.Log("[Init] Initializing mini game...");
->>>>>>> origin/main
+
         IsCompleted = false;
         _onCompleted = onCompleted;
 
         foreach (var cable in cables)
-<<<<<<< HEAD
+
-            cable.connected = false;
-=======
         {
             cable.connected = false;
         }
 
         PrintAllCableStates("After Initialization");
->>>>>>> origin/main
+
     }
 
     public void Complete()
@@ -95,38 +74,14 @@ public class CableMiniGame : MonoBehaviour, ITask
         if (IsCompleted) return;
 
         IsCompleted = true;
-<<<<<<< HEAD
-=======
         Debug.Log("[Complete] Task completed successfully!");
->>>>>>> origin/main
+
         _onCompleted?.Invoke(this);
         ExitTask(_onExit);
     }
 
     public void ExitTask(Action<ITask> onExit)
     {
-<<<<<<< HEAD
-        onExit?.Invoke(this);
-    }
-
-
-    void Start()
-    {
-        foreach (var cable in cables)
-        {
-            Cable localCable = cable;
-
-            cable.sourceButton.onClick.AddListener(() => OnSourceClicked(localCable));
-            cable.targetButton.onClick.AddListener(() => OnTargetClicked(localCable));
-        }
-    }
-
-    void OnSourceClicked(Cable cable)
-    {
-        if (cable.connected) return;
-
-        selectedColor = cable.colorName;
-=======
         Debug.Log("[ExitTask] Exiting task...");
         onExit?.Invoke(this);
     }
@@ -169,21 +124,12 @@ public class CableMiniGame : MonoBehaviour, ITask
         selectedColor = cable.colorName;
         Debug.Log($"[SourceClick] Selected color set to '{selectedColor}'");
         PrintAllCableStates("After Source Click");
->>>>>>> origin/main
+
     }
 
     void OnTargetClicked(Cable cable)
     {
-<<<<<<< HEAD
-        if (selectedColor == null || cable.connected)
-            return;
 
-        if (selectedColor == cable.colorName)
-        {
-            cable.cableImage.color = GetColorFromName(selectedColor);
-            cable.connected = true;
-
-=======
         Debug.Log($"[TargetClick] Clicked target of cable '{cable.colorName}'");
 
         if (selectedColor == null)
@@ -207,19 +153,12 @@ public class CableMiniGame : MonoBehaviour, ITask
             DrawLine(cable);
 
             PrintAllCableStates("After Correct Connection");
->>>>>>> origin/main
+
             CheckCompletion();
         }
         else
         {
-<<<<<<< HEAD
-            StartCoroutine(BlinkAndExit(cable.cableImage));
-        }
 
-        selectedColor = null;
-    }
-
-=======
             Debug.Log($"[TargetClick] Wrong connection attempt! Selected: '{selectedColor}', Target: '{cable.colorName}'");
             PrintAllCableStates("Before BlinkAndExit");
             StartCoroutine(BlinkAndExit(cable));
@@ -294,20 +233,13 @@ public class CableMiniGame : MonoBehaviour, ITask
     // Completion Check
     // ------------------------------
 
->>>>>>> origin/main
+
     void CheckCompletion()
     {
         foreach (var cable in cables)
         {
             if (!cable.connected)
-<<<<<<< HEAD
-                return;
-        }
 
-        Complete();
-    }
-
-=======
             {
                 Debug.Log($"[CheckCompletion] Cable '{cable.colorName}' not yet connected.");
                 return;
@@ -322,7 +254,7 @@ public class CableMiniGame : MonoBehaviour, ITask
     // Helpers
     // ------------------------------
 
->>>>>>> origin/main
+
     Color GetColorFromName(string name)
     {
         switch (name.ToLower())
@@ -331,27 +263,11 @@ public class CableMiniGame : MonoBehaviour, ITask
             case "blue": return Color.blue;
             case "green": return Color.green;
             case "yellow": return Color.yellow;
-<<<<<<< HEAD
+
-            case "purple": return new Color(0.5f, 0, 0.5f);
-=======
->>>>>>> origin/main
             default: return Color.white;
         }
     }
 
-<<<<<<< HEAD
-    IEnumerator BlinkAndExit(Image img)
-    {
-        Color original = img.color;
-        img.color = wrongAttemptColor;
-
-        yield return new WaitForSeconds(blinkDuration);
-
-        img.color = original;
-
-        ExitTask(_onExit);
-        SceneManager.LoadScene(previousSceneName);
-=======
     IEnumerator BlinkAndExit(Cable cable)
     {
         if (cable.lineObject == null) CreateLineUI(cable);
@@ -383,6 +299,5 @@ public class CableMiniGame : MonoBehaviour, ITask
             states += $"'{cable.colorName}': {(cable.connected ? "Connected" : "Not Connected")}, ";
         }
         Debug.Log(states.TrimEnd(' ', ','));
->>>>>>> origin/main
     }
 }

Assets/Scripts/kabely/kabely.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: d3fa58532362d2547ab6cd0ab17d7bde

Assets/Scripts/satelity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1df04c245c361e941955db9527a21afe
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/satelity/WindController.cs

@@ -1,20 +1,8 @@
-<<<<<<< HEAD
-using System;
 using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.SceneManagement;
 using GeoSus.Client;
+using System;
 
 public class WindController : MonoBehaviour, ITask
-{
-    [Header("Settings větru")]
-    public float maxWindTorque = 8f;
-    public float windChangeSpeed = 0.6f;
-    public float gustInterval = 4f;
-=======
-using UnityEngine;
-
-public class WindController : MonoBehaviour
 {
     [Header("settings větru")]
     [Tooltip("Maximální síla větru (kladná i záporná)")]
@@ -27,7 +15,7 @@ public class WindController : MonoBehaviour
     public float gustInterval = 4f;
 
     [Tooltip("Multiplier pro sílu vichřice")]
->>>>>>> origin/main
+
     public float gustMultiplier = 2.0f;
 
     public float CurrentWindTorque { get; private set; }
@@ -35,7 +23,6 @@ public class WindController : MonoBehaviour
     private float targetTorque;
     private float gustTimer;
 
-<<<<<<< HEAD
 
     private Action<ITask> _onCompleted;
     private Action<ITask> _onExit;
@@ -43,11 +30,10 @@ public class WindController : MonoBehaviour
     public string TaskID { get; set; }
     public TaskType TaskType { get; set; }
     public string TaskName { get; set; }
-    public Position TaskLocation { get; set; }
+    public (double, double) TaskLocation { get; set; }
     public bool IsCompleted { get; private set; }
 
-=======
+
->>>>>>> origin/main
     void Start()
     {
         PickNewTargetTorque();
@@ -56,7 +42,7 @@ public class WindController : MonoBehaviour
 
     void Update()
     {
-<<<<<<< HEAD
+
         CurrentWindTorque = Mathf.Lerp(CurrentWindTorque, targetTorque, Time.deltaTime * windChangeSpeed);
 
         gustTimer -= Time.deltaTime;
@@ -67,27 +53,13 @@ public class WindController : MonoBehaviour
 
             gustTimer = gustInterval;
             Invoke(nameof(PickNewTargetTorque), 0.8f);
-=======
+            // Smoothly move wind toward target torque
-        // Smoothly move wind toward target torque
+            CurrentWindTorque = Mathf.Lerp(CurrentWindTorque, targetTorque, Time.deltaTime * windChangeSpeed);
-        CurrentWindTorque = Mathf.Lerp(CurrentWindTorque, targetTorque, Time.deltaTime * windChangeSpeed);
-
-        // Occasional gusts
-        gustTimer -= Time.deltaTime;
-        if (gustTimer <= 0f)
-        {
-            // Apply a short gust by shifting target torque more aggressively
-            float gust = Random.Range(-maxWindTorque, maxWindTorque) * gustMultiplier;
-            targetTorque = Mathf.Clamp(gust, -maxWindTorque * gustMultiplier, maxWindTorque * gustMultiplier);
-
-            gustTimer = gustInterval;
-            Invoke(nameof(PickNewTargetTorque), 0.8f); // gust lasts ~0.8s
->>>>>>> origin/main
         }
     }
 
     private void PickNewTargetTorque()
     {
-<<<<<<< HEAD
         targetTorque = UnityEngine.Random.Range(-maxWindTorque, maxWindTorque);
     }
 
@@ -113,8 +85,4 @@ public class WindController : MonoBehaviour
         _onExit?.Invoke(this);
     }
 }
-=======
+
-        targetTorque = Random.Range(-maxWindTorque, maxWindTorque);
-    }
-}
->>>>>>> origin/main

Assets/Scripts/satelity/WindController.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 58e3f22231584b9459fe7c44ee63e515

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -5,11 +5,19 @@ Material:
 <<<<<<< HEAD
   serializedVersion: 8
 =======
+<<<<<<< HEAD
+  serializedVersion: 8
+=======
+<<<<<<< HEAD
+  serializedVersion: 8
+=======
 <<<<<<< HEAD
   serializedVersion: 6
 =======
   serializedVersion: 8
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -19,9 +27,15 @@ Material:
   m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
 <<<<<<< HEAD
   m_ShaderKeywords: 
 =======
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
@@ -29,6 +43,12 @@ Material:
   m_InvalidKeywords: []
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
   m_LightmapFlags: 1
@@ -40,10 +60,18 @@ Material:
 <<<<<<< HEAD
   m_LockedProperties: 
 =======
+<<<<<<< HEAD
+  m_LockedProperties:
+=======
+<<<<<<< HEAD
+  m_LockedProperties: 
+=======
 <<<<<<< HEAD
 =======
   m_LockedProperties: 
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_SavedProperties:
     serializedVersion: 3
@@ -99,10 +127,18 @@ Material:
 <<<<<<< HEAD
     m_Ints: []
 =======
+<<<<<<< HEAD
+    m_Ints: []
+=======
+<<<<<<< HEAD
+    m_Ints: []
+=======
 <<<<<<< HEAD
 =======
     m_Ints: []
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
     m_Floats:
     - _Ambient: 0.5
@@ -144,9 +180,9 @@ Material:
     - _Parallax: 0.02
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 0.90909094
+    - _ScaleRatioA: 0.9
     - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.7386364
+    - _ScaleRatioC: 0.73125
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
@@ -189,12 +225,23 @@ Material:
   m_BuildTextureStacks: []
   m_AllowLocking: 1
 =======
+<<<<<<< HEAD
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+
+=======
+<<<<<<< HEAD
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+=======
 <<<<<<< HEAD
 =======
   m_BuildTextureStacks: []
   m_AllowLocking: 1
 >>>>>>> origin/main
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -206,10 +253,14 @@ MonoBehaviour:
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
   m_Name: LiberationSans SDF - Fallback
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier:
   m_Version: 1.1.0
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
 <<<<<<< HEAD
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
@@ -218,6 +269,8 @@ MonoBehaviour:
   InternalDynamicOS: 0
 =======
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_FaceInfo:
     m_FaceIndex: 0
@@ -245,6 +298,20 @@ MonoBehaviour:
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
 =======
+<<<<<<< HEAD
+
+  m_Material: {fileID: 2180264}
+  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+  m_SourceFontFilePath:
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+
+=======
+<<<<<<< HEAD
+  m_Material: {fileID: 2180264}
+  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+=======
 <<<<<<< HEAD
   m_GlyphTable: []
   m_CharacterTable: []
@@ -301,9 +368,11 @@ MonoBehaviour:
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_CreationSettings:
-    sourceFontFileName: 
+    sourceFontFileName:
     sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
     faceIndex: 0
     pointSizeSamplingMode: 0
@@ -316,7 +385,7 @@ MonoBehaviour:
     characterSetSelectionMode: 1
     characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633
     referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee
-    referencedTextAssetGUID: 
+    referencedTextAssetGUID:
     fontStyle: 0
     fontStyleModifier: 0
     renderMode: 4169
@@ -324,12 +393,22 @@ MonoBehaviour:
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+
 =======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
+>>>>>>> origin/main
   m_GlyphTable: []
   m_CharacterTable: []
   m_AtlasTextures:
@@ -338,26 +417,291 @@ MonoBehaviour:
   m_IsMultiAtlasTexturesEnabled: 1
   m_GetFontFeatures: 1
   m_ClearDynamicDataOnBuild: 1
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/main
   m_AtlasWidth: 512
   m_AtlasHeight: 512
   m_AtlasPadding: 9
   m_AtlasRenderMode: 4169
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/main
   m_UsedGlyphRects: []
   m_FreeGlyphRects:
   - m_X: 0
     m_Y: 0
     m_Width: 511
     m_Height: 511
+<<<<<<< HEAD
+  m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords: []
+    m_GlyphPairAdjustmentRecords:
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.745117
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 36
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 55
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 60
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.745117
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 827
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.745117
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 836
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.745117
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 839
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -4.745117
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 846
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 854
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 855
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 3
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 861
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 53
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 55
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 53
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 57
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 53
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 58
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 53
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -1.5537109
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 60
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 92
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -6.3828125
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 15
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    - m_FirstAdjustmentRecord:
+        m_GlyphIndex: 92
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: -6.3828125
+          m_YAdvance: 0
+      m_SecondAdjustmentRecord:
+        m_GlyphIndex: 17
+        m_GlyphValueRecord:
+          m_XPlacement: 0
+          m_YPlacement: 0
+          m_XAdvance: 0
+          m_YAdvance: 0
+      m_FeatureLookupFlags: 0
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
+  m_FallbackFontAssetTable: []
+=======
+
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
     m_LigatureSubstitutionRecords: []
     m_GlyphPairAdjustmentRecords: []
     m_MarkToBaseAdjustmentRecords: []
     m_MarkToMarkAdjustmentRecords: []
+
   m_ShouldReimportFontFeatures: 0
   m_FallbackFontAssetTable: []
 <<<<<<< HEAD
+
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
   m_FontWeightTable:
@@ -381,6 +725,7 @@ MonoBehaviour:
     italicTypeface: {fileID: 0}
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
+
   fontWeights:
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
@@ -402,6 +747,7 @@ MonoBehaviour:
     italicTypeface: {fileID: 0}
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
+
   normalStyle: 0
   normalSpacingOffset: 0
   boldStyle: 0.75
@@ -411,7 +757,14 @@ MonoBehaviour:
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+
 =======
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_fontInfo:
     Name: Liberation Sans
@@ -435,15 +788,30 @@ MonoBehaviour:
     Padding: 9
     AtlasWidth: 1024
     AtlasHeight: 1024
+<<<<<<< HEAD
   m_glyphInfoList: []
   m_KerningTable:
     kerningPairs: []
   fallbackFontAssets: []
   atlas: {fileID: 0}
+=======
+
+  m_glyphInfoList: []
+
+  m_KerningTable:
+    kerningPairs: []
+
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
+<<<<<<< HEAD
+
+=======
 <<<<<<< HEAD
 =======
 >>>>>>> origin/main
 >>>>>>> origin/main
+>>>>>>> origin/main
+>>>>>>> origin/main
 --- !u!28 &28268798066460806
 Texture2D:
   m_ObjectHideFlags: 0
@@ -451,16 +819,25 @@ Texture2D:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: LiberationSans SDF Atlas
+
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+
+=======
+<<<<<<< HEAD
+>>>>>>> origin/main
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
   m_Width: 1
   m_Height: 1
   m_CompleteImageSize: 1
   m_MipsStripped: 0
+<<<<<<< HEAD
+=======
 =======
 <<<<<<< HEAD
   m_ForcedFallbackFormat: 4
@@ -469,6 +846,7 @@ Texture2D:
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
+>>>>>>> origin/main
 >>>>>>> origin/main
   m_TextureFormat: 1
   m_MipCount: 1
@@ -481,7 +859,11 @@ Texture2D:
 <<<<<<< HEAD
   m_VTOnly: 0
 =======
+<<<<<<< HEAD
+  m_VTOnly: 0
 =======
+=======
+>>>>>>> origin/main
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
   m_Width: 1
@@ -493,15 +875,21 @@ Texture2D:
   m_IsReadable: 1
   m_IsPreProcessed: 0
   m_IgnoreMipmapLimit: 0
-  m_MipmapLimitGroupName: 
+  m_MipmapLimitGroupName:
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_VTOnly: 0
+<<<<<<< HEAD
+
+=======
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
   m_AlphaIsTransparency: 0
   m_ImageCount: 1
   m_TextureDimension: 2
+
   m_TextureSettings:
     serializedVersion: 2
     m_FilterMode: 1
@@ -510,6 +898,7 @@ Texture2D:
     m_WrapU: 0
     m_WrapV: 0
     m_WrapW: 0
+
   m_LightmapFormat: 0
   m_ColorSpace: 0
 <<<<<<< HEAD
@@ -519,18 +908,34 @@ Texture2D:
   m_StreamData:
     serializedVersion: 2
 =======
+<<<<<<< HEAD
+  m_PlatformBlob:
+=======
+<<<<<<< HEAD
+  m_PlatformBlob: 
+  image data: 1
+  _typelessdata: 00
+  m_StreamData:
+    serializedVersion: 2
+=======
 <<<<<<< HEAD
   image data: 0
   _typelessdata: 
   m_StreamData:
 =======
   m_PlatformBlob: 
+>>>>>>> origin/main
   image data: 1
   _typelessdata: 00
+
   m_StreamData:
     serializedVersion: 2
+<<<<<<< HEAD
+=======
+>>>>>>> origin/main
+>>>>>>> origin/main
 >>>>>>> origin/main
 >>>>>>> origin/main
     offset: 0
     size: 0
-    path: 
+    path:

Assets/TextMesh Pro/Resources/TMP Settings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   assetVersion: 2
   m_TextWrappingMode: 1
   m_enableKerning: 1
-  m_ActiveFontFeatures: 00000000
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   m_enableTintAllSprites: 0
   m_enableParseEscapeCharacters: 1
@@ -33,20 +33,18 @@ MonoBehaviour:
   m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
   m_autoSizeTextContainer: 0
   m_IsTextObjectScaleStatic: 0
-  m_fallbackFontAssets: []
+  m_fallbackFontAssets:
+  - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
   m_matchMaterialPreset: 1
   m_HideSubTextObjects: 0
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
-    type: 2}
   m_defaultSpriteAssetPath: Sprite Assets/
   m_enableEmojiSupport: 1
   m_MissingCharacterSpriteUnicode: 0
   m_EmojiFallbackTextAssets: []
   m_defaultColorGradientPresetsPath: Color Gradient Presets/
-  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
-    type: 2}
   m_StyleSheetsResourcePath: 
   m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
-    type: 3}
   m_UseModernHangulLineBreakingRules: 0

Assets/TutorialInfo/Icons.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
-=======
-guid: c5ada28132037dc49b25799cd085863a
->>>>>>> origin/main
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/TutorialInfo/Scripts/Editor.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: ffed5da1f0e08a5409de9dfef22c21f3
-=======
-guid: 90a0dcae2a28dbc488afff041a155933
->>>>>>> origin/main
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Recovery.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: afdea084fa9cd5c48871a9bcc84d95e0
-=======
-guid: b9c8f9e5bbf063b4fb1152966129a495
->>>>>>> origin/main
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Recovery/0.unity.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 40a9261b0dbdcea4b9562c6a85f035ec
-=======
-guid: 6a844507f0c87344d90cf121a7787214
->>>>>>> origin/main
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/minigame.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
-guid: 5145a323a08373d4a9074774f7f3c501
+guid: 9ea95af2c84c9f849b7e336536ad2e0c
 =======
 guid: dbad2b6c9bd185540923b7342934e39e
 >>>>>>> origin/main

Assets/minigame/dekorace chodba.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
-guid: 3f5e4c6e6f8367342893fd7030d1b4cb
+guid: 12a4296967685ae4199be5761ef3a05e
 =======
 guid: 3919d291be0553e4ebdd5cb62ce994f4
 >>>>>>> origin/main

Assets/minigame/dekorace chodba/Trash and Debris.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
-guid: 8b02f5e5a2bd2df479219d58104b58e4
+guid: c18e5d53e072efa4ea79a41bb7855a1f
 =======
 guid: ada29dc2a8f88f34fbe9db1f0ec749af
 >>>>>>> origin/main

Assets/minigame/dekorace chodba/Trash and Debris/Trash and Debris.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
-guid: 9f4fa73205ab4db41871cc3e9260180f
+guid: 3c90a27b3d95bbc438834df641e276cc
 =======
 guid: 0f1c654fe4f7b3e47907315ebf701ac2
 >>>>>>> origin/main

Assets/minigame/dekorace chodba/materials/pipe/metal-23_normal.jpg.meta

@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -54,7 +54,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -93,6 +93,45 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Packages/packages-lock.json

@@ -53,6 +53,8 @@
       },
       "url": "https://packages.unity.com"
     },
+<<<<<<< HEAD
+=======
     "com.unity.mathematics": {
       "version": "1.3.2",
       "depth": 2,
@@ -60,6 +62,7 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+>>>>>>> origin/main
     "com.unity.multiplayer.center": {
       "version": "1.0.0",
       "depth": 0,
@@ -94,13 +97,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.settings-manager": {
-      "version": "2.1.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.remote-config": {
       "version": "4.2.5",
       "depth": 0,
@@ -198,6 +194,13 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.settings-manager": {
+      "version": "2.1.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.shadergraph": {
       "version": "17.2.0",
       "depth": 1,

ProjectSettings/EditorBuildSettings.asset

@@ -5,8 +5,8 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
-    path: Assets/Scenes/SampleScene.unity
+    path: Assets/Scenes/MainScene.unity
     guid: 8afa6ce05eb7dba4c894b910786e3baf
   - enabled: 1
     path: Assets/Scenes/Client.unity

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