Eda minigame but new branch

2026-05-17 20:44:46 +02:00
70 changed files with 3012 additions and 612 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -499,3 +499,5 @@ FodyWeavers.xsd

 # End of https://www.toptal.com/developers/gitignore/api/unity,visualstudiocode,visualstudio,vim

+
+.utmp/
--- a/Profiles.meta
+++ b/Profiles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 92df50b8fba934144a4c4dcaf506f9b4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/[YB3yHfqdw3Y].mp3
+++ b/[YB3yHfqdw3Y].mp3
--- a/[YB3yHfqdw3Y].mp3.meta
+++ b/[YB3yHfqdw3Y].mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 58ebc3ffa125a9949953f6704e0a8c39
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Debris/TrashDebrisUnityPackage.unitypackage.meta
+++ b/Debris/TrashDebrisUnityPackage.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5d7070679a02c0f478502a9eac088352
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameManager/GameManager.cs
+++ b/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",
-        //"MiniGame-insertkeys", Obsolete ?
-        "MiniGame-KeyInsert",
-        //"MiniGame-FlappyBird", Out Of Order, Not assigned prefabs
-        //"MiniGame-ThrowInHole", Not pushed into main branch
-        //"MiniGame-Satelit", No assets, just placeholder task
+        "MiniGame-Kabely V10",
+        "MiniGame-insertkeys",
+        "MiniGame-FlappyBird",
+        "MiniGame-ThrowInHole",
+        "MiniGame-Satelit"
+        // Add minigame scene name here
    };

    [Header("Debug")]
--- a/Assets/Materials.meta
+++ b/Assets/Materials.meta
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 2230bf768ecb84610af77bea6cdd7074
+=======
 guid: 6b37670de43269e4f984694475e75510
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
-  assetBundleVariant: 
+<<<<<<< HEAD
+  assetBundleVariant: 
+=======
+  assetBundleVariant: 
+>>>>>>> origin/main
--- a/Assets/Readme.asset.meta
+++ b/Assets/Readme.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: befd731805f7270498a643333899b479
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/MainScene.unity.meta
+++ b/Assets/Scenes/MainScene.unity.meta
--- a/Assets/Scenes/Client.unity
+++ b/Assets/Scenes/Client.unity
@@ -1509,6 +1509,7 @@ 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: []
@@ -2193,6 +2194,96 @@ 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
@@ -3334,6 +3425,7 @@ SceneRoots:
  m_Roots:
  - {fileID: 442151208}
  - {fileID: 1403738865}
+  - {fileID: 1353866371}
  - {fileID: 157221436}
  - {fileID: 12226904}
  - {fileID: 247614967}
--- a/Assets/Scenes/MiniGame-Kabely.unity
+++ b/Assets/Scenes/MiniGame-Kabely.unity
@@ -369,17 +369,31 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+<<<<<<< HEAD
+  - component: {fileID: 425617997}
+  - component: {fileID: 425617996}
+  - component: {fileID: 425617995}
+  - component: {fileID: 425617994}
+  - component: {fileID: 425617993}
+  - component: {fileID: 425617998}
+  m_Layer: 0
+  m_Name: canvas
+=======
  - component: {fileID: 431492667}
  - component: {fileID: 431492669}
  - component: {fileID: 431492668}
  - component: {fileID: 431492670}
  m_Layer: 5
  m_Name: L4
+>>>>>>> origin/main
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+<<<<<<< HEAD
+--- !u!114 &425617993
+=======
 --- !u!224 &431492667
 RectTransform:
  m_ObjectHideFlags: 0
@@ -400,27 +414,37 @@ RectTransform:
  m_SizeDelta: {x: 55, y: 35}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &431492668
+>>>>>>> origin/main
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+  m_GameObject: {fileID: 425617991}
+=======
  m_GameObject: {fileID: 431492666}
+>>>>>>> origin/main
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
  m_Name: 
  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+<<<<<<< HEAD
+  m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+=======
  m_Material: {fileID: 0}
  m_Color: {r: 0, g: 1, b: 0, a: 1}
+>>>>>>> origin/main
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
  m_PreserveAspect: 0
  m_FillCenter: 1
  m_FillMethod: 4
@@ -477,11 +501,58 @@ MonoBehaviour:
    m_SelectedTrigger: Selected
    m_DisabledTrigger: Disabled
  m_Interactable: 1
+<<<<<<< HEAD
+  m_TargetGraphic: {fileID: 425617993}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!224 &425617997
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 425617991}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &425617998
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 425617991}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3fa58532362d2547ab6cd0ab17d7bde, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::CableMiniGame
+  cables:
+  - colorName: 
+    sourceButton: {fileID: 0}
+    targetButton: {fileID: 0}
+    cableImage: {fileID: 0}
+  previousSceneName: 
+  wrongAttemptColor: {r: 1, g: 1, b: 1, a: 1}
+  blinkDuration: 0.2
+--- !u!1 &1645776851
+=======
  m_TargetGraphic: {fileID: 431492668}
  m_OnClick:
    m_PersistentCalls:
      m_Calls: []
 --- !u!1 &442827363
+>>>>>>> origin/main
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/Scenes/Minigame-KeyInsert.unity.meta
+++ b/Assets/Scenes/Minigame-KeyInsert.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 22ca1d6a0bb686a409e5f1fc1164b686
+guid: a9886d0962880e14fb8072fee41dc9b5
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/New
+++ b/Assets/Scenes/New
@@ -0,0 +1,316 @@
+%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}
--- a/Assets/Scenes/New
+++ b/Assets/Scenes/New
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ea777d1556aec75449ed545a887613d2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -151,35 +151,35 @@ MonoBehaviour:
  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
+    ResidentialBuildingsMat: {fileID: 2100000, guid: d52b379b821c9ed624c15e9bd1420204, type: 2}
+    ResidentialBuildingHeight: 5
+    CommercialBuildingsMat: {fileID: 2100000, guid: cade7a38e47c1b875f65cda2cf3b77c5, type: 2}
+    CommercialBuildingHeight: 5
+    IndustrialBuildingsMat: {fileID: 2100000, guid: 4179f65aa390e873e96480f462d9fc3a, type: 2}
+    IndustrialBuildingHeight: 5
+    DefaultBuildingMat: {fileID: 2100000, guid: 1a50367e9d7460063dec2f85d18dde35, type: 2}
+    DefaultBuildingHeight: 5
  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
