Merge branch 'main' into card-juice

Assets/Data/CinemachineCustomBlends.asset

@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 36baaa8bdcb9d8b49b9199833965d2c3, type: 3}
+  m_Name: CinemachineCustomBlends
+  m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineBlenderSettings
+  CustomBlends:
+  - From: 
+    To: 
+    Blend:
+      Style: 1
+      Time: 0
+      CustomCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 0
+        m_PostInfinity: 0
+        m_RotationOrder: 0
+  - From: 
+    To: 
+    Blend:
+      Style: 0
+      Time: 0
+      CustomCurve:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 0
+        m_PostInfinity: 0
+        m_RotationOrder: 0

Assets/Data/CinemachineCustomBlends.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8100a70d84f65b54a8973ea602cb4bf3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Items/BoosterPack.asset

@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3}
+  m_Name: BoosterPack
+  m_EditorClassIdentifier: 
+  _itemId: chocolate_4f2011c6
+  itemName: BoosterPack
+  description: boostert pack
+  mapSprite: {fileID: 4365544765984126881, guid: 9dac643e78ad86e4988c11a92f9c7a6d, type: 3}
+  pickUpSound: {fileID: 0}
+  dropSound: {fileID: 0}

Assets/Data/Items/BoosterPack.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c7fafa07afc3ea44598349d2a4777a8c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Settings/SceneOrientationConfig.asset

@@ -19,5 +19,7 @@ MonoBehaviour:
     requiredOrientation: 1
   - sceneName: DivingForPictures
     requiredOrientation: 0
+  - sceneName: BirdB
+    requiredOrientation: 1
   - sceneName: CardQualityControl
     requiredOrientation: 1