Fix issue with the ball tree

Added the steps, for the other Puzzles, the first step of the balltree is not showing.
Add an editor utility and fix issue with slot items
2025-10-15 18:50:21 +02:00 · 2025-10-15 17:25:30 +02:00 · 2025-10-15 16:53:18 +02:00 · 2025-10-15 16:33:19 +02:00 · 2025-10-15 16:01:02 +02:00 · 2025-10-15 15:51:37 +02:00
71 changed files with 3998 additions and 22608 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
  m_currentHash:
    serializedVersion: 2
-    Hash: 8453796ea514a8db40e72d511ee4981c
+    Hash: 00000000000000000000000000000000
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_CatalogRequestsTimeout: 0
--- a/Assets/Art/Sprites/Spritesheets/Quarry/GrassPatch0083.png.meta
+++ b/Assets/Art/Sprites/Spritesheets/Quarry/GrassPatch0083.png.meta
@@ -147,12 +147,12 @@ TextureImporter:
      name: GrassPatch0083_0
      rect:
        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 3840
-        height: 2160
+        x: 115
+        y: 1552
+        width: 253
+        height: 151
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -169,12 +169,12 @@ TextureImporter:
      name: GrassPatch0083_1
      rect:
        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 3840
-        height: 2160
+        x: 145
+        y: 226
+        width: 3335
+        height: 1884
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -196,7 +196,7 @@ TextureImporter:
        width: 319
        height: 190
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -218,7 +218,7 @@ TextureImporter:
        width: 246
        height: 144
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -240,7 +240,7 @@ TextureImporter:
        width: 211
        height: 117
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -262,7 +262,7 @@ TextureImporter:
        width: 319
        height: 171
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -284,7 +284,7 @@ TextureImporter:
        width: 246
        height: 144
      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
      border: {x: 0, y: 0, z: 0, w: 0}
      customData: 
      outline: []
@@ -301,7 +301,7 @@ TextureImporter:
    customData: 
    physicsShape: []
    bones: []
-    spriteID: bc86f6a2f58cad246ab3fa70c1c38032
+    spriteID: 
    internalID: 0
    vertices: []
    indices: 
--- a/Assets/Art/Sprites/Spritesheets/Quarry/Materials/GrassPatch0083.mat
+++ b/Assets/Art/Sprites/Spritesheets/Quarry/Materials/GrassPatch0083.mat
@@ -1,43 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: GrassPatch0083
-  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _AlphaTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 40958ea66f211ab4ea28178684593ae4, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - PixelSnap: 0
-    - _EnableExternalAlpha: 0
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Flip: {r: 1, g: 1, b: 1, a: 1}
-    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
--- a/Assets/Art/Sprites/Spritesheets/Quarry/Materials/GrassPatch0083.mat.meta
+++ b/Assets/Art/Sprites/Spritesheets/Quarry/Materials/GrassPatch0083.mat.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dbb3ada0b3bbee04f8e0643a2a936a9b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png
+++ b/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png
--- a/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png.meta
+++ b/Assets/Art/Sprites/Spritesheets/Quarry/Van/VanHorn.png.meta
@@ -1,156 +0,0 @@
-fileFormatVersion: 2
-guid: 668c87ebe73766b4db3e746ff563ad69
-TextureImporter:
-  internalIDToNameTable:
-  - first:
-      213: 844622183060740761
-    second: VanHorn_0
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: VanHorn_0
-      rect:
-        serializedVersion: 2
-        x: 6
-        y: 5
-        width: 1014
-        height: 560
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      customData: 
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-      bones: []
-      spriteID: 99a10c68663b8bb00800000000000000
-      internalID: 844622183060740761
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 139ed722a885930418cf53c13f07ee08
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable:
-      VanHorn_0: 844622183060740761
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial.meta
+++ b/Assets/Art/UI/Tutorial.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 70d5cb65eed0ca344a20e71fd4cfa86f
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/Animations.meta
+++ b/Assets/Art/UI/Tutorial/Animations.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 34b91b32be4f1614f85f8a5c88c6d660
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial1.anim
+++ b/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial1.anim
--- a/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial1.anim.meta
+++ b/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial1.anim.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d475a884109740d4c93f40c4d31a8875
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim
+++ b/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim
--- a/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim.meta
+++ b/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ca8f8ac4d70cc9d49957fd0b13ffda9e
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/Arrow.png
+++ b/Assets/Art/UI/Tutorial/Arrow.png
--- a/Assets/Art/UI/Tutorial/Arrow.png.meta
+++ b/Assets/Art/UI/Tutorial/Arrow.png.meta
@@ -1,182 +0,0 @@
-fileFormatVersion: 2
-guid: 7b5d036a9fa30484e911f4752e3a64c8
-TextureImporter:
-  internalIDToNameTable:
-  - first:
-      213: -4346244404228752641
-    second: Arrow_0
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: iOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WindowsStoreApps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: Arrow_0
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 161
-        height: 308
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      customData: 
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-      bones: []
-      spriteID: ffa7ae2edb90fa3c0800000000000000
-      internalID: -4346244404228752641
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable:
-      Arrow_0: -4346244404228752641
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/Finger.png
+++ b/Assets/Art/UI/Tutorial/Finger.png
--- a/Assets/Art/UI/Tutorial/Finger.png.meta
+++ b/Assets/Art/UI/Tutorial/Finger.png.meta
@@ -1,182 +0,0 @@
-fileFormatVersion: 2
-guid: 6fee60c82a4f504419e535456268a19e
-TextureImporter:
-  internalIDToNameTable:
-  - first:
-      213: -7164639588303836088
-    second: Finger_0
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: iOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WindowsStoreApps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: Finger_0
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 316
-        height: 246
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      customData: 
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-      bones: []
-      spriteID: 84ce27b1146129c90800000000000000
-      internalID: -7164639588303836088
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable:
-      Finger_0: -7164639588303836088
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/HUD.png
+++ b/Assets/Art/UI/Tutorial/HUD.png
--- a/Assets/Art/UI/Tutorial/HUD.png.meta
+++ b/Assets/Art/UI/Tutorial/HUD.png.meta
@@ -1,182 +0,0 @@
-fileFormatVersion: 2
-guid: bfff7425eb5869d49b7dbfbe9dab3af1
-TextureImporter:
-  internalIDToNameTable:
-  - first:
-      213: -6869325624984279803
-    second: HUD_0
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: iOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WindowsStoreApps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: HUD_0
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 976
-        height: 650
-      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      customData: 
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-      bones: []
-      spriteID: 505e2544db04ba0a0800000000000000
-      internalID: -6869325624984279803
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable:
-      HUD_0: -6869325624984279803
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Art/UI/Tutorial/Impact.png
+++ b/Assets/Art/UI/Tutorial/Impact.png
--- a/Assets/Art/UI/Tutorial/Impact.png.meta
+++ b/Assets/Art/UI/Tutorial/Impact.png.meta
@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: ba7c7163571103f49b86ceb15c8a1e8f
-TextureImporter:
-  internalIDToNameTable:
-  - first:
-      213: 5838690487585382102
-    second: Impact_0
-  - first:
-      213: 2912065134375024089
-    second: Impact_1
-  - first:
-      213: 2149313183507242163
-    second: Impact_2
-  - first:
-      213: -2666882680432870540
-    second: Impact_3
-  - first:
-      213: -7769254484576812942
-    second: Impact_4
-  - first:
-      213: -5623080056597879961
-    second: Impact_5
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 4
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: iOS
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 4
-    buildTarget: WindowsStoreApps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: Impact_0
-      rect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 138
-        height: 111
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      customData: 
-      outline: []
-      physicsShape: []
-      tessellationDetail: -1
-      bones: []
-      spriteID: 6de9af15012370150800000000000000
-      internalID: 5838690487585382102
-      vertices: []
-      indices: 
-      edges: []
-      weights: []
-    outline: []
-    customData: 
-    physicsShape: []
-    bones: []
-    spriteID: 1e87fe12fda7bb140b234257fbf6f67c
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    spriteCustomMetadata:
-      entries: []
-    nameFileIdTable:
-      Impact_0: 5838690487585382102
-      Impact_1: 2912065134375024089
-      Impact_2: 2149313183507242163
-      Impact_3: -2666882680432870540
-      Impact_4: -7769254484576812942
-      Impact_5: -5623080056597879961
-      Impact_6: 499494798
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Data/Puzzles/ChocolateBirdPuzzle/PickChocolate.asset
+++ b/Assets/Data/Puzzles/ChocolateBirdPuzzle/PickChocolate.asset
@@ -1,20 +0,0 @@
-%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: PickChocolate
-  m_EditorClassIdentifier: 
-  stepId: PickChocolate
-  displayName: Picked Up Chocolate!
-  description: Avoid the gaze of the picnic lovers and steal their loot.
-  icon: {fileID: 0}
-  unlocks:
-  - {fileID: 11400000, guid: d0851a7610551104fa285c0748549d90, type: 2}
--- a/Assets/Data/Puzzles/SoundBirdPuzzle/HeadbandPickup.asset
+++ b/Assets/Data/Puzzles/SoundBirdPuzzle/HeadbandPickup.asset
@@ -1,20 +0,0 @@
-%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: HeadbandPickup
-  m_EditorClassIdentifier: 
-  stepId: HeadBandPickup
-  displayName: Picked up Headband!
-  description: Once Wolter jumps out of the bushes, the headband is interactable.
-  icon: {fileID: 0}
-  unlocks:
-  - {fileID: 11400000, guid: 9c10f3091037ee4489cc15d0a91559f5, type: 2}
--- a/Assets/Data/Puzzles/SoundBirdPuzzle/SoundBirdDeafening.asset
+++ b/Assets/Data/Puzzles/SoundBirdPuzzle/SoundBirdDeafening.asset
@@ -1,19 +0,0 @@
-%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: SoundBirdDeafening
-  m_EditorClassIdentifier: 
-  stepId: SoundBirdDeaf
-  displayName: Soundbird is Deaf
-  description: Make sure the SoundBird Cannot hear
-  icon: {fileID: 0}
-  unlocks: []
--- a/Assets/Data/Puzzles/SoundBirdPuzzle/SoundBirdDeafening.asset.meta
+++ b/Assets/Data/Puzzles/SoundBirdPuzzle/SoundBirdDeafening.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9c10f3091037ee4489cc15d0a91559f5
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Playables/PulverCucumberSmack1.playable
+++ b/Assets/Playables/PulverCucumberSmack1.playable
@@ -1,17 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8141883812729867331
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
-  m_Name: ActivationPlayableAsset
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset
 --- !u!114 &-7584736085941489071
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -244,99 +232,6 @@ MonoBehaviour:
  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
  m_ApplyOffsets: 0
--- !u!114 &-2306502989242081801
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
-  m_Name: Activation Track (2)
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 1.0166666666666666
-    m_ClipIn: 0
-    m_Asset: {fileID: 8869473753107552233}
-    m_Duration: 0.8999999999999998
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -2306502989242081801}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Active
-  m_Markers:
-    m_Objects: []
-  m_PostPlaybackState: 3
 --- !u!114 &-2070454477998879764
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -359,99 +254,6 @@ MonoBehaviour:
  m_Loop: 0
  m_Version: 1
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-1942705774920494342
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
-  m_Name: Activation Track (1)
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 1.0166666666666666
-    m_ClipIn: 0
-    m_Asset: {fileID: 6919411930490113052}
-    m_Duration: 0.8999999999999999
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -1942705774920494342}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Active
-  m_Markers:
-    m_Objects: []
-  m_PostPlaybackState: 3
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -469,10 +271,6 @@ MonoBehaviour:
  - {fileID: -7584736085941489071}
  - {fileID: -2395336864975438248}
  - {fileID: 3942302933360259000}
-  - {fileID: -1942705774920494342}
-  - {fileID: -2306502989242081801}
-  - {fileID: 5194333105783184030}
-  - {fileID: 8484886637748558501}
  m_FixedDuration: 0
  m_EditorSettings:
    m_Framerate: 60
@@ -501,18 +299,6 @@ MonoBehaviour:
  m_Loop: 0
  m_Version: 1
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &3404527565291525971
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
-  m_Name: ActivationPlayableAsset
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset
 --- !u!114 &3942302933360259000
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -606,213 +392,3 @@ MonoBehaviour:
  m_Markers:
    m_Objects: []
  m_PostPlaybackState: 3
--- !u!114 &5194333105783184030
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
-  m_Name: Activation Track (3)
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 1.0166666666666666
-    m_ClipIn: 0
-    m_Asset: {fileID: 3404527565291525971}
-    m_Duration: 0.8999999999999998
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 5194333105783184030}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Active
-  m_Markers:
-    m_Objects: []
-  m_PostPlaybackState: 3
--- !u!114 &6919411930490113052
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
-  m_Name: ActivationPlayableAsset
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset
--- !u!114 &8484886637748558501
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
-  m_Name: Activation Track (4)
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationTrack
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 1.0166666666666666
-    m_ClipIn: 0
-    m_Asset: {fileID: -8141883812729867331}
-    m_Duration: 0.8999999999999998
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 8484886637748558501}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Active
-  m_Markers:
-    m_Objects: []
-  m_PostPlaybackState: 3
--- !u!114 &8869473753107552233
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
-  m_Name: ActivationPlayableAsset
-  m_EditorClassIdentifier: Unity.Timeline::UnityEngine.Timeline.ActivationPlayableAsset
--- a/Assets/Prefabs/Managers/SceneManager.prefab
+++ b/Assets/Prefabs/Managers/SceneManager.prefab
@@ -30,7 +30,7 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 4689617562113187593}
+  - {fileID: 7090108953567368886}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5327225408302228741
@@ -45,7 +45,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 360f320f4d7a48e38f5fd7cdfa28144a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
--- !u!1001 &4881964705042195055
+  loadingScreen: {fileID: 3391437592962192360}
+--- !u!1001 &6967569849783118800
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@@ -137,13 +138,32 @@ PrefabInstance:
      propertyPath: m_Name
      value: LoadingScreen
      objectReference: {fileID: 0}
+    - target: {fileID: 4869161796575291839, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5737877680156686392, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
+      propertyPath: minimumDisplayTime
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
--- !u!224 &4689617562113187593 stripped
+--- !u!114 &3391437592962192360 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5737877680156686392, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
+  m_PrefabInstance: {fileID: 6967569849783118800}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1494b10574e74acd880f9101b4248239, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::UI.LoadingScreenController
+--- !u!224 &7090108953567368886 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-  m_PrefabInstance: {fileID: 4881964705042195055}
+  m_PrefabInstance: {fileID: 6967569849783118800}
  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Puzzles/AnneLiseBush.prefab
+++ b/Assets/Prefabs/Puzzles/AnneLiseBush.prefab
@@ -108,8 +108,8 @@ SpriteRenderer:
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: -1132846201
-  m_SortingLayer: 1
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 1
  m_Sprite: {fileID: 3625043607559282579, guid: 19fb86013d8c24d6cb8410c0aadf30fa, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -222,8 +222,7 @@ GameObject:
  m_Component:
  - component: {fileID: 2071071585578300598}
  - component: {fileID: 1454372124634854912}
-  - component: {fileID: 4122067414526815177}
-  m_Layer: 6
+  m_Layer: 0
  m_Name: Hidden
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -259,52 +258,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
  m_Name: 
  m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.State
--- !u!61 &4122067414526815177
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1011363502278351410}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_CompositeOperation: 0
-  m_CompositeOrder: 0
-  m_Offset: {x: 1.05, y: -1.5}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  m_Size: {x: 5.42, y: 4}
-  m_EdgeRadius: 0
 --- !u!1 &1674229500073894281
 GameObject:
  m_ObjectHideFlags: 0
@@ -507,7 +460,7 @@ SpriteRenderer:
  m_GlobalIlluminationMeshLod: 0
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
  m_Sprite: {fileID: 1389104422143044133, guid: 88a896c19d8ef454e999af7d3b492dd9, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -915,8 +868,7 @@ GameObject:
  - component: {fileID: 3552553650332385501}
  - component: {fileID: 33904425063383983}
  - component: {fileID: 1494215563975893862}
-  - component: {fileID: 962877523590950341}
-  m_Layer: 6
+  m_Layer: 0
  m_Name: TakePhoto
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -989,52 +941,6 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: AppleHillsScripts::TakePhotoState
  playerTargetObject: {fileID: 4304786163860520790}
--- !u!61 &962877523590950341
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7816038554732339800}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_ForceSendLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ForceReceiveLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ContactCaptureLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_CallbackLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_CompositeOperation: 0
-  m_CompositeOrder: 0
-  m_Offset: {x: 1.05, y: -1.5}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  m_Size: {x: 5.42, y: 4}
-  m_EdgeRadius: 0
 --- !u!1 &8378940418688040866
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/UI/LoadingScreen.prefab
+++ b/Assets/Prefabs/UI/LoadingScreen.prefab
@@ -229,7 +229,9 @@ MonoBehaviour:
  m_EditorClassIdentifier: AppleHillsScripts::UI.LoadingScreenController
  loadingScreenContainer: {fileID: 7270617579256400696}
  progressBarImage: {fileID: 1674678211233966532}
-  minimumDisplayTime: 1
+  minimumDisplayTime: 2
+  animateProgressBar: 1
+  progressBarSmoothTime: 0.1
  progressUpdateInterval: 0.1
 --- !u!1 &6888795583318782279
 GameObject:
--- a/Assets/Prefabs/UI/Tutorial.prefab
+++ b/Assets/Prefabs/UI/Tutorial.prefab
--- a/Assets/Prefabs/UI/Tutorial.prefab.meta
+++ b/Assets/Prefabs/UI/Tutorial.prefab.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a4dd78ff48942854ebb4c65025a8dc36
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
--- a/Assets/Scenes/MiniGames/DivingForPictures.unity
+++ b/Assets/Scenes/MiniGames/DivingForPictures.unity
@@ -342,17 +342,17 @@ LineRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_Positions:
-  - {x: -0.15602553, y: 4.0749445, z: 0}
-  - {x: -0.1566351, y: 3.9736378, z: 0}
-  - {x: -0.1572447, y: 3.8729858, z: 0}
+  - {x: -0.15602553, y: 4.074945, z: 0}
+  - {x: -0.1566351, y: 3.973638, z: 0}
+  - {x: -0.1572447, y: 3.8729856, z: 0}
  - {x: -0.15785426, y: 3.7729874, z: 0}
-  - {x: -0.15846384, y: 3.6736438, z: 0}
-  - {x: -0.15907341, y: 3.5749543, z: 0}
-  - {x: -0.15968299, y: 3.4769194, z: 0}
+  - {x: -0.15846384, y: 3.6736436, z: 0}
+  - {x: -0.15907341, y: 3.574954, z: 0}
+  - {x: -0.15968299, y: 3.4769192, z: 0}
  - {x: -0.16029257, y: 3.3795385, z: 0}
  - {x: -0.16090216, y: 3.2828126, z: 0}
-  - {x: -0.16151173, y: 3.1867406, z: 0}
-  - {x: -0.16212131, y: 3.0913231, z: 0}
+  - {x: -0.16151173, y: 3.1867409, z: 0}
+  - {x: -0.16212131, y: 3.0913236, z: 0}
  m_Parameters:
    serializedVersion: 3
    widthMultiplier: 1
@@ -915,7 +915,7 @@ Transform:
  m_GameObject: {fileID: 747976396}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 3.1975174, z: 0}
+  m_LocalPosition: {x: 0, y: 3.197517, z: 0}
  m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574}
  m_ConstrainProportionsScale: 0
  m_Children:
@@ -1367,17 +1367,17 @@ LineRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_Positions:
-  - {x: -0.15602553, y: 4.074945, z: 0}
-  - {x: -0.11662118, y: 3.8796225, z: 0}
+  - {x: -0.15602553, y: 4.0749445, z: 0}
+  - {x: -0.11662118, y: 3.879622, z: 0}
  - {x: -0.07721684, y: 3.7057445, z: 0}
  - {x: -0.03781248, y: 3.5533106, z: 0}
  - {x: 0.0015918687, y: 3.4223216, z: 0}
  - {x: 0.040996216, y: 3.3127766, z: 0}
-  - {x: 0.08040057, y: 3.2246757, z: 0}
-  - {x: 0.11980491, y: 3.1580195, z: 0}
-  - {x: 0.15920927, y: 3.1128078, z: 0}
-  - {x: 0.1986136, y: 3.0890403, z: 0}
-  - {x: 0.23801796, y: 3.0867171, z: 0}
+  - {x: 0.08040057, y: 3.2246761, z: 0}
+  - {x: 0.11980491, y: 3.15802, z: 0}
+  - {x: 0.15920927, y: 3.1128082, z: 0}
+  - {x: 0.1986136, y: 3.0890405, z: 0}
+  - {x: 0.23801796, y: 3.0867176, z: 0}
  m_Parameters:
    serializedVersion: 3
    widthMultiplier: 1
@@ -1910,17 +1910,17 @@ LineRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_Positions:
-  - {x: -0.15602553, y: 4.074945, z: 0}
-  - {x: -0.18956745, y: 3.8764977, z: 0}
+  - {x: -0.15602553, y: 4.0749445, z: 0}
+  - {x: -0.18956745, y: 3.8764973, z: 0}
  - {x: -0.22310936, y: 3.7000232, z: 0}
-  - {x: -0.25665125, y: 3.5455205, z: 0}
-  - {x: -0.29019317, y: 3.4129908, z: 0}
-  - {x: -0.32373506, y: 3.3024333, z: 0}
-  - {x: -0.35727698, y: 3.213848, z: 0}
-  - {x: -0.39081886, y: 3.1472356, z: 0}
-  - {x: -0.4243608, y: 3.1025953, z: 0}
-  - {x: -0.45790267, y: 3.0799277, z: 0}
-  - {x: -0.4914446, y: 3.0792325, z: 0}
+  - {x: -0.25665125, y: 3.5455203, z: 0}
+  - {x: -0.29019317, y: 3.412991, z: 0}
+  - {x: -0.32373506, y: 3.3024335, z: 0}
+  - {x: -0.35727698, y: 3.2138484, z: 0}
+  - {x: -0.39081886, y: 3.1472359, z: 0}
+  - {x: -0.4243608, y: 3.1025958, z: 0}
+  - {x: -0.45790267, y: 3.0799282, z: 0}
+  - {x: -0.4914446, y: 3.079233, z: 0}
  m_Parameters:
    serializedVersion: 3
    widthMultiplier: 1
@@ -2463,7 +2463,7 @@ Transform:
  m_GameObject: {fileID: 2106431001}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.165, y: 2.697517, z: 0}
+  m_LocalPosition: {x: -0.165, y: 2.6975174, z: 0}
  m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574}
  m_ConstrainProportionsScale: 0
  m_Children:
@@ -2519,75 +2519,6 @@ MonoBehaviour:
  m_EditorClassIdentifier: AppleHillsScripts::Minigames.DivingForPictures.Utilities.RockPauser
  rockReference: {fileID: 2106431003}
  rockWobbleReference: {fileID: 2106431004}
