Merge branch 'Bestenliste'

pklaschka · May 29, 2017 · c71762e · c71762e
2 parents 92aa715 + 094205e
commit c71762e
Show file tree

Hide file tree

Showing 8 changed files with 621 additions and 20 deletions.
diff --git a/...01/Assets/Level/Test Monster Einfügen.png → ...1/Assets/Level/Test Monster Einfügen.png b/...01/Assets/Level/Test Monster Einfügen.png → ...1/Assets/Level/Test Monster Einfügen.png
diff --git a/...sets/Level/Test Monster Einfügen.png.meta → ...ets/Level/Test Monster Einfügen.png.meta b/...sets/Level/Test Monster Einfügen.png.meta → ...ets/Level/Test Monster Einfügen.png.meta
diff --git a/Platformer_001/Assets/Scenes (Level)/MenuSystem/Bestenliste.unity b/Platformer_001/Assets/Scenes (Level)/MenuSystem/Bestenliste.unity
@@ -333,7 +333,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "Ihr Ergebnis: \n122354 (#3367)"
+  m_Text: "Ihr Ergebnis: \n... (#...)"
 --- !u!222 &104631840
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1155,7 +1155,7 @@ Prefab:
     - target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
         type: 2}
       propertyPath: m_AnchoredPosition.x
-      value: 158.38164
+      value: 159.62134
       objectReference: {fileID: 0}
     - target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
         type: 2}
@@ -1882,7 +1882,7 @@ Prefab:
     - target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
         type: 2}
       propertyPath: m_AnchoredPosition.x
-      value: 158.38164
+      value: 159.62134
       objectReference: {fileID: 0}
     - target: {fileID: 224902029835350780, guid: f6748a010e46d4334a2b9717aa34b24d,
         type: 2}