Merge pull request 'damianContentFreeze' (#33) from damianContentFreeze into main

Reviewed-on: #33

Assets/Art/Sprites/UI/NextStepIndicator.prefab

@@ -29,7 +29,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 0}

Assets/Prefabs/UI/DialogueCanvas.prefab

@@ -156,8 +156,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 300, y: -125}
+  m_AnchoredPosition: {x: 300, y: -275}
-  m_SizeDelta: {x: 200, y: 200}
+  m_SizeDelta: {x: 500, y: 500}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7239040132725875785
 CanvasRenderer:
@@ -212,8 +212,8 @@ MonoBehaviour:
   m_IgnoreLayout: 0
   m_MinWidth: -1
   m_MinHeight: -1
-  m_PreferredWidth: 200
+  m_PreferredWidth: 500
-  m_PreferredHeight: 200
+  m_PreferredHeight: 500
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1

Assets/Scenes/Levels/Quarry.unity

@@ -312,7 +312,7 @@ GameObject:
   - component: {fileID: 12163668}
   - component: {fileID: 12163666}
   m_Layer: 0
-  m_Name: CameraSwitcher
+  m_Name: CameraSwitcherSoundBird
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -391,7 +391,7 @@ MonoBehaviour:
   virtualCamera: {fileID: 1137411210}
   confiner2D: {fileID: 1137411213}
   zoomOutOrthoSize: 25
-  normalOrthoSize: 12
+  normalOrthoSize: 15
   transitionDuration: 0.5
   flyingBehaviour: {fileID: 1790656766}
   birdStateMachine: {fileID: 368957769}
@@ -2966,6 +2966,143 @@ Transform:
   - {fileID: 85026788}
   m_Father: {fileID: 764788851}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &188220480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 188220483}
+  - component: {fileID: 188220482}
+  - component: {fileID: 188220481}
+  m_Layer: 6
+  m_Name: TrashCan (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!61 &188220481
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 188220480}
+  m_Enabled: 1
+  serializedVersion: 3
+  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: 0
+  m_UsedByEffector: 0
+  m_CompositeOperation: 0
+  m_CompositeOrder: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.2}
+    oldSize: {x: 3.98, y: 5.07}
+    newSize: {x: 3.98, y: 5.07}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Size: {x: 3.26, y: 2.03}
+  m_EdgeRadius: 0
+--- !u!212 &188220482
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 188220480}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 1
+  m_Sprite: {fileID: -3078401260823067384, guid: 6a9067e93704c28459a07abe13595616, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 3.98, y: 5.07}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!4 &188220483
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 188220480}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -5, y: -27, z: 0}
+  m_LocalScale: {x: 1.33, y: 1.33, z: 1.33}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &189976898
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -438131,11 +438268,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 45.81
+      value: 54.84
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -39.76
+      value: -37.62
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.z
@@ -441557,11 +441694,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -74.1
+      value: -74.5
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 73.91
+      value: 74.13
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.z
@@ -446149,11 +446286,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 27.06
+      value: 15.12
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 27.41
+      value: 33.35
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.z
@@ -446942,6 +447079,140 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
   m_PrefabInstance: {fileID: 1098846674}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1099764647
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1099764651}
+  - component: {fileID: 1099764650}
+  - component: {fileID: 1099764649}
+  - component: {fileID: 1099764648}
+  m_Layer: 0
+  m_Name: CameraSwitcherFootballBird
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1099764648
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1099764647}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d205c178cb6f7ea48b2d93690bd16ad3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::cameraSwitcherNailBird
+  virtualCamera: {fileID: 1137411210}
+  confiner2D: {fileID: 1137411213}
+  zoomOutOrthoSize: 20
+  normalOrthoSize: 15
+  transitionDuration: 0.5
+--- !u!50 &1099764649
+Rigidbody2D:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1099764647}
+  m_BodyType: 1
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!60 &1099764650
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1099764647}
+  m_Enabled: 1
+  serializedVersion: 3
+  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_CompositeOperation: 0
+  m_CompositeOrder: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 10.424332, y: 0.98830795}
+      - {x: 10.571083, y: 15.928223}
+      - {x: -2.0297632, y: 15.160116}
+      - {x: -13.178997, y: 10.386078}
+      - {x: -23.631615, y: 6.834036}
+      - {x: -24.06249, y: -9.995995}
+      - {x: -13.302564, y: -11.075344}
+      - {x: 6.3055325, y: -11.252594}
+      - {x: 9.911961, y: -11.205166}
+  m_UseDelaunayMesh: 0
+--- !u!4 &1099764651
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1099764647}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 70.9, y: -33.2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1101333109
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -447669,7 +447940,7 @@ MonoBehaviour:
     CustomLookAtTarget: 0
   Lens:
     FieldOfView: 60
