Merge remote-tracking branch 'origin/main'

2025-06-17 14:56:19 +02:00 · 2025-06-17 14:56:19 +02:00 · 0a5cc619b6
commit 0a5cc619b6
parent 581ca8f7bc 0f14c069aa
12 changed files with 487 additions and 119 deletions
--- a/blueberryPeak/Assets/Materials/FoxHouse/Material.mat
+++ b/blueberryPeak/Assets/Materials/FoxHouse/Material.mat
@ -82,7 +82,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _Texture:
-        m_Texture: {fileID: 2800000, guid: 0f6bb51ff58819342b8c1013d95101e7, type: 3}
+        m_Texture: {fileID: 2800000, guid: 672116c1dc933d746848b90b4e9ea9d6, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
--- a/blueberryPeak/Assets/Prefabs/Fox_House.prefab
+++ b/blueberryPeak/Assets/Prefabs/Fox_House.prefab
@ -27,7 +27,7 @@ Transform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 47.763264, y: -7.4082427, z: 69.63502}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1559863396023617479}
  m_Father: {fileID: 0}
@ -40,17 +40,29 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 8722327694553805759}
    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.03
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 2.4137812
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.9379632
+      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -47.763264
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 13.448242
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -69.602356
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
      propertyPath: m_LocalRotation.w
@ -80,6 +92,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 682a6da9db6fa234695474797af96c0f, type: 2}
    - target: {fileID: 919132149155446097, guid: 67614fa75482f9344bb5c3428398638d, type: 3}
      propertyPath: m_Name
      value: Fox_House
--- a/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab
+++ b/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab
@ -0,0 +1,124 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2264011724657500812
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1745689670249651042}
+  - component: {fileID: 5762019935787128362}
+  - component: {fileID: 3629119434639352391}
+  - component: {fileID: 2620713896011995392}
+  - component: {fileID: 7419702660099155392}
+  m_Layer: 0
+  m_Name: SceneSwitcher
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1745689670249651042
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2264011724657500812}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 16.3, y: 0.9, 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!33 &5762019935787128362
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2264011724657500812}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3629119434639352391
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2264011724657500812}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &2620713896011995392
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2264011724657500812}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7419702660099155392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2264011724657500812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b0d37cd57e83a8946b89c6d8daf07b7f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  switchToScene: flo_s_scene
--- a/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab.meta
+++ b/blueberryPeak/Assets/Prefabs/game/SceneSwitcher.prefab.meta
@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 45fb54606887c4401bca559e6e9923eb
-folderAsset: yes
-DefaultImporter:
+guid: 157ff23549611354485c3446833dc2bf
+PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/blueberryPeak/Assets/Scenes/Beach.unity
+++ b/blueberryPeak/Assets/Scenes/Beach.unity
@ -3975,6 +3975,68 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
  m_PrefabInstance: {fileID: 670741753}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &675381403
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1530957963}
+    m_Modifications:
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6251478765960268385, guid: d0370f51c6ba845828372ca749564589, type: 3}
+      propertyPath: m_Name
+      value: Path
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d0370f51c6ba845828372ca749564589, type: 3}
+--- !u!4 &675381404 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1992987633317296668, guid: d0370f51c6ba845828372ca749564589, type: 3}
+  m_PrefabInstance: {fileID: 675381403}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &689541243
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -7524,6 +7586,63 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
  m_PrefabInstance: {fileID: 1434359147}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1436752009
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 10.06
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.56
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.79863554
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.60181504
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -74
+      objectReference: {fileID: 0}
+    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8358918113582884329, guid: 752d00c28e3278343b00df87a0486005, type: 3}
+      propertyPath: m_Name
+      value: Mom_Fox
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 752d00c28e3278343b00df87a0486005, type: 3}
 --- !u!1001 &1443729183
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -8166,6 +8285,87 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 6831922599541806482, guid: b8057f4bb05b243d38e8bf9d6ad8e86e, type: 3}
  m_PrefabInstance: {fileID: 2026717546}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1530957962
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 9.16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Name
+      value: SceneSwitcher
+      objectReference: {fileID: 0}
+    - target: {fileID: 3629119434639352391, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: switchToScene
+      value: Market
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 675381404}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+--- !u!4 &1530957963 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+  m_PrefabInstance: {fileID: 1530957962}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1536064767
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -10013,83 +10213,6 @@ MonoBehaviour:
  pointA: {fileID: 839212091}
  pointB: {fileID: 825585977}
  speed: 3
--- !u!1001 &1783132636
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.33
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.32278
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.37593442
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 7.087946
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.93
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.02300644
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_ConstrainProportionsScale
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: 'm_Materials.Array.data[0]'
-      value: 
-      objectReference: {fileID: 2100000, guid: c40ac749869e04351a232d538465484d, type: 2}
-    - target: {fileID: 919132149155446097, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
-      propertyPath: m_Name
-      value: Mom_Fox
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9bc8800c250924fab88002917e76c6e6, type: 3}
 --- !u!1001 &1794261971
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -12206,6 +12329,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: Camera
      objectReference: {fileID: 0}