--- !u!1001 &8347532583749285323
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.20093
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 2.44859
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3183207532655435649, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3332446944854334578, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_Name
-      value: Tutorial
-      objectReference: {fileID: 0}
-    - target: {fileID: 3332446944854334578, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: playTutorial
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
-      propertyPath: divingGameManager
-      value: 
-      objectReference: {fileID: 424805725}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
@@ -2606,4 +2537,3 @@ SceneRoots:
  - {fileID: 323864665}
  - {fileID: 424805726}
  - {fileID: 1651034646}
-  - {fileID: 8347532583749285323}
--- a/Assets/Scenes/StartingScene.unity
+++ b/Assets/Scenes/StartingScene.unity
@@ -1,452 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
-OcclusionCullingSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_OcclusionBakeSettings:
-    smallestOccluder: 5
-    smallestHole: 0.25
-    backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
-RenderSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 10
-  m_Fog: 0
-  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  m_FogMode: 3
-  m_FogDensity: 0.01
-  m_LinearFogStart: 0
-  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
-  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
-  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
-  m_AmbientIntensity: 1
-  m_AmbientMode: 3
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 0}
-  m_HaloStrength: 0.5
-  m_FlareStrength: 1
-  m_FlareFadeSpeed: 3
-  m_HaloTexture: {fileID: 0}
-  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
-  m_DefaultReflectionMode: 0
-  m_DefaultReflectionResolution: 128
-  m_ReflectionBounces: 1
-  m_ReflectionIntensity: 1
-  m_CustomReflection: {fileID: 0}
-  m_Sun: {fileID: 0}
-  m_UseRadianceAmbientProbe: 0
--- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 0
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 0
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 1
-    m_PVRFilteringGaussRadiusAO: 1
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
-  m_LightingSettings: {fileID: 0}
--- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 3
-    agentTypeID: 0
-    agentRadius: 0.5
-    agentHeight: 2
-    agentSlope: 45
-    agentClimb: 0.4
-    ledgeDropHeight: 0
-    maxJumpAcrossDistance: 0
-    minRegionArea: 2
-    manualCellSize: 0
-    cellSize: 0.16666667
-    manualTileSize: 0
-    tileSize: 256
-    buildHeightMesh: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
--- !u!1001 &180679694
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 204042265062571366, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4869161796575291839, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      propertyPath: m_Name
-      value: LoadingScreen
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 5737877680156686392, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 4869161796575291839, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 180679698}
-  m_SourcePrefab: {fileID: 100100000, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
--- !u!1 &180679695 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4869161796575291839, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-  m_PrefabInstance: {fileID: 180679694}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &180679696 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 1674678211233966532, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-  m_PrefabInstance: {fileID: 180679694}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
--- !u!1 &180679697 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7270617579256400696, guid: 19fad826fce26d34ba304620216a7f47, type: 3}
-  m_PrefabInstance: {fileID: 180679694}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &180679698
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 180679695}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8968b564891a474baae157792b88e75f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: AppleHillsScripts::Bootstrap.InitialLoadingScreen
-  loadingScreenContainer: {fileID: 180679697}
-  progressBarImage: {fileID: 180679696}
-  minimumDisplayTime: 1
-  progressUpdateInterval: 0.1
--- !u!1 &400217123
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 400217126}
-  - component: {fileID: 400217125}
-  - component: {fileID: 400217124}
-  - component: {fileID: 400217127}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!81 &400217124
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400217123}
-  m_Enabled: 1
--- !u!20 &400217125
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400217123}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 1
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
--- !u!4 &400217126
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400217123}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
-  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!114 &400217127
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400217123}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
-  m_Version: 2
--- !u!1 &1710655392
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1710655394}
-  - component: {fileID: 1710655393}
-  m_Layer: 0
-  m_Name: BootSceneController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1710655393
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1710655392}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fdb797d6fcdc469bb9bfb9ad3c5f51b5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: AppleHillsScripts::Bootstrap.BootSceneController
-  mainMenuSceneName: MainMenu
-  minDelayAfterBoot: 0.5
-  debugMode: 0
-  initialLoadingScreen: {fileID: 180679698}
-  bootProgressWeight: 0.5
--- !u!4 &1710655394
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1710655392}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -39.55614, y: 4.31573, 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!1660057539 &9223372036854775807
-SceneRoots:
-  m_ObjectHideFlags: 0
-  m_Roots:
-  - {fileID: 400217126}
-  - {fileID: 1710655394}
-  - {fileID: 180679694}
--- a/Assets/Scenes/StartingScene.unity.meta
+++ b/Assets/Scenes/StartingScene.unity.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cf01e2d0135b06c4486d00ef393d0274
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Bootstrap/BootCompletionService.cs
+++ b/Assets/Scripts/Bootstrap/BootCompletionService.cs
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace Bootstrap
-{
-    /// <summary>
-    /// Service that provides notification and management of boot completion status.
-    /// Allows systems to subscribe to boot completion events, register initialization actions with priorities,
-    /// or await boot completion asynchronously.
-    /// </summary>
-    public static class BootCompletionService
-    {
-        /// <summary>
-        /// Indicates if the boot process has completed
-        /// </summary>
-        public static bool IsBootComplete { get; private set; } = false;
-        
-        /// <summary>
-        /// Event triggered when boot completes
-        /// </summary>
-        public static event Action OnBootComplete;
-        
-        /// <summary>
-        /// Represents an initialization action with priority
-        /// </summary>
-        private class InitializationAction
-        {
-            public Action Action { get; }
-            public int Priority { get; }
-            public string Name { get; }
-            
-            public InitializationAction(Action action, int priority, string name)
-            {
-                Action = action;
-                Priority = priority;
-                Name = name;
-            }
-        }
-        
-        // List of initialization actions to be executed once boot completes
-        private static List<InitializationAction> _initializationActions = new List<InitializationAction>();
-        
-        // TaskCompletionSource for async await pattern
-        private static TaskCompletionSource<bool> _bootCompletionTask = new TaskCompletionSource<bool>();
-        
-        /// <summary>
-        /// Called by CustomBoot when the boot process is complete
-        /// </summary>
-        internal static void HandleBootCompleted()
-        {
-            if (IsBootComplete)
-                return;
-            
-            IsBootComplete = true;
-            
-            Debug.Log("[BootCompletionService] Boot process completed, executing initialization actions");
-            
-            // Execute initialization actions in priority order (lower number = higher priority)
-            ExecuteInitializationActions();
-            
-            // Trigger the event
-            OnBootComplete?.Invoke();
-            
-            // Complete the task for async waiters
-            _bootCompletionTask.TrySetResult(true);
-            
-            Debug.Log("[BootCompletionService] All boot completion handlers executed");
-        }
-        
-        /// <summary>
-        /// Register an action to be executed when boot completes.
-        /// Lower priority numbers run first.
-        /// </summary>
-        /// <param name="action">The action to execute</param>
-        /// <param name="priority">Priority (lower numbers run first)</param>
-        /// <param name="name">Name for debugging</param>
-        public static void RegisterInitAction(Action action, int priority = 100, string name = null)
-        {
-            if (action == null)
-                return;
-            
-            if (string.IsNullOrEmpty(name))
-                name = $"Action_{_initializationActions.Count}";
-                
-            var initAction = new InitializationAction(action, priority, name);
-            
-            if (IsBootComplete)
-            {
-                // If boot is already complete, execute immediately
-                Debug.Log($"[BootCompletionService] Executing late registration: {name} (Priority: {priority})");
-                try
-                {
-                    action();
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogError($"[BootCompletionService] Error executing init action '{name}': {ex}");
-                }
-            }
-            else
-            {
-                // Otherwise add to the queue
-                _initializationActions.Add(initAction);
-                Debug.Log($"[BootCompletionService] Registered init action: {name} (Priority: {priority})");
-            }
-        }
-        
-        /// <summary>
-        /// Wait asynchronously for boot completion
-        /// </summary>
-        /// <returns>Task that completes when boot is complete</returns>
-        public static Task WaitForBootCompletionAsync()
-        {
-            if (IsBootComplete)
-                return Task.CompletedTask;
-                
-            return _bootCompletionTask.Task;
-        }
-        
-        /// <summary>
-        /// Execute all registered initialization actions in priority order
-        /// </summary>
-        private static void ExecuteInitializationActions()
-        {
-            // Sort by priority (lowest first)
-            var sortedActions = _initializationActions
-                .OrderBy(a => a.Priority)
-                .ToList();
-                
-            foreach (var action in sortedActions)
-            {
-                try
-                {
-                    Debug.Log($"[BootCompletionService] Executing: {action.Name} (Priority: {action.Priority})");
-                    action.Action();
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogError($"[BootCompletionService] Error executing init action '{action.Name}': {ex}");
-                }
-            }
-            
-            // Clear the list after execution
-            _initializationActions.Clear();
-        }
-    }
-}
--- a/Assets/Scripts/Bootstrap/BootCompletionService.cs.meta
+++ b/Assets/Scripts/Bootstrap/BootCompletionService.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: aa0228cf33a64515bc166b7a9bc8c0b9
-timeCreated: 1760606319
--- a/Assets/Scripts/Bootstrap/BootSceneController.cs
+++ b/Assets/Scripts/Bootstrap/BootSceneController.cs
@@ -1,269 +0,0 @@
-using System;
-using UnityEngine;
-using UI;
-using Core;
-using UnityEngine.SceneManagement;
-using Cinematics;
-
-namespace Bootstrap
-{
-    /// <summary>
-    /// Controller for the boot scene that coordinates bootstrap initialization with loading screen
-    /// </summary>
-    public class BootSceneController : MonoBehaviour
-    {
-        [SerializeField] private string mainMenuSceneName = "MainMenu";
-        [SerializeField] private float minDelayAfterBoot = 0.5f; // Small delay after boot to ensure smooth transition
-        [SerializeField] private bool debugMode = false;
-        [SerializeField] private InitialLoadingScreen initialLoadingScreen; // Reference to our specialized loading screen
-        
-        // Progress distribution between bootstrap and scene loading
-        [SerializeField, Range(0.1f, 0.9f)] private float bootProgressWeight = 0.5f; // Default 50/50 split
-        
-        private enum LoadingPhase { Bootstrap, SceneLoading }
-        private LoadingPhase _currentPhase = LoadingPhase.Bootstrap;
-        
-        private bool _bootComplete = false;
-        private bool _hasStartedLoading = false;
-        private float _sceneLoadingProgress = 0f;
-
-        private void Start()
-        {
-            Debug.Log("[BootSceneController] Boot scene started");
-            
-            // Ensure the initial loading screen exists
-            if (initialLoadingScreen == null)
-            {
-                Debug.LogError("[BootSceneController] No InitialLoadingScreen assigned! Please assign it in the inspector.");
-                return;
-            }
-
-            // Subscribe to the loading screen completion event
-            initialLoadingScreen.OnLoadingScreenFullyHidden += OnInitialLoadingComplete;
-            
-            // Show the loading screen immediately with our combined progress provider
-            initialLoadingScreen.ShowLoadingScreen(GetCombinedProgress);
-            
-            // Subscribe to boot progress events
-            CustomBoot.OnBootProgressChanged += OnBootProgressChanged;
-            
-            // Register our boot completion handler with the BootCompletionService
-            // This will execute either immediately if boot is already complete,
-            // or when the boot process completes
-            BootCompletionService.RegisterInitAction(
-                OnBootCompleted,
-                50, // Higher priority (lower number)
-                "BootSceneController.OnBootCompleted"
-            );
-            
-            // In debug mode, log additional information
-            if (debugMode)
-            {
-                InvokeRepeating(nameof(LogDebugInfo), 0.1f, 0.5f);
-            }
-        }
-        
-        /// <summary>
-        /// Called when the initial loading screen is fully hidden
-        /// </summary>
-        private void OnInitialLoadingComplete()
-        {
-            Debug.Log("[BootSceneController] Initial loading screen fully hidden, boot sequence completed");
-            
-            // Play the intro cinematic if available
-            if (CinematicsManager.Instance != null)
-            {
-                Debug.Log("[BootSceneController] Attempting to play intro cinematic");
-                
-                // Use LoadAndPlayCinematic to play the intro sequence
-                CinematicsManager.Instance.LoadAndPlayCinematic("IntroSequence");
-                
-                // Immediately unload the StartingScene - no need to wait for cinematic to finish
-                // since CinematicsManager is bootstrapped and won't be unloaded
-                UnloadStartingScene();
-            }
-            else
-            {
-                // If no cinematics manager, unload the StartingScene directly
-                UnloadStartingScene();
-            }
-        }
-        
-        private void OnDestroy()
-        {
-            // Clean up event subscriptions
-            CustomBoot.OnBootCompleted -= OnBootCompleted;
-            CustomBoot.OnBootProgressChanged -= OnBootProgressChanged;
-            
-            if (initialLoadingScreen != null)
-            {
-                initialLoadingScreen.OnLoadingScreenFullyHidden -= OnInitialLoadingComplete;
-            }
-            
-            if (debugMode)
-            {
-                CancelInvoke(nameof(LogDebugInfo));
-            }
-        }
-        
-        /// <summary>
-        /// Progress provider that combines bootstrap and scene loading progress
-        /// </summary>
-        private float GetCombinedProgress()
-        {
-            switch (_currentPhase)
-            {
-                case LoadingPhase.Bootstrap:
-                    // Scale bootstrap progress from 0 to bootProgressWeight
-                    return CustomBoot.CurrentProgress * bootProgressWeight;
-                    
-                case LoadingPhase.SceneLoading:
-                    // Scale scene loading progress from bootProgressWeight to 1.0
-                    return bootProgressWeight + (_sceneLoadingProgress * (1f - bootProgressWeight));
-                    
-                default:
-                    return 0f;
-            }
-        }
-        
-        private void OnBootProgressChanged(float progress)
-        {
-            if (debugMode)
-            {
-                Debug.Log($"[BootSceneController] Bootstrap progress: {progress:P0}, Combined: {GetCombinedProgress():P0}");
-            }
-        }
-        
-        private void LogDebugInfo()
-        {
-            Debug.Log($"[BootSceneController] Debug - Phase: {_currentPhase}, Bootstrap: {CustomBoot.CurrentProgress:P0}, " +
-                      $"Scene: {_sceneLoadingProgress:P0}, Combined: {GetCombinedProgress():P0}, Boot Complete: {_bootComplete}");
-        }
-        
-        private void OnBootCompleted()
-        {
-            // Unsubscribe to prevent duplicate calls
-            CustomBoot.OnBootCompleted -= OnBootCompleted;
-            
-            Debug.Log("[BootSceneController] Boot process completed");
-            _bootComplete = true;
-            
-            // After a small delay, start loading the main menu
-            // This prevents jerky transitions if boot happens very quickly
-            Invoke(nameof(StartLoadingMainMenu), minDelayAfterBoot);
-        }
-        
-        private void StartLoadingMainMenu()
-        {
-            if (_hasStartedLoading)
-                return;
-                
-            _hasStartedLoading = true;
-            _currentPhase = LoadingPhase.SceneLoading;
-            LoadMainMenu();
-        }
-        
-        private async void LoadMainMenu()
-        {
-            Debug.Log($"[BootSceneController] Loading main menu scene: {mainMenuSceneName}");
-            
-            try
-            {
-                // Initialize scene loading progress to 0 to ensure proper remapping
-                _sceneLoadingProgress = 0f;
-                
-                // Create a custom progress reporter using a custom class
-                var progressHandler = new ProgressHandler(value => {
-                    // Store the raw scene loading progress (0-1)
-                    _sceneLoadingProgress = value;
-                    
-                    if (debugMode)
-                    {
-                        Debug.Log($"[BootSceneController] Scene loading raw: {value:P0}, Combined: {GetCombinedProgress():P0}");
-                    }
-                });
-
-                // Step 1: Additively load the main menu scene - don't unload StartingScene yet
-                var op = SceneManager.LoadSceneAsync(mainMenuSceneName, LoadSceneMode.Additive);
-                
-                // Disable scene activation until we're ready to show it
-                op.allowSceneActivation = true;
-                
-                // Track progress while loading
-                while (!op.isDone)
-                {
-                    progressHandler.ReportProgress(op.progress);
-                    await System.Threading.Tasks.Task.Yield();
-                }
-                
-                // Update the current gameplay scene in SceneManagerService
-                SceneManagerService.Instance.CurrentGameplayScene = mainMenuSceneName;
-                
-                // Ensure progress is complete
-                _sceneLoadingProgress = 1f;
-                
-                // Step 2: Scene is fully loaded, now hide the loading screen
-                // This will trigger OnInitialLoadingComplete via the event when animation completes
-                initialLoadingScreen.HideLoadingScreen();
-                
-                // Step 3: The OnInitialLoadingComplete method will handle playing the intro cinematic
-                // Step 4: StartingScene will be unloaded after the cinematic completes in OnIntroCinematicFinished
-            }
-            catch (Exception e)
-            {
-                Debug.LogError($"[BootSceneController] Error loading main menu: {e.Message}");
-                // Still try to hide the loading screen even if there was an error
-                initialLoadingScreen.HideLoadingScreen();
-            }
-        }
-        
-        /// <summary>
-        /// Unloads the StartingScene, completing the transition to the main menu
-        /// </summary>
-        private async void UnloadStartingScene()
-        {
-            try
-            {
-                // Get the current scene (StartingScene)
-                Scene currentScene = SceneManager.GetActiveScene();
-                string startingSceneName = currentScene.name;
-                
-                Debug.Log($"[BootSceneController] Unloading StartingScene: {startingSceneName}");
-                
-                // Unload the StartingScene
-                await SceneManager.UnloadSceneAsync(startingSceneName);
-                
-                // Set the main menu scene as the active scene
-                Scene mainMenuScene = SceneManager.GetSceneByName(mainMenuSceneName);
-                SceneManager.SetActiveScene(mainMenuScene);
-                
-                Debug.Log($"[BootSceneController] Transition complete: {startingSceneName} unloaded, {mainMenuSceneName} is now active");
-                
-                // Destroy the boot scene controller since its job is done
-                Destroy(gameObject);
-            }
-            catch (Exception e)
-            {
-                Logging.Warning($"[BootSceneController] Error unloading StartingScene: {e.Message}");
-            }
-        }
-        
-        /// <summary>
-        /// Helper class to handle progress reporting without running into explicit interface implementation issues
-        /// </summary>
-        private class ProgressHandler
-        {
-            private Action<float> _progressAction;
-            
-            public ProgressHandler(Action<float> progressAction)
-            {
-                _progressAction = progressAction;
-            }
-            
-            public void ReportProgress(float value)
-            {
-                _progressAction?.Invoke(value);
-            }
-        }
-    }
-}
--- a/Assets/Scripts/Bootstrap/BootSceneController.cs.meta
+++ b/Assets/Scripts/Bootstrap/BootSceneController.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: fdb797d6fcdc469bb9bfb9ad3c5f51b5
-timeCreated: 1760604860
--- a/Assets/Scripts/Bootstrap/CustomBoot.cs
+++ b/Assets/Scripts/Bootstrap/CustomBoot.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
@@ -15,24 +14,9 @@ namespace Bootstrap
        /// Current initialisation status
        /// </summary>
        public static bool Initialised { get; private set; }
-        
-        /// <summary>
-        /// Event triggered when boot progress changes
-        /// </summary>
-        public static event Action<float> OnBootProgressChanged;
-        
-        /// <summary>
-        /// Event triggered when boot process completes
-        /// </summary>
-        public static event Action OnBootCompleted;
-        
-        /// <summary>
-        /// Current progress of the boot process (0-1)
-        /// </summary>
-        public static float CurrentProgress { get; private set; }

        /// <summary>
-        /// Called as soon as the game begins
+        // Called as soon as the game begins
        /// </summary>
        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)]
        private static void Initialise()
@@ -48,9 +32,6 @@ namespace Bootstrap
        /// </summary>
        public static void PerformInitialisation()
        {
-            //Reset progress
-            CurrentProgress = 0f;
-            
            //In editor, perform initialisation synchronously
            if (Application.isEditor)
            {
@@ -91,17 +72,6 @@ namespace Bootstrap
        {
            await LoadCustomBootSettings();
            Initialised = true;
-            CurrentProgress = 1f;
-            OnBootProgressChanged?.Invoke(1f);
-            OnBootCompleted?.Invoke();
-            
-            // Notify the BootCompletionService that boot is complete
-            if (Application.isPlaying)
-            {
-                // Direct call to boot completion service
-                Debug.Log("[CustomBoot] Calling BootCompletionService.HandleBootCompleted()");
-                BootCompletionService.HandleBootCompleted();
-            }
        }

        /// <summary>
@@ -111,17 +81,6 @@ namespace Bootstrap
        {
            LoadCustomBootSettingsSync();
            Initialised = true;
-            CurrentProgress = 1f;
-            OnBootProgressChanged?.Invoke(1f);
-            OnBootCompleted?.Invoke();
-            
-            // Notify the BootCompletionService that boot is complete
-            if (Application.isPlaying)
-            {
-                // Direct call to boot completion service
-                Debug.Log("[CustomBoot] Calling BootCompletionService.HandleBootCompleted()");
-                BootCompletionService.HandleBootCompleted();
-            }
        }


@@ -218,16 +177,5 @@ namespace Bootstrap
            result.InitialiseSync();
            return handle;
        }
-
-        /// <summary>
-        /// Updates the current progress value and triggers the progress event
-        /// </summary>
-        /// <param name="progress">Progress value between 0-1</param>
-        internal static void UpdateProgress(float progress)
-        {
-            CurrentProgress = Mathf.Clamp01(progress);
-            OnBootProgressChanged?.Invoke(CurrentProgress);
-            Debug.Log($"[CustomBoot] Progress: {CurrentProgress:P0}");
-        }
    }
 }
--- a/Assets/Scripts/Bootstrap/CustomBootSettings.cs
+++ b/Assets/Scripts/Bootstrap/CustomBootSettings.cs
@@ -31,37 +31,15 @@ namespace Bootstrap
            RuntimeContainer = new GameObject($"{name}_Container");
            DontDestroyOnLoad(RuntimeContainer);
            Instances = new GameObject[BootPrefabs.Length];
-            
-            // Calculate total prefabs for progress tracking
-            int totalPrefabs = BootPrefabs.Length;
-            float progressPerPrefab = totalPrefabs > 0 ? 1f / totalPrefabs : 1f;
-            float currentProgress = 0f;
-            
            for (var i = 0; i < BootPrefabs.Length; i++)
            {
-                if (!BootPrefabs[i]) 
-                {
-                    // Report incremental progress even for null prefabs
-                    currentProgress = (i + 1) * progressPerPrefab;
-                    CustomBoot.UpdateProgress(currentProgress);
-                    continue;
-                }
+                if (!BootPrefabs[i]) continue;
                
                var instance = GameObject.InstantiateAsync(BootPrefabs[i], RuntimeContainer.transform);
                while (!instance.isDone)
-                {
-                    // Report partial progress while waiting
-                    float progressInStep = instance.progress * progressPerPrefab;
-                    float overallProgress = i * progressPerPrefab + progressInStep;
-                    CustomBoot.UpdateProgress(overallProgress);
                    await Task.Yield();
-                }

                Instances[i] = instance.Result[0];
-                
-                // Report completion of this step
-                currentProgress = (i + 1) * progressPerPrefab;
-                CustomBoot.UpdateProgress(currentProgress);
            }
        }
        
@@ -77,28 +55,12 @@ namespace Bootstrap
            }

            Instances = new GameObject[BootPrefabs.Length];
-            
-            // Calculate total prefabs for progress tracking
-            int totalPrefabs = BootPrefabs.Length;
-            float progressPerPrefab = totalPrefabs > 0 ? 1f / totalPrefabs : 1f;
-            float currentProgress = 0f;
-            
            for (var i = 0; i < BootPrefabs.Length; i++)
            {
-                if (!BootPrefabs[i])
-                {
-                    // Report incremental progress even for null prefabs
-                    currentProgress = (i + 1) * progressPerPrefab;
-                    CustomBoot.UpdateProgress(currentProgress);
-                    continue;
-                }
+                if (!BootPrefabs[i]) continue;
                
                var instance = GameObject.Instantiate(BootPrefabs[i], RuntimeContainer.transform);
                Instances[i] = instance;
-                
-                // Report completion of this step
-                currentProgress = (i + 1) * progressPerPrefab;
-                CustomBoot.UpdateProgress(currentProgress);
            }
        }

--- a/Assets/Scripts/Bootstrap/InitialLoadingScreen.cs
+++ b/Assets/Scripts/Bootstrap/InitialLoadingScreen.cs
@@ -1,240 +0,0 @@
-using System;
-using System.Collections;
-using UnityEngine;
-using UnityEngine.UI;
-using Core;
-
-namespace Bootstrap
-{
-    /// <summary>
-    /// Specialized loading screen controller specifically for the initial boot sequence.
-    /// This handles the combined progress of bootstrap initialization and main menu loading.
-    /// </summary>
-    public class InitialLoadingScreen : MonoBehaviour
-    {
-        [Header("UI References")]
-        [SerializeField] private GameObject loadingScreenContainer;
-        [SerializeField] private Image progressBarImage;
-
-        [Header("Settings")]
-        [SerializeField] private float minimumDisplayTime = 1.0f;
-        [SerializeField] private float progressUpdateInterval = 0.1f;
-    
-        private float _displayStartTime;
-        private Coroutine _progressCoroutine;
-        private bool _loadingComplete = false;
-        private bool _animationComplete = false;
-        private Action _onLoadingScreenFullyHidden;
-        
-        /// <summary>
-        /// Event that fires when the loading screen is fully hidden (both loading and animation completed)
-        /// </summary>
-        public event Action OnLoadingScreenFullyHidden;
-        
-        /// <summary>
-        /// Delegate for providing progress values from different sources
-        /// </summary>
-        public delegate float ProgressProvider();
-        
-        /// <summary>
-        /// Current progress provider being used for the loading screen
-        /// </summary>
-        private ProgressProvider _currentProgressProvider;
-        
-        /// <summary>
-        /// Default progress provider that returns 0 (or 1 if loading is complete)
-        /// </summary>
-        private float DefaultProgressProvider() => _loadingComplete ? 1f : 0f;
-        
-        /// <summary>
-        /// Check if the loading screen is currently active
-        /// </summary>
-        public bool IsActive => loadingScreenContainer != null && loadingScreenContainer.activeSelf;
-        
-        private void Awake()
-        {
-            if (loadingScreenContainer == null)
-                loadingScreenContainer = gameObject;
-            
-            // Ensure the loading screen is initially hidden
-            if (loadingScreenContainer != null)
-            {
-                loadingScreenContainer.SetActive(false);
-            }
-        }
-    
-        /// <summary>
-        /// Shows the loading screen and resets the progress bar to zero
-        /// </summary>
-        /// <param name="progressProvider">Optional delegate to provide progress values (0-1). If null, uses default provider.</param>
-        /// <param name="onComplete">Optional callback when loading screen is fully hidden</param>
-        public void ShowLoadingScreen(ProgressProvider progressProvider = null, Action onComplete = null)
-        {
-            // Store the completion callback
-            _onLoadingScreenFullyHidden = onComplete;
-            
-            // Set the progress provider, use default if none provided
-            _currentProgressProvider = progressProvider ?? DefaultProgressProvider;
-            
-            // Stop any existing progress coroutine
-            if (_progressCoroutine != null)
-            {
-                StopCoroutine(_progressCoroutine);
-                _progressCoroutine = null;
-            }
-        
-            _displayStartTime = Time.time;
-            _loadingComplete = false;
-            _animationComplete = false;
-        
-            if (progressBarImage != null)
-            {
-                progressBarImage.fillAmount = 0f;
-            }
-        
-            if (loadingScreenContainer != null)
-            {
-                loadingScreenContainer.SetActive(true);
-            }
-            
-            // Start the progress filling coroutine
-            _progressCoroutine = StartCoroutine(AnimateProgressBar());
-        }
-        
-        /// <summary>
-        /// Animates the progress bar at a steady pace over the minimum display time,
-        /// while also checking actual loading progress from the current progress provider
-        /// </summary>
-        private IEnumerator AnimateProgressBar()
-        {
-            float startTime = Time.time;
-            
-            // Continue until both animation and loading are complete
-            while (!_animationComplete)
-            {
-                // Calculate the steady progress based on elapsed time
-                float elapsedTime = Time.time - startTime;
-                float steadyProgress = Mathf.Clamp01(elapsedTime / minimumDisplayTime);
-                
-                // Get the actual loading progress from the current provider
-                float actualProgress = _currentProgressProvider();
-                
-                // If loading is complete, actualProgress should be 1.0
-                if (_loadingComplete)
-                {
-                    actualProgress = 1.0f;
-                }
-                
-                // Use the minimum of steady progress and actual progress
-                // This ensures we don't show more progress than actual loading
-                float displayProgress = Mathf.Min(steadyProgress, actualProgress);
-                
-                // Log the progress values for debugging
-                Debug.Log($"[InitialLoadingScreen] Progress - Default: {steadyProgress:F2}, Actual: {actualProgress:F2}, Display: {displayProgress:F2}");
-                
-                // Directly set the progress bar fill amount without smoothing
-                if (progressBarImage != null)
-                {
-                    progressBarImage.fillAmount = displayProgress;
-                }
-                
-                // Check if the animation has completed
-                // Animation is complete when we've reached the minimum display time AND we're at 100% progress
-                if (steadyProgress >= 1.0f && displayProgress >= 1.0f)
-                {
-                    _animationComplete = true;
-                    Debug.Log("[InitialLoadingScreen] Animation complete");
-                    break;
-                }
-                
-                // Wait for the configured interval before updating again
-                yield return new WaitForSeconds(progressUpdateInterval);
-            }
-            
-            // Ensure we end at 100% progress
-            if (progressBarImage != null)
-            {
-                progressBarImage.fillAmount = 1.0f;
-                Debug.Log("[InitialLoadingScreen] Final progress set to 1.0");
-            }
-            
-            // Hide the screen if loading is also complete
-            if (_loadingComplete)
-            {
-                if (loadingScreenContainer != null)
-                {
-                    loadingScreenContainer.SetActive(false);
-                    Debug.Log("[InitialLoadingScreen] Animation AND loading complete, hiding screen");
-                    
-                    // Invoke the callback when fully hidden
-                    _onLoadingScreenFullyHidden?.Invoke();
-                    OnLoadingScreenFullyHidden?.Invoke();
-                    _onLoadingScreenFullyHidden = null;
-                }
-            }
-            
-            _progressCoroutine = null;
-        }
-        
-        /// <summary>
-        /// Called when the actual loading process is complete
-        /// </summary>
-        public void HideLoadingScreen()
-        {
-            Debug.Log("[InitialLoadingScreen] Loading complete, marking loading as finished");
-            
-            // Mark that loading is complete
-            _loadingComplete = true;
-            
-            // If animation is already complete, we can hide the screen now
-            if (_animationComplete)
-            {
-                if (loadingScreenContainer != null)
-                {
-                    loadingScreenContainer.SetActive(false);
-                    Debug.Log("[InitialLoadingScreen] Animation already complete, hiding screen immediately");
-                    
-                    // Invoke the callback when fully hidden
-                    _onLoadingScreenFullyHidden?.Invoke();
-                    OnLoadingScreenFullyHidden?.Invoke();
-                    _onLoadingScreenFullyHidden = null;
-                }
-            }
-            else
-            {
-                Debug.Log("[InitialLoadingScreen] Animation still in progress, waiting for it to complete");
-                // The coroutine will handle hiding when animation completes
-            }
-        }
-        
-        /// <summary>
-        /// Waits until the loading screen is fully hidden before continuing
-        /// </summary>
-        /// <returns>Task that completes when the loading screen is hidden</returns>
-        public System.Threading.Tasks.Task WaitForLoadingScreenToHideAsync()
-        {
-            var tcs = new System.Threading.Tasks.TaskCompletionSource<bool>();
-            
-            // If the loading screen is not active, complete immediately
-            if (!IsActive)
-            {
-                tcs.SetResult(true);
-                return tcs.Task;
-            }
-            
-            // Store existing callback to chain it
-            Action existingCallback = _onLoadingScreenFullyHidden;
-            
-            // Set new callback
-            _onLoadingScreenFullyHidden = () => {
-                // Call existing callback if any
-                existingCallback?.Invoke();
-                
-                // Complete the task
-                tcs.SetResult(true);
-            };
-            
-            return tcs.Task;
-        }
-    }
-}
--- a/Assets/Scripts/Bootstrap/InitialLoadingScreen.cs.meta
+++ b/Assets/Scripts/Bootstrap/InitialLoadingScreen.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8968b564891a474baae157792b88e75f
-timeCreated: 1760613320
--- a/Assets/Scripts/Cinematics/CinematicsManager.cs
+++ b/Assets/Scripts/Cinematics/CinematicsManager.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using Bootstrap;
 using Core;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
@@ -28,27 +26,24 @@ namespace Cinematics
        private Dictionary<PlayableDirector, AsyncOperationHandle<PlayableAsset>> _addressableHandles 
            = new Dictionary<PlayableDirector, AsyncOperationHandle<PlayableAsset>>();

-        /// <summary>
-        /// Singleton instance of the CinematicsManager. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static CinematicsManager Instance => _instance;
-        
+        public static CinematicsManager Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<CinematicsManager>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("CinematicsManager");
+                        _instance = go.AddComponent<CinematicsManager>();
+                        // DontDestroyOnLoad(go);
+                    }
+                }
+                return _instance;
+            }
+        }
        public PlayableDirector playableDirector;
-        
-        private void Awake()
-        {
-            _instance = this;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Initialize any dependencies that require other services to be ready
-            // For example, subscribe to SceneManagerService events if needed
-            Logging.Debug("[CinematicsManager] Post-boot initialization complete");
-        }

        private void OnEnable()
        {
@@ -67,55 +62,15 @@ namespace Cinematics

        private void OnApplicationQuit()
        {
-            _isQuitting = true;
            ReleaseAllHandles();
        }
        
-        /// <summary>
-        /// Initializes required components for the CinematicsManager
-        /// </summary>
-        private void InitializeComponents()
-        {
-            // Initialize PlayableDirector if not set
-            if (playableDirector == null)
-            {
-                playableDirector = GetComponent<PlayableDirector>();
-                
-                // If still null, try to add the component
-                if (playableDirector == null)
-                {
-                    playableDirector = gameObject.AddComponent<PlayableDirector>();
-                    Debug.Log("[CinematicsManager] Added missing PlayableDirector component");
-                }
-            }
-            
-            // Initialize _cinematicSprites if not set
-            if (_cinematicSprites == null)
-            {
-                // First try to find in children
-                _cinematicSprites = GetComponentInChildren<Image>(true);
-                
-                // If still null, create a new UI Image for cinematics
-                if (_cinematicSprites == null)
-                {
-                    Debug.LogWarning("[CinematicsManager] No Image found for cinematics display. Cinematics may not display correctly.");
-                }
-            }
-        }
-        
        /// <summary>
        /// Plays a cinematic from an object reference and returns the PlayableDirector playing the timeline
        /// </summary>
        public PlayableDirector PlayCinematic(PlayableAsset assetToPlay)
        {
-            // Ensure components are initialized before playing
-            InitializeComponents();
-            
-            if (_cinematicSprites != null)
-            {
-                _cinematicSprites.enabled = true;
-            }
-            
+            _cinematicSprites.enabled = true;
            playableDirector.stopped += OnPlayableDirectorStopped;
            playableDirector.Play(assetToPlay);
            Logging.Debug("Playing cinematic " + assetToPlay.name);
@@ -190,5 +145,68 @@ namespace Cinematics
            }
            _addressableHandles.Clear();
        }
+
+        private void Awake()
+        {
+            PlayStartCinematicOnGameLoad();
+        }
+        
+        /// <summary>
+        /// Loads a cinematic asynchronously while showing a loading screen, then plays it
+        /// </summary>
+        /// <param name="key">The addressable key of the cinematic to load</param>
+        /// <returns>The PlayableDirector playing the cinematic</returns>
+        public async System.Threading.Tasks.Task<PlayableDirector> PlayCinematicWithLoadingScreen(string key)
+        {
+            Logging.Debug($"[CinematicsManager] Preparing to load cinematic with loading screen: {key}");
+            
+            // First, show the loading screen BEFORE creating any async operations
+            UI.LoadingScreenController.Instance.ShowLoadingScreen();
+            
+            // Give the loading screen a frame to render
+            await System.Threading.Tasks.Task.Yield();
+            
+            // Now create the load handle and track its progress
+            Logging.Debug($"[CinematicsManager] Starting cinematic asset load: {key}");
+            AsyncOperationHandle<PlayableAsset> handle = Addressables.LoadAssetAsync<PlayableAsset>(key);
+            
+            // Update the loading screen with the progress provider after the handle is created
+            UI.LoadingScreenController.Instance.ShowLoadingScreen(() => handle.PercentComplete);
+            
+            // Wait for the loading to complete
+            var result = await handle.Task;
+            
+            // Store the handle for later release
+            _addressableHandles[playableDirector] = handle;
+            
+            Logging.Debug($"[CinematicsManager] Cinematic loaded: {key}");
+            
+            // Hide the loading screen
+            UI.LoadingScreenController.Instance.HideLoadingScreen();
+            
+            // Important: Wait for the loading screen to be fully hidden before playing the cinematic
+            await UI.LoadingScreenController.Instance.WaitForLoadingScreenToHideAsync();
+            
+            Logging.Debug($"[CinematicsManager] Loading screen hidden, now playing cinematic: {key}");
+            
+            // Play the cinematic
+            return PlayCinematic(result);
+        }
+
+        private async void PlayStartCinematicOnGameLoad()
+        {
+            if (!SceneManager.GetActiveScene().name.ToLower().Contains("mainmenu"))
+            {
+                return;
+            }
+            
+            _instance = this;
+
+            playableDirector = GetComponent<PlayableDirector>();
+            _cinematicSprites = GetComponentInChildren<Image>(true);
+            
+            // Use the new method with loading screen instead of direct load
+            await PlayCinematicWithLoadingScreen("IntroSequence");
+        }
    }
 }
--- a/Assets/Scripts/Cinematics/SkipCinematic.cs
+++ b/Assets/Scripts/Cinematics/SkipCinematic.cs
@@ -1,4 +1,3 @@
-using Bootstrap;
 using Core;
 using Input;
 using UnityEngine;
@@ -15,14 +14,7 @@ namespace Cinematics
        private float _holdStartTime;
        private bool _isHolding;
        private bool _skipPerformed;
-        private bool _initialized = false;
    
-        void Awake()
-        {
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
        void Start()
        {
            // Reset the progress bar
@@ -31,76 +23,32 @@ namespace Cinematics
                radialProgressBar.fillAmount = 0f;
            }
        }
+    
+        void OnEnable()
+        {
+            if (CinematicsManager.Instance.IsCinematicPlaying)
+                HandleCinematicStarted();
+            
+            CinematicsManager.Instance.OnCinematicStarted += HandleCinematicStarted;
+            CinematicsManager.Instance.OnCinematicStopped += HandleCinematicStopped;
+        }

        void OnDisable()
        {
-            // Clean up subscriptions regardless of initialization state
-            UnsubscribeFromCinematicsEvents();
-        }
-    
-        private void InitializePostBoot()
-        {
-            // Safe initialization of manager dependencies after boot is complete
-            if (_initialized)
-                return;
-                
-            _initialized = true;
-            
-            // Subscribe to CinematicsManager events now that boot is complete
-            SubscribeToCinematicsEvents();
-            
-            Logging.Debug("[SkipCinematic] Post-boot initialization complete");
-        }
-    
-        private void SubscribeToCinematicsEvents()
-        {
-            if (CinematicsManager.Instance == null) return;
-            
-            // First unsubscribe to prevent duplicate subscriptions
-            UnsubscribeFromCinematicsEvents();
-            
-            // Now subscribe
-            CinematicsManager.Instance.OnCinematicStarted += HandleCinematicStarted;
-            CinematicsManager.Instance.OnCinematicStopped += HandleCinematicStopped;
-            
-            // Check if a cinematic is already playing
-            if (CinematicsManager.Instance.IsCinematicPlaying)
-                HandleCinematicStarted();
-                
-            Logging.Debug("[SkipCinematic] Subscribed to cinematics events");
-        }
-        
-        private void UnsubscribeFromCinematicsEvents()
-        {
-            if (CinematicsManager.Instance != null)
-            {
-                CinematicsManager.Instance.OnCinematicStarted -= HandleCinematicStarted;
-                CinematicsManager.Instance.OnCinematicStopped -= HandleCinematicStopped;
-                Logging.Debug("[SkipCinematic] Unsubscribed from cinematics events");
-            }
-            
-            // If still registered as an input override consumer, unregister
-            if (InputManager.Instance != null)
-            {
-                InputManager.Instance.UnregisterOverrideConsumer(this);
-                Logging.Debug("[SkipCinematic] Unregistered as input override consumer");
-            }
+            CinematicsManager.Instance.OnCinematicStarted -= HandleCinematicStarted;
+            CinematicsManager.Instance.OnCinematicStopped -= HandleCinematicStopped;
+            // If still registered, unregister input override
+            InputManager.Instance.UnregisterOverrideConsumer(this);
        }

        private void HandleCinematicStarted()
        {
-            if (InputManager.Instance != null)
-            {
-                InputManager.Instance.RegisterOverrideConsumer(this);
-            }
+            InputManager.Instance.RegisterOverrideConsumer(this);
        }

        private void HandleCinematicStopped()
        {
-            if (InputManager.Instance != null)
-            {
-                InputManager.Instance.UnregisterOverrideConsumer(this);
-            }
+            InputManager.Instance.UnregisterOverrideConsumer(this);
        }
    
        void Update()
--- a/Assets/Scripts/Core/GameManager.cs
+++ b/Assets/Scripts/Core/GameManager.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using AppleHills.Core.Interfaces;
 using Core;
 using UI;
-using Bootstrap;

 /// <summary>
 /// Singleton manager for global game state and settings. Provides accessors for various gameplay parameters.
@@ -16,9 +15,25 @@ public class GameManager : MonoBehaviour
    private static bool _isQuitting = false;

    /// <summary>
-    /// Singleton instance of the GameManager. No longer creates an instance if one doesn't exist.
+    /// Singleton instance of the GameManager.
    /// </summary>
-    public static GameManager Instance => _instance;
+    public static GameManager Instance
+    {
+        get
+        {
+            if (_instance == null && Application.isPlaying && !_isQuitting)
+            {
+                _instance = FindAnyObjectByType<GameManager>();
+                if (_instance == null)
+                {
+                    var go = new GameObject("GameManager");
+                    _instance = go.AddComponent<GameManager>();
+                    // DontDestroyOnLoad(go);
+                }
+            }
+            return _instance;
+        }
+    }

    [Header("Settings Status")]
    [SerializeField] private bool _settingsLoaded = false;
@@ -55,13 +70,10 @@ public class GameManager : MonoBehaviour
        InitializeSettings();
        InitializeDeveloperSettings();
        
-        // Register for post-boot initialization
-        BootCompletionService.RegisterInitAction(InitializePostBoot);
-        
        // DontDestroyOnLoad(gameObject);
    }
    
-    private void InitializePostBoot()
+    private void Start()
    {
        // Find and subscribe to PauseMenu events
        PauseMenu pauseMenu = PauseMenu.Instance;
--- a/Assets/Scripts/Core/ItemManager.cs
+++ b/Assets/Scripts/Core/ItemManager.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using UnityEngine;
 using Interactions;
-using Bootstrap;

 namespace Core
 {
@@ -15,10 +14,23 @@ namespace Core
        private static ItemManager _instance;
        private static bool _isQuitting;

-        /// <summary>
-        /// Singleton instance of the ItemManager. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static ItemManager Instance => _instance;
+        public static ItemManager Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<ItemManager>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("ItemManager");
+                        _instance = go.AddComponent<ItemManager>();
+                        // DontDestroyOnLoad(go);
+                    }
+                }
+                return _instance;
+            }
+        }

        private readonly HashSet<Pickup> _pickups = new HashSet<Pickup>();
        private readonly HashSet<ItemSlot> _itemSlots = new HashSet<ItemSlot>();
@@ -51,16 +63,13 @@ namespace Core
        void Awake()
        {
            _instance = this;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
        }
-        
-        private void InitializePostBoot()
+
+        void Start()
        {
            // Subscribe to scene load completed so we can clear registrations when scenes change
+            // Access Instance directly to ensure the service is initialized and we get the event hookup.
            SceneManagerService.Instance.SceneLoadStarted += OnSceneLoadStarted;
-            Logging.Debug("[ItemManager] Subscribed to SceneManagerService events");
        }

        void OnDestroy()
--- a/Assets/Scripts/Core/QuickAccess.cs
+++ b/Assets/Scripts/Core/QuickAccess.cs
@@ -18,11 +18,23 @@ namespace AppleHills.Core
 		private static QuickAccess _instance;
        private static bool _isQuitting = false;
        
-        /// <summary>
-        /// Singleton instance of QuickAccess. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static QuickAccess Instance => _instance;
-
+        public static QuickAccess Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<QuickAccess>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("QuickAccess");
+                        _instance = go.AddComponent<QuickAccess>();
+                    }
+                }
+                return _instance;
+            }
+        }
+        
        void OnApplicationQuit()
        {
            _isQuitting = true;
@@ -134,8 +146,6 @@ namespace AppleHills.Core

        private void Awake()
        {
-            _instance = this;
-            
            if (!_initialized)
            {
                // Subscribe to scene changes
--- a/Assets/Scripts/Core/SceneManagerService.cs
+++ b/Assets/Scripts/Core/SceneManagerService.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using UI;
 using UnityEngine;
 using UnityEngine.SceneManagement;
-using Bootstrap;

 namespace Core
 {
@@ -16,11 +15,26 @@ namespace Core
        private LoadingScreenController _loadingScreen;
        private static SceneManagerService _instance;
        private static bool _isQuitting = false;
-        
        /// <summary>
-        /// Singleton instance of the SceneManagerService. No longer creates an instance if one doesn't exist.
+        /// Singleton instance of the SceneManagerService.
        /// </summary>
-        public static SceneManagerService Instance => _instance;
+        public static SceneManagerService Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<SceneManagerService>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("SceneManagerService");
+                        _instance = go.AddComponent<SceneManagerService>();
+                        // DontDestroyOnLoad(go);
+                    }
+                }
+                return _instance;
+            }
+        }

        // Events for scene lifecycle
        public event Action<string> SceneLoadStarted;
@@ -34,17 +48,30 @@ namespace Core
        private readonly Dictionary<string, AsyncOperation> _activeUnloads = new();
        private const string BootstrapSceneName = "BootstrapScene";

+        void Start()
+        {
+            _loadingScreen = LoadingScreenController.Instance;
+            
+            // Set up loading screen event handlers
+            SetupLoadingScreenEvents();
+        }
+        
+        
        void Awake()
        {
            _instance = this;
            // DontDestroyOnLoad(gameObject);
-            
-            // Initialize current scene tracking immediately in Awake
-            InitializeCurrentSceneTracking();
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-            
+#if UNITY_EDITOR
+            // In Editor, set CurrentGameplayScene to the currently open scene at play start
+            if (Application.isPlaying)
+            {
+                var activeScene = SceneManager.GetActiveScene();
+                if (activeScene.IsValid())
+                {
+                    CurrentGameplayScene = activeScene.name;
+                }
+            }
+#endif
            // Ensure BootstrapScene is loaded at startup
            var bootstrap = SceneManager.GetSceneByName(BootstrapSceneName);
            if (!bootstrap.isLoaded)
@@ -52,48 +79,6 @@ namespace Core
                SceneManager.LoadScene(BootstrapSceneName, LoadSceneMode.Additive);
            }
        }
-        
-        /// <summary>
-        /// Initialize current scene tracking immediately in Awake
-        /// This ensures scene management works correctly regardless of boot timing
-        /// </summary>
-        private void InitializeCurrentSceneTracking()
-        {
-            // Get the active scene and use it as the current gameplay scene
-            Scene activeScene = SceneManager.GetActiveScene();
-            
-            if (activeScene.IsValid())
-            {
-                // If this is the MainMenu or another gameplay scene, track it
-                if (activeScene.name != BootstrapSceneName)
-                {
-                    CurrentGameplayScene = activeScene.name;
-                    Logging.Debug($"[SceneManagerService] Initialized with current scene: {CurrentGameplayScene}");
-                }
-                // Otherwise default to MainMenu
-                else
-                {
-                    CurrentGameplayScene = "MainMenu";
-                    Logging.Debug($"[SceneManagerService] Initialized with default scene: {CurrentGameplayScene}");
-                }
-            }
-            else
-            {
-                CurrentGameplayScene = "MainMenu";
-                Logging.Debug($"[SceneManagerService] No valid active scene, defaulting to: {CurrentGameplayScene}");
-            }
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Set up loading screen reference and events after boot is complete
-            _loadingScreen = LoadingScreenController.Instance;
-            
-            // Set up loading screen event handlers if available
-            SetupLoadingScreenEvents();
-            
-            Logging.Debug($"[SceneManagerService] Post-boot initialization complete, current scene is: {CurrentGameplayScene}");
-        }
    
        private void SetupLoadingScreenEvents()
        {
@@ -277,27 +262,16 @@ namespace Core
        }

        // Tracks the currently loaded gameplay scene (not persistent/bootstrapper)
-        public string CurrentGameplayScene { get; set; } = "MainMenu";
+        public string CurrentGameplayScene { get; private set; } = "MainMenu";

-        public async Task ReloadCurrentScene(IProgress<float> progress = null, bool autoHideLoadingScreen = true)
+        public async Task ReloadCurrentScene(IProgress<float> progress = null)
        {
-            await SwitchSceneAsync(CurrentGameplayScene, progress, autoHideLoadingScreen);
+            await SwitchSceneAsync(CurrentGameplayScene, progress);
        }

-        /// <summary>
-        /// Switches from current gameplay scene to a new one
-        /// </summary>
-        /// <param name="newSceneName">Name of the scene to load</param>
-        /// <param name="progress">Optional progress reporter</param>
-        /// <param name="autoHideLoadingScreen">Whether to automatically hide the loading screen when complete. If false, caller must hide it manually.</param>
-        public async Task SwitchSceneAsync(string newSceneName, IProgress<float> progress = null, bool autoHideLoadingScreen = true)
+        // Switches from current gameplay scene to a new one
+        public async Task SwitchSceneAsync(string newSceneName, IProgress<float> progress = null)
        {
-            // Show loading screen at the start (whether using auto-hide or not)
-            if (_loadingScreen != null && !_loadingScreen.IsActive)
-            {
-                _loadingScreen.ShowLoadingScreen();
-            }
-
            // Remove all AstarPath (A* Pathfinder) singletons before loading the new scene
            var astarPaths = FindObjectsByType<AstarPath>(FindObjectsSortMode.None);
            foreach (var astar in astarPaths)
@@ -330,12 +304,6 @@ namespace Core
            await LoadSceneAsync(newSceneName, progress);
            // Update tracker
            CurrentGameplayScene = newSceneName;
-            
-            // Only hide the loading screen if autoHideLoadingScreen is true
-            if (autoHideLoadingScreen && _loadingScreen != null)
-            {
-                _loadingScreen.HideLoadingScreen();
-            }
        }
    }
 }
--- a/Assets/Scripts/Core/SceneOrientationEnforcer.cs
+++ b/Assets/Scripts/Core/SceneOrientationEnforcer.cs
@@ -5,8 +5,6 @@ using Input;
 using Settings;
 using System.Collections;
 using Minigames.DivingForPictures;
-using Bootstrap;
-using Core;

 namespace Utility
 {
@@ -14,11 +12,23 @@ namespace Utility
    {
        private static SceneOrientationEnforcer _instance;
        private static bool _isQuitting;
-        
-        /// <summary>
-        /// Singleton instance of the SceneOrientationEnforcer. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static SceneOrientationEnforcer Instance => _instance;
+        public static SceneOrientationEnforcer Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<SceneOrientationEnforcer>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("SceneOrientationEnforcer");
+                        _instance = go.AddComponent<SceneOrientationEnforcer>();
+                        // DontDestroyOnLoad(go); // Uncomment if you want persistence
+                    }
+                }
+                return _instance;
+            }
+        }

        [Header("Config")]
        public SceneOrientationConfig orientationConfig;
@@ -38,16 +48,10 @@ namespace Utility
        {
            _instance = this;
            OnOrientationCorrect += HandleOrientationCorrect;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
        }
-        
-        private void InitializePostBoot()
+
+        void Start()
        {
-            // Initialize any dependencies that require other services to be ready
-            Logging.Debug("[SceneOrientationEnforcer] Post-boot initialization complete");
-            
            // Subscribe to sceneLoaded event
            SceneManager.sceneLoaded += OnSceneLoaded;
            // Manually invoke for the first scene (unless it's Main Menu)
@@ -70,8 +74,6 @@ namespace Utility
                    return Screen.orientation == ScreenOrientation.Portrait || Screen.orientation == ScreenOrientation.PortraitUpsideDown;
                case ScreenOrientationRequirement.Landscape:
                    return Screen.orientation == ScreenOrientation.LandscapeLeft || Screen.orientation == ScreenOrientation.LandscapeRight;
-                case ScreenOrientationRequirement.NotApplicable:
-                    return true;
                default:
                    return true;
            }
@@ -96,7 +98,7 @@ namespace Utility

            _isDivingMinigame = IsDivingMinigameScene(scene);
            
-            _requiredOrientation = orientationConfig != null ? orientationConfig.GetRequirementForScene(scene.name) : ScreenOrientationRequirement.NotApplicable;
+            _requiredOrientation = orientationConfig != null ? orientationConfig.GetRequirementForScene(scene.name) : ScreenOrientationRequirement.Portrait;
            _orientationCorrect = IsOrientationCorrect();
            
            if (!_orientationCorrect)
@@ -184,7 +186,7 @@ namespace Utility
                _orientationCheckCoroutine = null;
            }
            
-            InputManager.Instance.SetInputMode(InputMode.GameAndUI);
+            InputManager.Instance.SetInputMode(InputMode.Game);
        }

        private void CleanupPromptAndCoroutine()
--- a/Assets/Scripts/Core/Settings/Developer/DeveloperSettingsProvider.cs
+++ b/Assets/Scripts/Core/Settings/Developer/DeveloperSettingsProvider.cs
@@ -24,7 +24,7 @@ namespace AppleHills.Core.Settings
                if (_instance == null && Application.isPlaying)
                {
                    _instance = FindFirstObjectByType<DeveloperSettingsProvider>();
-
+                    
                    if (_instance == null)
                    {
                        GameObject go = new GameObject("DeveloperSettingsProvider");
@@ -33,7 +33,7 @@ namespace AppleHills.Core.Settings
                        DontDestroyOnLoad(go);
                    }
                }
-
+                
                return _instance;
            }
        }
--- a/Assets/Scripts/Data/CardSystem/CardSystemManager.cs
+++ b/Assets/Scripts/Data/CardSystem/CardSystemManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using AppleHills.Data.CardSystem;
-using Bootstrap;
 using Core;
 using UnityEngine;

@@ -62,15 +61,6 @@ namespace Data.CardSystem
            
            // Build lookup dictionary
            BuildDefinitionLookup();
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Initialize any dependencies that require other services to be ready
-            Logging.Debug("[CardSystemManager] Post-boot initialization complete");
        }

        private void OnApplicationQuit()
--- a/Assets/Scripts/Input/InputManager.cs
+++ b/Assets/Scripts/Input/InputManager.cs
@@ -5,7 +5,6 @@ using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 using UnityEngine.SceneManagement;
 using AppleHills.Core.Settings;
-using Bootstrap;
 using Core; // Added for IInteractionSettings

 namespace Input
@@ -36,10 +35,22 @@ namespace Input
        // Track which consumer is handling the current hold operation
        private ITouchInputConsumer _activeHoldConsumer;

-        /// <summary>
-        /// Singleton instance of the InputManager. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static InputManager Instance => _instance;
+        public static InputManager Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<InputManager>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("InputManager");
+                        _instance = go.AddComponent<InputManager>();
+                    }
+                }
+                return _instance;
+            }
+        }

        // Settings reference
        private IInteractionSettings _interactionSettings;
@@ -55,15 +66,6 @@ namespace Input
        {
            _instance = this;
            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Subscribe to scene load completed events now that boot is complete
-            SceneManagerService.Instance.SceneLoadCompleted += SwitchInputOnSceneLoaded;
-            
            // Initialize settings reference
            _interactionSettings = GameManager.GetSettingsObject<IInteractionSettings>();
            
@@ -76,25 +78,12 @@ namespace Input
            tapMoveAction = playerInput.actions.FindAction("TapMove", false);
            holdMoveAction = playerInput.actions.FindAction("HoldMove", false);
            positionAction = playerInput.actions.FindAction("TouchPosition", false);
-            
-            if (tapMoveAction != null)
-                tapMoveAction.performed += OnTapMovePerformed;
-            if (holdMoveAction != null)
-            {
-                holdMoveAction.performed += OnHoldMoveStarted;
-                holdMoveAction.canceled += OnHoldMoveCanceled;
-            }
-            
-            SwitchInputOnSceneLoaded(SceneManager.GetActiveScene().name);
-            
-            Logging.Debug("[InputManager] Subscribed to SceneManagerService events");
        }