-    OrthographicSize: 12
+    OrthographicSize: 15
     NearClipPlane: 0.3
     FarClipPlane: 1000
     Dutch: 0
@@ -451104,11 +451375,11 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 562729166424004180, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_Size.x
-      value: 15
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 562729166424004180, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_Size.y
-      value: 12
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 562729166424004180, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_SpriteTilingProperty.oldSize.x
@@ -451120,15 +451391,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.4
+      value: 0.45000002
       objectReference: {fileID: 0}
     - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.4
+      value: 0.45000002
       objectReference: {fileID: 0}
     - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0.1
+      value: 0.112500004
       objectReference: {fileID: 0}
     - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3}
       propertyPath: m_LocalPosition.x
@@ -456776,7 +457047,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 12
+  orthographic size: 15
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
@@ -457465,6 +457736,10 @@ PrefabInstance:
       propertyPath: m_FlexibleWidth
       value: -1
       objectReference: {fileID: 0}
+    - target: {fileID: 3123748273643935430, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_FlexibleHeight
+      value: -1
+      objectReference: {fileID: 0}
     - target: {fileID: 3123748273643935430, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
       propertyPath: m_PreferredWidth
       value: -1
@@ -457573,6 +457848,30 @@ PrefabInstance:
       propertyPath: m_PresetInfoIsWorld
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -458902,6 +459201,30 @@ PrefabInstance:
       propertyPath: m_PresetInfoIsWorld
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7453431659909988258, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7704981663008171144, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -462008,6 +462331,139 @@ BoxCollider2D:
   m_AutoTiling: 0
   m_Size: {x: 6.3, y: 3.5}
   m_EdgeRadius: 0
+--- !u!1 &1939263931
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1939263935}
+  - component: {fileID: 1939263934}
+  - component: {fileID: 1939263933}
+  - component: {fileID: 1939263932}
+  m_Layer: 0
+  m_Name: CameraSwitcherChocoBird
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1939263932
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939263931}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d205c178cb6f7ea48b2d93690bd16ad3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::cameraSwitcherNailBird
+  virtualCamera: {fileID: 1137411210}
+  confiner2D: {fileID: 1137411213}
+  zoomOutOrthoSize: 20
+  normalOrthoSize: 15
+  transitionDuration: 0.5
+--- !u!50 &1939263933
+Rigidbody2D:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939263931}
+  m_BodyType: 1
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!60 &1939263934
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939263931}
+  m_Enabled: 1
+  serializedVersion: 3
+  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_CompositeOperation: 0
+  m_CompositeOrder: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 16.7656, y: 6.3819795}
+      - {x: 3.3377829, y: 7.7918468}
+      - {x: -11.6289215, y: 10.349083}
+      - {x: -22.048141, y: 2.9809132}
+      - {x: -22.417425, y: -7.462571}
+      - {x: -10.452306, y: -10.54752}
+      - {x: 8.15292, y: -10.883116}
+      - {x: 16.878841, y: -6.6168175}
+  m_UseDelaunayMesh: 0
+--- !u!4 &1939263935
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939263931}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -39.4, y: 7.1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1943192893
 GameObject:
   m_ObjectHideFlags: 0
@@ -466192,6 +466648,139 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
   m_PrefabInstance: {fileID: 2127196911}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2130005657
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2130005661}
+  - component: {fileID: 2130005660}
+  - component: {fileID: 2130005659}
+  - component: {fileID: 2130005658}
+  m_Layer: 0
+  m_Name: CameraSwitcherNailbird
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2130005658
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2130005657}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d205c178cb6f7ea48b2d93690bd16ad3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::cameraSwitcherNailBird
+  virtualCamera: {fileID: 1137411210}
+  confiner2D: {fileID: 1137411213}
+  zoomOutOrthoSize: 20
+  normalOrthoSize: 15
+  transitionDuration: 0.5
+--- !u!50 &2130005659
+Rigidbody2D:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2130005657}
+  m_BodyType: 1
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDamping: 0
+  m_AngularDamping: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!60 &2130005660
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2130005657}
+  m_Enabled: 1
+  serializedVersion: 3
+  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_CompositeOperation: 0
+  m_CompositeOrder: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 19.193596, y: 8.07102}
+      - {x: 7.613166, y: 11.486622}
+      - {x: -13.740223, y: 11.457516}
+      - {x: -23.631615, y: 6.834036}
+      - {x: -24.317595, y: -6.934746}
+      - {x: -13.302564, y: -11.075344}
+      - {x: 6.3055325, y: -11.252594}
+      - {x: 19.095707, y: -6.5112534}
+  m_UseDelaunayMesh: 0
+--- !u!4 &2130005661
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2130005657}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 7.94, y: 33.84, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2132554617
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -466329,11 +466918,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -22.76
+      value: -27.09
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: 3.58
       objectReference: {fileID: 0}
     - target: {fileID: 8259693476957892150, guid: 9b2926886934b554f9a1727331d34787, type: 3}
       propertyPath: m_LocalPosition.z