+    FootwayMat: {fileID: 2100000, guid: a40e1c43763bb5c9b97d7999ac3c6f9d, type: 2}
+    FootwayWidth: 2
+    PathMat: {fileID: 2100000, guid: b8c268a7008ed5031da152380545235d, type: 2}
+    PathWidth: 2
+    StepsMat: {fileID: 2100000, guid: b8c268a7008ed5031da152380545235d, type: 2}
+    StepsWidth: 2
+    CyclewayMat: {fileID: 2100000, guid: 9ecf5df4890c0486002bf43baf684bab, type: 2}
+    CyclewayWidth: 2
+    PedestrianMat: {fileID: 2100000, guid: b8c268a7008ed5031da152380545235d, type: 2}
+    PedestrianWidth: 2
+    RoadMat: {fileID: 2100000, guid: f831020d62c88ea9dfde83f98d539f55, type: 2}
+    RoadWidth: 2
+    ServiceMat: {fileID: 2100000, guid: f831020d62c88ea9dfde83f98d539f55, type: 2}
+    ServiceWidth: 2
+    ResidentialMat: {fileID: 2100000, guid: d52b379b821c9ed624c15e9bd1420204, type: 2}
+    ResidentialWidth: 2
+    TrackMat: {fileID: 2100000, guid: b8c268a7008ed5031da152380545235d, type: 2}
+    TrackWidth: 2
+    DefaultMat: {fileID: 2100000, guid: 57c69638d7afff039a48123e7b4ade7b, type: 2}
+    DefaultWidth: 2
  areaSettings:
    ParkMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
    GardenMat: {fileID: 2100000, guid: 77b772132676975a3462e3aca2cfac0c, type: 2}
@@ -198,8 +198,6 @@ MonoBehaviour:
  - MiniGame-ThrowInHole
  - MiniGame-Satelit
  testMode: 0
-  showGPSDebugOverlay: 1
-  testClientCount: 3
 --- !u!4 &90211614
 Transform:
  m_ObjectHideFlags: 0
@@ -320,38 +318,6 @@ MonoBehaviour:
  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
@@ -462,23 +428,6 @@ MonoBehaviour:
  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
@@ -508,11 +457,6 @@ MonoBehaviour:
  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
--- a/Assets/Scenes/SampleScene.unity.meta
+++ b/Assets/Scenes/SampleScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8afa6ce05eb7dba4c894b910786e3baf
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/komrskazkousim.unity
+++ b/Assets/Scenes/komrskazkousim.unity
@@ -119,7 +119,8 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &350850563
+<<<<<<< HEAD:Assets/pojekt.unity
+--- !u!1 &26104820
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -127,9 +128,49 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+  - component: {fileID: 26104821}
+  m_Layer: 0
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &26104821
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 26104820}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.9, y: 5.3, z: -20.9}
+  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 &871248414
+=======
+--- !u!1 &350850563
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+<<<<<<< HEAD:Assets/pojekt.unity
+  - component: {fileID: 871248415}
+  - component: {fileID: 871248419}
+  - component: {fileID: 871248420}
+=======
  - component: {fileID: 350850566}
  - component: {fileID: 350850565}
  - component: {fileID: 350850564}
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
  m_Layer: 0
  m_Name: EventSystem
  m_TagString: Untagged
@@ -187,7 +228,46 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+<<<<<<< HEAD:Assets/pojekt.unity
+--- !u!114 &871248419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871248414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d665da208a5a3ad408e85341263c60e5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  ball: {fileID: 3655566030548358981}
+  forceStrength: 50
+  dampingPerSecond: 0.9
+--- !u!114 &871248420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871248414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9f70c5a8e211b7142b26b4ea95bf2348, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  platformController: {fileID: 871248419}
+  goalTrigger: {fileID: 1036109236}
+  ball: {fileID: 3655566030548358981}
+  startSound: {fileID: 0}
+  winSound: {fileID: 0}
+  isActive: 1
+  freezeOnWin: 1
+  disableBallOnWin: 0
+--- !u!1 &1036109232
+=======
 --- !u!1 &713781621
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -195,22 +275,136 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+<<<<<<< HEAD:Assets/pojekt.unity
+  - component: {fileID: 1036109235}
+  - component: {fileID: 1036109234}
+  - component: {fileID: 1036109236}
+  m_Layer: 0
+  m_Name: HoleTrigger
+=======
  - component: {fileID: 713781622}
  - component: {fileID: 713781624}
  - component: {fileID: 713781623}
  m_Layer: 5
  m_Name: RawImage
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+<<<<<<< HEAD:Assets/pojekt.unity
+--- !u!65 &1036109234
+BoxCollider:
+=======
 --- !u!224 &713781622
 RectTransform:
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD:Assets/pojekt.unity
+  m_GameObject: {fileID: 1036109232}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!4 &1036109235
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1036109232}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.57, y: 1.67, z: -16.17}
+  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 &1036109236
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1036109232}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e6bad0eb7441229448191433d8a9f758, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  ballRigidbody: {fileID: 3655566030548358981}
+  requireBallTag: 1
+--- !u!1 &1078774431
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1078774434}
+  - component: {fileID: 1078774433}
+  - component: {fileID: 1078774432}
+  - component: {fileID: 1078774436}
+  - component: {fileID: 1078774435}
+  - component: {fileID: 1078774437}
+  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 &1078774432
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1078774431}
+  m_Enabled: 1
+--- !u!20 &1078774433
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1078774431}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.764151, g: 0.65241194, b: 0.752649, 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:
+=======
  m_GameObject: {fileID: 713781621}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -246,20 +440,182 @@ MonoBehaviour:
      m_Calls: []
  m_Texture: {fileID: 8400000, guid: 4d595312cdcdd094cbe411227603ceea, type: 2}
  m_UVRect:
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
    serializedVersion: 2
    x: 0
    y: 0
    width: 1
    height: 1
+<<<<<<< HEAD:Assets/pojekt.unity
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 131.6
+  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 &1078774434
+Transform:
+=======
 --- !u!222 &713781624
 CanvasRenderer:
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD:Assets/pojekt.unity
+  m_GameObject: {fileID: 1078774431}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.994375, y: -0, z: -0, w: 0.10591704}
+  m_LocalPosition: {x: 0.013403273, y: 0.0635, z: 0.1102}
+  m_LocalScale: {x: 0.016666666, y: 0.015950274, z: 0.03959131}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1359128623787926744}
+  m_LocalEulerAnglesHint: {x: 167.84, y: 0, z: 0}
+--- !u!114 &1078774435
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1078774431}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37f33c8b63e5b384db6a385b909b27aa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  clip: {fileID: 8300000, guid: 58ebc3ffa125a9949953f6704e0a8c39, type: 3}
+--- !u!82 &1078774436
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1078774431}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_Resource: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 0.8200283
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!114 &1078774437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1078774431}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b159266533f64ba4eb30ef6112cc4611, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  parent: {fileID: 0}
+--- !u!1 &1757180458
+=======
  m_GameObject: {fileID: 713781621}
  m_CullTransparentMesh: 1
 --- !u!1 &863085480
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -356,7 +712,150 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+<<<<<<< HEAD:Assets/pojekt.unity
+--- !u!1 &1859351083
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1859351086}
+  - component: {fileID: 1859351085}
+  - component: {fileID: 1859351084}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1859351084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1859351083}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2e101cb487f02244592e16548d98f0b5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  targetPosition: {fileID: 26104821}
+--- !u!65 &1859351085
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1859351083}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 200, y: 2, z: 200}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!4 &1859351086
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1859351083}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.87, y: -1.63, z: -15.8}
+  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 &519675517008124548
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382865335249670925}
+  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: -3846018093981099296, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
+  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 &1048207857388389211
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1498391756221246888}
+  m_Mesh: {fileID: 4711208715938537054, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
+--- !u!4 &1359128623787926744
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1498391756221246888}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
+  m_LocalPosition: {x: 1.26, y: 6.29, z: -20.48}
+  m_LocalScale: {x: 60, y: 60, z: 60}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1078774434}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1382865335249670925
+=======
 --- !u!1 &903577773
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -548,11 +1047,19 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
+<<<<<<< HEAD:Assets/pojekt.unity
+  - component: {fileID: 1359128623787926744}
+  - component: {fileID: 1048207857388389211}
+  - component: {fileID: 3655566030548358980}
+  - component: {fileID: 3655566030548358981}
+  - component: {fileID: 3655566030548358982}
+=======
  - component: {fileID: 1692768359}
  - component: {fileID: 1692768358}
  - component: {fileID: 1692768357}
  - component: {fileID: 1692768356}
  - component: {fileID: 1692768355}
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
  m_Layer: 0
  m_Name: Zemekoule
  m_TagString: Untagged
