Merge branch 'main' into DamianBranch

Assets/Scenes/MiniGames/BirdPoop.unity

@@ -820,7 +820,7 @@ Transform:
   m_GameObject: {fileID: 941621855}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -14.66, y: 0, z: 0}
+  m_LocalPosition: {x: -21.326666, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -872,6 +872,7 @@ MonoBehaviour:
   OnPlayerDamaged:
     m_PersistentCalls:
       m_Calls: []
+  flapCooldown: 0.15
 --- !u!114 &941621860
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1314,7 +1315,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3058fe4801134fea916ad685f924668f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: AppleHillsScripts::AppleHillsCamera.ScreenReferenceMarker
+  scalingMode: 1
   targetWidth: 40
+  targetHeight: 30.21
   topMargin: 0.2
   bottomMargin: 0.2
   leftMargin: 0.2
@@ -2021,6 +2024,7 @@ MonoBehaviour:
   referenceMarker: {fileID: 1143700529}
   adjustOnStart: 1
   adjustOnScreenResize: 1
+  debugLogging: 0
 --- !u!1 &2116132838
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/MiniGames/CardQualityControl.unity

@@ -152,8 +152,6 @@ MonoBehaviour:
   conveyorSpawnPoint: {fileID: 1122663370}
   conveyorEndPoint: {fileID: 1595343397}
   conveyorDespawnPoint: {fileID: 1992305141}
-  sortableCardPrefab: {fileID: 1384381902454720507, guid: 9788d529b225ddd44b92be992be99988, type: 3}
-  sortableGarbagePrefab: {fileID: 1384381902454720507, guid: 942e43abb9beaef429f3d0e7f5bb8fcc, type: 3}
   sortingBoxes:
   - {fileID: 1800137401}
   - {fileID: 731655009}