@@ -466755,6 +467344,18 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5057760771402457000, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+      propertyPath: m_Size.x
+      value: 6.43
+      objectReference: {fileID: 0}
+    - target: {fileID: 5057760771402457000, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+      propertyPath: m_Size.y
+      value: 6.27
+      objectReference: {fileID: 0}
+    - target: {fileID: 5057760771402457000, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+      propertyPath: m_Offset.y
+      value: 0.04
+      objectReference: {fileID: 0}
     - target: {fileID: 5057760771402457000, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
       propertyPath: m_SpriteTilingProperty.pivot.y
       value: 0.5
@@ -466812,11 +467413,11 @@ PrefabInstance:
       objectReference: {fileID: -3550219642256907274, guid: 1df66fc312bec494f9c7ee17317ff1aa, type: 3}
     - target: {fileID: 3022736757165821944, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.76
+      value: 2.68
       objectReference: {fileID: 0}
     - target: {fileID: 3022736757165821944, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.77
+      value: 2.61
       objectReference: {fileID: 0}
     - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: iconRenderer
@@ -466868,11 +467469,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -9.82
+      value: -10.11
       objectReference: {fileID: 0}
     - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.84
+      value: 0.61
+      objectReference: {fileID: 0}
+    - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.99141264
+      objectReference: {fileID: 0}
+    - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.13077137
+      objectReference: {fileID: 0}
+    - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -15.028
       objectReference: {fileID: 0}
     - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_ConstrainProportionsScale
@@ -466932,11 +467545,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -36.52
+      value: -37.18
       objectReference: {fileID: 0}
     - target: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.62
+      value: 3.34
       objectReference: {fileID: 0}
     - target: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: m_LocalPosition.z
@@ -466994,6 +467607,18 @@ PrefabInstance:
       propertyPath: m_SpriteTilingProperty.oldSize.y
       value: 5.3199997
       objectReference: {fileID: 0}
+    - target: {fileID: 8374056515464764762, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_Size.x
+      value: 6.39
+      objectReference: {fileID: 0}
+    - target: {fileID: 8374056515464764762, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_Size.y
+      value: 3.79
+      objectReference: {fileID: 0}
+    - target: {fileID: 8374056515464764762, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: m_Offset.y
+      value: 0.78
+      objectReference: {fileID: 0}
     - target: {fileID: 8758136668472096799, guid: 3346526f3046f424196615241a307104, type: 3}
       propertyPath: puzzleIndicator
       value: 
@@ -467150,15 +467775,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1828079450404796388, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.397
+      value: 2.412
       objectReference: {fileID: 0}
     - target: {fileID: 1857323601952658682, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_Size.x
-      value: 4.46
+      value: 6.69
       objectReference: {fileID: 0}
     - target: {fileID: 1857323601952658682, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_Size.y
-      value: 3.46
+      value: 4.02
       objectReference: {fileID: 0}
     - target: {fileID: 1857323601952658682, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_Offset.y
@@ -467214,11 +467839,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 10.58
+      value: 7.37
       objectReference: {fileID: 0}
     - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 25.96
+      value: 29.43
       objectReference: {fileID: 0}
     - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_LocalPosition.z
@@ -467254,11 +467879,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -14.05
+      value: -12.34
       objectReference: {fileID: 0}
     - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -3.74
+      value: -5.21
+      objectReference: {fileID: 0}
+    - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.98042035
+      objectReference: {fileID: 0}
+    - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.19691631
+      objectReference: {fileID: 0}
+    - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -22.713
       objectReference: {fileID: 0}
     - target: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
       propertyPath: m_Name
@@ -468575,11 +469212,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 59.41
+      value: 64.85
       objectReference: {fileID: 0}
     - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -38.51
+      value: -36.5
       objectReference: {fileID: 0}
     - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.z
@@ -468665,17 +469302,33 @@ PrefabInstance:
       propertyPath: playerToPlaceDistance
       value: 30
       objectReference: {fileID: 0}
+    - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.28
+      objectReference: {fileID: 0}
+    - target: {fileID: 5375394469162727687, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.91
+      objectReference: {fileID: 0}
+    - target: {fileID: 5475802662781903683, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+      propertyPath: m_Size.x
+      value: 6.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 5475802662781903683, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+      propertyPath: m_Size.y
+      value: 3.63
+      objectReference: {fileID: 0}
     - target: {fileID: 5475802662781903683, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_IsTrigger
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6063784346986324055, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.49
+      value: 1.56
       objectReference: {fileID: 0}
     - target: {fileID: 6063784346986324055, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1.172
+      value: 0.76
       objectReference: {fileID: 0}
     - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalScale.x
@@ -468691,11 +469344,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.42
+      value: -0.33
       objectReference: {fileID: 0}
     - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -2.24
+      value: -1.38
       objectReference: {fileID: 0}
     - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
       propertyPath: m_LocalRotation.w
@@ -468782,6 +469435,9 @@ SceneRoots:
   - {fileID: 1137411211}
   - {fileID: 1373293420}
   - {fileID: 12163667}
+  - {fileID: 2130005661}
+  - {fileID: 1099764651}
+  - {fileID: 1939263935}
   - {fileID: 1073425384}
   - {fileID: 624616733}
   - {fileID: 1794862441}
@@ -468793,6 +469449,7 @@ SceneRoots:
   - {fileID: 312860098}
   - {fileID: 1363194738}
   - {fileID: 622277207}
+  - {fileID: 188220483}
   - {fileID: 2926576032425091693}
   - {fileID: 4656836127232412646}
   - {fileID: 5320929981885366459}

Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcherNests.cs

@@ -0,0 +1,60 @@
+using UnityEngine;
+using Unity.Cinemachine;
+using System.Collections;
+using Pixelplacement;
+
+public class cameraSwitcherNailBird : MonoBehaviour
+{
+    [SerializeField] private CinemachineCamera virtualCamera;
+    [SerializeField] private CinemachineConfiner2D confiner2D;
+    [SerializeField] private float zoomOutOrthoSize = 27f;
+    [SerializeField] private float normalOrthoSize = 20f;
+    [SerializeField] private float transitionDuration = 0.5f; // Duration of the transition
+    
+
+    private int playerInsideCount = 0;
+    private Coroutine zoomCoroutine;
+
+    private void OnTriggerEnter2D(Collider2D other)
+    {
+        if (other.CompareTag("Player"))
+        {
+            playerInsideCount++;
+            if (playerInsideCount == 1 && virtualCamera != null)
+            {
+                if (zoomCoroutine != null) StopCoroutine(zoomCoroutine);
+                zoomCoroutine = StartCoroutine(SmoothOrthoSize(virtualCamera, zoomOutOrthoSize, transitionDuration));
+            }
+        }
+    }
+
+    private void OnTriggerExit2D(Collider2D other)
+    {
+        if (other.CompareTag("Player"))
+        {
+            playerInsideCount--;
+            if (playerInsideCount == 0 && virtualCamera != null)
+            {
+                if (zoomCoroutine != null) StopCoroutine(zoomCoroutine);
+                zoomCoroutine = StartCoroutine(SmoothOrthoSize(virtualCamera, normalOrthoSize, transitionDuration));
+            }
+        }
+    }
+
+    private IEnumerator SmoothOrthoSize(CinemachineCamera cam, float targetSize, float duration)
+    {
+        float startSize = cam.Lens.OrthographicSize;
+        float elapsed = 0f;
+        while (elapsed < duration)
+        {
+            elapsed += Time.deltaTime;
+            cam.Lens.OrthographicSize = Mathf.Lerp(startSize, targetSize, elapsed / duration);
+            yield return null;
+        }
+        cam.Lens.OrthographicSize = targetSize;
+        if (confiner2D != null)
+        {
+            confiner2D.InvalidateBoundingShapeCache();
+        }
+    }
+}

Assets/Scripts/DamianExperiments/SoundBirdPuzzleSection/cameraSwitcherNests.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d205c178cb6f7ea48b2d93690bd16ad3