Merge pull request 'opravene kabely (je jen 1 scena)' (#8) from KabelyOprava into main

Reviewed-on: #8
Reviewed-by: Trubkokrtek <agentdominik707@gmail.com>
This commit was merged in pull request #8.
This commit is contained in:
2026-05-17 12:48:26 +02:00
23 changed files with 13 additions and 17728 deletions

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2230bf768ecb84610af77bea6cdd7074 guid: 6b37670de43269e4f984694475e75510
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -1,5 +1,10 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Materials.meta
guid: 2230bf768ecb84610af77bea6cdd7074
folderAsset: yes
========
guid: 15742d157dfd1e42fb34ae90434eee41 guid: 15742d157dfd1e42fb34ae90434eee41
>>>>>>>> origin/main:Assets/Scenes/MiniGame-FlappyBird.unity.meta
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@@ -193,13 +193,13 @@ Transform:
m_GameObject: {fileID: 210602716} m_GameObject: {fileID: 210602716}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -55.235718, y: 368.19592, z: -781.7374} m_LocalPosition: {x: -55.235718, y: 368.19595, z: -781.7374}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1140131532} - {fileID: 1140131532}
- {fileID: 2102485167} - {fileID: 2102485167}
m_Father: {fileID: 1814274513} m_Father: {fileID: 1790534262}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &331729628 --- !u!1 &331729628
GameObject: GameObject:
@@ -1570,9 +1570,10 @@ RectTransform:
m_GameObject: {fileID: 1790534261} m_GameObject: {fileID: 1790534261}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 781.2808} m_LocalPosition: {x: 0, y: 0, z: 781.2808}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 2.92736, y: 2.5490422, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children:
- {fileID: 210602717}
m_Father: {fileID: 143293625} m_Father: {fileID: 143293625}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@@ -1650,9 +1651,8 @@ RectTransform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 143293625} - {fileID: 143293625}
- {fileID: 210602717}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 34.899}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}