Merge branch 'main' into dump-dump

2025-12-17 17:40:08 +01:00
parent da84724125 c247178bdc
commit 9e983f1af7
17 changed files with 161 additions and 0 deletions
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_A.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_A.prefab
@@ -116,6 +116,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_B.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_B.prefab
@@ -108,6 +108,14 @@ PrefabInstance:
      propertyPath: m_Sprite
      value: 
      objectReference: {fileID: 1321569088537654207, guid: af39a1a1c9ae02447a4f4ddad308359f, type: 3}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_C.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_C.prefab
@@ -16,6 +16,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: Obstacle_Difficulty1_C
      objectReference: {fileID: 0}
+    - target: {fileID: 4644084095652292950, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4644084095652292950, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 7518525353613855027, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_D.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_D.prefab
@@ -16,6 +16,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: Obstacle_Difficulty1_D
      objectReference: {fileID: 0}
+    - target: {fileID: 4644084095652292950, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4644084095652292950, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 7518525353613855027, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_E.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_E.prefab
@@ -16,6 +16,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: Obstacle_Difficulty1_E
      objectReference: {fileID: 0}
+    - target: {fileID: 4644084095652292950, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4644084095652292950, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 7518525353613855027, guid: ee834e7efcf7d8749881f71f8b0da99c, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_F.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty1/Obstacle_Difficulty1_F.prefab
@@ -148,6 +148,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_A.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_A.prefab
@@ -342,6 +342,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_B.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_B.prefab
@@ -485,6 +485,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_C.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_C.prefab
@@ -354,6 +354,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_D.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_D.prefab
@@ -361,6 +361,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_E.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_E.prefab
@@ -357,6 +357,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_F.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty2/Obstacle_Difficulty2_F.prefab
@@ -485,6 +485,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_A.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_A.prefab
@@ -628,6 +628,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_B.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_B.prefab
@@ -640,6 +640,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_C.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_C.prefab
@@ -504,6 +504,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_D.prefab
+++ b/Assets/Prefabs/Minigames/BirdPoop/Obstacles/Difficulty3/Obstacle_Difficulty3_D.prefab
@@ -500,6 +500,14 @@ PrefabInstance:
      propertyPath: anchorEdge
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: cameraAdapter
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 8883963617039772247, guid: 0b18590141426314baa76ee19159178f, type: 3}
+      propertyPath: referenceMarker
+      value: 
+      objectReference: {fileID: 0}
    m_RemovedComponents:
    - {fileID: 6932862566265229765, guid: 0b18590141426314baa76ee19159178f, type: 3}
    m_RemovedGameObjects: []
--- a/Assets/Scenes/MiniGames/BirdPoop.unity
+++ b/Assets/Scenes/MiniGames/BirdPoop.unity
@@ -788,6 +788,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: AppleHillsScripts::Minigames.BirdPooper.ObstacleSpawner
  spawnPoint: {fileID: 690060018}
  despawnPoint: {fileID: 938473626}
+  obstacleContainer: {fileID: 2116132839}
  referenceMarker: {fileID: 1143700529}
  cameraAdapter: {fileID: 2103114179}
 --- !u!1 &941621855
@@ -1564,6 +1565,7 @@ Transform:
  - {fileID: 1838778560}
  - {fileID: 690060018}
  - {fileID: 938473626}
+  - {fileID: 2116132839}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1536057436
@@ -2019,6 +2021,37 @@ MonoBehaviour:
  referenceMarker: {fileID: 1143700529}
  adjustOnStart: 1
  adjustOnScreenResize: 1
+--- !u!1 &2116132838
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2116132839}
+  m_Layer: 0
+  m_Name: PawnContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2116132839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2116132838}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1498486831}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0