@@ -579,7 +1086,35 @@ SphereCollider:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1692768354}
+<<<<<<< HEAD:Assets/pojekt.unity
+  m_GameObject: {fileID: 1498391756221246888}
+  serializedVersion: 5
+  m_Mass: 20
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 1
+  m_Constraints: 0
+  m_CollisionDetection: 1
+--- !u!64 &3655566030548358982
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1498391756221246888}
  m_Material: {fileID: 0}
  m_IncludeLayers:
    serializedVersion: 2
@@ -591,6 +1126,125 @@ SphereCollider:
  m_IsTrigger: 0
  m_ProvidesContacts: 0
  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4711208715938537054, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
+--- !u!4 &4076998000468173039
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382865335249670925}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.033134237}
+  m_LocalScale: {x: 0.22222221, y: 0.125, z: 2.0199997}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6263590706582785712}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &6263590706582785712
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7970178287526494298}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
+  m_LocalPosition: {x: 2.5141964, y: 0.50000185, z: -16.063879}
+  m_LocalScale: {x: 900, y: 1599.9998, z: 50}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4076998000468173039}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &6491906927663981809
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7970178287526494298}
+  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: -876546973899608171, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
+  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 &6633840909085778479
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382865335249670925}
+  m_Mesh: {fileID: -7387706064836869012, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
+--- !u!64 &6633840909085778480
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382865335249670925}
+=======
+  m_GameObject: {fileID: 1692768354}
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+<<<<<<< HEAD:Assets/pojekt.unity
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -7387706064836869012, guid: 7fd80bd46d706b042a137593bf706d58, type: 3}
+--- !u!1 &7970178287526494298
+=======
  serializedVersion: 3
  m_Radius: 0.5
  m_Center: {x: 0, y: 0, z: 0}
@@ -666,6 +1320,7 @@ Transform:
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1715099257
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -811,9 +1466,19 @@ CanvasRenderer:
 SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
+<<<<<<< HEAD:Assets/pojekt.unity
+  - {fileID: 1757180460}
+  - {fileID: 871248415}
+  - {fileID: 6263590706582785712}
+  - {fileID: 1359128623787926744}
+  - {fileID: 1036109235}
+  - {fileID: 1859351086}
+  - {fileID: 26104821}
+=======
  - {fileID: 903577776}
  - {fileID: 863085482}
  - {fileID: 1692768359}
  - {fileID: 1250930873}
  - {fileID: 1715099261}
  - {fileID: 350850566}
