Merge branch 'master' of https://github.com/marcinzelent/ngj2019

1 files changed, 15 insertions, 16 deletions

diff --git a/nGJ2019/Assets/Scenes/Marcin_sandbox.unity b/nGJ2019/Assets/Scenes/Marcin_sandbox.unity
index 2babc03..42a9843 100644
--- a/nGJ2019/Assets/Scenes/Marcin_sandbox.unity
+++ b/nGJ2019/Assets/Scenes/Marcin_sandbox.unity
@@ -151,8 +151,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   UpdateRate: -5
   Obstacles:
-  - {fileID: 572685425}
-  - {fileID: 1961649641}
+  - {fileID: 1359531025}
+  - {fileID: 1133548864}
   Background: {fileID: 1342555977}
 --- !u!4 &202725832
 Transform:
@@ -170,12 +170,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &572685425 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1998900778231223133, guid: 1955f0f25a1504ef6978634b4e8986ca,
-    type: 3}
-  m_PrefabInstance: {fileID: 963179641}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &762447638
 GameObject:
   m_ObjectHideFlags: 0
@@ -290,6 +284,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1955f0f25a1504ef6978634b4e8986ca, type: 3}
+--- !u!1 &1133548864 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1998900778231223134, guid: 1955f0f25a1504ef6978634b4e8986ca,
+    type: 3}
+  m_PrefabInstance: {fileID: 1920748800}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1196247045
 GameObject:
   m_ObjectHideFlags: 0
@@ -424,7 +424,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -1
-  m_Sprite: {fileID: 21300000, guid: f961209db19f64f58a67ad7f0554c561, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 420921107e115344ea4e97eeb2bca416, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -435,6 +435,12 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &1359531025 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1998900778231223134, guid: 1955f0f25a1504ef6978634b4e8986ca,
+    type: 3}
+  m_PrefabInstance: {fileID: 963179641}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1427683651
 GameObject:
   m_ObjectHideFlags: 0
@@ -659,7 +665,6 @@ MonoBehaviour:
   rockJawsPrefab: {fileID: 1998900778231223134, guid: a2b1bab6b90944171a71ff986bce4ebf,
     type: 3}
   scrolling: {fileID: 202725831}
-  messenger: {fileID: 0}
   spawnLine: 13.5
 --- !u!1 &1695765865
 GameObject:
@@ -912,9 +917,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &1961649641 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1998900778231223133, guid: 1955f0f25a1504ef6978634b4e8986ca,
-    type: 3}
-  m_PrefabInstance: {fileID: 1920748800}
-  m_PrefabAsset: {fileID: 0}