merged "master" into "combining

Assets/Scenes/GrappleScene.unity

@@ -357,7 +357,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -15.68
+      value: -30.56
       objectReference: {fileID: 0}
     - target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
       propertyPath: m_LocalPosition.y
@@ -402,7 +402,10 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 493245979038171997, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 451427081}
   m_SourcePrefab: {fileID: 100100000, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
 --- !u!1 &343324896
 GameObject:
@@ -541,6 +544,46 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 343324896}
   m_CullTransparentMesh: 1
+--- !u!1 &451427075 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 493245979038171997, guid: d175e4c5882b2464ab0425220d00a671, type: 3}
+  m_PrefabInstance: {fileID: 296651438}
+  m_PrefabAsset: {fileID: 0}
+--- !u!58 &451427081
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 451427075}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.0000009536743, y: 0.14860392}
+  serializedVersion: 2
+  m_Radius: 2.1117759
 --- !u!1 &489243773
 GameObject:
   m_ObjectHideFlags: 0
@@ -1322,7 +1365,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &724240633
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2627,7 +2670,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1385054184
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scenes/GrenouilleVillage.unity.meta

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