+>>>>>>> origin/main:Assets/Scenes/komrskazkousim.unity
--- a/Assets/Scenes/scene.unity
+++ b/Assets/Scenes/scene.unity
@@ -0,0 +1,548 @@
+%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 &564375757
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 564375760}
+  - component: {fileID: 564375759}
+  - component: {fileID: 564375758}
+  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 &564375758
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 564375757}
+  m_Enabled: 1
+--- !u!20 &564375759
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 564375757}
+  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 &564375760
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 564375757}
+  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 &1274200469
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1274200471}
+  - component: {fileID: 1274200473}
+  - component: {fileID: 1274200472}
+  - 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
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &1896274047
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1896274046}
+  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 &1896274048
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1896274046}
+  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: 564375760}
+  - {fileID: 1896274048}
+  - {fileID: 1865882990}
+  - {fileID: 1274200471}
+  - {fileID: 1539417979}
--- a/Assets/Scenes/scene.unity.meta
+++ b/Assets/Scenes/scene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3909e36074a570d4c9ec7d4c324d811f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/FollowPositionOnly.cs
+++ b/Assets/Scripts/FollowPositionOnly.cs
@@ -0,0 +1,27 @@
+using UnityEngine;
+
+public class FollowParentPositionOnly : MonoBehaviour
+{
+    public Transform parent;
+    private Quaternion initialRotation;
+    private Vector3 worldOffset;
+
+    void Start()
+    {
+        if (parent == null)
+            parent = transform.parent;
+
+        // Store offset in WORLD space
+        worldOffset = transform.position - parent.position;
+        initialRotation = transform.rotation;
+    }
+
+    void LateUpdate()
+    {
+        if (parent == null) return;
+
+        // Move child using stored world offset
+        transform.position = parent.position + worldOffset;
+        transform.rotation = initialRotation;
+    }
+}
--- a/Assets/Scripts/FollowPositionOnly.cs.meta
+++ b/Assets/Scripts/FollowPositionOnly.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b159266533f64ba4eb30ef6112cc4611
--- a/Assets/Scripts/GyroPlatformController.cs
+++ b/Assets/Scripts/GyroPlatformController.cs
@@ -0,0 +1,30 @@
+using UnityEngine;
+
+public class GyroPlatformController : MonoBehaviour
+{
+    public Rigidbody ball;
+    public float forceStrength = 30f;
+    public float dampingPerSecond = 0.9f;
+    void Start()
+    {
+        if (SystemInfo.supportsGyroscope)
+        {
+            Input.gyro.enabled = true;
+        }
+    }
+
+    void FixedUpdate()
+    {
+        if (ball == null) return;
+
+        Vector3 g = Input.gyro.gravity;
+      
+        Vector3 force = new Vector3(g.x, 0f, g.y);
+
+        ball.AddForce(force * forceStrength, ForceMode.Acceleration);
+        
+        float frameDamping = Mathf.Pow(dampingPerSecond, Time.deltaTime);
+
+        ball.linearVelocity *= frameDamping;
+    }
+}
--- a/Assets/Scripts/GyroPlatformController.cs.meta
+++ b/Assets/Scripts/GyroPlatformController.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d665da208a5a3ad408e85341263c60e5
--- a/Assets/Scripts/HoleGoalTrigger.cs
+++ b/Assets/Scripts/HoleGoalTrigger.cs
@@ -0,0 +1,33 @@
+using UnityEngine;
+
+public class HoleGoalTrigger : MonoBehaviour
+{
+    [Tooltip("Optional: assign the ball rigidbody or leave empty to accept any Rigidbody with tag Ball.")]
+    public Rigidbody ballRigidbody;
+
+    [Tooltip("If true, checks tag 'Ball' when ballRigidbody not assigned.")]
+    public bool requireBallTag = true;
+
+    public System.Action OnBallScored;
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (ballRigidbody != null)
+        {
+            if (other.attachedRigidbody == ballRigidbody)
+            {
+                OnBallScored?.Invoke();
+            }
+            return;
+        }
+
+        if (other.attachedRigidbody == null) return;
+
+        if (requireBallTag)
+        {
+            if (!other.CompareTag("Ball")) return;
+        }
+
+        OnBallScored?.Invoke();
+    }
+}
--- a/Assets/Scripts/HoleGoalTrigger.cs.meta
+++ b/Assets/Scripts/HoleGoalTrigger.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e6bad0eb7441229448191433d8a9f758
--- a/Assets/Scripts/PlayAudioOnCamera.cs
+++ b/Assets/Scripts/PlayAudioOnCamera.cs
@@ -0,0 +1,30 @@
+using UnityEngine;
+
+public class PlayAudioOnCamera : MonoBehaviour
+{
+    public AudioClip clip;   // assign your audio file in the Inspector
+    private AudioSource audioSource;
+
+    void Start()
+    {
+        // Get or add an AudioSource to this GameObject
+        audioSource = gameObject.GetComponent<AudioSource>();
+        if (audioSource == null)
+        {
+            audioSource = gameObject.AddComponent<AudioSource>();
+        }
+
+        // Assign the audio clip
+        if (clip != null)
+        {
+            audioSource.clip = clip;
+            audioSource.playOnAwake = false;
+            audioSource.loop = false;   // change to true if you want looping
+            audioSource.Play();
+        }
+        else
+        {
+            Debug.LogWarning("PlayAudioOnCamera: No audio clip assigned!");
+        }
+    }
+}
--- a/Assets/Scripts/PlayAudioOnCamera.cs.meta
+++ b/Assets/Scripts/PlayAudioOnCamera.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 37f33c8b63e5b384db6a385b909b27aa
--- a/Assets/Scripts/TeleportOnTrigger.cs
+++ b/Assets/Scripts/TeleportOnTrigger.cs
@@ -0,0 +1,29 @@
+using UnityEngine;
+
+public class TeleportOnTrigger : MonoBehaviour
+{
+    [Header("Teleport Target")]
+    public Transform targetPosition;
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (targetPosition == null) return;
+
+        Rigidbody rb = other.attachedRigidbody;
+
+        if (rb != null)
+        {
+            // STOP ALL MOTION
+            rb.linearVelocity = Vector3.zero;
+            rb.angularVelocity = Vector3.zero;
+
+            // TELEPORT
+            rb.position = targetPosition.position;
+        }
+        else
+        {
+            // Non-physics objects
+            other.transform.position = targetPosition.position;
+        }
+    }
+}
--- a/Assets/Scripts/TeleportOnTrigger.cs.meta
+++ b/Assets/Scripts/TeleportOnTrigger.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2e101cb487f02244592e16548d98f0b5
--- a/Assets/Scripts/TiltHoleMiniGameManager.cs
+++ b/Assets/Scripts/TiltHoleMiniGameManager.cs
@@ -0,0 +1,187 @@
+using System;
+using UnityEngine;
+
+public class TiltHoleMiniGameManager : MonoBehaviour, ITask
+{
+    // =========================
+    // ITask PROPERTIES
+    // =========================
+
+    public string TaskID { get; private set; } = "TILT_HOLE_01";
+    public TaskType TaskType { get; private set; } = TaskType.Task;
+    public string TaskName { get; private set; } = "Tilt Ball Into Hole";
+    public (double, double) TaskLocation { get; private set; } = (0, 0);
+    public bool IsCompleted { get; private set; }
+
+    private Action<ITask> _onCompletedCallback;
+
+    // =========================
+    // MINIGAME REFERENCES
+    // =========================
+
+    [Header("References")]
+    public GyroPlatformController platformController;
+    public HoleGoalTrigger goalTrigger;
+    public Rigidbody ball;
+
+    [Header("Audio")]
+    public AudioClip startSound;
+    public AudioClip winSound;
+
+    private AudioSource audioSource;
+
+    [Header("Game State")]
+    public bool isActive = false;
+
+    [Header("Win Behavior")]
+    public bool freezeOnWin = true;
+    public bool disableBallOnWin = false;
+
+    // =========================
+    // UNITY LIFECYCLE
+    // =========================
+
+    void Awake()
+    {
+        if (platformController == null) platformController = FindFirstObjectByType<GyroPlatformController>();
+        if (goalTrigger == null) goalTrigger = FindFirstObjectByType<HoleGoalTrigger>();
+
+        if (Camera.main != null)
+        {
+            audioSource = Camera.main.GetComponent<AudioSource>();
+            if (audioSource == null)
+                audioSource = Camera.main.gameObject.AddComponent<AudioSource>();
+        }
+    }
+
+    void Start()
+    {
+        if (goalTrigger != null)
+        {
+            goalTrigger.OnBallScored += HandleWin;
+        }
+
+        if (ball != null && goalTrigger != null)
+        {
+            goalTrigger.ballRigidbody = ball;
+        }
+    }
+
+    void OnDestroy()
+    {
+        if (goalTrigger != null)
+            goalTrigger.OnBallScored -= HandleWin;
+    }
+
+    // =========================
+    // TASK LIFECYCLE
+    // =========================
+
+    public void Initialize(Action<ITask> onCompleted)
+    {
+        Debug.Log("Initializing Tilt Hole Task");
+
+        IsCompleted = false;
+        isActive = true;
+        _onCompletedCallback = onCompleted;
+
+        if (platformController != null)
+            platformController.enabled = true;
+
+        if (ball != null)
+        {
+            ball.isKinematic = false;
+            ball.linearVelocity = Vector3.zero;
+            ball.angularVelocity = Vector3.zero;
+        }
+
+        if (startSound != null && audioSource != null)
+        {
+            audioSource.PlayOneShot(startSound);
+        }
+    }
+
+    public void ExitTask(Action<ITask> onExit)
+    {
+        Debug.Log("Exiting Tilt Hole Task");
+
+        isActive = false;
+
+        if (platformController != null)
+            platformController.enabled = false;
+
+        onExit?.Invoke(this);
+    }
+
+    public void Complete()
+    {
+        if (IsCompleted) return;
+
+        Debug.Log("Task Complete: Tilt Hole");
+
+        IsCompleted = true;
+        isActive = false;
+
+        if (winSound != null && audioSource != null)
+        {
+            audioSource.PlayOneShot(winSound);
+        }
+
+        _onCompletedCallback?.Invoke(this);
+        ExitTask(null);
+    }
+
+    // =========================
+    // MINIGAME WIN EVENT
+    // =========================
+
+    private void HandleWin()
+    {
+        if (!isActive) return;
+
+        Debug.Log("Ball reached hole.");
+
+        if (freezeOnWin)
+        {
+            if (platformController != null)
+                platformController.enabled = false;
+
+            if (ball != null)
+            {
+                ball.linearVelocity = Vector3.zero;
+                ball.angularVelocity = Vector3.zero;
+                ball.isKinematic = true;
+            }
+        }
+
+        if (disableBallOnWin && ball != null)
+        {
+            ball.gameObject.SetActive(false);
+        }
+
+        Complete(); // 🔥 THIS completes the task
+    }
+
+    // =========================
+    // DEBUG GUI
+    // =========================
+
+    void OnGUI()
+    {
+        GUIStyle s = new GUIStyle(GUI.skin.label);
+        s.fontSize = 24;
+
+        if (isActive)
+        {
+            s.normal.textColor = Color.white;
+            GUI.Label(new Rect(10, 10, 700, 30),
+                "Goal: Tilt platform to roll the ball into the hole.", s);
+        }
+        else if (IsCompleted)
+        {
+            s.normal.textColor = Color.yellow;
+            GUI.Label(new Rect(10, 10, 700, 30),
+                "Task Completed!", s);
+        }
+    }
+}
--- a/Assets/Scripts/TiltHoleMiniGameManager.cs.meta
+++ b/Assets/Scripts/TiltHoleMiniGameManager.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9f70c5a8e211b7142b26b4ea95bf2348
--- a/Assets/Scripts/WindController.cs.meta
+++ b/Assets/Scripts/WindController.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a2d62d3ffa507924ab3a6fd97f185f3e
--- a/Assets/Settings/Build
+++ b/Assets/Settings/Build
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 15003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: "Android\u2122 1"
+  m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.Build.Profile.BuildProfile
+  m_AssetVersion: 1
+  m_BuildTarget: 13
+  m_Subtarget: 0
+  m_PlatformId: b9b35072a6f44c2e863f17467ea3dc13
+  m_PlatformBuildProfile:
+    rid: 240730859082350731
+  m_OverrideGlobalSceneList: 0
+  m_Scenes: []
+  m_ScriptingDefines: []
+  m_PlayerSettingsYaml:
+    m_Settings: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 240730859082350731
+      type: {class: AndroidPlatformBuildSettings, ns: UnityEditor.Android, asm: UnityEditor.Android.Extensions}
+      data:
+        m_Development: 0
+        m_ConnectProfiler: 0
+        m_BuildWithDeepProfilingSupport: 0
+        m_AllowDebugging: 0
+        m_WaitForManagedDebugger: 0
+        m_ManagedDebuggerFixedPort: 0
+        m_ExplicitNullChecks: 0
+        m_ExplicitDivideByZeroChecks: 0
+        m_ExplicitArrayBoundsChecks: 0
+        m_CompressionType: 2
+        m_InstallInBuildFolder: 0
+        m_InsightsSettingsContainer:
+          m_BuildProfileEngineDiagnosticsState: 2
+        m_BuildSubtarget: 0
+        m_BuildSystem: 1
+        m_ExportAsGoogleAndroidProject: 0
+        m_DebugSymbolLevel: 1
+        m_DebugSymbolFormat: 5
+        m_CurrentDeploymentTargetId: __builtin__target_default
+        m_BuildType: 2
+        m_LinkTimeOptimization: 0
+        m_BuildAppBundle: 0
+        m_IPAddressToConnect: 
+        m_SymlinkSources: 0
--- a/Assets/Settings/Build
+++ b/Assets/Settings/Build
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9496285097e5d904da120cdcec6534dc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Profiles/Android™.asset
+++ b/Profiles/Android™.asset
@@ -29,7 +29,7 @@ MonoBehaviour:
    - rid: 4246746364202188844
      type: {class: AndroidPlatformBuildSettings, ns: UnityEditor.Android, asm: UnityEditor.Android.Extensions}
      data:
