Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction

2025-09-03 17:02:07 +02:00
parent 76f0e5ae22 1dfcee3d2c
commit 5a996046cb
34 changed files with 1253 additions and 213 deletions
--- a/Assets/Data/Items/ExamplePickupItem.asset
+++ b/Assets/Data/Items/ExamplePickupItem.asset
@@ -10,8 +10,8 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 951b5c8af5114086a865d4bb7eae4548, type: 3}
-  m_Name: ExamplePickupItem
+  m_Name: AssPickupItem
  m_EditorClassIdentifier: 
-  itemName: TestApple
+  itemName: TestAss
  description: Well... how do you like 'em?
  mapSprite: {fileID: -5471482676633547895, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3}
--- a/Assets/Data/Items/ExamplePickupItem.asset.meta
+++ b/Assets/Data/Items/ExamplePickupItem.asset.meta
--- a/Assets/Data/Items/HeadPickupItem.asset
+++ b/Assets/Data/Items/HeadPickupItem.asset
@@ -0,0 +1,17 @@
+%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: HeadPickupItem
+  m_EditorClassIdentifier: 
+  itemName: TestHead
+  description: Well... how do you like 'em?
+  mapSprite: {fileID: -1693247529382600072, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3}
--- a/Assets/Data/Items/HeadPickupItem.asset.meta
+++ b/Assets/Data/Items/HeadPickupItem.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b2616beb14825a46b9b1ed85ad3cb25
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Puzzles.meta
+++ b/Assets/Data/Puzzles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: adbd68ed84c26f140b56418af3650fc1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Puzzles/Ass1.asset
+++ b/Assets/Data/Puzzles/Ass1.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: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
+  m_Name: Ass1
+  m_EditorClassIdentifier: 
+  stepId: ass1
+  displayName: Pickup Ass 1
+  description: 
+  icon: {fileID: 0}
+  unlocks:
+  - {fileID: 11400000, guid: 9de0c57af6191384e96e2ba7c04a3d0d, type: 2}
--- a/Assets/Data/Puzzles/Ass1.asset.meta
+++ b/Assets/Data/Puzzles/Ass1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b13ff4f31443b74281b13e0eef865c2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Puzzles/Ass2.asset
+++ b/Assets/Data/Puzzles/Ass2.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: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
+  m_Name: Ass2
+  m_EditorClassIdentifier: 
+  stepId: ass2
+  displayName: Pickup Ass 2
+  description: 
+  icon: {fileID: 0}
+  unlocks:
+  - {fileID: 11400000, guid: 13b0c411066f85a41ba40c3bbbc281ed, type: 2}
--- a/Assets/Data/Puzzles/Ass2.asset.meta
+++ b/Assets/Data/Puzzles/Ass2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a84cbe9804e13f74e857c55d90cc10d1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Puzzles/Ass3.asset
+++ b/Assets/Data/Puzzles/Ass3.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: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
+  m_Name: Ass3
+  m_EditorClassIdentifier: 
+  stepId: ass3
+  displayName: Pickup Ass 3
+  description: 
+  icon: {fileID: 0}
+  unlocks:
+  - {fileID: 11400000, guid: 9de0c57af6191384e96e2ba7c04a3d0d, type: 2}
--- a/Assets/Data/Puzzles/Ass3.asset.meta
+++ b/Assets/Data/Puzzles/Ass3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 13b0c411066f85a41ba40c3bbbc281ed
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Puzzles/Head.asset
+++ b/Assets/Data/Puzzles/Head.asset
@@ -0,0 +1,23 @@
+%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: 84e39aac66cf4a10a89abc01b04b13af, type: 3}
+  m_Name: Head
+  m_EditorClassIdentifier: 
+  stepId: head
+  displayName: Pickup Head
+  description: 
+  icon: {fileID: 0}
+  dependencies:
+  - {fileID: 11400000, guid: 0b13ff4f31443b74281b13e0eef865c2, type: 2}
+  - {fileID: 11400000, guid: a84cbe9804e13f74e857c55d90cc10d1, type: 2}
+  - {fileID: 11400000, guid: 13b0c411066f85a41ba40c3bbbc281ed, type: 2}
+  unlocks: []
--- a/Assets/Data/Puzzles/Head.asset.meta
+++ b/Assets/Data/Puzzles/Head.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9de0c57af6191384e96e2ba7c04a3d0d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Puzzles.meta
+++ b/Assets/Prefabs/Puzzles.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7e9fc3f9c0d2b4e49bae3767152cef10
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Puzzles/AssPuzzlePickup.prefab
+++ b/Assets/Prefabs/Puzzles/AssPuzzlePickup.prefab
@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &2315714521250031805
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 530025588511586483, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1688506115392420945, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: itemData
+      value: 
+      objectReference: {fileID: 11400000, guid: 33e7ca06b22108d4e802486e08bcdfd1, type: 2}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Size.x
+      value: 0.6203164
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Size.y
+      value: 0.58297074
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Offset.x
+      value: -0.009336546
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Offset.y
+      value: 0.003112197
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.newSize.x
+      value: 0.53125
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.newSize.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.x
+      value: 0.53125
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.oldSize.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3873876058501900908, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Size.x
+      value: 0.53125
+      objectReference: {fileID: 0}
+    - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Size.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -5471482676633547895, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3}
+    - target: {fileID: 8600723754240441458, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8647987978133738235, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
+      propertyPath: m_Name
+      value: TestAss
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 68fe09242bd73f34bad304c509872d90, type: 3}
--- a/Assets/Prefabs/Puzzles/AssPuzzlePickup.prefab.meta
+++ b/Assets/Prefabs/Puzzles/AssPuzzlePickup.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b5fc01af35233eb4cbeede05e50a7c34
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Puzzles/BasePuzzlePickup.prefab
+++ b/Assets/Prefabs/Puzzles/BasePuzzlePickup.prefab
@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &2259004978614309710
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      propertyPath: m_Name
+      value: BasePuzzlePickup
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7092109305969191084}
+  m_SourcePrefab: {fileID: 100100000, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+--- !u!1 &8647987978133738235 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7447346505753002421, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3}
+  m_PrefabInstance: {fileID: 2259004978614309710}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7092109305969191084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8647987978133738235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stepData: {fileID: 0}
--- a/Assets/Prefabs/Puzzles/BasePuzzlePickup.prefab.meta
+++ b/Assets/Prefabs/Puzzles/BasePuzzlePickup.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 68fe09242bd73f34bad304c509872d90
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources.meta
+++ b/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cfa619a4e508a184588b500e8b34ac81
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Fonts.meta
+++ b/Assets/Resources/Fonts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 42111873997850f4cbced0be4400e7f9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Fonts/DebugFont.ttf
+++ b/Assets/Resources/Fonts/DebugFont.ttf
--- a/Assets/Resources/Fonts/DebugFont.ttf.meta
+++ b/Assets/Resources/Fonts/DebugFont.ttf.meta
@@ -0,0 +1,28 @@
+fileFormatVersion: 2
+guid: d7cffddcbc0cc8f4ebe6e28eb9804082
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - Square
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 216954
+  packageName: Fatality FPS Gaming Font
+  packageVersion: 1.0
+  assetPath: Assets/FPSFont/FPS Gaming Font/Square-Black.ttf
+  uploadId: 490185
--- a/Assets/Scenes/AppleHillsOverworld.unity
+++ b/Assets/Scenes/AppleHillsOverworld.unity
@@ -214,6 +214,146 @@ MonoBehaviour:
    RotationDamping: {x: 1, y: 1, z: 1}
    QuaternionDamping: 1
  FollowOffset: {x: 0, y: 0, z: -10}
