Update Quarry.unity

2025-10-07 13:16:08 +02:00
1 changed files with 232 additions and 19 deletions
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
@@ -448077,18 +448077,6 @@ MonoBehaviour:
  stepData: {fileID: 11400000, guid: 8ac614a698631554ab8ac39aed04a189, type: 2}
  puzzleIndicator: {fileID: 0}
  drawPromptRangeGizmo: 1
--- !u!114 &1182494941
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1182494929}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!95 &1182494942
 Animator:
  serializedVersion: 7
@@ -448099,7 +448087,7 @@ Animator:
  m_GameObject: {fileID: 1182494929}
  m_Enabled: 1
  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 4587ce13b65b5154c853fe4bddbd6247, type: 2}
+  m_Controller: {fileID: 0}
  m_CullingMode: 0
  m_UpdateMode: 0
  m_ApplyRootMotion: 0
@@ -449934,6 +449922,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: FootballBall
      objectReference: {fileID: 0}
+    - target: {fileID: 3606875748053192296, guid: 30285f2632211504484661965ed61c57, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4386785291364665203, guid: 30285f2632211504484661965ed61c57, type: 3}
+      propertyPath: characterToInteract
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 4419731015739629793, guid: 30285f2632211504484661965ed61c57, type: 3}
      propertyPath: m_Sprite
      value: 
@@ -449944,7 +449940,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5572894649736340512, guid: 30285f2632211504484661965ed61c57, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 92.757
+      value: 92.79
      objectReference: {fileID: 0}
    - target: {fileID: 5572894649736340512, guid: 30285f2632211504484661965ed61c57, type: 3}
      propertyPath: m_LocalPosition.z
@@ -449989,8 +449985,38 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3606875748053192296, guid: 30285f2632211504484661965ed61c57, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1295249128}
  m_SourcePrefab: {fileID: 100100000, guid: 30285f2632211504484661965ed61c57, type: 3}
+--- !u!1 &1295249127 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3606875748053192296, guid: 30285f2632211504484661965ed61c57, type: 3}
+  m_PrefabInstance: {fileID: 1295249126}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &1295249128
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1295249127}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1001 &1313372821
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -450847,11 +450873,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 2264394306674147778, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -40.250267
+      value: -36.1
      objectReference: {fileID: 0}
    - target: {fileID: 2264394306674147778, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
      propertyPath: m_LocalPosition.y
-      value: -44.838055
+      value: -41.5
      objectReference: {fileID: 0}
    - target: {fileID: 2264394306674147778, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
      propertyPath: m_LocalPosition.z
@@ -450894,6 +450920,11 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
+--- !u!95 &1363194739 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 1798693240065965692, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3}
+  m_PrefabInstance: {fileID: 1363194738}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1370055784 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3}
@@ -462092,6 +462123,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 1682591185}
    m_Modifications:
+    - target: {fileID: 1597866798502552092, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3}
+      propertyPath: characterToInteract
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 1784002662241348359, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3}
      propertyPath: m_Name
      value: Nails
@@ -464393,10 +464428,17 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+<<<<<<< HEAD
    - target: {fileID: 786704689256514639, guid: 3346526f3046f424196615241a307104, type: 3}
      propertyPath: bushAnimator
      value: 
      objectReference: {fileID: 1476225951}
+=======
+    - target: {fileID: 2491802807835645092, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: characterToInteract
+      value: 2
+      objectReference: {fileID: 0}
+>>>>>>> d0d785d6053a1be8a1f66c4bda195d773c3c521c
    - target: {fileID: 2531688711670838070, guid: 3346526f3046f424196615241a307104, type: 3}
      propertyPath: m_Sprite
      value: 
@@ -464469,6 +464511,10 @@ PrefabInstance:
      propertyPath: isOneTime
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 4289780218821574471, guid: 3346526f3046f424196615241a307104, type: 3}
+      propertyPath: characterToInteract
+      value: 2
+      objectReference: {fileID: 0}
    - target: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3}
      propertyPath: m_Layer
      value: 10
@@ -464624,6 +464670,7 @@ PrefabInstance:
      propertyPath: isOneTime
      value: 1
      objectReference: {fileID: 0}