-        
-        private void OnDestroy()
+
+        private void Start()
        {
-            // Unsubscribe from SceneManagerService
-            if (SceneManagerService.Instance != null)
-                SceneManagerService.Instance.SceneLoadCompleted -= SwitchInputOnSceneLoaded;
+            // SceneManagerService.Instance.SceneLoadCompleted += SwitchInputOnSceneLoaded;
+            SwitchInputOnSceneLoaded(SceneManager.GetActiveScene().name);
        }

        private void SwitchInputOnSceneLoaded(string sceneName)
@@ -133,6 +122,17 @@ namespace Input
                    break;
            }
        }
+        
+        void OnEnable()
+        {
+            if (tapMoveAction != null)
+                tapMoveAction.performed += OnTapMovePerformed;
+            if (holdMoveAction != null)
+            {
+                holdMoveAction.performed += OnHoldMoveStarted;
+                holdMoveAction.canceled += OnHoldMoveCanceled;
+            }
+        }

        void OnDisable()
        {
@@ -149,7 +149,7 @@ namespace Input
        {
            _isQuitting = true;
        }
-        
+
        /// <summary>
        /// Sets the default ITouchInputConsumer to receive input events.
        /// </summary>
--- a/Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs
+++ b/Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs
@@ -798,7 +798,7 @@ namespace Minigames.DivingForPictures
            
            // Change input mode to UI when menu is open
            if(turnOffGameInput)
-                InputManager.Instance.SetInputMode(InputMode.GameAndUI);
+                InputManager.Instance.SetInputMode(InputMode.UI);
            
            Logging.Debug($"[DivingGameManager] Game paused. Paused {_pausableComponents.Count} components.");
        }
--- a/Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs
+++ b/Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs
@@ -545,6 +545,167 @@ namespace Minigames.DivingForPictures
            _movementCoroutine = null;
        }

+        /// <summary>
+        /// Coroutine that checks for tiles to destroy periodically
+        /// </summary>
+        private IEnumerator TileDestructionRoutine()
+        {
+            const float checkInterval = 0.5f; // Check every half second
+            Logging.Debug($"[TrenchTileSpawner] Started tile destruction coroutine with interval: {checkInterval}s");
+            
+            while (enabled && gameObject.activeInHierarchy && !_isPaused)
+            {
+                // Check and handle tile destruction
+                if (_activeTiles.Count > 0)
+                {
+                    GameObject topTile = _activeTiles[0];
+                    if (topTile == null)
+                    {
+                        _activeTiles.RemoveAt(0);
+                    }
+                    else
+                    {
+                        float tileHeight = GetTileHeight(topTile);
+                        
+                        bool shouldDestroy;
+                        if (_isSurfacing)
+                        {
+                            // When surfacing, destroy tiles at the bottom
+                            shouldDestroy = topTile.transform.position.y + tileHeight / 2 < _screenBottom - _settings.TileSpawnBuffer;
+                        }
+                        else
+                        {
+                            // When descending, destroy tiles at the top
+                            shouldDestroy = topTile.transform.position.y - tileHeight / 2 > _screenTop + _settings.TileSpawnBuffer;
+                        }
+                        
+                        if (shouldDestroy)
+                        {
+                            _activeTiles.RemoveAt(0);
+                            onTileDestroyed?.Invoke(topTile);
+                            
+                            if (_devSettings != null && _devSettings.TrenchTileUseObjectPooling && _tilePool != null)
+                            {
+                                // Find the prefab index for this tile
+                                int prefabIndex = GetPrefabIndex(topTile);
+                                if (prefabIndex >= 0)
+                                {
+                                    _tilePool.ReturnTile(topTile, prefabIndex);
+                                }
+                                else
+                                {
+                                    Destroy(topTile);
+                                }
+                            }
+                            else
+                            {
+                                Destroy(topTile);
+                            }
+                        }
+                    }
+                }
+                
+                // Wait for the next check interval
+                yield return new WaitForSeconds(checkInterval);
+            }
+            
+            // Clear coroutine reference when stopped
+            _tileDestructionCoroutine = null;
+        }
+        
+        /// <summary>
+        /// Coroutine that checks if new tiles need to be spawned periodically
+        /// </summary>
+        private IEnumerator TileSpawningRoutine()
+        {
+            const float checkInterval = 0.2f; // Check every fifth of a second
+            Logging.Debug($"[TrenchTileSpawner] Started tile spawning coroutine with interval: {checkInterval}s");
+            
+            while (enabled && gameObject.activeInHierarchy && !_isPaused && !_stopSpawning)
+            {
+                // Check if we need to spawn new tiles
+                if (_activeTiles.Count == 0) 
+                {
+                    // If we have no active tiles and spawning is stopped, trigger the event
+                    if (_stopSpawning)
+                    {
+                        onLastTileLeft.Invoke();
+                    }
+                }
+                else
+                {
+                    GameObject bottomTile = _activeTiles[^1];
+                    if (bottomTile == null)
+                    {
+                        _activeTiles.RemoveAt(_activeTiles.Count - 1);
+                    }
+                    else
+                    {
+                        // Get the tile height once to use in all calculations
+                        float tileHeight = GetTileHeight(bottomTile);
+                        
+                        // If we're in stop spawning mode, check if last tile is leaving
+                        if (_stopSpawning)
+                        {
+                            // Check if this is the last tile, and if it's about to leave the screen
+                            if (_activeTiles.Count == 1)
+                            {
+                                bool isLastTileLeaving;
+                                
+                                if (_isSurfacing)
+                                {
+                                    // When surfacing, check if bottom of tile is above top of screen
+                                    isLastTileLeaving = bottomTile.transform.position.y - tileHeight / 2 > _screenTop + _settings.TileSpawnBuffer;
+                                }
+                                else
+                                {
+                                    // When descending, check if top of tile is below bottom of screen
+                                    isLastTileLeaving = bottomTile.transform.position.y + tileHeight / 2 < _screenBottom - _settings.TileSpawnBuffer;
+                                }
+                                
+                                if (isLastTileLeaving)
+                                {
+                                    onLastTileLeft.Invoke();
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // Normal spawning mode
+                            bool shouldSpawn;
+                            float newY;
+                            
+                            if (_isSurfacing)
+                            {
+                                // When surfacing, spawn new tiles at the top
+                                float topEdge = bottomTile.transform.position.y + tileHeight / 2;
+                                shouldSpawn = topEdge < _screenTop + _settings.TileSpawnBuffer;
+                                newY = bottomTile.transform.position.y + tileHeight;
+                            }
+                            else
+                            {
+                                // When descending, spawn new tiles at the bottom
+                                float bottomEdge = bottomTile.transform.position.y - tileHeight / 2;
+                                shouldSpawn = bottomEdge > _screenBottom - _settings.TileSpawnBuffer;
+                                newY = bottomTile.transform.position.y - tileHeight;
+                            }
+                            
+                            if (shouldSpawn)
+                            {
+                                SpawnTileAtY(newY);
+                            }
+                        }
+                    }
+                }
+                
+                // Wait for the next check interval
+                yield return new WaitForSeconds(checkInterval);
+            }
+            
+            // Clear coroutine reference when stopped
+            _tileSpawningCoroutine = null;
+        }
+
        /// <summary>
        /// Coroutine that handles increasing the movement speed over time
        /// </summary>
@@ -1099,9 +1260,6 @@ namespace Minigames.DivingForPictures
                    if (_stopSpawning)
                    {
                        onLastTileLeft.Invoke();
-                        // Stop the coroutine since all tiles are gone and no new ones will spawn
-                        Logging.Debug("[TrenchTileSpawner] No active tiles and spawning stopped - ending tile spawning coroutine");
-                        yield break;
                    }
                }
                else
@@ -1138,9 +1296,6 @@ namespace Minigames.DivingForPictures
                                if (isLastTileLeaving)
                                {
                                    onLastTileLeft.Invoke();
-                                    // Stop the coroutine since the last tile has left and no new ones will spawn
-                                    Logging.Debug("[TrenchTileSpawner] Last tile left screen and spawning stopped - ending tile spawning coroutine");
-                                    yield break;
                                }
                            }
                        }
--- a/Assets/Scripts/PuzzleS/ObjectiveStepBehaviour.cs
+++ b/Assets/Scripts/PuzzleS/ObjectiveStepBehaviour.cs
@@ -71,16 +71,9 @@ namespace PuzzleS

        void Start()
        {
-            // Simply register with the PuzzleManager
-            // The manager will handle state updates appropriately based on whether data is loaded
-            if (stepData != null && PuzzleManager.Instance != null)
-            {
-                PuzzleManager.Instance.RegisterStepBehaviour(this);
-            }
-            else if (stepData == null)
-            {
-                Logging.Warning($"[Puzzles] Cannot register step on {gameObject.name}: stepData is null");
-            }
+            // Register with PuzzleManager, regardless of enabled/disabled state
+            // PuzzleManager will call UnlockStep or LockStep based on current puzzle state
+            PuzzleManager.Instance?.RegisterStepBehaviour(this);
        }

        void OnDestroy()
@@ -90,11 +83,7 @@ namespace PuzzleS
                _interactable.interactionStarted.RemoveListener(OnInteractionStarted);
                _interactable.interactionComplete.RemoveListener(OnInteractionComplete);
            }
-            
-            if (PuzzleManager.Instance != null && stepData != null)
-            {
-                PuzzleManager.Instance.UnregisterStepBehaviour(this);
-            }
+            PuzzleManager.Instance?.UnregisterStepBehaviour(this);
        }
        
        /// <summary>
--- a/Assets/Scripts/PuzzleS/PuzzleManager.cs
+++ b/Assets/Scripts/PuzzleS/PuzzleManager.cs
@@ -5,11 +5,9 @@ using System.Linq;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using AppleHills.Core.Settings;
-using Bootstrap;
 using Core;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
-using Utils;

 namespace PuzzleS
 {
@@ -33,15 +31,28 @@ namespace PuzzleS
        // Current level puzzle data
        private PuzzleLevelDataSO _currentLevelData;
        private AsyncOperationHandle<PuzzleLevelDataSO> _levelDataLoadOperation;
-        private bool _isDataLoaded = false;
-
-        // Store registered behaviors that are waiting for data to be loaded
-        private List<ObjectiveStepBehaviour> _registeredBehaviours = new List<ObjectiveStepBehaviour>();
+        private bool _isLoadingLevelData = false;

        /// <summary>
        /// Singleton instance of the PuzzleManager.
        /// </summary>
-        public static PuzzleManager Instance => _instance;
+        public static PuzzleManager Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<PuzzleManager>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("PuzzleManager");
+                        _instance = go.AddComponent<PuzzleManager>();
+                        // DontDestroyOnLoad(go);
+                    }
+                }
+                return _instance;
+            }
+        }

        // Events to notify about step lifecycle
        public event Action<PuzzleStepSO> OnStepCompleted;
@@ -57,20 +68,17 @@ namespace PuzzleS
        void Awake()
        {
            _instance = this;
+            // DontDestroyOnLoad(gameObject);
            
            // Initialize settings reference
            _interactionSettings = GameManager.GetSettingsObject<IInteractionSettings>();
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Subscribe to SceneManagerService events after boot is complete
+
+            // Subscribe to scene manager events
            SceneManagerService.Instance.SceneLoadCompleted += OnSceneLoadCompleted;
-            SceneManagerService.Instance.SceneLoadStarted += OnSceneLoadStarted;
-            
+        }
+
+        void Start()
+        {
            // Find player transform
            _playerTransform = GameObject.FindGameObjectWithTag("Player")?.transform;
            
@@ -78,14 +86,12 @@ namespace PuzzleS
            StartProximityChecks();
            
            // Load puzzle data for the current scene if not already loading
-            if (_currentLevelData == null && !_isDataLoaded)
+            if (_currentLevelData == null && !_isLoadingLevelData)
            {
                LoadPuzzleDataForCurrentScene();
            }
-            
-            Logging.Debug("[PuzzleManager] Subscribed to SceneManagerService events");
        }
-        
+
        void OnDestroy()
        {
            StopProximityChecks();
@@ -94,7 +100,6 @@ namespace PuzzleS
            if (SceneManagerService.Instance != null)
            {
                SceneManagerService.Instance.SceneLoadCompleted -= OnSceneLoadCompleted;
-                SceneManagerService.Instance.SceneLoadStarted -= OnSceneLoadStarted;
            }
            
            // Release addressable handle if needed
@@ -104,20 +109,10 @@ namespace PuzzleS
            }
        }

-        /// <summary>
-        /// Called when a scene is starting to load
-        /// </summary>
-        public void OnSceneLoadStarted(string sceneName)
-        {
-            // Reset data loaded state when changing scenes to avoid using stale data
-            _isDataLoaded = false;
-            Logging.Debug($"[Puzzles] Scene load started: {sceneName}, marked puzzle data as not loaded");
-        }
-
        /// <summary>
        /// Called when a scene is loaded
        /// </summary>
-        public void  OnSceneLoadCompleted(string sceneName)
+        private void OnSceneLoadCompleted(string sceneName)
        {
            // Skip for non-gameplay scenes
            if (sceneName == "BootstrapScene" || string.IsNullOrEmpty(sceneName))
@@ -126,7 +121,7 @@ namespace PuzzleS
            }
            
            Logging.Debug($"[Puzzles] Scene loaded: {sceneName}, loading puzzle data");
-            LoadPuzzleDataForCurrentScene(sceneName);
+            LoadPuzzleDataForCurrentScene();
            
            // Find player transform again in case it changed with scene load
            _playerTransform = GameObject.FindGameObjectWithTag("Player")?.transform;
@@ -138,16 +133,16 @@ namespace PuzzleS
        /// <summary>
        /// Load puzzle data for the current scene
        /// </summary>
-        private void LoadPuzzleDataForCurrentScene(string sceneName = null)
+        private void LoadPuzzleDataForCurrentScene()
        {
-            string currentScene = sceneName ?? SceneManagerService.Instance.CurrentGameplayScene;
+            string currentScene = SceneManagerService.Instance.CurrentGameplayScene;
            if (string.IsNullOrEmpty(currentScene))
            {
                Logging.Warning("[Puzzles] Cannot load puzzle data: Current scene name is empty");
                return;
            }
            
-            _isDataLoaded = false;
+            _isLoadingLevelData = true;
            string addressablePath = $"Puzzles/{currentScene}";
            
            Logging.Debug($"[Puzzles] Loading puzzle data from addressable: {addressablePath}");
@@ -157,20 +152,13 @@ namespace PuzzleS
            {
                Addressables.Release(_levelDataLoadOperation);
            }
-
-            // Check if the addressable exists before trying to load it
-            if (!AppleHillsUtils.AddressableKeyExists(addressablePath))
-            {
-                Logging.Warning($"[Puzzles] Puzzle data does not exist for scene: {currentScene}");
-                _isDataLoaded = true; // Mark as loaded but with no data
-                _currentLevelData = null;
-                return;
-            }
            
            // Load the level data asset
            _levelDataLoadOperation = Addressables.LoadAssetAsync<PuzzleLevelDataSO>(addressablePath);
            _levelDataLoadOperation.Completed += handle => 
            {
+                _isLoadingLevelData = false;
+                
                if (handle.Status == AsyncOperationStatus.Succeeded)
                {
                    _currentLevelData = handle.Result;
@@ -183,11 +171,8 @@ namespace PuzzleS
                    // Unlock initial steps
                    UnlockInitialSteps();
                    
-                    // Update all registered behaviors now that data is loaded
-                    UpdateAllRegisteredBehaviors();
-                    
-                    // Mark data as loaded
-                    _isDataLoaded = true;
+                    // Update existing ObjectiveStepBehaviours with the current state
+                    UpdateRegisteredStepStates();
                    
                    // Notify listeners
                    OnLevelDataLoaded?.Invoke(_currentLevelData);
@@ -195,8 +180,6 @@ namespace PuzzleS
                else
                {
                    Logging.Warning($"[Puzzles] Failed to load puzzle data for {currentScene}: {handle.OperationException?.Message}");
-                    _isDataLoaded = true; // Mark as loaded but with error
-                    _currentLevelData = null;
                }
            };
        }
@@ -259,24 +242,6 @@ namespace PuzzleS
            }
        }