+--- !u!1001 &109902894
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 218805561}
+    m_Modifications:
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 11.828135
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.2350407
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4778083634590203921, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: stepData
+      value: 
+      objectReference: {fileID: 11400000, guid: 13b0c411066f85a41ba40c3bbbc281ed, type: 2}
+    - target: {fileID: 6350287859698694726, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_Name
+      value: TestAss
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+--- !u!1 &189988799
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 189988800}
+  - component: {fileID: 189988801}
+  m_Layer: 0
+  m_Name: PuzzleManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &189988800
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 189988799}
+  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: 638340961}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &189988801
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 189988799}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bdc7ceebe82348dba3ad1ca1153e0dba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &218805560
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 218805561}
+  m_Layer: 0
+  m_Name: Objectives
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &218805561
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 218805560}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.65768, y: 4.06878, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 754397347}
+  - {fileID: 1553825406}
+  - {fileID: 2102167558}
+  - {fileID: 1627665103}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &249343019
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -283,6 +423,140 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 539b408cd1191614abdcd99506f1157d, type: 3}
+--- !u!1001 &368640488
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 218805561}
+    m_Modifications:
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -20.60536
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -4.3414383
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3985075764085675244, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4778083634590203921, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: stepData
+      value: 
+      objectReference: {fileID: 11400000, guid: 0b13ff4f31443b74281b13e0eef865c2, type: 2}
+    - target: {fileID: 6350287859698694726, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_Name
+      value: TestAss
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+--- !u!1001 &448642088
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 218805561}
+    m_Modifications:
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 17.217047
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -12.421608
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3985075764085675244, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: itemData
+      value: 
+      objectReference: {fileID: 11400000, guid: 8b2616beb14825a46b9b1ed85ad3cb25, type: 2}
+    - target: {fileID: 4778083634590203921, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: stepData
+      value: 
+      objectReference: {fileID: 11400000, guid: 9de0c57af6191384e96e2ba7c04a3d0d, type: 2}
+    - target: {fileID: 6303063351359542479, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -1693247529382600072, guid: 77ab3d770c92d5344b36eee3293a0f94, type: 3}
+    - target: {fileID: 6350287859698694726, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_Name
+      value: TestHead
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
 --- !u!1 &535638823
 GameObject:
  m_ObjectHideFlags: 0
@@ -308,12 +582,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 535638823}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.25458, y: 2.22049, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -3.4031, y: -1.84829, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 638340961}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &535638825
 MonoBehaviour:
