From 67f5c090219feb973aa3d0b60c58e6708c6503e6 Mon Sep 17 00:00:00 2001 From: trubkokrtek Date: Fri, 5 Jun 2026 18:48:01 +0200 Subject: [PATCH] resolved issues and added minigames to list --- Assets/GameManager/GameManager.cs | 10 +- Assets/Materials/image.mat.meta | 2 +- Assets/Scenes/Client.unity.meta | 2 +- Assets/Scenes/Lobby.unity.meta | 2 +- ....unity.meta => MiniGame-Kabely.unity.meta} | 2 +- Assets/Scenes/MiniGame-Satelit.unity.meta | 2 +- Assets/Scenes/komrskazkousim.unity | 1484 ----------------- Assets/Scripts/ButtonsMinigame.cs | 30 +- .../flappy_bird - přejmenovat.meta} | 6 +- .../flappy bird.cs.meta | 2 + Assets/Scripts/hod_veci_do_diry.meta | 8 + .../hod_veci_do_diry/DraggableObject.cs.meta | 2 + Assets/Scripts/hod_veci_do_diry/Hole.cs.meta | 2 + .../hod_veci_do_diry/LevelManager.cs.meta | 2 + .../hod_veci_do_diry/ObjectSpawner.cs.meta | 2 + Assets/Scripts/insert key.meta | 8 + Assets/Scripts/insert key/insertkeys.cs.meta | 2 + .../insert key/keysminiigamemanager.cs.meta | 2 + Assets/Scripts/kabely.meta | 8 + Assets/Scripts/kabely/kabely.cs.meta | 2 + Assets/Scripts/satelity.meta | 8 + .../Scripts/satelity/WindController.cs.meta | 2 + .../LiberationSans SDF - Fallback.asset | 226 +-- .../LiberationSans SDF.asset | 4 - Assets/TutorialInfo/Icons.meta | 8 + Assets/koulickaone.blend1.meta | 11 - Packages/packages-lock.json | 4 +- 27 files changed, 87 insertions(+), 1756 deletions(-) rename Assets/Scenes/{komrskazkousim.unity.meta => MiniGame-Kabely.unity.meta} (74%) delete mode 100644 Assets/Scenes/komrskazkousim.unity rename Assets/{TutorialInfo/Scripts.meta => Scripts/flappy_bird - přejmenovat.meta} (52%) create mode 100644 Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs.meta create mode 100644 Assets/Scripts/hod_veci_do_diry.meta create mode 100644 Assets/Scripts/hod_veci_do_diry/DraggableObject.cs.meta create mode 100644 Assets/Scripts/hod_veci_do_diry/Hole.cs.meta create mode 100644 Assets/Scripts/hod_veci_do_diry/LevelManager.cs.meta create mode 100644 Assets/Scripts/hod_veci_do_diry/ObjectSpawner.cs.meta create mode 100644 Assets/Scripts/insert key.meta create mode 100644 Assets/Scripts/insert key/insertkeys.cs.meta create mode 100644 Assets/Scripts/insert key/keysminiigamemanager.cs.meta create mode 100644 Assets/Scripts/kabely.meta create mode 100644 Assets/Scripts/kabely/kabely.cs.meta create mode 100644 Assets/Scripts/satelity.meta create mode 100644 Assets/Scripts/satelity/WindController.cs.meta create mode 100644 Assets/TutorialInfo/Icons.meta delete mode 100644 Assets/koulickaone.blend1.meta diff --git a/Assets/GameManager/GameManager.cs b/Assets/GameManager/GameManager.cs index 380c2ce..6f604ed 100644 --- a/Assets/GameManager/GameManager.cs +++ b/Assets/GameManager/GameManager.cs @@ -58,11 +58,13 @@ public class GameManager : MonoBehaviour // will silently fail and the task button will appear dead. [SerializeField] public string[] minigameScenes = { "MiniGame-Kabely", - //"MiniGame-insertkeys", Obsolete ? + "ButtonsMemoryMinigame", + "Happywheelminigamescene", "MiniGame-KeyInsert", - //"MiniGame-FlappyBird", Out Of Order, Not assigned prefabs - //"MiniGame-ThrowInHole", Not pushed into main branch - //"MiniGame-Satelit", No assets, just placeholder task + "MiniGame-FlappyBird", + "MiniGame-Satelit", + "MiniGame-ThrowInHole", + "minihra cistici dira" }; [Header("Debug")] diff --git a/Assets/Materials/image.mat.meta b/Assets/Materials/image.mat.meta index 3cbc5f0..28e78de 100644 --- a/Assets/Materials/image.mat.meta +++ b/Assets/Materials/image.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Materials/Blue.mat.meta -guid: 151c2d5ead486e14f84805c05457ef7f +guid: 35493988850f6fe489b4be5b2f625f95 ======== guid: 0ac383cb888b6814d8432e6ec14f49cd >>>>>>>> origin/main:Assets/Materials/image.mat.meta diff --git a/Assets/Scenes/Client.unity.meta b/Assets/Scenes/Client.unity.meta index 8ff4ba2..bddcb8c 100644 --- a/Assets/Scenes/Client.unity.meta +++ b/Assets/Scenes/Client.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Scenes/ButtonsMemoryMinigame.unity.meta -guid: 5f8ea27ba7c86044e9192a63e6e3b6db +guid: a25fb175a69711142ad29b45ee525020 ======== guid: 99349b837685d91408e5eb5bac237678 >>>>>>>> origin/main:Assets/Scenes/Client.unity.meta diff --git a/Assets/Scenes/Lobby.unity.meta b/Assets/Scenes/Lobby.unity.meta index d8ac640..bf96633 100644 --- a/Assets/Scenes/Lobby.unity.meta +++ b/Assets/Scenes/Lobby.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Materials/Green.mat.meta -guid: 0fb69fc17dec90a41803db19eb400738 +guid: 2c6b0099075291549ac7194c83d1e61e NativeFormatImporter: ======== guid: a8455b5835249e44d931c30790f60381 diff --git a/Assets/Scenes/komrskazkousim.unity.meta b/Assets/Scenes/MiniGame-Kabely.unity.meta similarity index 74% rename from Assets/Scenes/komrskazkousim.unity.meta rename to Assets/Scenes/MiniGame-Kabely.unity.meta index c2fa2e4..efd2d35 100644 --- a/Assets/Scenes/komrskazkousim.unity.meta +++ b/Assets/Scenes/MiniGame-Kabely.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1be8570b1bc20d946a6e92f218d0de7d +guid: 900bc523907f8ee48baf5515a54e6716 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/MiniGame-Satelit.unity.meta b/Assets/Scenes/MiniGame-Satelit.unity.meta index e8f2604..c1afd89 100644 --- a/Assets/Scenes/MiniGame-Satelit.unity.meta +++ b/Assets/Scenes/MiniGame-Satelit.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Materials/Magenta.mat.meta -guid: f5b74b605e2aedd42a9e4e8a40046cf5 +guid: fb3371dc09f50d14990c4fd40a2862b6 NativeFormatImporter: ======== guid: 070c4a89027b6e9a28e16859d55f8c66 diff --git a/Assets/Scenes/komrskazkousim.unity b/Assets/Scenes/komrskazkousim.unity deleted file mode 100644 index 49211a7..0000000 --- a/Assets/Scenes/komrskazkousim.unity +++ /dev/null @@ -1,1484 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 13 - m_BakeOnSceneLoad: 0 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 1 - m_PVRFilteringGaussRadiusAO: 1 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} -<<<<<<< HEAD:Assets/pojekt.unity ---- !u!1 &26104820 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - 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 - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &350850564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 350850563} - 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 &350850565 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 350850563} - 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 &350850566 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 350850563} - 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} -<<<<<<< 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} - m_PrefabInstance: {fileID: 0} - 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} - m_LocalScale: {x: 9.792883, y: 9.792883, z: 9.792883} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1715099261} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &713781623 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 713781621} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - 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} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 863085482} - - component: {fileID: 863085481} - 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 &863085481 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863085480} - 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 &863085482 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 863085480} - 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} -<<<<<<< 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} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 903577776} - - component: {fileID: 903577775} - - component: {fileID: 903577774} - 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 &903577774 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903577773} - m_Enabled: 1 ---- !u!20 &903577775 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903577773} - 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 &903577776 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903577773} - 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 &1250930870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1250930873} - - component: {fileID: 1250930872} - - component: {fileID: 1250930871} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1250930871 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250930870} - m_Enabled: 1 ---- !u!20 &1250930872 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250930870} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - 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: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 8400000, guid: 4d595312cdcdd094cbe411227603ceea, type: 2} - 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 &1250930873 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250930870} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2.3175147, y: 0.19786058, z: 0.47171304} - 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 &1692768354 -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: 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 - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1692768355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1692768354} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 33d0056a23f977a40b857ca923bb9f0d, type: 3} - m_Name: - m_EditorClassIdentifier: '::' - rychlost: 30 ---- !u!135 &1692768356 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} -<<<<<<< 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 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - 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} ---- !u!23 &1692768357 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1692768354} - 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: 4cf6d1d65bc4af24fa762f6801fcc7c4, 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 &1692768358 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1692768354} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1692768359 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1692768354} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.016, y: 0.33497, z: 0.3704} - 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 &1715099257 ->>>>>>> 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: - - component: {fileID: 1715099261} - - component: {fileID: 1715099260} - - component: {fileID: 1715099259} - - component: {fileID: 1715099258} - - component: {fileID: 1715099263} - - component: {fileID: 1715099262} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1715099258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1715099257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1715099259 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1715099257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1715099260 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1715099257} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1715099261 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1715099257} - 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: - - {fileID: 713781622} - 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 &1715099262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1715099257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - 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_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1715099263 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1715099257} - m_CullTransparentMesh: 1 ---- !u!1660057539 &9223372036854775807 -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 diff --git a/Assets/Scripts/ButtonsMinigame.cs b/Assets/Scripts/ButtonsMinigame.cs index 30baf6a..5431c96 100644 --- a/Assets/Scripts/ButtonsMinigame.cs +++ b/Assets/Scripts/ButtonsMinigame.cs @@ -7,7 +7,7 @@ using TMPro; using UnityEditor; using UnityEngine; -public enum GameState +public enum MinigameState { Idle, ShowingSequance, @@ -27,7 +27,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask public TMP_Text statusText; public GameObject startButton; private int playerStep = 0; - private GameState state = GameState.Idle; + private MinigameState state = MinigameState.Idle; private List sequence = new List(); public string TaskID { get; set; } @@ -54,7 +54,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask IEnumerator PlaySequence() { - SetState(GameState.ShowingSequance); + SetState(MinigameState.ShowingSequance); yield return new WaitForSeconds(delayBeforeSequence); for (int i = 0; i < sequence.Count; i++) @@ -67,12 +67,12 @@ public class ButtonsMinigame : MonoBehaviour, ITask } playerStep = 0; - SetState(GameState.PlayerTurn); + SetState(MinigameState.PlayerTurn); } void Start() { - SetState(GameState.Idle); + SetState(MinigameState.Idle); } public void StartGame() @@ -83,34 +83,34 @@ public class ButtonsMinigame : MonoBehaviour, ITask StartCoroutine(PlaySequence()); } - void SetState(GameState newState) + void SetState(MinigameState newState) { state = newState; switch (newState) { - case GameState.Idle: + case MinigameState.Idle: statusText.text = "Get Ready!"; break; - case GameState.ShowingSequance: + case MinigameState.ShowingSequance: statusText.text = "Watch the sequence"; break; - case GameState.PlayerTurn: + case MinigameState.PlayerTurn: statusText.text = "Your turn!"; break; - case GameState.GameOver: + case MinigameState.GameOver: statusText.text = "Gameover"; break; - case GameState.MinigameWon: + case MinigameState.MinigameWon: statusText.text = "Task Completed"; break; } - startButton.SetActive(state == GameState.Idle || state == GameState.GameOver); + startButton.SetActive(state == MinigameState.Idle || state == MinigameState.GameOver); } public void OnButtonClicked(int buttonIndex) { - if (state != GameState.PlayerTurn) return; + if (state != MinigameState.PlayerTurn) return; if (buttonIndex == sequence[playerStep]) { playerStep++; @@ -118,7 +118,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask { if (round >= winRound) { - SetState(GameState.MinigameWon); + SetState(MinigameState.MinigameWon); Complete(); } else @@ -132,7 +132,7 @@ public class ButtonsMinigame : MonoBehaviour, ITask } else { - SetState(GameState.GameOver); + SetState(MinigameState.GameOver); Debug.Log("GameOver"); } } diff --git a/Assets/TutorialInfo/Scripts.meta b/Assets/Scripts/flappy_bird - přejmenovat.meta similarity index 52% rename from Assets/TutorialInfo/Scripts.meta rename to Assets/Scripts/flappy_bird - přejmenovat.meta index fbd59bc..0a7abfa 100644 --- a/Assets/TutorialInfo/Scripts.meta +++ b/Assets/Scripts/flappy_bird - přejmenovat.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD -guid: 478503718c5a2c449bf8efbdda9c5aa2 -======= -guid: 340fa7a6658f67b4884beda3ce703bc8 ->>>>>>> origin/main +guid: b680a6b1d72cd374b90a4eac38c8713b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs.meta b/Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs.meta new file mode 100644 index 0000000..7089bd7 --- /dev/null +++ b/Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5a394b419f210bb4fb74ddc99bf3c469 \ No newline at end of file diff --git a/Assets/Scripts/hod_veci_do_diry.meta b/Assets/Scripts/hod_veci_do_diry.meta new file mode 100644 index 0000000..4676888 --- /dev/null +++ b/Assets/Scripts/hod_veci_do_diry.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c32eef1764a44149be639d15fac5717 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/hod_veci_do_diry/DraggableObject.cs.meta b/Assets/Scripts/hod_veci_do_diry/DraggableObject.cs.meta new file mode 100644 index 0000000..7767a03 --- /dev/null +++ b/Assets/Scripts/hod_veci_do_diry/DraggableObject.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f4fdb2075cae8cf459906793b0fc07dd \ No newline at end of file diff --git a/Assets/Scripts/hod_veci_do_diry/Hole.cs.meta b/Assets/Scripts/hod_veci_do_diry/Hole.cs.meta new file mode 100644 index 0000000..3f30cb0 --- /dev/null +++ b/Assets/Scripts/hod_veci_do_diry/Hole.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 499bc5c49b2d47744a55d527594ece5e \ No newline at end of file diff --git a/Assets/Scripts/hod_veci_do_diry/LevelManager.cs.meta b/Assets/Scripts/hod_veci_do_diry/LevelManager.cs.meta new file mode 100644 index 0000000..fc61a21 --- /dev/null +++ b/Assets/Scripts/hod_veci_do_diry/LevelManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7f708f4b0a7fb8e4f888b67817f5b7ce \ No newline at end of file diff --git a/Assets/Scripts/hod_veci_do_diry/ObjectSpawner.cs.meta b/Assets/Scripts/hod_veci_do_diry/ObjectSpawner.cs.meta new file mode 100644 index 0000000..ed31dbb --- /dev/null +++ b/Assets/Scripts/hod_veci_do_diry/ObjectSpawner.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 871ab3a9010b6e14ba6c3295b2ed089d \ No newline at end of file diff --git a/Assets/Scripts/insert key.meta b/Assets/Scripts/insert key.meta new file mode 100644 index 0000000..26eec40 --- /dev/null +++ b/Assets/Scripts/insert key.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dadb43c30d8c91448a8c72cec4b687dd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/insert key/insertkeys.cs.meta b/Assets/Scripts/insert key/insertkeys.cs.meta new file mode 100644 index 0000000..e4457da --- /dev/null +++ b/Assets/Scripts/insert key/insertkeys.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0db843a35232004438f51e9b9b8eeab7 \ No newline at end of file diff --git a/Assets/Scripts/insert key/keysminiigamemanager.cs.meta b/Assets/Scripts/insert key/keysminiigamemanager.cs.meta new file mode 100644 index 0000000..5d74dd9 --- /dev/null +++ b/Assets/Scripts/insert key/keysminiigamemanager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c86a2bcbba19e514b8658980f381825c \ No newline at end of file diff --git a/Assets/Scripts/kabely.meta b/Assets/Scripts/kabely.meta new file mode 100644 index 0000000..266f36a --- /dev/null +++ b/Assets/Scripts/kabely.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b188e084f53e5f4799b63469c805c14 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/kabely/kabely.cs.meta b/Assets/Scripts/kabely/kabely.cs.meta new file mode 100644 index 0000000..628551e --- /dev/null +++ b/Assets/Scripts/kabely/kabely.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a76580d42c601f44aa909f9dd41ba1b7 \ No newline at end of file diff --git a/Assets/Scripts/satelity.meta b/Assets/Scripts/satelity.meta new file mode 100644 index 0000000..b5c6460 --- /dev/null +++ b/Assets/Scripts/satelity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27a7d88fa5bb3084b983e9e76d82bc87 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/satelity/WindController.cs.meta b/Assets/Scripts/satelity/WindController.cs.meta new file mode 100644 index 0000000..baf5c81 --- /dev/null +++ b/Assets/Scripts/satelity/WindController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1124b38022849a047ba3418e466160e5 \ No newline at end of file diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 592e128..b964122 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -2,77 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2180264 Material: -<<<<<<< HEAD serializedVersion: 8 -======= -<<<<<<< HEAD - serializedVersion: 8 -======= -<<<<<<< HEAD - serializedVersion: 8 -======= -<<<<<<< HEAD - serializedVersion: 6 -======= - serializedVersion: 8 ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LiberationSans SDF Material m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD m_ShaderKeywords: -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] -<<<<<<< HEAD m_LockedProperties: -======= -<<<<<<< HEAD - m_LockedProperties: -======= -<<<<<<< HEAD - m_LockedProperties: -======= -<<<<<<< HEAD -======= - m_LockedProperties: ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -124,22 +72,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} -<<<<<<< HEAD m_Ints: [] -======= -<<<<<<< HEAD - m_Ints: [] -======= -<<<<<<< HEAD - m_Ints: [] -======= -<<<<<<< HEAD -======= - m_Ints: [] ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_Floats: - _Ambient: 0.5 - _Bevel: 0.5 @@ -221,27 +154,8 @@ Material: - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} -<<<<<<< HEAD m_BuildTextureStacks: [] m_AllowLocking: 1 -======= -<<<<<<< HEAD - m_BuildTextureStacks: [] - m_AllowLocking: 1 - -======= -<<<<<<< HEAD - m_BuildTextureStacks: [] - m_AllowLocking: 1 -======= -<<<<<<< HEAD -======= - m_BuildTextureStacks: [] - m_AllowLocking: 1 ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -255,23 +169,11 @@ MonoBehaviour: m_Name: LiberationSans SDF - Fallback m_EditorClassIdentifier: m_Version: 1.1.0 -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD m_Material: {fileID: 2180264} m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_AtlasPopulationMode: 1 InternalDynamicOS: 0 -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_FaceInfo: m_FaceIndex: 0 m_FamilyName: Liberation Sans @@ -294,25 +196,12 @@ MonoBehaviour: m_StrikethroughOffset: 18 m_StrikethroughThickness: 6.298828 m_TabWidth: 24 -<<<<<<< HEAD - m_Material: {fileID: 2180264} - m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 -======= -<<<<<<< HEAD - m_Material: {fileID: 2180264} m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_SourceFontFilePath: m_AtlasPopulationMode: 1 InternalDynamicOS: 0 - -======= -<<<<<<< HEAD - m_Material: {fileID: 2180264} - m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 -======= -<<<<<<< HEAD m_GlyphTable: [] m_CharacterTable: [] m_AtlasTextures: @@ -364,16 +253,10 @@ MonoBehaviour: m_MarkToMarkAdjustmentRecords: [] fallbackFontAssets: [] m_FallbackFontAssetTable: [] -======= m_Material: {fileID: 2180264} m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_CreationSettings: sourceFontFileName: - sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 faceIndex: 0 pointSizeSamplingMode: 0 pointSize: 86 @@ -390,25 +273,10 @@ MonoBehaviour: fontStyleModifier: 0 renderMode: 4169 includeFontFeatures: 1 -<<<<<<< HEAD -======= -<<<<<<< HEAD - -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_SourceFontFilePath: m_AtlasPopulationMode: 1 InternalDynamicOS: 0 -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main m_GlyphTable: [] m_CharacterTable: [] m_AtlasTextures: @@ -417,25 +285,17 @@ MonoBehaviour: m_IsMultiAtlasTexturesEnabled: 1 m_GetFontFeatures: 1 m_ClearDynamicDataOnBuild: 1 -<<<<<<< HEAD -======= - ->>>>>>> origin/main m_AtlasWidth: 512 m_AtlasHeight: 512 m_AtlasPadding: 9 m_AtlasRenderMode: 4169 -<<<<<<< HEAD -======= ->>>>>>> origin/main m_UsedGlyphRects: [] m_FreeGlyphRects: - m_X: 0 m_Y: 0 m_Width: 511 m_Height: 511 -<<<<<<< HEAD m_FontFeatureTable: m_MultipleSubstitutionRecords: [] m_LigatureSubstitutionRecords: [] @@ -684,7 +544,7 @@ MonoBehaviour: m_MarkToMarkAdjustmentRecords: [] m_ShouldReimportFontFeatures: 0 m_FallbackFontAssetTable: [] -======= + m_FontFeatureTable: m_MultipleSubstitutionRecords: [] @@ -695,15 +555,6 @@ MonoBehaviour: m_ShouldReimportFontFeatures: 0 m_FallbackFontAssetTable: [] -<<<<<<< HEAD - -======= -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_FontWeightTable: - regularTypeface: {fileID: 0} italicTypeface: {fileID: 0} @@ -754,18 +605,6 @@ MonoBehaviour: boldSpacing: 7 italicStyle: 35 tabSize: 10 -<<<<<<< HEAD -======= -<<<<<<< HEAD - -======= -<<<<<<< HEAD -======= -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_fontInfo: Name: Liberation Sans PointSize: 86 @@ -788,13 +627,11 @@ MonoBehaviour: Padding: 9 AtlasWidth: 1024 AtlasHeight: 1024 -<<<<<<< HEAD m_glyphInfoList: [] m_KerningTable: kerningPairs: [] fallbackFontAssets: [] atlas: {fileID: 0} -======= m_glyphInfoList: [] @@ -803,15 +640,6 @@ MonoBehaviour: fallbackFontAssets: [] atlas: {fileID: 0} -<<<<<<< HEAD - -======= -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main --- !u!28 &28268798066460806 Texture2D: m_ObjectHideFlags: 0 @@ -823,31 +651,18 @@ Texture2D: m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 -<<<<<<< HEAD -======= -<<<<<<< HEAD - -======= -<<<<<<< HEAD ->>>>>>> origin/main m_IsAlphaChannelOptional: 0 serializedVersion: 4 m_Width: 1 m_Height: 1 m_CompleteImageSize: 1 m_MipsStripped: 0 -<<<<<<< HEAD -======= -======= -<<<<<<< HEAD m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 serializedVersion: 2 m_Width: 0 m_Height: 0 m_CompleteImageSize: 0 ->>>>>>> origin/main ->>>>>>> origin/main m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 @@ -856,14 +671,7 @@ Texture2D: m_MipmapLimitGroupName: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 -<<<<<<< HEAD m_VTOnly: 0 -======= -<<<<<<< HEAD - m_VTOnly: 0 -======= -======= ->>>>>>> origin/main m_IsAlphaChannelOptional: 0 serializedVersion: 4 m_Width: 1 @@ -879,13 +687,6 @@ Texture2D: m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 m_VTOnly: 0 -<<<<<<< HEAD - -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main m_AlphaIsTransparency: 0 m_ImageCount: 1 m_TextureDimension: 2 @@ -901,41 +702,16 @@ Texture2D: m_LightmapFormat: 0 m_ColorSpace: 0 -<<<<<<< HEAD m_PlatformBlob: image data: 1 _typelessdata: 00 m_StreamData: serializedVersion: 2 -======= -<<<<<<< HEAD - m_PlatformBlob: -======= -<<<<<<< HEAD - m_PlatformBlob: - image data: 1 - _typelessdata: 00 - m_StreamData: - serializedVersion: 2 -======= -<<<<<<< HEAD - image data: 0 - _typelessdata: - m_StreamData: -======= - m_PlatformBlob: ->>>>>>> origin/main image data: 1 _typelessdata: 00 m_StreamData: serializedVersion: 2 -<<<<<<< HEAD -======= ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main ->>>>>>> origin/main offset: 0 size: 0 path: \ No newline at end of file diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index 399dfd3..930dcf3 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -7970,12 +7970,8 @@ MonoBehaviour: m_MarkToBaseAdjustmentRecords: [] m_MarkToMarkAdjustmentRecords: [] m_ShouldReimportFontFeatures: 0 -<<<<<<< HEAD m_FallbackFontAssetTable: - {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} -======= - m_FallbackFontAssetTable: [] ->>>>>>> origin/main m_FontWeightTable: - regularTypeface: {fileID: 0} italicTypeface: {fileID: 0} diff --git a/Assets/TutorialInfo/Icons.meta b/Assets/TutorialInfo/Icons.meta new file mode 100644 index 0000000..98356ca --- /dev/null +++ b/Assets/TutorialInfo/Icons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9f406932633c2346b644ed6045bd5d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/koulickaone.blend1.meta b/Assets/koulickaone.blend1.meta deleted file mode 100644 index 42cb6ef..0000000 --- a/Assets/koulickaone.blend1.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: 74379ac554348f84c8d3abeb440b79b9 -======= -guid: f0565825ed419f845acc6ec1f2406ead ->>>>>>> origin/main -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b8f3852..3ed4d86 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -53,8 +53,6 @@ }, "url": "https://packages.unity.com" }, -<<<<<<< HEAD -======= "com.unity.mathematics": { "version": "1.3.2", "depth": 2, @@ -62,7 +60,7 @@ "dependencies": {}, "url": "https://packages.unity.com" }, ->>>>>>> origin/main + "com.unity.multiplayer.center": { "version": "1.0.0", "depth": 0,