-        /// <summary>
-        /// Update all registered behaviors with their current state
-        /// </summary>
-        private void UpdateAllRegisteredBehaviors()
-        {
-            foreach (var behaviour in _registeredBehaviours)
-            {
-                if (behaviour == null) continue;
-                
-                // Only update if the step is in our dictionary
-                bool stepUnlocked = IsStepUnlocked(behaviour.stepData);
-                if (stepUnlocked)
-                {
-                    UpdateStepState(behaviour);
-                }
-            }
-        }
-
        /// <summary>
        /// Registers a step behaviour with the manager.
        /// </summary>
@@ -285,24 +250,13 @@ namespace PuzzleS
        {
            if (behaviour?.stepData == null) return;
            
-            // Always add to our registered behaviors list
-            if (!_registeredBehaviours.Contains(behaviour))
-            {
-                _registeredBehaviours.Add(behaviour);
-            }
-            
-            // Add to the step behaviours dictionary if not already there
            if (!_stepBehaviours.ContainsKey(behaviour.stepData))
            {
                _stepBehaviours.Add(behaviour.stepData, behaviour);
                Logging.Debug($"[Puzzles] Registered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
                
-                // Only update state if data is already loaded
-                if (_isDataLoaded && _currentLevelData != null)
-                {
-                    UpdateStepState(behaviour);
-                }
-                // Otherwise, the state will be updated when data loads in UpdateAllRegisteredBehaviors
+                // Immediately set the correct state based on current puzzle state
+                UpdateStepState(behaviour);
            }
        }
        
@@ -329,6 +283,17 @@ namespace PuzzleS
            }
        }
        
+        /// <summary>
+        /// Updates the states of all registered step behaviours based on current puzzle state.
+        /// </summary>
+        private void UpdateRegisteredStepStates()
+        {
+            foreach (var kvp in _stepBehaviours)
+            {
+                UpdateStepState(kvp.Value);
+            }
+        }
+
        /// <summary>
        /// Unregisters a step behaviour from the manager.
        /// </summary>
@@ -336,10 +301,7 @@ namespace PuzzleS
        public void UnregisterStepBehaviour(ObjectiveStepBehaviour behaviour)
        {
            if (behaviour?.stepData == null) return;
-            
            _stepBehaviours.Remove(behaviour.stepData);
-            _registeredBehaviours.Remove(behaviour);
-            
            Logging.Debug($"[Puzzles] Unregistered step: {behaviour.stepData.stepId} on {behaviour.gameObject.name}");
        }

@@ -488,15 +450,6 @@ namespace PuzzleS
            return _currentLevelData;
        }

-        /// <summary>
-        /// Checks if puzzle data is loaded
-        /// </summary>
-        /// <returns>True if data loading has completed (whether successful or not)</returns>
-        public bool IsDataLoaded()
-        {
-            return _isDataLoaded;
-        }
-
        void OnApplicationQuit()
        {
            _isQuitting = true;
--- a/Assets/Scripts/PuzzleS/PuzzleStepSO.cs
+++ b/Assets/Scripts/PuzzleS/PuzzleStepSO.cs
@@ -1,6 +1,5 @@
 using UnityEngine;
 using System.Collections.Generic;
-using System;

 /// <summary>
 /// ScriptableObject representing a single puzzle step, its display info, and which steps it unlocks.
@@ -30,58 +29,4 @@ public class PuzzleStepSO : ScriptableObject
    /// </summary>
    [Header("Unlocks")]
    public List<PuzzleStepSO> unlocks = new List<PuzzleStepSO>();
-    
-    /// <summary>
-    /// Override Equals to compare by stepId rather than reference equality.
-    /// This ensures consistent behavior across different platforms (Editor vs Mobile).
-    /// </summary>
-    /// <param name="obj">Object to compare to</param>
-    /// <returns>True if the objects represent the same puzzle step</returns>
-    public override bool Equals(object obj)
-    {
-        if (obj == null) return false;
-        
-        // Check if the object is actually a PuzzleStepSO
-        PuzzleStepSO other = obj as PuzzleStepSO;
-        if (other == null) return false;
-        
-        // Compare by stepId instead of reference
-        return string.Equals(stepId, other.stepId, StringComparison.Ordinal);
-    }
-    
-    /// <summary>
-    /// Override GetHashCode to be consistent with the Equals method.
-    /// This is crucial for HashSet and Dictionary to work properly.
-    /// </summary>
-    /// <returns>Hash code based on stepId</returns>
-    public override int GetHashCode()
-    {
-        // Generate hash code from stepId to ensure consistent hashing
-        return stepId != null ? stepId.GetHashCode() : 0;
-    }
-    
-    /// <summary>
-    /// Override == operator to use our custom equality logic
-    /// </summary>
-    public static bool operator ==(PuzzleStepSO a, PuzzleStepSO b)
-    {
-        // Check if both are null or if they're the same instance
-        if (ReferenceEquals(a, b))
-            return true;
-            
-        // Check if either is null (but not both, as that's handled above)
-        if (((object)a == null) || ((object)b == null))
-            return false;
-            
-        // Use our custom Equals method
-        return a.Equals(b);
-    }
-    
-    /// <summary>
-    /// Override != operator to be consistent with == operator
-    /// </summary>
-    public static bool operator !=(PuzzleStepSO a, PuzzleStepSO b)
-    {
-        return !(a == b);
-    }
 }
--- a/Assets/Scripts/Settings/SceneOrientationConfig.cs
+++ b/Assets/Scripts/Settings/SceneOrientationConfig.cs
@@ -23,7 +23,7 @@ namespace Settings
                    return entry.requiredOrientation;
            }
            // Default to Portrait if not found
-            return ScreenOrientationRequirement.NotApplicable;
+            return ScreenOrientationRequirement.Portrait;
        }
    }
 }
--- a/Assets/Scripts/Settings/ScreenOrientationRequirement.cs
+++ b/Assets/Scripts/Settings/ScreenOrientationRequirement.cs
@@ -3,8 +3,7 @@
    public enum ScreenOrientationRequirement
    {
        Portrait,
-        Landscape,
-        NotApplicable
+        Landscape
    }
 }

--- a/Assets/Scripts/UI/CardSystem/UIPageController.cs
+++ b/Assets/Scripts/UI/CardSystem/UIPageController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Bootstrap;
 using Core;
 using UnityEngine;

@@ -30,15 +29,6 @@ namespace AppleHills.UI.CardSystem
            }

            _instance = this;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Initialize any dependencies that require other services to be ready
-            Logging.Debug("[UIPageController] Post-boot initialization complete");
        }

        /// <summary>
--- a/Assets/Scripts/UI/LoadingScreenController.cs
+++ b/Assets/Scripts/UI/LoadingScreenController.cs
@@ -1,6 +1,5 @@
 using System.Collections;
 using System;
-using Bootstrap;
 using UnityEngine;
 using UnityEngine.UI;
 using Core;
@@ -49,10 +48,22 @@ namespace UI
        /// </summary>
        public bool IsActive => loadingScreenContainer != null && loadingScreenContainer.activeSelf;
        
-        /// <summary>
-        /// Singleton instance of the LoadingScreenController. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static LoadingScreenController Instance => _instance;
+        public static LoadingScreenController Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<LoadingScreenController>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("LoadingScreenController");
+                        _instance = go.AddComponent<LoadingScreenController>();
+                    }
+                }
+                return _instance;
+            }
+        }
        
        private void Awake()
        {
@@ -66,15 +77,6 @@ namespace UI
            {
                loadingScreenContainer.SetActive(false);
            }
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-        
-        private void InitializePostBoot()
-        {
-            // Initialize any dependencies that require other services to be ready
-            Logging.Debug("[LoadingScreenController] Post-boot initialization complete");
        }
    
        /// <summary>
--- a/Assets/Scripts/UI/PauseMenu.cs
+++ b/Assets/Scripts/UI/PauseMenu.cs
@@ -3,7 +3,6 @@ using Core;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using Input;
-using Bootstrap;

 namespace UI
 {
@@ -12,10 +11,23 @@ namespace UI
        private static PauseMenu _instance;
        private static bool _isQuitting;

-        /// <summary>
-        /// Singleton instance of the PauseMenu. No longer creates an instance if one doesn't exist.
-        /// </summary>
-        public static PauseMenu Instance => _instance;
+        public static PauseMenu Instance
+        {
+            get
+            {
+                if (_instance == null && Application.isPlaying && !_isQuitting)
+                {
+                    _instance = FindAnyObjectByType<PauseMenu>();
+                    if (_instance == null)
+                    {
+                        var go = new GameObject("PauseMenu");
+                        _instance = go.AddComponent<PauseMenu>();
+                        // DontDestroyOnLoad(go);
+                    }
+                }
+                return _instance;
+            }
+        }
        
        [Header("UI References")]
        [SerializeField] private GameObject pauseMenuPanel;
@@ -31,30 +43,18 @@ namespace UI
        /// </summary>
        public bool IsPaused => _isPaused;
        
-        private void Awake()
-        {
-            _instance = this;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        }
-
-        private void InitializePostBoot()
+        private void Start()
        {
            // Subscribe to scene loaded events
            SceneManagerService.Instance.SceneLoadCompleted += SetPauseMenuByLevel;
            
-            // SceneManagerService subscription moved to InitializePostBoot
-            
            // Set initial state based on current scene
            SetPauseMenuByLevel(SceneManager.GetActiveScene().name);
            
-#if UNITY_EDITOR
+            #if UNITY_EDITOR
            // Initialize pause menu state
            HidePauseMenu(false);
-#endif
-            
-            Logging.Debug("[PauseMenu] Subscribed to SceneManagerService events");
+            #endif
        }

        private void OnDestroy()
@@ -81,11 +81,9 @@ namespace UI
                return;
                
            bool isMainMenu = levelName.ToLower().Contains("mainmenu");
-            bool isStartingLevel = levelName.ToLower().Contains("startingscene");
+            gameObject.SetActive(!isMainMenu);
            
-            gameObject.SetActive(!(isMainMenu || isStartingLevel));
-            
-            if(!isMainMenu && !isStartingLevel)
+            if(!isMainMenu)
                HidePauseMenu(false); // Ensure menu is hidden when switching to a game level
            
            Logging.Debug($"[PauseMenu] Setting pause menu active: {!isMainMenu} for scene: {levelName}");
--- a/Assets/Scripts/UI/Tutorial.meta
+++ b/Assets/Scripts/UI/Tutorial.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b98977013f83da24a8e4aa17926525c6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/UI/Tutorial/DivingTutorial.cs
+++ b/Assets/Scripts/UI/Tutorial/DivingTutorial.cs
@@ -1,62 +0,0 @@
-using UnityEngine;
-using Pixelplacement;
-using Minigames.DivingForPictures;
-using Input;
-using UnityEngine.Events;
-
-public class DivingTutorial : MonoBehaviour, ITouchInputConsumer
-{
-    private StateMachine stateMachine;
-    public DivingGameManager divingGameManager;
-    public bool playTutorial;
-
-    // Start is called once before the first execution of Update after the MonoBehaviour is created
-    void Start()
-    {
-        if (playTutorial==true)
-        {
-            InitializeTutorial();
-        }
-        else { RemoveTutorial(); }
-
-
-        
-    }
-
-    void InitializeTutorial()
-    {
-        stateMachine = GetComponentInChildren<StateMachine>();
-        divingGameManager.Pause();
-        InputManager.Instance.RegisterOverrideConsumer(this);
-        stateMachine.OnLastStateExited.AddListener(RemoveTutorial);
-
-    }
-
-    void RemoveTutorial()
-    {
-        Debug.Log("Remove me!");
-        Destroy(gameObject);
-        InputManager.Instance.UnregisterOverrideConsumer(this);
-        divingGameManager.DoResume();
-    }
-
-    public void OnTap(Vector2 position)
-    {
-        stateMachine.Next(true);
-    }
-
-    public void OnHoldStart(Vector2 position)
-    {
-        return;
-    }
-
-    public void OnHoldMove(Vector2 position)
-    {
-        return;
-    }
-
-    public void OnHoldEnd(Vector2 position)
-    {
-        return;
-    }
-}
--- a/Assets/Scripts/UI/Tutorial/DivingTutorial.cs.meta
+++ b/Assets/Scripts/UI/Tutorial/DivingTutorial.cs.meta
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: c0f21d12fb6a50242b483dbdc3a6a1df
--- a/Assets/Scripts/Utils/AppleHillsUtils.cs
+++ b/Assets/Scripts/Utils/AppleHillsUtils.cs
@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 using AppleHills.Core.Settings;
 using Core;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.ResourceLocations;

 namespace Utils
 {
@@ -71,11 +68,5 @@ namespace Utils
            // Apply screen normalization
            return frameAdjustedSpeed * screenNormalizationFactor;
        }
-        
-        public static bool AddressableKeyExists(object key)
-        {
-            IList<IResourceLocation> locations;
-            return Addressables.LoadResourceLocationsAsync(key).WaitForCompletion()?.Count > 0;
-        }
    }
 }
--- a/Assets/Scripts/found_instances
+++ b/Assets/Scripts/found_instances
@@ -1,207 +0,0 @@
-Targets
-    Occurrences of '.Instance' in Directory C:\Users\info\Desktop\repos\AppleHillsProduction\Assets\Scripts
-Found usages  (163 usages found)
-    <AppleHillsScripts>  (163 usages found)
-        Assets  (163 usages found)
-            Scripts  (163 usages found)
-                Bootstrap  (3 usages found)
-                    BootSceneController.cs  (3 usages found)
-                        79 if (CinematicsManager.Instance != null)
-                        84 CinematicsManager.Instance.LoadAndPlayCinematic("IntroSequence");
-                        205 SceneManagerService.Instance.CurrentGameplayScene = mainMenuSceneName;
-                Cinematics  (16 usages found)
-                    SkipCinematic.cs  (16 usages found)
-                        57 if (CinematicsManager.Instance == null) return;
-                        63 CinematicsManager.Instance.OnCinematicStarted += HandleCinematicStarted;
-                        64 CinematicsManager.Instance.OnCinematicStopped += HandleCinematicStopped;
-                        67 if (CinematicsManager.Instance.IsCinematicPlaying)
-                        75 if (CinematicsManager.Instance != null)
-                        77 CinematicsManager.Instance.OnCinematicStarted -= HandleCinematicStarted;
-                        78 CinematicsManager.Instance.OnCinematicStopped -= HandleCinematicStopped;
-                        83 if (InputManager.Instance != null)
-                        85 InputManager.Instance.UnregisterOverrideConsumer(this);
-                        92 if (InputManager.Instance != null)
-                        94 InputManager.Instance.RegisterOverrideConsumer(this);
-                        100 if (InputManager.Instance != null)
-                        102 InputManager.Instance.UnregisterOverrideConsumer(this);
-                        109 if (_isHolding && CinematicsManager.Instance.IsCinematicPlaying)
-                        131 CinematicsManager.Instance.SkipCurrentCinematic();
-                        141 InputManager.Instance.UnregisterOverrideConsumer(this);
-                Core  (25 usages found)
-                    GameManager.cs  (8 usages found)
-                        65 SettingsProvider.Instance.gameObject.name = "Settings Provider";
-                        68 DeveloperSettingsProvider.Instance.gameObject.name = "Developer Settings Provider";
-                        88 PauseMenu pauseMenu = PauseMenu.Instance;
-                        220 var playerSettings = SettingsProvider.Instance.LoadSettingsSynchronous<PlayerFollowerSettings>();
-                        221 var interactionSettings = SettingsProvider.Instance.LoadSettingsSynchronous<InteractionSettings>();
-                        222 var minigameSettings = SettingsProvider.Instance.LoadSettingsSynchronous<DivingMinigameSettings>();
-                        275 var divingDevSettings = DeveloperSettingsProvider.Instance.GetSettings<DivingDeveloperSettings>();
-                        318 return DeveloperSettingsProvider.Instance?.GetSettings<T>();
-                    ItemManager.cs  (3 usages found)
-                        80 SceneManagerService.Instance.SceneLoadStarted += OnSceneLoadStarted;
-                        87 if (SceneManagerService.Instance != null)
-                        88 SceneManagerService.Instance.SceneLoadStarted -= OnSceneLoadStarted;
-                    QuickAccess.cs  (7 usages found)
-                        47 public GameManager GameManager => GameManager.Instance;
-                        48 public ItemManager ItemManager => ItemManager.Instance;
-                        49 public SceneManagerService SceneManager => SceneManagerService.Instance;
-                        52 public InputManager InputManager => InputManager.Instance;
-                        53 public PuzzleManager PuzzleManager => PuzzleManager.Instance;
-                        54 public CinematicsManager CinematicsManager => CinematicsManager.Instance;
-                        55 public CardSystemManager CardSystemManager => CardSystemManager.Instance;
-                    SceneManagerService.cs  (1 usage found)
-                        110 _loadingScreen = LoadingScreenController.Instance;
-                    SceneOrientationEnforcer.cs  (3 usages found)
-                        106 InputManager.Instance.SetInputMode(InputMode.UI);
-                        159 InputManager.Instance.SetInputMode(InputMode.UI);
-                        189 InputManager.Instance.SetInputMode(InputMode.Game);
-                    SettingsAccess.cs  (3 usages found)
-                        43 return GameManager.Instance.PlayerStopDistance;
-                        55 return GameManager.Instance.PlayerStopDistanceDirectInteraction;
-                        67 return GameManager.Instance.DefaultPuzzlePromptRange;
-                Dialogue  (26 usages found)
-                    DialogueComponent.cs  (26 usages found)
-                        39 if (PuzzleManager.Instance != null)
-                        40 PuzzleManager.Instance.OnStepCompleted += OnAnyPuzzleStepCompleted;
-                        42 if (ItemManager.Instance != null)
-                        44 ItemManager.Instance.OnItemPickedUp += OnAnyItemPickedUp;
-                        45 ItemManager.Instance.OnCorrectItemSlotted += OnAnyItemSlotted;
-                        46 ItemManager.Instance.OnIncorrectItemSlotted += OnAnyIncorrectItemSlotted;
-                        47 ItemManager.Instance.OnForbiddenItemSlotted += OnAnyForbiddenItemSlotted;
-                        48 ItemManager.Instance.OnItemSlotCleared += OnAnyItemSlotCleared;
-                        49 ItemManager.Instance.OnItemsCombined += OnAnyItemsCombined;
-                        170 if (PuzzleManager.Instance != null)
-                        171 PuzzleManager.Instance.OnStepCompleted -= OnAnyPuzzleStepCompleted;
-                        173 if (ItemManager.Instance != null)
-                        175 ItemManager.Instance.OnItemPickedUp -= OnAnyItemPickedUp;
-                        176 ItemManager.Instance.OnCorrectItemSlotted -= OnAnyItemSlotted;
-                        177 ItemManager.Instance.OnIncorrectItemSlotted -= OnAnyIncorrectItemSlotted;
-                        178 ItemManager.Instance.OnForbiddenItemSlotted -= OnAnyForbiddenItemSlotted;
-                        179 ItemManager.Instance.OnItemSlotCleared -= OnAnyItemSlotCleared;
-                        180 ItemManager.Instance.OnItemsCombined -= OnAnyItemsCombined;
-                        600 return PuzzleManager.Instance != null && 
-                        601 PuzzleManager.Instance.IsPuzzleStepCompleted(stepID);
-                        606 if (ItemManager.Instance == null) return false;
-                        609 foreach (var pickup in ItemManager.Instance.Pickups)
-                        622 if (ItemManager.Instance == null) return false;
-                        625 foreach (var slot in ItemManager.Instance.ItemSlots)
-                        638 if (ItemManager.Instance == null) return false;
-                        641 return ItemManager.Instance.WasItemCreatedThroughCombination(resultItemId);
-                Input  (4 usages found)
-                    InputManager.cs  (3 usages found)
-                        96 SceneManagerService.Instance.SceneLoadCompleted += SwitchInputOnSceneLoaded;
-                        103 if (SceneManagerService.Instance != null)
-                        104 SceneManagerService.Instance.SceneLoadCompleted -= SwitchInputOnSceneLoaded;
-                    PlayerTouchController.cs  (1 usage found)
-                        77 InputManager.Instance?.SetDefaultConsumer(this);
-                Interactions  (6 usages found)
-                    Interactable.cs  (2 usages found)
-                        213 ? GameManager.Instance.PlayerStopDistance
-                        214 : GameManager.Instance.PlayerStopDistanceDirectInteraction;
-                    ItemSlot.cs  (2 usages found)
-                        222 ItemManager.Instance?.RegisterItemSlot(this);
-                        227 ItemManager.Instance?.UnregisterItemSlot(this);
-                    Pickup.cs  (2 usages found)
-                        49 ItemManager.Instance?.RegisterPickup(this);
-                        64 ItemManager.Instance?.UnregisterPickup(this);
-                LevelS  (3 usages found)
-                    LevelSwitch.cs  (3 usages found)
-                        114 InputManager.Instance.SetInputMode(InputMode.UI);
-                        120 await SceneManagerService.Instance.SwitchSceneAsync(switchData.targetLevelSceneName, progress);
-                        126 InputManager.Instance.SetInputMode(InputMode.GameAndUI);
-                Minigames  (43 usages found)
-                    DivingForPictures  (43 usages found)
-                        Bubbles  (2 usages found)
-                            BubbleSpawner.cs  (2 usages found)
-                                70 DivingGameManager.Instance.RegisterPausableComponent(this);
-                                78 DivingGameManager.Instance.UnregisterPausableComponent(this);
-                        Obstacles  (5 usages found)
-                            ObstacleSpawner.cs  (5 usages found)
-                                88 DivingGameManager.Instance.OnGameInitialized += Initialize;
-                                91 DivingGameManager.Instance.RegisterPausableComponent(this);
-                                94 if (DivingGameManager.Instance.GetType().GetField("_isGameInitialized", 
-                                96 System.Reflection.BindingFlags.Instance)?.GetValue(DivingGameManager.Instance) is bool isInitialized && isInitialized)
-                                104 DivingGameManager.Instance.UnregisterPausableComponent(this);
-                        PictureCamera  (2 usages found)
-                            Viewfinder.cs  (2 usages found)
-                                89 InputManager.Instance.RegisterOverrideConsumer(this);
-                                94 InputManager.Instance.UnregisterOverrideConsumer(this);
-                        Player  (6 usages found)
-                            PlayerCollisionBehavior.cs  (1 usage found)
-                                262 .GetField("_targetFingerX", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
-                            PlayerController.cs  (5 usages found)
-                                83 DivingGameManager.Instance.OnGameInitialized += Initialize;
-                                86 if (DivingGameManager.Instance.GetType().GetField("_isGameInitialized", 
-                                88 System.Reflection.BindingFlags.Instance)?.GetValue(DivingGameManager.Instance) is bool isInitialized && isInitialized)
-                                102 InputManager.Instance?.SetDefaultConsumer(this);
-                                110 DivingGameManager.Instance.OnGameInitialized -= Initialize;
-                        Tiles  (5 usages found)
-                            TrenchTileSpawner.cs  (5 usages found)
-                                171 DivingGameManager.Instance.OnGameInitialized += Initialize;
-                                174 DivingGameManager.Instance.RegisterPausableComponent(this);
-                                177 if (DivingGameManager.Instance.GetType().GetField("_isGameInitialized", 
-                                179 System.Reflection.BindingFlags.Instance)?.GetValue(DivingGameManager.Instance) is bool isInitialized && isInitialized)
-                                187 DivingGameManager.Instance.UnregisterPausableComponent(this);
-                        Utilities  (2 usages found)
-                            BottlePauser.cs  (1 usage found)
-                                14 DivingGameManager.Instance.RegisterPausableComponent(this);
-                            RockPauser.cs  (1 usage found)
-                                15 DivingGameManager.Instance.RegisterPausableComponent(this);
-                        DivingGameManager.cs  (16 usages found)
-                            142 PauseMenu pauseMenu = PauseMenu.Instance;
-                            156 if (GameManager.Instance != null)
-                            158 GameManager.Instance.RegisterPausableComponent(this);
-                            162 if (SceneOrientationEnforcer.Instance != null)
-                            164 SceneOrientationEnforcer.Instance.OnOrientationCorrect += InitializeGame;
-                            165 SceneOrientationEnforcer.Instance.OnOrientationIncorrect += Pause;
-                            169 if (SceneOrientationEnforcer.Instance.IsOrientationCorrect())
-                            186 viewfinderManager = CameraViewfinderManager.Instance;
-                            212 if (SceneOrientationEnforcer.Instance != null)
-                            214 SceneOrientationEnforcer.Instance.OnOrientationCorrect -= InitializeGame;
-                            215 SceneOrientationEnforcer.Instance.OnOrientationIncorrect -= Pause;
-                            219 PauseMenu pauseMenu = PauseMenu.Instance;
-                            227 if (GameManager.Instance != null)
-                            229 GameManager.Instance.UnregisterPausableComponent(this);
-                            801 InputManager.Instance.SetInputMode(InputMode.GameAndUI);
-                            822 InputManager.Instance.SetInputMode(InputMode.GameAndUI);
-                        DivingScoreUI.cs  (5 usages found)
-                            15 DivingGameManager.Instance.OnScoreChanged += UpdateScoreDisplay;
-                            16 DivingGameManager.Instance.OnPictureTaken += ShowScorePopup;
-                            19 UpdateScoreDisplay(DivingGameManager.Instance.PlayerScore);
-                            32 DivingGameManager.Instance.OnScoreChanged -= UpdateScoreDisplay;
-                            33 DivingGameManager.Instance.OnPictureTaken -= ShowScorePopup;
-                PuzzleS  (7 usages found)
-                    ObjectiveStepBehaviour.cs  (3 usages found)
-                        76 PuzzleManager.Instance?.RegisterStepBehaviour(this);
-                        86 PuzzleManager.Instance?.UnregisterStepBehaviour(this);
-                        304 PuzzleManager.Instance?.MarkPuzzleStepCompleted(stepData);
-                    PuzzleManager.cs  (4 usages found)
-                        102 SceneManagerService.Instance.SceneLoadCompleted += OnSceneLoadCompleted;
-                        111 if (SceneManagerService.Instance != null)
-                        113 SceneManagerService.Instance.SceneLoadCompleted -= OnSceneLoadCompleted;
-                        149 string currentScene = sceneName ?? SceneManagerService.Instance.CurrentGameplayScene;
-                StateMachines  (2 usages found)
-                    Quarry  (2 usages found)
-                        AnneLise  (2 usages found)
-                            TakePhotoState.cs  (2 usages found)
-                                39 InputManager.Instance.SetInputMode(InputMode.InputDisabled);
-                                47 InputManager.Instance.SetInputMode(InputMode.Game);
-                UI  (21 usages found)
-                    Tutorial  (2 usages found)
-                        DivingTutorial.cs  (2 usages found)
-                            30 InputManager.Instance.RegisterOverrideConsumer(this);
-                            39 InputManager.Instance.UnregisterOverrideConsumer(this);
-                    MainMenu.cs  (1 usage found)
-                        12 await SceneManagerService.Instance.SwitchSceneAsync("AppleHillsOverworld", progress);
-                    PauseMenu.cs  (11 usages found)
-                        71 SceneManagerService.Instance.SceneLoadCompleted += SetPauseMenuByLevel;
-                        78 if (SceneManagerService.Instance != null)
-                        80 SceneManagerService.Instance.SceneLoadCompleted -= SetPauseMenuByLevel;
-                        122 InputManager.Instance.SetInputMode(InputMode.UI);
-                        141 InputManager.Instance.SetInputMode(InputMode.GameAndUI);
-                        162 await SceneManagerService.Instance.SwitchSceneAsync("MainMenu", progress);
-                        180 await SceneManagerService.Instance.ReloadCurrentScene(progress);
-                        198 await SceneManagerService.Instance.SwitchSceneAsync("MainMenu", progress);
-                        201 await SceneManagerService.Instance.SwitchSceneAsync("AppleHillsOverworld", progress);
-                        204 await SceneManagerService.Instance.SwitchSceneAsync("Quarry", progress);
-                        207 await SceneManagerService.Instance.SwitchSceneAsync("DivingForPictures", progress);
--- a/Assets/Scripts/found_instances.meta
+++ b/Assets/Scripts/found_instances.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: faea13914b0c70740accf1eeb03f11aa
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Settings/DivingMinigameSettings.asset
+++ b/Assets/Settings/DivingMinigameSettings.asset
@@ -50,8 +50,8 @@ MonoBehaviour:
  smoothMoveSpeed: 8
  blockInputDuringBump: 0
  viewfinderPrefab: {fileID: 3191012273289593430, guid: 99666bddf27a652479c2a3e0007a94dc, type: 3}
-  viewfinderShrinkDuration: 1
-  viewfinderMoveSpeed: 3
+  viewfinderShrinkDuration: 2
+  viewfinderMoveSpeed: 2
  viewfinderShrinkCurve:
    serializedVersion: 2
    m_Curve:
@@ -77,7 +77,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  photoInputMode: 1
-  paddingFactor: 1
+  paddingFactor: 2
  minSizePercent: 0.15
  maxSizePercent: 1
  viewfinderStartScale: 1
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,9 +5,6 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
-    path: Assets/Scenes/StartingScene.unity
-    guid: cf01e2d0135b06c4486d00ef393d0274
  - enabled: 1
    path: Assets/Scenes/MainMenu.unity
    guid: b93f2f3b39a62684c8474ba79c8f698d
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -329,6 +329,42 @@ PlayerSettings:
      m_Height: 36
      m_Kind: 0
      m_SubKind: 
+    - m_Textures:
+      - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
+      - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
+      - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
+      - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3}
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
    - m_Textures: []
      m_Width: 192
      m_Height: 192
@@ -359,42 +395,6 @@ PlayerSettings:
      m_Height: 36
      m_Kind: 1
      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 6767e1e5c0a16f14e926a72a81bf95cb, type: 3}
-      - {fileID: 2800000, guid: 6767e1e5c0a16f14e926a72a81bf95cb, type: 3}
-      m_Width: 432
-      m_Height: 432
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 6767e1e5c0a16f14e926a72a81bf95cb, type: 3}
-      - {fileID: 2800000, guid: 6767e1e5c0a16f14e926a72a81bf95cb, type: 3}
-      m_Width: 324
-      m_Height: 324
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures:
-      - {fileID: 2800000, guid: 6767e1e5c0a16f14e926a72a81bf95cb, type: 3}
-      - {fileID: 2800000, guid: 6767e1e5c0a16f14e926a72a81bf95cb, type: 3}
-      m_Width: 216
-      m_Height: 216
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 162
-      m_Height: 162
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 108
-      m_Height: 108
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 81
-      m_Height: 81
-      m_Kind: 2
-      m_SubKind: 
  - m_BuildTarget: iPhone
    m_Icons:
    - m_Textures: []
Author	SHA1	Message	Date
Michal Pikulski	197b7895e1	Fix issue with the ball tree	2025-10-15 18:50:21 +02:00
DamianCorazza	6c45c28364	Added the steps, for the other Puzzles, the first step of the balltree is not showing.	2025-10-15 17:25:30 +02:00
Michal Pikulski	133f1094fb	Add an editor utility and fix issue with slot items	2025-10-15 16:53:18 +02:00
Michal Pikulski	17feef7945	Update display issues with the puzzle steps	2025-10-15 16:33:19 +02:00
Michal Pikulski	9de50c42bc	REmove deprecated editor	2025-10-15 16:01:02 +02:00
Michal Pikulski	1d773823c4	Change the puzzle system to an offline-processed data structure to get around activation issues	2025-10-15 15:51:37 +02:00