+<<<<<<< HEAD
    - target: {fileID: 666692440329091063, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
      propertyPath: m_LocalPosition.x
      value: -7.686
@@ -464631,6 +464678,11 @@ PrefabInstance:
    - target: {fileID: 725521450222831012, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
      propertyPath: m_Name
      value: Renderer&Collider
+=======
+    - target: {fileID: 519585874127847016, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+      propertyPath: characterToInteract
+      value: 2
+>>>>>>> d0d785d6053a1be8a1f66c4bda195d773c3c521c
      objectReference: {fileID: 0}
    - target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
      propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
@@ -465130,6 +465182,10 @@ PrefabInstance:
      propertyPath: isOneTime
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 2767794910448825193, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3}
+      propertyPath: characterToInteract
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 2767794910448825193, guid: 1fda7fccaa5fbd04695f4c98d29bcbe0, type: 3}
      propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.size
      value: 2
@@ -465681,6 +465737,58 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_PlayableAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: ee609df51f47bd541a23d5425e289e30, type: 2}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.size
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[3].key
+      value: 
+      objectReference: {fileID: -2395336864975438248, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[4].key
+      value: 
+      objectReference: {fileID: -7584736085941489071, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[5].key
+      value: 
+      objectReference: {fileID: 3942302933360259000, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[6].key
+      value: 
+      objectReference: {fileID: -7584736085941489071, guid: ee609df51f47bd541a23d5425e289e30, type: 2}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[7].key
+      value: 
+      objectReference: {fileID: -2395336864975438248, guid: ee609df51f47bd541a23d5425e289e30, type: 2}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[0].value
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[3].value
+      value: 
+      objectReference: {fileID: 1363194739}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[4].value
+      value: 
+      objectReference: {fileID: 1182494942}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[5].value
+      value: 
+      objectReference: {fileID: 1295249127}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[6].value
+      value: 
+      objectReference: {fileID: 1182494942}
+    - target: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_SceneBindings.Array.data[7].value
+      value: 
+      objectReference: {fileID: 1363194739}
    - target: {fileID: 2720557426779044373, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
      propertyPath: m_Sprite
      value: 
@@ -465745,6 +465853,14 @@ PrefabInstance:
      propertyPath: m_LocalPosition.y
      value: -0.16
      objectReference: {fileID: 0}
+    - target: {fileID: 7371967679236352629, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.606
+      objectReference: {fileID: 0}
+    - target: {fileID: 7371967679236352629, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0
+      objectReference: {fileID: 0}
    - target: {fileID: 7379304988657006554, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
      propertyPath: m_Name
      value: BallTree
@@ -465813,6 +465929,82 @@ PrefabInstance:
      propertyPath: m_SpriteTilingProperty.oldSize.y
      value: 9.060193
      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: playableDirector
+      value: 
+      objectReference: {fileID: 7530821580781571561}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: 'respondToEvents.Array.data[0]'
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].loopLast
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].eventType
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].eventType
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].timeoutSeconds
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].playerTrackName
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].pulverTrackName
+      value: Pulver
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].playerTrackName
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].pulverTrackName
+      value: Pulver
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].bindPlayerCharacter
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].bindPulverCharacter
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].bindPlayerCharacter
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].bindPulverCharacter
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[0].timelines.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: timelineMappings.Array.data[1].timelines.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: 'timelineMappings.Array.data[0].timelines.Array.data[0]'
+      value: 
+      objectReference: {fileID: 11400000, guid: 1791fd5a24a3142418ed441a2a25b374, type: 2}
+    - target: {fileID: 8984729148657672365, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+      propertyPath: 'timelineMappings.Array.data[0].timelines.Array.data[1]'
+      value: 
+      objectReference: {fileID: 11400000, guid: ee609df51f47bd541a23d5425e289e30, type: 2}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -465825,11 +466017,28 @@ PrefabInstance:
      addedObject: {fileID: 1182494937}
    - targetCorrespondingSourceObject: {fileID: 7379304988657006554, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
      insertIndex: -1
-      addedObject: {fileID: 1182494941}
+      addedObject: {fileID: 1182494942}
    - targetCorrespondingSourceObject: {fileID: 7379304988657006554, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
      insertIndex: -1
-      addedObject: {fileID: 1182494942}
+      addedObject: {fileID: 7530821580781571568}
  m_SourcePrefab: {fileID: 100100000, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+--- !u!320 &7530821580781571561 stripped
+PlayableDirector:
+  m_CorrespondingSourceObject: {fileID: 1569498917964935965, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
+  m_PrefabInstance: {fileID: 7530821580781571560}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7530821580781571568
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1182494929}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::OneClickInteraction
 --- !u!1001 &7535757761066548300
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -466147,6 +466356,10 @@ PrefabInstance:
      propertyPath: isOneTime
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 8818689886719637838, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+      propertyPath: characterToInteract
+      value: 2
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []