Merge branch 'master' of github.com:Torbilicious/InnoGamesGlobalGameJ…

…am2019
Torbilicious · Jan 27, 2019 · 3d5a500 · 3d5a500
2 parents 44254cb + db544a7
commit 3d5a500
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity
@@ -1796,6 +1796,26 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2012584995, guid: b47f14303583bdd469ae9536d218ff1d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -25.025116
+      objectReference: {fileID: 0}
+    - target: {fileID: 2012584996, guid: b47f14303583bdd469ae9536d218ff1d, type: 3}
+      propertyPath: m_Color.r
+      value: 0.8470589
+      objectReference: {fileID: 0}
+    - target: {fileID: 2012584996, guid: b47f14303583bdd469ae9536d218ff1d, type: 3}
+      propertyPath: m_Color.g
+      value: 0.9686275
+      objectReference: {fileID: 0}
+    - target: {fileID: 2012584996, guid: b47f14303583bdd469ae9536d218ff1d, type: 3}
+      propertyPath: m_Color.b
+      value: 0.8862746
+      objectReference: {fileID: 0}
+    - target: {fileID: 2012584996, guid: b47f14303583bdd469ae9536d218ff1d, type: 3}
+      propertyPath: m_FontData.m_LineSpacing
+      value: 1.21
+      objectReference: {fileID: 0}
     - target: {fileID: 4007144745297153434, guid: b47f14303583bdd469ae9536d218ff1d,
         type: 3}
       propertyPath: m_Camera

diff --git a/Assets/Scenes/Levels/Level 6.unity b/Assets/Scenes/Levels/Level 6.unity
@@ -905,6 +905,11 @@ PrefabInstance:
       propertyPath: m_Color.b
       value: 0.8301887
       objectReference: {fileID: 0}
+    - target: {fileID: 5532602308604616868, guid: 74fa013da52ceee47b8387d3826ae0d2,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 74fa013da52ceee47b8387d3826ae0d2, type: 3}
 --- !u!1 &651149474
@@ -1131,6 +1136,11 @@ PrefabInstance:
       propertyPath: m_Color.b
       value: 0.7075472
       objectReference: {fileID: 0}
+    - target: {fileID: 5532602308604616868, guid: 74fa013da52ceee47b8387d3826ae0d2,
+        type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 74fa013da52ceee47b8387d3826ae0d2, type: 3}
 --- !u!1001 &662307032
@@ -2343,21 +2353,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -7.997
       objectReference: {fileID: 0}
-    - target: {fileID: 5532602308604616875, guid: 74fa013da52ceee47b8387d3826ae0d2,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1.8513949
-      objectReference: {fileID: 0}
-    - target: {fileID: 5532602308604616875, guid: 74fa013da52ceee47b8387d3826ae0d2,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1.8513949
-      objectReference: {fileID: 0}
-    - target: {fileID: 5532602308604616875, guid: 74fa013da52ceee47b8387d3826ae0d2,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 3.7027898
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 74fa013da52ceee47b8387d3826ae0d2, type: 3}
 --- !u!1 &1479998999