Merge remote-tracking branch 'origin/master'

hs-furtwangen · Jun 2, 2019 · e35496c · e35496c
2 parents 64caecc + 7ddbd81
commit e35496c
Show file tree

Hide file tree

Showing 2 changed files with 199 additions and 199 deletions.
diff --git a/Assets/Prefabs/Level Elements/Laser Cube.prefab b/Assets/Prefabs/Level Elements/Laser Cube.prefab
@@ -30,7 +30,7 @@ PrefabInstance:
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.515
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
@@ -175,57 +175,57 @@ PrefabInstance:
     - target: {fileID: 4276197606275607523, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_Name
-      value: LaserGenerator (5)
+      value: LaserGenerator
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.516
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.002
+      value: -0.498
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.7071068
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.7071068
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0
+      value: 0.0000001490116
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
+      value: 180.00002
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
@@ -249,7 +249,7 @@ PrefabInstance:
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.509
+      value: -0.457
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
@@ -303,7 +303,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 37b01847234eeb44990eb90bb1f7f942, type: 3}
---- !u!1001 &7320084377175469855
+--- !u!1001 &7009102156661960315
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -313,17 +313,17 @@ PrefabInstance:
     - target: {fileID: 4276197606275607523, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_Name
-      value: LaserGenerator (2)
+      value: LaserGenerator (5)
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.522
+      value: -0.492
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
@@ -333,32 +333,32 @@ PrefabInstance:
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.00000010536717
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0.7071064
+      value: 0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.70710725
+      value: -0.7071068
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.00000010536704
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 270
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
@@ -372,7 +372,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 37b01847234eeb44990eb90bb1f7f942, type: 3}
---- !u!1001 &8176477897522497547
+--- !u!1001 &7320084377175469855
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -382,57 +382,57 @@ PrefabInstance:
     - target: {fileID: 4276197606275607523, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_Name
-      value: LaserGenerator
+      value: LaserGenerator (2)
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: 0.488
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.53
+      value: 0.002
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0.00000010536717
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 1
+      value: -0.7071064
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: -0.70710725
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.0000001490116
+      value: -0.00000010536704
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: 270
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 180.00002
+      value: 180
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
@@ -466,7 +466,7 @@ PrefabInstance:
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.521
+      value: 0.477
       objectReference: {fileID: 0}
     - target: {fileID: 4276197606275607533, guid: 37b01847234eeb44990eb90bb1f7f942,
         type: 3}