+    - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -12667,6 +12794,63 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
  m_PrefabInstance: {fileID: 2146104686}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4910437401304687815
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 7239189625101029300, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_Name
+      value: Fox_House
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 15.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.88
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.93
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.8186512
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.5742911
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -70.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
@ -12677,9 +12861,11 @@ SceneRoots:
  - {fileID: 1591857820}
  - {fileID: 1183713119}
  - {fileID: 1714858951}
-  - {fileID: 1783132636}
  - {fileID: 382261870}
  - {fileID: 536486187}
  - {fileID: 829142795}
  - {fileID: 2092541789}
  - {fileID: 1469030856}
+  - {fileID: 1436752009}
+  - {fileID: 4910437401304687815}
+  - {fileID: 1530957962}
--- a/blueberryPeak/Assets/Scripts/BushInteraction.cs
+++ b/blueberryPeak/Assets/Scripts/BushInteraction.cs
@ -6,9 +6,22 @@ using AK.Wwise; // Make sure your Wwise namespace is correct

 public class BushInteraction : MonoBehaviour
 {
+    [SerializeField] private int blueberryCount;
+
+#if UNITY_EDITOR
+    void OnValidate()
+    {
+        if (blueberryCount > 0)
+        {
+            // If the UID is already set, we don't need to do anything
+            return;
+        }
+        // Generate a new UID based on the position of the object
+        blueberryCount = Random.Range(1, 5);
+    }
+#endif
    [SerializeField] private GameObject emptyBush;

-    private int blueberryCount = 0;
    private bool BlueBerriesPicked = false;

    // Wwise Events
@ -17,7 +30,6 @@ public class BushInteraction : MonoBehaviour

    void Start()
    {
-        blueberryCount = Random.Range(1, 5); // Randomly initialize blueberry count between 1 and 5
    }

    void OnTriggerEnter(Collider other)
@ -33,7 +45,26 @@ public class BushInteraction : MonoBehaviour
            PlayBerryWithBushEvent.Post(gameObject);

            other.gameObject.GetComponent<PlayerInteraction>().CollectBlueberry(blueberryCount);
+            ChangeBushAppearance();
+            blueberryCount = 0;
+            BlueBerriesPicked = true;
+        }

+    }
+    public int GetBlueberryCount()
+    {
+        return blueberryCount;
+    }
+    public void SetBlueberryCount(int count)
+    {
+        blueberryCount = count;
+        if (blueberryCount == 0 && BlueBerriesPicked)
+        {
+            ChangeBushAppearance();
+        }
+    }
+    public void ChangeBushAppearance()
+    {
        Vector3 currentPosition = transform.position;
        Quaternion currentRotation = transform.rotation;
        Transform parent = transform.parent;
@ -41,11 +72,15 @@ public class BushInteraction : MonoBehaviour
        Destroy(gameObject);

        GameObject _emptyBush = Instantiate(emptyBush, currentPosition, currentRotation);
-            // Optionally assign parent if needed
-            // _emptyBush.transform.parent = parent;
-
-            BlueBerriesPicked = true;
-        }

    }
+
+    public void SetBlueberriesPicked(bool picked)
+    {
+        BlueBerriesPicked = picked;
+    }
+    public bool AreBlueberriesPicked()
+    {
+        return BlueBerriesPicked;
+    }
 }
--- a/blueberryPeak/Assets/Scripts/SceneSwitcher.cs
+++ b/blueberryPeak/Assets/Scripts/SceneSwitcher.cs
@ -0,0 +1,21 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class SceneSwitcher : MonoBehaviour
+{
+
+    [SerializeField] private string switchToScene;
+
+
+    void Update()
+    {
+
+    }
+
+    void OnTriggerEnter(Collider other)
+    {
+        // switch to scene
+        SceneManager.LoadScene(switchToScene);
+        Debug.Log($"Switched to scene: {switchToScene}");
+    }
+}
--- a/blueberryPeak/Assets/Scripts/SceneSwitcher.cs.meta
+++ b/blueberryPeak/Assets/Scripts/SceneSwitcher.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b0d37cd57e83a8946b89c6d8daf07b7f
--- a/blueberryPeak/Assets/Terrain/New
+++ b/blueberryPeak/Assets/Terrain/New
--- a/blueberryPeak/Assets/Terrain/New
+++ b/blueberryPeak/Assets/Terrain/New
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 32cbfc57eff4248f2b3a1660868f5352
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 15600000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/blueberryPeak/Assets/Terrain/New
+++ b/blueberryPeak/Assets/Terrain/New
--- a/blueberryPeak/Assets/Terrain/New
+++ b/blueberryPeak/Assets/Terrain/New
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 94868b31ee4cd4c72b9e51d5ae912552
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 15600000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: