resolved issues and added minigames to list

Reviewed-on: #28

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

@@ -58,11 +58,13 @@ public class GameManager : MonoBehaviour
     // will silently fail and the task button will appear dead.
     [SerializeField] public string[] minigameScenes = {
         "MiniGame-Kabely",
-        //"MiniGame-insertkeys", Obsolete ?
+        "ButtonsMemoryMinigame",
+        "Happywheelminigamescene",
         "MiniGame-KeyInsert",
-        //"MiniGame-FlappyBird", Out Of Order, Not assigned prefabs
+        "MiniGame-FlappyBird",
-        //"MiniGame-ThrowInHole", Not pushed into main branch
+        "MiniGame-Satelit",
-        //"MiniGame-Satelit", No assets, just placeholder task
+        "MiniGame-ThrowInHole",
+        "minihra cistici dira"
     };
 
     [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: 1be8570b1bc20d946a6e92f218d0de7d
+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

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4a654876946382b44a3e59745d85b328
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Materials/image.mat.meta

@@ -1,8 +1,12 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Blue.mat.meta
+guid: 35493988850f6fe489b4be5b2f625f95
+========
 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.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/ButtonsMemoryMinigame.unity.meta
+guid: a25fb175a69711142ad29b45ee525020
+========
 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: 2c6b0099075291549ac7194c83d1e61e
+NativeFormatImporter:
+========
 guid: a8455b5835249e44d931c30790f60381
 DefaultImporter:
+>>>>>>>> origin/main:Assets/Scenes/Lobby.unity.meta
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scenes/MainScene.unity.meta

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

Assets/Scenes/MiniGame-Kabely.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 55b6abf6106d3da4d9a6d0550a804f3b
+guid: 900bc523907f8ee48baf5515a54e6716
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/MiniGame-Satelit.unity.meta

@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta
+guid: fb3371dc09f50d14990c4fd40a2862b6
+NativeFormatImporter:
+========
 guid: 070c4a89027b6e9a28e16859d55f8c66
 DefaultImporter:
+>>>>>>>> origin/main:Assets/Scenes/MiniGame-Satelit.unity.meta
   externalObjects: {}
+  mainObjectFileID: 2100000
   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 MinigameState
+{
+    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 MinigameState state = MinigameState.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(MinigameState.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(MinigameState.PlayerTurn);
+    }
+
+    void Start()
+    {
+       SetState(MinigameState.Idle);
+    }
+
+    public void StartGame()
+    {
+        round = 1;
+        playerStep = 0;
+        GenerateSequence();
+        StartCoroutine(PlaySequence());
+    }
+
+    void SetState(MinigameState newState)
+    {
+        state = newState;
+
+        switch (newState)
+        {
+            case MinigameState.Idle:
+                statusText.text = "Get Ready!";
+                break; 
+            case MinigameState.ShowingSequance:
+                statusText.text = "Watch the sequence";
+                break; 
+            case MinigameState.PlayerTurn:
+                statusText.text = "Your turn!";
+                break;   
+            case MinigameState.GameOver:
+                statusText.text = "Gameover";
+                break; 
+            case MinigameState.MinigameWon:
+                statusText.text = "Task Completed";
+                break; 
+        }
+
+        startButton.SetActive(state == MinigameState.Idle || state == MinigameState.GameOver);
+    }
+    public void OnButtonClicked(int buttonIndex)
+    {
+        if (state != MinigameState.PlayerTurn) return;
+        if (buttonIndex == sequence[playerStep])
+        {
+            playerStep++;
+            if (playerStep >= sequence.Count)
+            {
+                if (round >= winRound)
+                {
+                    SetState(MinigameState.MinigameWon);
+                    Complete();
+                }
+                else
+                {
+                round++;
+                GenerateSequence();
+                StartCoroutine(PlaySequence());
+                }
+                
+            }
+        }
+        else
+        {
+            SetState(MinigameState.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.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 078ea16f7b9620d4f839c1d44f968b45
+guid: b680a6b1d72cd374b90a4eac38c8713b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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 +1,2 @@
 fileFormatVersion: 2
-guid: 19096191e142d154e956c7169cca9a1e
+guid: 5a394b419f210bb4fb74ddc99bf3c469

Assets/Scripts/hod_veci_do_diry.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9bee8d2d15f48de4c86e3b983e5d1ca6
+guid: 3c32eef1764a44149be639d15fac5717
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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 +1,2 @@
 fileFormatVersion: 2
-guid: fb5157d7cd78450439c40cd6f5afe6ac
+guid: f4fdb2075cae8cf459906793b0fc07dd

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 +1,2 @@
 fileFormatVersion: 2
-guid: ca7423fcca5f83249a2574cd84b7f806
+guid: 499bc5c49b2d47744a55d527594ece5e

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 +1,2 @@
 fileFormatVersion: 2
-guid: a819c02c3679b5a449b41052d2e6b3c9
+guid: 7f708f4b0a7fb8e4f888b67817f5b7ce

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;
@@ -40,20 +33,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()
     {
         if (Instance == null) Instance = this;
@@ -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 +1,2 @@
 fileFormatVersion: 2
-guid: 071f79f81861c2741a92d8b044457d94
+guid: 871ab3a9010b6e14ba6c3295b2ed089d

Assets/Scripts/insert key.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 25326dbbba644974d81eaf9bddc8f76b
+guid: dadb43c30d8c91448a8c72cec4b687dd
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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 +1,2 @@
 fileFormatVersion: 2
-guid: 21dc5fa96a2ceec428d7b0332e55cbe5
+guid: 0db843a35232004438f51e9b9b8eeab7

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 +1,2 @@
 fileFormatVersion: 2
-guid: 0ef083a6749a8ce459b724dafa1eb08f
+guid: c86a2bcbba19e514b8658980f381825c

Assets/Scripts/kabely.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 488d6eb84e65aa94b8b3c77dcb2e21a3
+guid: 5b188e084f53e5f4799b63469c805c14
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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 +1,2 @@
 fileFormatVersion: 2
-guid: d3fa58532362d2547ab6cd0ab17d7bde
+guid: a76580d42c601f44aa909f9dd41ba1b7

Assets/Scripts/satelity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1df04c245c361e941955db9527a21afe
+guid: 27a7d88fa5bb3084b983e9e76d82bc87
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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
             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 +1,2 @@
 fileFormatVersion: 2
-guid: 58e3f22231584b9459fe7c44ee63e515
+guid: 1124b38022849a047ba3418e466160e5

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

@@ -2,63 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2180264
 Material:
-<<<<<<< HEAD
   serializedVersion: 8
-=======
-<<<<<<< HEAD
-  serializedVersion: 8
-=======
-<<<<<<< HEAD
-  serializedVersion: 6
-=======
-  serializedVersion: 8
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: LiberationSans SDF Material
   m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
   m_ShaderKeywords: 
-=======
->>>>>>> origin/main
->>>>>>> origin/main
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
-<<<<<<< HEAD
   m_LockedProperties: 
-=======
-<<<<<<< HEAD
-  m_LockedProperties: 
-=======
-<<<<<<< HEAD
-=======
-  m_LockedProperties: 
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -110,18 +72,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-<<<<<<< HEAD
     m_Ints: []
-=======
-<<<<<<< HEAD
-    m_Ints: []
-=======
-<<<<<<< HEAD
-=======
-    m_Ints: []
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -162,9 +113,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
@@ -203,22 +154,8 @@ Material:
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
-<<<<<<< HEAD
   m_BuildTextureStacks: []
   m_AllowLocking: 1
-
-=======
-<<<<<<< HEAD
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
-=======
-<<<<<<< HEAD
-=======
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -232,20 +169,11 @@ MonoBehaviour:
   m_Name: LiberationSans SDF - Fallback
   m_EditorClassIdentifier:
   m_Version: 1.1.0
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
   m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
-=======
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_FaceInfo:
     m_FaceIndex: 0
     m_FamilyName: Liberation Sans
@@ -268,21 +196,12 @@ MonoBehaviour:
     m_StrikethroughOffset: 18
     m_StrikethroughThickness: 6.298828
     m_TabWidth: 24
-<<<<<<< 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: []
   m_AtlasTextures:
@@ -334,15 +253,10 @@ MonoBehaviour:
     m_MarkToMarkAdjustmentRecords: []
   fallbackFontAssets: []
   m_FallbackFontAssetTable: []
-=======
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_CreationSettings:
     sourceFontFileName:
-    sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
     faceIndex: 0
     pointSizeSamplingMode: 0
     pointSize: 86
@@ -359,19 +273,10 @@ MonoBehaviour:
     fontStyleModifier: 0
     renderMode: 4169
     includeFontFeatures: 1
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> origin/main
   m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
->>>>>>> origin/main
   m_GlyphTable: []
   m_CharacterTable: []
   m_AtlasTextures:
@@ -380,7 +285,6 @@ MonoBehaviour:
   m_IsMultiAtlasTexturesEnabled: 1
   m_GetFontFeatures: 1
   m_ClearDynamicDataOnBuild: 1
-
   m_AtlasWidth: 512
   m_AtlasHeight: 512
   m_AtlasPadding: 9
@@ -392,6 +296,255 @@ MonoBehaviour:
     m_Y: 0
     m_Width: 511
     m_Height: 511
+  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: []
@@ -402,14 +555,6 @@ MonoBehaviour:
 
   m_ShouldReimportFontFeatures: 0
   m_FallbackFontAssetTable: []
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-=======
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_FontWeightTable:
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
@@ -460,15 +605,6 @@ MonoBehaviour:
   boldSpacing: 7
   italicStyle: 35
   tabSize: 10
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> origin/main
->>>>>>> origin/main
   m_fontInfo:
     Name: Liberation Sans
     PointSize: 86
@@ -491,6 +627,11 @@ MonoBehaviour:
     Padding: 9
     AtlasWidth: 1024
     AtlasHeight: 1024
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
 
   m_glyphInfoList: []
 
@@ -499,14 +640,6 @@ MonoBehaviour:
 
   fallbackFontAssets: []
   atlas: {fileID: 0}
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-=======
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
 --- !u!28 &28268798066460806
 Texture2D:
   m_ObjectHideFlags: 0
@@ -518,25 +651,18 @@ Texture2D:
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
   m_Width: 1
   m_Height: 1
   m_CompleteImageSize: 1
   m_MipsStripped: 0
-=======
-<<<<<<< HEAD
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   serializedVersion: 2
   m_Width: 0
   m_Height: 0
   m_CompleteImageSize: 0
->>>>>>> origin/main
   m_TextureFormat: 1
   m_MipCount: 1
   m_IsReadable: 1
@@ -545,11 +671,7 @@ Texture2D:
   m_MipmapLimitGroupName: 
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
-<<<<<<< HEAD
   m_VTOnly: 0
-=======
-=======
->>>>>>> origin/main
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
   m_Width: 1
@@ -565,12 +687,6 @@ Texture2D:
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_VTOnly: 0
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/main
->>>>>>> origin/main
->>>>>>> origin/main
   m_AlphaIsTransparency: 0
   m_ImageCount: 1
   m_TextureDimension: 2
@@ -586,33 +702,16 @@ Texture2D:
 
   m_LightmapFormat: 0
   m_ColorSpace: 0
-<<<<<<< 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
     offset: 0
     size: 0
     path:

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

@@ -7970,7 +7970,8 @@ MonoBehaviour:
     m_MarkToBaseAdjustmentRecords: []
     m_MarkToMarkAdjustmentRecords: []
   m_ShouldReimportFontFeatures: 0
-  m_FallbackFontAssetTable: []
+  m_FallbackFontAssetTable:
+  - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
   m_FontWeightTable:
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}

Assets/TutorialInfo/Icons.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
+guid: a9f406932633c2346b644ed6045bd5d3
-guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
-=======
-guid: c5ada28132037dc49b25799cd085863a
->>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/TutorialInfo/Scripts.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 478503718c5a2c449bf8efbdda9c5aa2
-=======
-guid: 340fa7a6658f67b4884beda3ce703bc8
->>>>>>> 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/koulickaone.blend1.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 74379ac554348f84c8d3abeb440b79b9
-=======
-guid: f0565825ed419f845acc6ec1f2406ead
->>>>>>> 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

@@ -60,6 +60,7 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+
     "com.unity.multiplayer.center": {
       "version": "1.0.0",
       "depth": 0,
@@ -94,26 +95,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,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.remote-config-runtime": "4.0.4",
-        "com.unity.modules.unitywebrequest": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.remote-config-runtime": {
-      "version": "4.0.4",
     "com.unity.remote-config": {
       "version": "4.2.5",
       "depth": 0,
@@ -211,6 +192,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,
@@ -246,14 +234,6 @@
         "com.unity.modules.jsonserialize": "1.0.0"
       }
     },
-    "com.unity.textmeshpro": {
-      "version": "5.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.ugui": "2.0.0"
-      }
-    },
     "com.unity.test-framework.performance": {
       "version": "3.2.0",
       "depth": 3,
@@ -264,6 +244,14 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.textmeshpro": {
+      "version": "5.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.ugui": "2.0.0"
+      }
+    },
     "com.unity.toolchain.linux-x86_64": {
       "version": "2.0.11",
       "depth": 0,
@@ -276,7 +264,7 @@
     },
     "com.unity.ugui": {
       "version": "2.0.0",
-      "depth": 2,
+      "depth": 0,
       "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
@@ -542,4 +530,3 @@
     }
   }
 }
-}

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