-        m_Development: 0
+        m_Development: 1
        m_ConnectProfiler: 0
        m_BuildWithDeepProfilingSupport: 0
        m_AllowDebugging: 0
@@ -45,10 +45,10 @@ MonoBehaviour:
        m_BuildSubtarget: 0
        m_BuildSystem: 1
        m_ExportAsGoogleAndroidProject: 0
-        m_DebugSymbolLevel: 1
+        m_DebugSymbolLevel: 4
        m_DebugSymbolFormat: 5
        m_CurrentDeploymentTargetId: __builtin__target_default
-        m_BuildType: 2
+        m_BuildType: 1
        m_LinkTimeOptimization: 0
        m_BuildAppBundle: 0
        m_IPAddressToConnect: 
--- a/Profiles/Android™.asset.meta
+++ b/Profiles/Android™.asset.meta
@@ -1,8 +1,15 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 7f18313555a02cd48bc22d29d0f2ff55
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+=======
 guid: f7414f44a3a063a4d80af09af6a4cc50
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
+>>>>>>> origin/main
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Settings/Build
+++ b/Assets/Settings/Build
@@ -0,0 +1,49 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 15003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: iOS
+  m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.Build.Profile.BuildProfile
+  m_AssetVersion: 1
+  m_BuildTarget: 9
+  m_Subtarget: 0
+  m_PlatformId: ad48d16a66894befa4d8181998c3cb09
+  m_PlatformBuildProfile:
+    rid: 4718407457732296746
+  m_OverrideGlobalSceneList: 0
+  m_Scenes: []
+  m_ScriptingDefines:
+  - 
+  m_PlayerSettingsYaml:
+    m_Settings: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 4718407457732296746
+      type: {class: iOSPlatformSettings, ns: UnityEditor.iOS, asm: UnityEditor.iOS.Extensions}
+      data:
+        m_Development: 0
+        m_ConnectProfiler: 0
+        m_BuildWithDeepProfilingSupport: 0
+        m_AllowDebugging: 0
+        m_WaitForManagedDebugger: 0
+        m_ManagedDebuggerFixedPort: 0
+        m_ExplicitNullChecks: 0
+        m_ExplicitDivideByZeroChecks: 0
+        m_ExplicitArrayBoundsChecks: 0
+        m_CompressionType: 0
+        m_InstallInBuildFolder: 0
+        m_InsightsSettingsContainer:
+          m_BuildProfileEngineDiagnosticsState: 2
+        m_iOSXcodeBuildConfig: 1
+        m_SymlinkSources: 0
+        m_PreferredXcode: 
+        m_SymlinkTrampoline: 0
--- a/Profiles/iOS.asset.meta
+++ b/Profiles/iOS.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 18829ddd933a57c489872a4f1a3942e4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Settings/DefaultVolumeProfile.asset.meta
+++ b/Assets/Settings/DefaultVolumeProfile.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 526aab55ceaf10142a59ee4d62fe8f42
+=======
 guid: 45dce265e34e8484d8a0ac37bbb3f593
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/Mobile_RPAsset.asset.meta
+++ b/Assets/Settings/Mobile_RPAsset.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 0e9d05516516cba48aff23bd436701ca
+=======
 guid: 7a71f5fa3cfec3240876dcc0cf90945c
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/Mobile_Renderer.asset.meta
+++ b/Assets/Settings/Mobile_Renderer.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: e6ba5b26dda963e43beba7012129f6a5
+=======
 guid: da9ec6b53c9d2604eb3b9b733f09d25f
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/PC_RPAsset.asset.meta
+++ b/Assets/Settings/PC_RPAsset.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 9c73e51f432aa184cb1408179eb09d3f
+=======
 guid: c2dd8e13cc746c643853b4d68aa29b08
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/PC_Renderer.asset.meta
+++ b/Assets/Settings/PC_Renderer.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 1fe0ebf7f09ec7e4fa76e81c31b87dde
+=======
 guid: 838b2b6371a376844b3213d982530ce0
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/SampleSceneProfile.asset.meta
+++ b/Assets/Settings/SampleSceneProfile.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 3dc1b9d50da01394198653f975d9c13d
+=======
 guid: 696a9922efc80544cbf9fc061955f550
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta
+++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 7bfdf167f826294468ffbde02bb390f1
+=======
 guid: 800007f585dbb8d409bce87a3ccad193
+>>>>>>> origin/main
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 0
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@@ -2,24 +2,35 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2180264
 Material:
+<<<<<<< HEAD
+  serializedVersion: 6
+=======
  serializedVersion: 8
+>>>>>>> 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
+  m_ShaderKeywords: 
+=======
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords: []
  m_InvalidKeywords: []
+>>>>>>> origin/main
  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
-  m_LockedProperties:
+<<<<<<< HEAD
+=======
+  m_LockedProperties: 
+>>>>>>> origin/main
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@@ -71,7 +82,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+<<<<<<< HEAD
+=======
    m_Ints: []
+>>>>>>> origin/main
    m_Floats:
    - _Ambient: 0.5
    - _Bevel: 0.5
@@ -153,9 +167,11 @@ 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
-
+>>>>>>> origin/main
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -167,8 +183,16 @@ 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
+  m_Material: {fileID: 2180264}
+  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+=======
+>>>>>>> origin/main
  m_FaceInfo:
    m_FaceIndex: 0
    m_FamilyName: Liberation Sans
@@ -191,116 +215,20 @@ MonoBehaviour:
    m_StrikethroughOffset: 18
    m_StrikethroughThickness: 6.298828
    m_TabWidth: 24
-
-  m_Material: {fileID: 2180264}
-  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
-  m_SourceFontFilePath:
-  m_AtlasPopulationMode: 1
-  InternalDynamicOS: 0
-
-  m_CreationSettings:
-    sourceFontFileName:
-    sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
-    faceIndex: 0
-    pointSizeSamplingMode: 0
-    pointSize: 86
-    padding: 9
-    paddingMode: 0
-    packingMode: 4
-    atlasWidth: 512
-    atlasHeight: 512
-    characterSetSelectionMode: 1
-    characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633
-    referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee
-    referencedTextAssetGUID:
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4169
-    includeFontFeatures: 1
-
+<<<<<<< HEAD
  m_GlyphTable: []
  m_CharacterTable: []
  m_AtlasTextures:
  - {fileID: 28268798066460806}
  m_AtlasTextureIndex: 0
  m_IsMultiAtlasTexturesEnabled: 1
-  m_GetFontFeatures: 1
  m_ClearDynamicDataOnBuild: 1
-
-  m_AtlasWidth: 512
-  m_AtlasHeight: 512
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4169
-
  m_UsedGlyphRects: []
  m_FreeGlyphRects:
  - m_X: 0
    m_Y: 0
    m_Width: 511
    m_Height: 511
-
-  m_FontFeatureTable:
-    m_MultipleSubstitutionRecords: []
-    m_LigatureSubstitutionRecords: []
-    m_GlyphPairAdjustmentRecords: []
-    m_MarkToBaseAdjustmentRecords: []
-    m_MarkToMarkAdjustmentRecords: []
-
-  m_ShouldReimportFontFeatures: 0
-  m_FallbackFontAssetTable: []
-
-  m_FontWeightTable:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-
-  fontWeights:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-
-  normalStyle: 0
-  normalSpacingOffset: 0
-  boldStyle: 0.75
-  boldSpacing: 7
-  italicStyle: 35
-  tabSize: 10
-
  m_fontInfo:
    Name: Liberation Sans
    PointSize: 86
@@ -323,15 +251,156 @@ MonoBehaviour:
    Padding: 9
    AtlasWidth: 1024
    AtlasHeight: 1024
-
+  atlas: {fileID: 0}
+  m_AtlasWidth: 512
+  m_AtlasHeight: 512
+  m_AtlasPadding: 9
+  m_AtlasRenderMode: 4169
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords: []
+    m_GlyphPairAdjustmentRecords: []
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  fallbackFontAssets: []
+  m_FallbackFontAssetTable: []
+=======
+  m_Material: {fileID: 2180264}
+  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+>>>>>>> origin/main
+  m_CreationSettings:
+    sourceFontFileName: 
+    sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+    faceIndex: 0
+    pointSizeSamplingMode: 0
+    pointSize: 86
+    padding: 9
+    paddingMode: 0
+    packingMode: 4
+    atlasWidth: 512
+    atlasHeight: 512
+    characterSetSelectionMode: 1
+    characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633
+    referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee
+    referencedTextAssetGUID: 
+    fontStyle: 0
+    fontStyleModifier: 0
+    renderMode: 4169
+    includeFontFeatures: 1
+<<<<<<< HEAD
+=======
+  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+  m_GlyphTable: []
+  m_CharacterTable: []
+  m_AtlasTextures:
+  - {fileID: 28268798066460806}
+  m_AtlasTextureIndex: 0
+  m_IsMultiAtlasTexturesEnabled: 1
+  m_GetFontFeatures: 1
+  m_ClearDynamicDataOnBuild: 1
+  m_AtlasWidth: 512
+  m_AtlasHeight: 512
+  m_AtlasPadding: 9
+  m_AtlasRenderMode: 4169
+  m_UsedGlyphRects: []
+  m_FreeGlyphRects:
+  - m_X: 0
+    m_Y: 0
+    m_Width: 511
+    m_Height: 511
+  m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords: []
+    m_GlyphPairAdjustmentRecords: []
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
+  m_FallbackFontAssetTable: []
+>>>>>>> origin/main
+  m_FontWeightTable:
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  fontWeights:
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  - regularTypeface: {fileID: 0}
+    italicTypeface: {fileID: 0}
+  normalStyle: 0
+  normalSpacingOffset: 0
+  boldStyle: 0.75
+  boldSpacing: 7
+  italicStyle: 35
+  tabSize: 10
+<<<<<<< HEAD
+=======
+  m_fontInfo:
+    Name: Liberation Sans
+    PointSize: 86
+    Scale: 1
+    CharacterCount: 250
+    LineHeight: 98.90625
+    Baseline: 0
+    Ascender: 77.84375
+    CapHeight: 59.1875
+    Descender: -18.21875
+    CenterLine: 0
+    SuperscriptOffset: 77.84375
+    SubscriptOffset: -12.261719
+    SubSize: 0.5
+    Underline: -12.261719
+    UnderlineThickness: 6.298828
+    strikethrough: 23.675
+    strikethroughThickness: 0
+    TabWidth: 239.0625
+    Padding: 9
+    AtlasWidth: 1024
+    AtlasHeight: 1024
  m_glyphInfoList: []
-
  m_KerningTable:
    kerningPairs: []
-
  fallbackFontAssets: []
  atlas: {fileID: 0}