@@ -327,6 +601,45 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 360f320f4d7a48e38f5fd7cdfa28144a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &638340960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 638340961}
+  m_Layer: 0
+  m_Name: Managers
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &638340961
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 638340960}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.65768, y: 4.06878, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 954512636}
+  - {fileID: 535638824}
+  - {fileID: 189988800}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &754397347 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+  m_PrefabInstance: {fileID: 368640488}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &954512633
 GameObject:
  m_ObjectHideFlags: 0
@@ -395,205 +708,168 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 954512633}
  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -16.97768, y: -4.06878, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 638340961}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1088965592
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 218805561}
+    m_Modifications:
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -6.6248198
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 7.2833157
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4778083634590203921, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: stepData
+      value: 
+      objectReference: {fileID: 11400000, guid: a84cbe9804e13f74e857c55d90cc10d1, type: 2}
+    - target: {fileID: 6350287859698694726, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+      propertyPath: m_Name
+      value: TestAss
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+--- !u!1 &1255598765
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1255598768}
+  - component: {fileID: 1255598767}
+  - component: {fileID: 1255598766}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1255598766
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255598765}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_MoveRepeatDelay: 0.5
+  m_MoveRepeatRate: 0.1
+  m_XRTrackingOrigin: {fileID: 0}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_DeselectOnBackgroundClick: 1
+  m_PointerBehavior: 0
+  m_CursorLockBehavior: 0
+  m_ScrollDeltaPerTick: 6
+--- !u!114 &1255598767
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255598765}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1255598768
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1255598765}
+  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -12.32, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, 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!1001 &1067158016
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2202795855638212749, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_Name
-      value: TestApple
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -8.54
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
--- !u!1001 &1244279152
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2202795855638212749, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_Name
-      value: TestApple
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 5.6
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 4.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
 --- !u!4 &1309036670 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3}
  m_PrefabInstance: {fileID: 8865498003578620591}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &1335103842
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2202795855638212749, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_Name
-      value: TestApple
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.43
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 6.43
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7046219584904338117, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5e0579453a4cbae438cf2422f6786a48, type: 3}
+--- !u!4 &1553825406 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+  m_PrefabInstance: {fileID: 1088965592}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1627665103 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+  m_PrefabInstance: {fileID: 448642088}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1728894744
 GameObject:
  m_ObjectHideFlags: 0
@@ -22666,6 +22942,11 @@ Tilemap:
    e31: 0
    e32: 0
    e33: 1
+--- !u!4 &2102167558 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2844046668579196942, guid: b5fc01af35233eb4cbeede05e50a7c34, type: 3}
+  m_PrefabInstance: {fileID: 109902894}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1950557796102186365
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -22787,12 +23068,10 @@ SceneRoots:
  - {fileID: 1741016590}
  - {fileID: 1728894746}
  - {fileID: 8865498003578620591}
-  - {fileID: 954512636}
-  - {fileID: 1244279152}
-  - {fileID: 1335103842}
-  - {fileID: 1067158016}
  - {fileID: 100481744}
  - {fileID: 249343019}
-  - {fileID: 535638824}
  - {fileID: 1880929595}
  - {fileID: 1950557796102186365}
+  - {fileID: 638340961}
+  - {fileID: 218805561}
+  - {fileID: 1255598768}
--- a/Assets/Scripts/DebugUIMessage.cs
+++ b/Assets/Scripts/DebugUIMessage.cs
@@ -0,0 +1,69 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections;
+
+public class DebugUIMessage : MonoBehaviour
+{
+    private static DebugUIMessage instance;
+    private Text messageText;
+    private Canvas canvas;
+    private Coroutine hideCoroutine;
+
+    public static void Show(string message, float duration = 2f)
+    {
+        if (instance == null)
+        {
+            var go = new GameObject("DebugUIMessage");
+            instance = go.AddComponent<DebugUIMessage>();
+            instance.SetupUI();
+            DontDestroyOnLoad(go);
+        }
+        instance.ShowMessage(message, duration);
+    }
+
+    private void SetupUI()
+    {
+        canvas = new GameObject("DebugUICanvas").AddComponent<Canvas>();
+        canvas.renderMode = RenderMode.ScreenSpaceOverlay;
+        canvas.sortingOrder = 9999;
+        canvas.gameObject.transform.SetParent(transform);
+        var textGO = new GameObject("DebugUIText");
+        textGO.transform.SetParent(canvas.transform);
+        messageText = textGO.AddComponent<Text>();
+        messageText.alignment = TextAnchor.MiddleCenter;
+        // Try to load a custom font from Resources/Fonts/DebugFont.ttf
+        Font customFont = Resources.Load<Font>("Fonts/DebugFont");
+        if (customFont != null)
+            messageText.font = customFont;
+        else
+            messageText.font = Resources.GetBuiltinResource<Font>("LegacyRuntime.ttf");
+        messageText.fontSize = 16;
+        messageText.color = Color.yellow;
+        var outline = textGO.AddComponent<Outline>();
+        outline.effectColor = Color.black;
+        outline.effectDistance = new Vector2(2, -2);
+        var rect = messageText.GetComponent<RectTransform>();
+        rect.anchorMin = new Vector2(0.5f, 0.5f);
+        rect.anchorMax = new Vector2(0.5f, 0.5f);
+        rect.pivot = new Vector2(0.5f, 0.5f);
+        rect.anchoredPosition = Vector2.zero;
+        rect.sizeDelta = new Vector2(400, 40);
+        messageText.text = "";
+    }
+
+    private void ShowMessage(string message, float duration)
+    {
+        messageText.text = message;
+        messageText.enabled = true;
+        if (hideCoroutine != null)
+            StopCoroutine(hideCoroutine);
+        hideCoroutine = StartCoroutine(HideAfterSeconds(duration));
+    }
+
+    private IEnumerator HideAfterSeconds(float seconds)
+    {
+        yield return new WaitForSeconds(seconds);
+        messageText.text = "";
+        messageText.enabled = false;
+    }
+}
--- a/Assets/Scripts/DebugUIMessage.cs.meta
+++ b/Assets/Scripts/DebugUIMessage.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5878ce6b61524c18b7cbdf0f55f143ea
+timeCreated: 1756903750
--- a/Assets/Scripts/InputManager.cs
+++ b/Assets/Scripts/InputManager.cs
@@ -4,27 +4,46 @@ using System;

 public class InputManager : MonoBehaviour
 {
-    public static InputManager Instance { get; private set; }
+    private static InputManager _instance;
+    public static InputManager Instance
+    {
+        get
+        {
+            if (_instance == null)
+            {
+                _instance = FindAnyObjectByType<InputManager>();
+                if (_instance == null)
+                {
+                    var go = new GameObject("InputManager");
+                    _instance = go.AddComponent<InputManager>();
+                    DontDestroyOnLoad(go);
+                }
+            }
+            return _instance;
+        }
+    }
+
    private PlayerInput playerInput;
    private InputAction touchPressAction;
    private InputAction touchPositionAction;
    private ITouchInputConsumer defaultConsumer;

    private bool isTouchHeld = false;
+    private bool lastFrameInteracted = false;

    void Awake()
    {
-        if (Instance != null && Instance != this)
+        if (_instance != null && _instance != this)
        {
            Destroy(gameObject);
            return;
        }
-        Instance = this;
+        _instance = this;
        DontDestroyOnLoad(gameObject);
        playerInput = GetComponent<PlayerInput>();
        if (playerInput == null)
        {
-            Debug.LogError("InputManager requires a PlayerInput component attached to the same GameObject.");
+            Debug.LogError("[InputManager] InputManager requires a PlayerInput component attached to the same GameObject.");
            return;
        }
        // Find actions by name in the assigned action map
@@ -62,17 +81,20 @@ public class InputManager : MonoBehaviour
    private void OnTouchPressStarted(InputAction.CallbackContext ctx)
    {
        // Touch started (finger down)
-        isTouchHeld = true;
        Vector3 _screenPos = Camera.main.ScreenToWorldPoint(touchPositionAction.ReadValue<Vector2>());
        Vector2 screenPos = new Vector2(_screenPos.x, _screenPos.y);
-        if (!TryDelegateToInteractable(screenPos))
+        lastFrameInteracted = TryDelegateToInteractable(screenPos);
+        if (!lastFrameInteracted)
            defaultConsumer?.OnTouchPress(screenPos);
+        isTouchHeld = true;
    }

    private void OnTouchPressCanceled(InputAction.CallbackContext ctx)
    {
        // Touch released (finger up)
        isTouchHeld = false;
+        // Reset lastFrameInteracted for next frame
+        lastFrameInteracted = false;
        // Optionally, you can notify consumers of release if needed
    }

@@ -84,12 +106,9 @@ public class InputManager : MonoBehaviour
            // Convert to world position
            Vector3 worldPos = Camera.main.ScreenToWorldPoint(pos);
            Vector2 worldPos2D = new Vector2(worldPos.x, worldPos.y);
+            if (!lastFrameInteracted)
                defaultConsumer?.OnTouchPress(worldPos2D); // Move continuously to finger position
        }
-        else
-        {
-            defaultConsumer?.OnTouchPosition(pos); // For drag or hover
-        }
    }

    void Update()
