Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021

Assets/Scenes/Levels/Hans.unity.meta

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

Assets/Scenes/Levels/Level1_Release.unity

@@ -2416,7 +2416,7 @@ Transform:
   - {fileID: 264424618}
   - {fileID: 1128662191}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1347954125
 GameObject:
@@ -2517,6 +2517,85 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2549885454013026912}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1386901338
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 70.43702
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 86.41835
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 7.371993
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.90702474
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 1608164773368580968, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2097140291153564114, guid: c5f1d956f2c374843a80ed7bc6ec0a9b,
+        type: 3}
+      propertyPath: m_Name
+      value: background
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c5f1d956f2c374843a80ed7bc6ec0a9b, type: 3}
 --- !u!4 &1470075335 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8810309419999466072, guid: 75a5dff38607d264bbf318173d359a5e,

Assets/Scenes/Menu/FinalMenu.unity

@@ -503,11 +503,11 @@ RectTransform:
   m_Father: {fileID: 989324636}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -507, y: 226}
+  m_AnchoredPosition: {x: 25, y: -18.000015}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 100, y: 99}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!114 &393393100
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/Menu/MainMenu.unity

@@ -3361,11 +3361,11 @@ RectTransform:
   m_Father: {fileID: 989324636}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -507, y: 226}
+  m_AnchoredPosition: {x: 25, y: -18}
   m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!114 &1633138937
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/Menu/MiddleMenu.unity

@@ -1320,11 +1320,11 @@ RectTransform:
   m_Father: {fileID: 989324636}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -507, y: 226}
+  m_AnchoredPosition: {x: 25, y: -18}
   m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!114 &1615578617
 MonoBehaviour:
   m_ObjectHideFlags: 0