-
+>>>>>>> origin/main
 --- !u!28 &28268798066460806
 Texture2D:
  m_ObjectHideFlags: 0
@@ -339,11 +408,22 @@ Texture2D:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: LiberationSans SDF Atlas
-
  m_ImageContentsHash:
    serializedVersion: 2
    Hash: 00000000000000000000000000000000
-
+<<<<<<< HEAD
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 2
+  m_Width: 0
+  m_Height: 0
+  m_CompleteImageSize: 0
+  m_TextureFormat: 1
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+=======
  m_IsAlphaChannelOptional: 0
  serializedVersion: 4
  m_Width: 1
@@ -355,15 +435,14 @@ Texture2D:
  m_IsReadable: 1
  m_IsPreProcessed: 0
  m_IgnoreMipmapLimit: 0
-  m_MipmapLimitGroupName:
+  m_MipmapLimitGroupName: 
  m_StreamingMipmaps: 0
  m_StreamingMipmapsPriority: 0
  m_VTOnly: 0
-
+>>>>>>> origin/main
  m_AlphaIsTransparency: 0
  m_ImageCount: 1
  m_TextureDimension: 2
-
  m_TextureSettings:
    serializedVersion: 2
    m_FilterMode: 1
@@ -372,15 +451,19 @@ Texture2D:
    m_WrapU: 0
    m_WrapV: 0
    m_WrapW: 0
-
  m_LightmapFormat: 0
  m_ColorSpace: 0
-  m_PlatformBlob:
+<<<<<<< HEAD
+  image data: 0
+  _typelessdata: 
+  m_StreamData:
+=======
+  m_PlatformBlob: 
  image data: 1
  _typelessdata: 00
-
  m_StreamData:
    serializedVersion: 2
+>>>>>>> origin/main
    offset: 0
    size: 0
-    path:
+    path: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Pro/Resources/TMP
+++ b/Pro/Resources/TMP
@@ -15,7 +15,7 @@ MonoBehaviour:
  assetVersion: 2
  m_TextWrappingMode: 1
  m_enableKerning: 1
-  m_ActiveFontFeatures: 6e72656b
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  m_enableTintAllSprites: 0
  m_enableParseEscapeCharacters: 1
@@ -33,18 +33,20 @@ MonoBehaviour:
  m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
  m_autoSizeTextContainer: 0
  m_IsTextObjectScaleStatic: 0
-  m_fallbackFontAssets:
-  - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
+  m_fallbackFontAssets: []
  m_matchMaterialPreset: 1
  m_HideSubTextObjects: 0
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
+    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, type: 2}
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
+    type: 2}
  m_StyleSheetsResourcePath: 
  m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
+    type: 3}
  m_UseModernHangulLineBreakingRules: 0
--- a/Assets/TutorialInfo.meta
+++ b/Assets/TutorialInfo.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 2692316a8a73b434783a8c8c50c49ac0
+=======
 guid: 4c89ded1fa5528e43965b0d178497f9a
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/TutorialInfo/Icons.meta
+++ b/Assets/TutorialInfo/Icons.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: d8c6f31643437cf4fa0e66ec2ff9a2e2
+=======
 guid: c5ada28132037dc49b25799cd085863a
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/TutorialInfo/Icons/URP.png.meta
+++ b/Assets/TutorialInfo/Icons/URP.png.meta
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 95952c7b1590baf479a484d39d256da9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    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: Standalone
+    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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TutorialInfo/Layout.wlt.meta
+++ b/Assets/TutorialInfo/Layout.wlt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7717e22d410f9a444be1699f27f08476
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TutorialInfo/Scripts.meta
+++ b/Assets/TutorialInfo/Scripts.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 478503718c5a2c449bf8efbdda9c5aa2
+=======
 guid: 340fa7a6658f67b4884beda3ce703bc8
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/TutorialInfo/Scripts/Editor.meta
+++ b/Assets/TutorialInfo/Scripts/Editor.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: ffed5da1f0e08a5409de9dfef22c21f3
+=======
 guid: 90a0dcae2a28dbc488afff041a155933
+>>>>>>> origin/main
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta
+++ b/Assets/TutorialInfo/Scripts/Editor/ReadmeEditor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 84b2aaf916697844694b8831472d3e0e
--- a/Assets/TutorialInfo/Scripts/Readme.cs.meta
+++ b/Assets/TutorialInfo/Scripts/Readme.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: bd183dd179558504ab1767087b1efc32
--- a/Assets/Untitled.blend1.meta
+++ b/Assets/Untitled.blend1.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8a3ae6902f1c0f640a60306c36bf7976
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Untitled.stl.meta
+++ b/Assets/Untitled.stl.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2e89477d2c2cb534988b1a3912bf69dd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/[55PRWfko7pI].mp3
+++ b/[55PRWfko7pI].mp3
--- a/[55PRWfko7pI].mp3.meta
+++ b/[55PRWfko7pI].mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 26709d992d8a99b4791083f116c56a36
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/dd.unity.meta
+++ b/Assets/dd.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8f9e944b2f23a444588ce2e4ac78b0f0
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/koulickaone.blend1.meta
+++ b/Assets/koulickaone.blend1.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 74379ac554348f84c8d3abeb440b79b9
+=======
 guid: f0565825ed419f845acc6ec1f2406ead