@@ -100,6 +119,7 @@ public class InputManager : MonoBehaviour
            Vector2 pos = touchPositionAction.ReadValue<Vector2>();
            Vector3 worldPos = Camera.main.ScreenToWorldPoint(pos);
            Vector2 worldPos2D = new Vector2(worldPos.x, worldPos.y);
+            if (!lastFrameInteracted)
                defaultConsumer?.OnTouchPress(worldPos2D);
        }
    }
--- a/Assets/Scripts/Interactable.cs
+++ b/Assets/Scripts/Interactable.cs
@@ -5,10 +5,23 @@ public class Interactable : MonoBehaviour, ITouchInputConsumer
 {
    public event Action Interacted;

+    private ObjectiveStepBehaviour stepBehaviour;
+
+    void Awake()
+    {
+        stepBehaviour = GetComponent<ObjectiveStepBehaviour>();
+    }
+
    // Called by InputManager when this interactable is clicked/touched
    public void OnTouchPress(Vector2 worldPosition)
    {
-        Debug.Log($"Interactable.OnTouchPress at {worldPosition} on {gameObject.name}");
+        if (stepBehaviour != null && !stepBehaviour.IsStepUnlocked())
+        {
+            DebugUIMessage.Show("Item is not unlocked yet");
+            Debug.Log("[Puzzles] Tried to interact with locked step: " + gameObject.name);
+            return;
+        }
+        Debug.Log($"[Interactable] OnTouchPress at {worldPosition} on {gameObject.name}");
        Interacted?.Invoke();
    }

@@ -17,4 +30,3 @@ public class Interactable : MonoBehaviour, ITouchInputConsumer
        // Optionally handle drag/move here
    }
 }
-
--- a/Assets/Scripts/ObjectiveStepBehaviour.cs
+++ b/Assets/Scripts/ObjectiveStepBehaviour.cs
@@ -0,0 +1,56 @@
+using UnityEngine;
+
+[RequireComponent(typeof(Interactable))]
+public class ObjectiveStepBehaviour : MonoBehaviour
+{
+    public PuzzleStepSO stepData;
+    private Interactable interactable;
+    private bool isUnlocked = false;
+
+    void Awake()
+    {
+        interactable = GetComponent<Interactable>();
+    }
+
+    void OnEnable()
+    {
+        if (interactable == null)
+            interactable = GetComponent<Interactable>();
+        if (interactable != null)
+            interactable.Interacted += OnInteracted;
+        PuzzleManager.Instance?.RegisterStepBehaviour(this);
+    }
+
+    void OnDisable()
+    {
+        if (interactable != null)
+            interactable.Interacted -= OnInteracted;
+        PuzzleManager.Instance?.UnregisterStepBehaviour(this);
+    }
+
+    public void UnlockStep()
+    {
+        isUnlocked = true;
+        Debug.Log($"[Puzzles] Step unlocked: {stepData?.stepId} on {gameObject.name}");
+        // Optionally, show visual feedback for unlocked state
+    }
+
+    public void LockStep()
+    {
+        isUnlocked = false;
+        Debug.Log($"[Puzzles] Step locked: {stepData?.stepId} on {gameObject.name}");
+        // Optionally, show visual feedback for locked state
+    }
+
+    public bool IsStepUnlocked()
+    {
+        return isUnlocked;
+    }
+
+    private void OnInteracted()
+    {
+        if (!isUnlocked) return;
+        Debug.Log($"[Puzzles] Step interacted: {stepData?.stepId} on {gameObject.name}");
+        PuzzleManager.Instance?.OnStepCompleted(stepData);
+    }
+}
--- a/Assets/Scripts/ObjectiveStepBehaviour.cs.meta
+++ b/Assets/Scripts/ObjectiveStepBehaviour.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1101f6c4eb04423b89dc78dc7c9f1aae
+timeCreated: 1756901353
--- a/Assets/Scripts/Pickup.cs
+++ b/Assets/Scripts/Pickup.cs
@@ -48,7 +48,7 @@ public class Pickup : MonoBehaviour

    private void OnInteracted()
    {
-        Debug.Log($"Pickup.OnInteracted: Picked up {itemData?.itemName}");
+        Debug.Log($"[Pickup] OnInteracted: Picked up {itemData?.itemName}");
        // TODO: Add item to inventory manager here
        Destroy(gameObject);
    }
--- a/Assets/Scripts/PuzzleManager.cs
+++ b/Assets/Scripts/PuzzleManager.cs
@@ -0,0 +1,149 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+public class PuzzleManager : MonoBehaviour
+{
+    private static PuzzleManager _instance;
+    public static PuzzleManager Instance
+    {
+        get
+        {
+            if (_instance == null)
+            {
+                _instance = FindAnyObjectByType<PuzzleManager>();
+                if (_instance == null)
+                {
+                    var go = new GameObject("PuzzleManager");
+                    _instance = go.AddComponent<PuzzleManager>();
+                    DontDestroyOnLoad(go);
+                }
+            }
+            return _instance;
+        }
+    }
+
+    private HashSet<PuzzleStepSO> completedSteps = new HashSet<PuzzleStepSO>();
+    private HashSet<PuzzleStepSO> unlockedSteps = new HashSet<PuzzleStepSO>();
+
+    // Registration for ObjectiveStepBehaviour
+    private Dictionary<PuzzleStepSO, ObjectiveStepBehaviour> stepBehaviours = new Dictionary<PuzzleStepSO, ObjectiveStepBehaviour>();
+
+    // Runtime dependency graph
+    private Dictionary<PuzzleStepSO, List<PuzzleStepSO>> runtimeDependencies = new Dictionary<PuzzleStepSO, List<PuzzleStepSO>>();
+
+    void Awake()
+    {
+        if (_instance != null && _instance != this)
+        {
+            Destroy(gameObject);
+            return;
+        }
+        _instance = this;
+        DontDestroyOnLoad(gameObject);
+    }
+
+    public void RegisterStepBehaviour(ObjectiveStepBehaviour behaviour)
+    {
+        if (behaviour?.stepData == null) return;
+        if (!stepBehaviours.ContainsKey(behaviour.stepData))
+        {
+            stepBehaviours.Add(behaviour.stepData, behaviour);
+            Debug.Log($"[Puzzles] Registered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
+        }
+    }
+
+    public void UnregisterStepBehaviour(ObjectiveStepBehaviour behaviour)
+    {
+        if (behaviour?.stepData == null) return;
+        stepBehaviours.Remove(behaviour.stepData);
+        Debug.Log($"[Puzzles] Unregistered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
+    }
+
+    void Start()
+    {
+        BuildRuntimeDependencies();
+        UnlockInitialSteps();
+    }
+
+    private void BuildRuntimeDependencies()
+    {
+        runtimeDependencies.Clear();
+        foreach (var step in stepBehaviours.Keys)
+        {
+            runtimeDependencies[step] = new List<PuzzleStepSO>();
+        }
+        foreach (var step in stepBehaviours.Keys)
+        {
+            foreach (var unlocked in step.unlocks)
+            {
+                if (!runtimeDependencies.ContainsKey(unlocked))
+                    runtimeDependencies[unlocked] = new List<PuzzleStepSO>();
+                runtimeDependencies[unlocked].Add(step);
+                Debug.Log($"[Puzzles] Step {unlocked.stepId} depends on {step.stepId}");
+            }
+        }
+        Debug.Log($"[Puzzles] Runtime dependencies built. Total steps: {stepBehaviours.Count}");
+    }
+
+    private void UnlockInitialSteps()
+    {
+        foreach (var step in stepBehaviours.Keys)
+        {
+            if (runtimeDependencies[step].Count == 0)
+            {
+                Debug.Log($"[Puzzles] Initial step unlocked: {step.stepId}");
+                UnlockStep(step);
+            }
+        }
+    }
+
+    public void OnStepCompleted(PuzzleStepSO step)
+    {
+        if (completedSteps.Contains(step)) return;
+        completedSteps.Add(step);
+        Debug.Log($"[Puzzles] Step completed: {step.stepId}");
+        foreach (var unlock in step.unlocks)
+        {
+            if (AreRuntimeDependenciesMet(unlock))
+            {
+                Debug.Log($"[Puzzles] Unlocking step {unlock.stepId} after completing {step.stepId}");
+                UnlockStep(unlock);
+            }
+            else
+            {
+                Debug.Log($"[Puzzles] Step {unlock.stepId} not unlocked yet, waiting for other dependencies");
+            }
+        }
+        CheckPuzzleCompletion();
+    }
+
+    private bool AreRuntimeDependenciesMet(PuzzleStepSO step)
+    {
+        if (!runtimeDependencies.ContainsKey(step) || runtimeDependencies[step].Count == 0) return true;
+        foreach (var dep in runtimeDependencies[step])
+        {
+            if (!completedSteps.Contains(dep)) return false;
+        }
+        return true;
+    }
+
+    private void UnlockStep(PuzzleStepSO step)
+    {
+        if (unlockedSteps.Contains(step)) return;
+        unlockedSteps.Add(step);
+        if (stepBehaviours.TryGetValue(step, out var behaviour))
+        {
+            behaviour.UnlockStep();
+        }
+        Debug.Log($"[Puzzles] Step unlocked: {step.stepId}");
+    }
+
+    private void CheckPuzzleCompletion()
+    {
+        if (completedSteps.Count == stepBehaviours.Count)
+        {
+            Debug.Log("[Puzzles] Puzzle complete! All steps finished.");
+            // TODO: Fire puzzle complete event or trigger outcome logic
+        }
+    }
+}
--- a/Assets/Scripts/PuzzleManager.cs.meta
+++ b/Assets/Scripts/PuzzleManager.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bdc7ceebe82348dba3ad1ca1153e0dba
+timeCreated: 1756901363
--- a/Assets/Scripts/PuzzleStepSO.cs
+++ b/Assets/Scripts/PuzzleStepSO.cs
@@ -0,0 +1,14 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+[CreateAssetMenu(fileName = "PuzzleStepSO", menuName = "Puzzle/Step")]
+public class PuzzleStepSO : ScriptableObject
+{
+    public string stepId;
+    public string displayName;
+    [TextArea]
+    public string description;
+    public Sprite icon;
+    [Header("Unlocks")]
+    public List<PuzzleStepSO> unlocks = new List<PuzzleStepSO>();
+}
--- a/Assets/Scripts/PuzzleStepSO.cs.meta
+++ b/Assets/Scripts/PuzzleStepSO.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 84e39aac66cf4a10a89abc01b04b13af
+timeCreated: 1756901344