+>>>>>>> origin/main
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/koulickaone.fbx.meta
+++ b/Assets/koulickaone.fbx.meta
@@ -0,0 +1,110 @@
+fileFormatVersion: 2
+guid: 7fd80bd46d706b042a137593bf706d58
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/pojekt.unity.meta
+++ b/Assets/pojekt.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f01e25b5a8e60224fa8643bf4f074a71
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/[YB3yHfqdw3Y].mp3
+++ b/[YB3yHfqdw3Y].mp3
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,5 +1,10 @@
 {
  "dependencies": {
+<<<<<<< HEAD
+    "com.unity.textmeshpro": "4.0.0",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.multiplayer.center": "1.0.0",
+=======
    "com.unity.2d.sprite": "1.0.0",
    "com.unity.ide.visualstudio": "2.0.27",
    "com.unity.inputsystem": "1.14.2",
@@ -7,7 +12,10 @@
    "com.unity.nuget.newtonsoft-json": "3.2.2",
    "com.unity.remote-config": "4.2.5",
    "com.unity.render-pipelines.universal": "17.2.0",
+    "com.unity.nuget.newtonsoft-json": "3.2.2",
    "com.unity.toolchain.linux-x86_64": "2.0.11",
+    "com.unity.ugui": "2.0.0",
+>>>>>>> origin/main
    "com.unity.modules.accessibility": "1.0.0",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,11 +1,60 @@
 {
  "dependencies": {
+<<<<<<< HEAD
+=======
    "com.unity.2d.sprite": {
      "version": "1.0.0",
      "depth": 0,
      "source": "builtin",
      "dependencies": {}
    },
+    "com.unity.2d.spriteshape": {
+      "version": "12.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.2d.common": "11.0.1",
+        "com.unity.mathematics": "1.1.0",
+        "com.unity.modules.physics2d": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.2d.tilemap": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.tilemap": "1.0.0",
+        "com.unity.modules.uielements": "1.0.0"
+      }
+    },
+    "com.unity.2d.tilemap.extras": {
+      "version": "5.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.2d.tilemap": "1.0.0",
+        "com.unity.modules.tilemap": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.addressables": {
+      "version": "2.7.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.profiling.core": "1.0.2",
+        "com.unity.test-framework": "1.4.5",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.scriptablebuildpipeline": "2.4.3",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.burst": {
      "version": "1.8.25",
      "depth": 2,
@@ -29,6 +78,13 @@
      },
      "url": "https://packages.unity.com"
    },
+    "com.unity.device-simulator.devices": {
+      "version": "1.0.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
    "com.unity.ext.nunit": {
      "version": "2.0.5",
      "depth": 2,
@@ -53,13 +109,7 @@
      },
      "url": "https://packages.unity.com"
    },
-    "com.unity.mathematics": {
-      "version": "1.3.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
+>>>>>>> origin/main
    "com.unity.multiplayer.center": {
      "version": "1.0.0",
      "depth": 0,
@@ -68,13 +118,16 @@
        "com.unity.modules.uielements": "1.0.0"
      }
    },
-    "com.unity.nuget.mono-cecil": {
-      "version": "1.11.5",
-      "depth": 3,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
+<<<<<<< HEAD
+    "com.unity.textmeshpro": {
+      "version": "5.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.ugui": "2.0.0"
+      }
    },
+=======
    "com.unity.nuget.newtonsoft-json": {
      "version": "3.2.2",
      "depth": 0,
@@ -82,19 +135,18 @@
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
-    "com.unity.remote-config": {
-      "version": "4.2.5",
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.2",
      "depth": 0,
+    "com.unity.sysroot": {
+      "version": "2.0.10",
+      "depth": 1,
      "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"
-      },
+      "dependencies": {},
      "url": "https://packages.unity.com"
    },
-    "com.unity.remote-config-runtime": {
-      "version": "4.0.4",
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "2.0.9",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@@ -149,6 +201,16 @@
        "com.unity.modules.terrain": "1.0.0"
      }
    },
+    "com.unity.scriptablebuildpipeline": {
+      "version": "2.4.3",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.4.5",
+        "com.unity.modules.assetbundle": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.searcher": {
      "version": "4.9.3",
      "depth": 2,
@@ -176,6 +238,7 @@
        "com.unity.modules.androidjni": "1.0.0",
        "com.unity.nuget.newtonsoft-json": "3.2.1",
        "com.unity.modules.unitywebrequest": "1.0.0"
+        "com.unity.sysroot": "2.0.10"
      },
      "url": "https://packages.unity.com"
    },
@@ -188,22 +251,6 @@
        "com.unity.searcher": "4.9.3"
      }
    },
-    "com.unity.sysroot": {
-      "version": "2.0.10",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.sysroot.linux-x86_64": {
-      "version": "2.0.9",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.sysroot": "2.0.10"
-      },
-      "url": "https://packages.unity.com"
-    },
    "com.unity.test-framework": {
      "version": "1.6.0",
      "depth": 1,
@@ -214,16 +261,6 @@
        "com.unity.modules.jsonserialize": "1.0.0"
      }
    },
-    "com.unity.test-framework.performance": {
-      "version": "3.2.0",
-      "depth": 3,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.test-framework": "1.1.33",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
    "com.unity.toolchain.linux-x86_64": {
      "version": "2.0.11",
      "depth": 0,
@@ -234,9 +271,10 @@
      },
      "url": "https://packages.unity.com"
    },
+>>>>>>> origin/main
    "com.unity.ugui": {
      "version": "2.0.0",
-      "depth": 2,
+      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.modules.ui": "1.0.0",
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
@@ -3,10 +3,11 @@
 --- !u!55 &1
 PhysicsManager:
  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_Gravity: {x: 0, y: -9.81, z: 0}
+  serializedVersion: 20
+  m_Gravity: {x: 0, y: -20, z: 0}
  m_DefaultMaterial: {fileID: 0}
  m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
  m_SleepThreshold: 0.005
  m_DefaultContactOffset: 0.01
  m_DefaultSolverIterations: 6
@@ -16,11 +17,11 @@ PhysicsManager:
  m_EnableAdaptiveForce: 0
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
-  m_ContactsGeneration: 1
  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  m_AutoSimulation: 1
+  m_SimulationMode: 0
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 1
+  m_InvokeCollisionCallbacks: 1
  m_ClothInterCollisionSettingsToggle: 0
  m_ClothGravity: {x: 0, y: -9.81, z: 0}
  m_ContactPairsMode: 0
@@ -31,6 +32,10 @@ PhysicsManager:
  m_WorldSubdivisions: 8
  m_FrictionType: 0
  m_EnableEnhancedDeterminism: 0
-  m_EnableUnifiedHeightmaps: 1
+  m_ImprovedPatchFriction: 0
+  m_GenerateOnTriggerStayEvents: 1
  m_SolverType: 0
  m_DefaultMaxAngularSpeed: 50
+  m_ScratchBufferChunkCount: 4
+  m_CurrentBackendId: 4072204805
+  m_FastMotionThreshold: 3.4028235e+38
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,8 +5,14 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
+  - enabled: 0
+    path: Assets/Scenes/SampleScene.unity
+<<<<<<< HEAD
+    guid: 6a18d9b328b6a794da5d050347950362
  - enabled: 1
-    path: Assets/Scenes/MainScene.unity
+    path: Assets/pojekt.unity
+    guid: f01e25b5a8e60224fa8643bf4f074a71
+=======
    guid: 8afa6ce05eb7dba4c894b910786e3baf
  - enabled: 1
    path: Assets/Scenes/Client.unity
@@ -53,6 +59,7 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/MiniGame-Satelit.unity
    guid: 070c4a89027b6e9a28e16859d55f8c66
+>>>>>>> origin/main
  m_configObjects:
    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
  m_UseUCBPForAssetBundles: 0
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -8,7 +8,7 @@ PlayerSettings:
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 4
+  defaultScreenOrientation: 0
  targetDevice: 2
  useOnDemandResources: 0
  accelerometerFrequency: 60
@@ -161,7 +161,7 @@ PlayerSettings:
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
  resolutionScalingMode: 0
-  resetResolutionOnWindowResize: 0
+  resetResolutionOnWindowResize: 1
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.4
  androidMinAspectRatio: 1
@@ -558,13 +558,16 @@ PlayerSettings:
  - serializedVersion: 3
    m_BuildTarget: Android
    m_Formats: 03000000
+  - serializedVersion: 3
+    m_BuildTarget: iOS
+    m_Formats: 03000000
  playModeTestRunnerEnabled: 0
  runPlayModeTestAsEditModeTest: 0
  actionOnDotNetUnhandledException: 1
  editorGfxJobOverride: 1
  enableInternalProfiler: 0
  logObjCUncaughtExceptions: 1
-  enableCrashReportAPI: 0
+  enableCrashReportAPI: 1
  cameraUsageDescription: 
  locationUsageDescription: 
  microphoneUsageDescription: