Merge branch 'main' into animation-pipeline-overhaul

Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com>
Reviewed-on: #57

.github/copilot-instructions.md

@@ -1,5 +0,0 @@
-You are an expert code architect and developer. YOu prioritize clean, efficient, and maintainable code.
-You priotize up-front though out planning before writing code.
-You will always present implementaiton plan first and always ask for permission to implement it.
-Never insert zero-width spaces or non-breaking spaces in my code.
-DOn't produce .MD documentation unless i ask you to.

.gitignore

@@ -104,3 +104,6 @@ InitTestScene*.unity*
 .vscode/launch.json
 .vscode/settings.json
 .idea/.idea.AppleHillsProduction/.idea/indexLayout.xml
+
+# WIP docs
+/docs/wip/

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 6f3207429a65b3e4b83935ac19791077
   m_currentHash:
     serializedVersion: 2
-    Hash: f08b6489862aaf7bfceb29f571e2ef6c
+    Hash: 589e22fe6cd2fe0e25d89bd44a35bcbc
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Assets/AddressableAssetsData/iOS.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d60f8ff6bf46b494b80e210228c43e61
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Characters/Trafalgar/AnimSM_Trafalgar.controller

@@ -185,7 +185,7 @@ AnimatorController:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: trafalgar_0002
+  m_Name: AnimSM_Trafalgar
   serializedVersion: 5
   m_AnimatorParameters:
   - m_Name: Speed

Assets/Art/Animations/Trafalgar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bdcb5eef530d4d341b9957fc5d954164
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking1.png.meta

@@ -0,0 +1,570 @@
+fileFormatVersion: 2
+guid: e071f6ab7f5db5642bcf5502788a8b6e
+TextureImporter:
+  internalIDToNameTable: []
+  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: 0
+  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: Traf_0012
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 1294
+        width: 497
+        height: 753
+      alignment: 9
+      pivot: {x: 0.43661973, y: -0.006799469}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2104c4fa569ede04e9e6db84327b11cc
+      internalID: -1603423718
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0013
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 1294
+        width: 497
+        height: 753
+      alignment: 9
+      pivot: {x: 0.43661973, y: -0.006799469}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: dfc34b8e58260474097ac74c0e16fcc7
+      internalID: -1907988884
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0022
+      rect:
+        serializedVersion: 2
+        x: 887
+        y: 1295
+        width: 489
+        height: 752
+      alignment: 9
+      pivot: {x: 0.4212679, y: -0.0014893617}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5c931e231e8e6474f8882cd577bf312e
+      internalID: 959286612
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0023
+      rect:
+        serializedVersion: 2
+        x: 887
+        y: 1295
+        width: 489
+        height: 752
+      alignment: 9
+      pivot: {x: 0.4212679, y: -0.0014893617}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 3d3411da19b993140a2d54d72ebdbfe3
+      internalID: -1984904044
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0031
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 523
+        width: 388
+        height: 769
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.01576073}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: d76407aa4dcdc8648b365da2d2eb5d10
+      internalID: 1903400688
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0032
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 523
+        width: 388
+        height: 769
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.01576073}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6584cd841ef691d47b5c391cf55bcb5a
+      internalID: -346991893
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0033
+      rect:
+        serializedVersion: 2
+        x: 1168
+        y: 530
+        width: 388
+        height: 749
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.046889186}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c812b6a01ffaa1c4cbfdfd343883fedd
+      internalID: -1312077390
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0034
+      rect:
+        serializedVersion: 2
+        x: 1168
+        y: 530
+        width: 388
+        height: 749
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.046889186}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: dadb8259df47d584d948a41e2679ed4f
+      internalID: -251651705
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0035
+      rect:
+        serializedVersion: 2
+        x: 1378
+        y: 1281
+        width: 388
+        height: 766
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.027571801}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0e6daaa9f75a679449677f606258ad79
+      internalID: -1497385347
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0036
+      rect:
+        serializedVersion: 2
+        x: 1378
+        y: 1281
+        width: 388
+        height: 766
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.027571801}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c83aaa087c551d645af3e82a7bfd409c
+      internalID: 2048706373
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0039
+      rect:
+        serializedVersion: 2
+        x: 778
+        y: 523
+        width: 388
+        height: 769
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.01576073}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 450ecc69dd2e0b14a8428b41d32a4618
+      internalID: 1138447422
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0040
+      rect:
+        serializedVersion: 2
+        x: 778
+        y: 523
+        width: 388
+        height: 769
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.01576073}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8a8ac3b3cf365d94882a586d83233997
+      internalID: -1620690620
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0041
+      rect:
+        serializedVersion: 2
+        x: 1558
+        y: 530
+        width: 388
+        height: 749
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.046889186}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c7949d6564430af498a79afd6fc5f4be
+      internalID: 110470137
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0042
+      rect:
+        serializedVersion: 2
+        x: 1558
+        y: 530
+        width: 388
+        height: 749
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.046889186}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 742eaa0dbdc99824898ed699287521fe
+      internalID: 393019130
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0045
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1267
+        width: 385
+        height: 780
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.04502564}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4e7250220be8bc2408ffd1ae6fe05476
+      internalID: 1669039794
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0046
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1267
+        width: 385
+        height: 780
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.04502564}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8d3317b4ee45cff4f836db94bac449ca
+      internalID: 1592877174
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0053
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 487
+        width: 385
+        height: 778
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.045141388}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 87e25079c251b2a4d9ac3aa05da45bc0
+      internalID: -1032471120
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0054
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 487
+        width: 385
+        height: 778
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.045141388}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 229c666cb10a51d4aaf6a9ac700fded1
+      internalID: 206645212
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: f90f4f1df4613dd4c9174310f08eec3e
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Traf_0012: -1603423718
+      Traf_0013: -1907988884
+      Traf_0022: 959286612
+      Traf_0023: -1984904044
+      Traf_0031: 1903400688
+      Traf_0032: -346991893
+      Traf_0033: -1312077390
+      Traf_0034: -251651705
+      Traf_0035: -1497385347
+      Traf_0036: 2048706373
+      Traf_0039: 1138447422
+      Traf_0040: -1620690620
+      Traf_0041: 110470137
+      Traf_0042: 393019130
+      Traf_0045: 1669039794
+      Traf_0046: 1592877174
+      Traf_0053: -1032471120
+      Traf_0054: 206645212
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking1.tpsheet

@@ -0,0 +1,33 @@
+#
+# Sprite sheet data for Unity.
+#
+# To import these sprites into your Unity project, download "TexturePackerImporter":
+# https://www.codeandweb.com/texturepacker/unity
+#
+# $TexturePacker:SmartUpdate:12cdac846eeb0ac92e8b589818b5b9fd:1617b416bec25e82693e9f78935249ba:a11e88a1024a8564f888a3954b97f2ab$
+#
+:format=40300
+:texture=Trafalgar-_Walking1.png
+:size=2048x2048
+:pivotpoints=enabled
+:borders=disabled
+:alphahandling=ClearTransparentPixels
+
+Traf_0012;388;1294;497;753; 0.43661971830985913;-0.006799468791500729; 0;0;0;0
+Traf_0013;388;1294;497;753; 0.43661971830985913;-0.006799468791500729; 0;0;0;0
+Traf_0022;887;1295;489;752; 0.4212678936605317;-0.0014893617021276562; 0;0;0;0
+Traf_0023;887;1295;489;752; 0.4212678936605317;-0.0014893617021276562; 0;0;0;0
+Traf_0031;388;523;388;769; 0.49742268041237114;-0.015760728218465525; 0;0;0;0
+Traf_0032;388;523;388;769; 0.49742268041237114;-0.015760728218465525; 0;0;0;0
+Traf_0033;1168;530;388;749; 0.49742268041237114;-0.04688918558077426; 0;0;0;0
+Traf_0034;1168;530;388;749; 0.49742268041237114;-0.04688918558077426; 0;0;0;0
+Traf_0035;1378;1281;388;766; 0.49742268041237114;-0.027571801566579568; 0;0;0;0
+Traf_0036;1378;1281;388;766; 0.49742268041237114;-0.027571801566579568; 0;0;0;0
+Traf_0039;778;523;388;769; 0.49742268041237114;-0.015760728218465525; 0;0;0;0
+Traf_0040;778;523;388;769; 0.49742268041237114;-0.015760728218465525; 0;0;0;0
+Traf_0041;1558;530;388;749; 0.49742268041237114;-0.04688918558077426; 0;0;0;0
+Traf_0042;1558;530;388;749; 0.49742268041237114;-0.04688918558077426; 0;0;0;0
+Traf_0045;1;1267;385;780; 0.4987012987012987;-0.045025641025641105; 0;0;0;0
+Traf_0046;1;1267;385;780; 0.4987012987012987;-0.045025641025641105; 0;0;0;0
+Traf_0053;1;487;385;778; 0.4987012987012987;-0.045141388174807284; 0;0;0;0
+Traf_0054;1;487;385;778; 0.4987012987012987;-0.045141388174807284; 0;0;0;0

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking1.tpsheet.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4f8877ac6aea8414b836f7aebe5971c5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking2.png.meta

@@ -0,0 +1,455 @@
+fileFormatVersion: 2
+guid: 733a93f45fa2217478df69dfce47bfe4
+TextureImporter:
+  internalIDToNameTable: []
+  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: 0
+  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: Traf_0001
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 435
+        width: 388
+        height: 789
+      alignment: 9
+      pivot: {x: 0.4974227, y: 0.0011153359}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 99e3a7760a8f854449fd6d920b476d9a
+      internalID: 2116105473
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0002
+      rect:
+        serializedVersion: 2
+        x: 428
+        y: 1276
+        width: 484
+        height: 771
+      alignment: 9
+      pivot: {x: 0.4318182, y: 0.008923476}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 42b45001238b5a344bb3c33c518f09c5
+      internalID: 1747672391
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0004
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1226
+        width: 425
+        height: 821
+      alignment: 9
+      pivot: {x: 0.45411766, y: 0.0010718636}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 38b273fc1f1eb2e4d86d7d188ae29d3b
+      internalID: 676913695
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0010
+      rect:
+        serializedVersion: 2
+        x: 914
+        y: 1287
+        width: 487
+        height: 760
+      alignment: 9
+      pivot: {x: 0.42299795, y: -0.00015789474}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4f6ffaf61113d374abe4e06fd73cbc36
+      internalID: 1666239922
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0011
+      rect:
+        serializedVersion: 2
+        x: 914
+        y: 1287
+        width: 487
+        height: 760
+      alignment: 9
+      pivot: {x: 0.42299795, y: -0.00015789474}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 86ba464b7d2c8634fb72a9a07dbbef5b
+      internalID: -1222548245
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0014
+      rect:
+        serializedVersion: 2
+        x: 1403
+        y: 1299
+        width: 489
+        height: 748
+      alignment: 9
+      pivot: {x: 0.4212679, y: -0.0068449196}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 16f254ec4e949174e9994e2ab73659b0
+      internalID: -996981228
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0015
+      rect:
+        serializedVersion: 2
+        x: 1403
+        y: 1299
+        width: 489
+        height: 748
+      alignment: 9
+      pivot: {x: 0.4212679, y: -0.0068449196}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 1009f1f27d01b2f4388b7bbe4a3f831e
+      internalID: -575895047
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0016
+      rect:
+        serializedVersion: 2
+        x: 1403
+        y: 539
+        width: 488
+        height: 758
+      alignment: 9
+      pivot: {x: 0.42008197, y: 0.002480211}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8169527510c5b444396b0858c71de75b
+      internalID: -157325566
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0017
+      rect:
+        serializedVersion: 2
+        x: 1403
+        y: 539
+        width: 488
+        height: 758
+      alignment: 9
+      pivot: {x: 0.42008197, y: 0.002480211}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2f72d53a23eef9f438ea36b8cc42f35b
+      internalID: 879950995
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0027
+      rect:
+        serializedVersion: 2
+        x: 781
+        y: 508
+        width: 388
+        height: 766
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.027571801}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 93a43eb0ec82d584397edb3d0382e9f1
+      internalID: -687394884
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0028
+      rect:
+        serializedVersion: 2
+        x: 781
+        y: 508
+        width: 388
+        height: 766
+      alignment: 9
+      pivot: {x: 0.4974227, y: -0.027571801}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 536dcf11c6fb0364ebc1fac7120e2a2e
+      internalID: -200100742
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0029
+      rect:
+        serializedVersion: 2
+        x: 391
+        y: 436
+        width: 388
+        height: 788
+      alignment: 9
+      pivot: {x: 0.4974227, y: 0.0023857867}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 177be93cf20be3e438bd15e6a40ccf16
+      internalID: 97038495
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0030
+      rect:
+        serializedVersion: 2
+        x: 391
+        y: 436
+        width: 388
+        height: 788
+      alignment: 9
+      pivot: {x: 0.4974227, y: 0.0023857867}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 713b76ad51f3f6840bb01e6eb75b75a8
+      internalID: 1945709413
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 1d9a5d7bb6391e34dbaa067b99ff0718
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Traf_0001: 2116105473
+      Traf_0002: 1747672391
+      Traf_0004: 676913695
+      Traf_0010: 1666239922
+      Traf_0011: -1222548245
+      Traf_0014: -996981228
+      Traf_0015: -575895047
+      Traf_0016: -157325566
+      Traf_0017: 879950995
+      Traf_0027: -687394884
+      Traf_0028: -200100742
+      Traf_0029: 97038495
+      Traf_0030: 1945709413
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking2.tpsheet

@@ -0,0 +1,28 @@
+#
+# Sprite sheet data for Unity.
+#
+# To import these sprites into your Unity project, download "TexturePackerImporter":
+# https://www.codeandweb.com/texturepacker/unity
+#
+# $TexturePacker:SmartUpdate:12cdac846eeb0ac92e8b589818b5b9fd:1617b416bec25e82693e9f78935249ba:a11e88a1024a8564f888a3954b97f2ab$
+#
+:format=40300
+:texture=Trafalgar-_Walking2.png
+:size=2048x2048
+:pivotpoints=enabled
+:borders=disabled
+:alphahandling=ClearTransparentPixels
+
+Traf_0001;1;435;388;789; 0.49742268041237114;0.0011153358681875725; 0;0;0;0
+Traf_0002;428;1276;484;771; 0.4318181818181818;0.008923476005188058; 0;0;0;0
+Traf_0004;1;1226;425;821; 0.4541176470588235;0.0010718635809987553; 0;0;0;0
+Traf_0010;914;1287;487;760; 0.42299794661190965;-0.00015789473684213462; 0;0;0;0
+Traf_0011;914;1287;487;760; 0.42299794661190965;-0.00015789473684213462; 0;0;0;0
+Traf_0014;1403;1299;489;748; 0.4212678936605317;-0.0068449197860962485; 0;0;0;0
+Traf_0015;1403;1299;489;748; 0.4212678936605317;-0.0068449197860962485; 0;0;0;0
+Traf_0016;1403;539;488;758; 0.42008196721311475;0.0024802110817941925; 0;0;0;0
+Traf_0017;1403;539;488;758; 0.42008196721311475;0.0024802110817941925; 0;0;0;0
+Traf_0027;781;508;388;766; 0.49742268041237114;-0.027571801566579568; 0;0;0;0
+Traf_0028;781;508;388;766; 0.49742268041237114;-0.027571801566579568; 0;0;0;0
+Traf_0029;391;436;388;788; 0.49742268041237114;0.0023857868020304984; 0;0;0;0
+Traf_0030;391;436;388;788; 0.49742268041237114;0.0023857868020304984; 0;0;0;0

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking2.tpsheet.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9cbfb3dc06a1e1e469c8648617968feb
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking3.png.meta

@@ -0,0 +1,570 @@
+fileFormatVersion: 2
+guid: 433bc1aad6c5ab748aac4443291f7252
+TextureImporter:
+  internalIDToNameTable: []
+  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: 0
+  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: Traf_0018
+      rect:
+        serializedVersion: 2
+        x: 874
+        y: 1296
+        width: 484
+        height: 751
+      alignment: 9
+      pivot: {x: 0.4194215, y: -0.012143808}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: a858c3dfbb70e8446aa55ae6b35af296
+      internalID: 733294300
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0019
+      rect:
+        serializedVersion: 2
+        x: 874
+        y: 1296
+        width: 484
+        height: 751
+      alignment: 9
+      pivot: {x: 0.4194215, y: -0.012143808}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 43a8dc58a6d230d4491863fb2958623d
+      internalID: 705458408
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0020
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 1295
+        width: 484
+        height: 752
+      alignment: 9
+      pivot: {x: 0.4214876, y: -0.008138298}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: fde948e9fdc670045a63f5375c9a76e4
+      internalID: -1431518560
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0021
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 1295
+        width: 484
+        height: 752
+      alignment: 9
+      pivot: {x: 0.4214876, y: -0.008138298}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 092b482429e28a643b19d6599355fcc0
+      internalID: 1414616556
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0037
+      rect:
+        serializedVersion: 2
+        x: 1360
+        y: 1259
+        width: 388
+        height: 788
+      alignment: 9
+      pivot: {x: 0.4974227, y: 0.0023857867}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 58adfd457989f754cb25c1bc446597d8
+      internalID: -1013923138
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0038
+      rect:
+        serializedVersion: 2
+        x: 1360
+        y: 1259
+        width: 388
+        height: 788
+      alignment: 9
+      pivot: {x: 0.4974227, y: 0.0023857867}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 7803c4e1dadb44747b0aefc79fcc49e8
+      internalID: -1414315956
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0047
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 495
+        width: 385
+        height: 798
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.01518797}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f90b9fc757002b645bc596cb8264a9aa
+      internalID: -1890952713
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0048
+      rect:
+        serializedVersion: 2
+        x: 388
+        y: 495
+        width: 385
+        height: 798
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.01518797}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 9659dae68f79ac041bb18891d2f76a29
+      internalID: 475769653
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0049
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1231
+        width: 385
+        height: 816
+      alignment: 9
+      pivot: {x: 0.4987013, y: 0.0023039216}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6d91a74e4045ee84b8e74ab315c17fbd
+      internalID: -1497933548
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0050
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1231
+        width: 385
+        height: 816
+      alignment: 9
+      pivot: {x: 0.4987013, y: 0.0023039216}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0e6beda4798000a4d83a5157043b0e34
+      internalID: 436138382
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0051
+      rect:
+        serializedVersion: 2
+        x: 1162
+        y: 462
+        width: 385
+        height: 795
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.026566038}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 3cf4c64953b169a4784b520927e9f63a
+      internalID: -1550351557
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0052
+      rect:
+        serializedVersion: 2
+        x: 1162
+        y: 462
+        width: 385
+        height: 795
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.026566038}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 50bd5e33bf88ec6478003c5d562236e3
+      internalID: 69286420
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0055
+      rect:
+        serializedVersion: 2
+        x: 775
+        y: 495
+        width: 385
+        height: 798
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.01518797}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: bf7c57e5ba290b745a5da716a0923e18
+      internalID: -1976038361
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0056
+      rect:
+        serializedVersion: 2
+        x: 775
+        y: 495
+        width: 385
+        height: 798
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.01518797}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 1762325b04ba42c4d86923c76cf3274c
+      internalID: -1779701630
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0057
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 413
+        width: 385
+        height: 816
+      alignment: 9
+      pivot: {x: 0.4987013, y: 0.0023039216}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: e0dff8cf484ad2b43a9de9a0fd05b3f5
+      internalID: 747752778
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0058
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 413
+        width: 385
+        height: 816
+      alignment: 9
+      pivot: {x: 0.4987013, y: 0.0023039216}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 47cd4dcfd00536e42910a354fecde20c
+      internalID: 1507533172
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0059
+      rect:
+        serializedVersion: 2
+        x: 1549
+        y: 462
+        width: 385
+        height: 795
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.026566038}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: e90e03a6ba1435f4e97d2f5f4205f366
+      internalID: -1052919729
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0060
+      rect:
+        serializedVersion: 2
+        x: 1549
+        y: 462
+        width: 385
+        height: 795
+      alignment: 9
+      pivot: {x: 0.4987013, y: -0.026566038}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: db25bd93e4d789a48a38745450b1dad1
+      internalID: -413710878
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 140593767a7e00749b0fe65319e90927
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Traf_0018: 733294300
+      Traf_0019: 705458408
+      Traf_0020: -1431518560
+      Traf_0021: 1414616556
+      Traf_0037: -1013923138
+      Traf_0038: -1414315956
+      Traf_0047: -1890952713
+      Traf_0048: 475769653
+      Traf_0049: -1497933548
+      Traf_0050: 436138382
+      Traf_0051: -1550351557
+      Traf_0052: 69286420
+      Traf_0055: -1976038361
+      Traf_0056: -1779701630
+      Traf_0057: 747752778
+      Traf_0058: 1507533172
+      Traf_0059: -1052919729
+      Traf_0060: -413710878
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking3.tpsheet

@@ -0,0 +1,33 @@
+#
+# Sprite sheet data for Unity.
+#
+# To import these sprites into your Unity project, download "TexturePackerImporter":
+# https://www.codeandweb.com/texturepacker/unity
+#
+# $TexturePacker:SmartUpdate:12cdac846eeb0ac92e8b589818b5b9fd:1617b416bec25e82693e9f78935249ba:a11e88a1024a8564f888a3954b97f2ab$
+#
+:format=40300
+:texture=Trafalgar-_Walking3.png
+:size=2048x2048
+:pivotpoints=enabled
+:borders=disabled
+:alphahandling=ClearTransparentPixels
+
+Traf_0018;874;1296;484;751; 0.4194214876033058;-0.012143808255659083; 0;0;0;0
+Traf_0019;874;1296;484;751; 0.4194214876033058;-0.012143808255659083; 0;0;0;0
+Traf_0020;388;1295;484;752; 0.4214876033057851;-0.008138297872340328; 0;0;0;0
+Traf_0021;388;1295;484;752; 0.4214876033057851;-0.008138297872340328; 0;0;0;0
+Traf_0037;1360;1259;388;788; 0.49742268041237114;0.0023857868020304984; 0;0;0;0
+Traf_0038;1360;1259;388;788; 0.49742268041237114;0.0023857868020304984; 0;0;0;0
+Traf_0047;388;495;385;798; 0.4987012987012987;-0.015187969924812084; 0;0;0;0
+Traf_0048;388;495;385;798; 0.4987012987012987;-0.015187969924812084; 0;0;0;0
+Traf_0049;1;1231;385;816; 0.4987012987012987;0.002303921568627465; 0;0;0;0
+Traf_0050;1;1231;385;816; 0.4987012987012987;0.002303921568627465; 0;0;0;0
+Traf_0051;1162;462;385;795; 0.4987012987012987;-0.02656603773584898; 0;0;0;0
+Traf_0052;1162;462;385;795; 0.4987012987012987;-0.02656603773584898; 0;0;0;0
+Traf_0055;775;495;385;798; 0.4987012987012987;-0.015187969924812084; 0;0;0;0
+Traf_0056;775;495;385;798; 0.4987012987012987;-0.015187969924812084; 0;0;0;0
+Traf_0057;1;413;385;816; 0.4987012987012987;0.002303921568627465; 0;0;0;0
+Traf_0058;1;413;385;816; 0.4987012987012987;0.002303921568627465; 0;0;0;0
+Traf_0059;1549;462;385;795; 0.4987012987012987;-0.02656603773584898; 0;0;0;0
+Traf_0060;1549;462;385;795; 0.4987012987012987;-0.02656603773584898; 0;0;0;0

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking3.tpsheet.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ae948f43b1dcedb408002364a6c894df
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking4.png.meta

@@ -0,0 +1,202 @@
+fileFormatVersion: 2
+guid: 0f575f07e5277824294ade86131e83c2
+TextureImporter:
+  internalIDToNameTable: []
+  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: 0
+  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: Traf_0024
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 273
+        width: 488
+        height: 750
+      alignment: 9
+      pivot: {x: 0.42008197, y: -0.00816}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 19eae4ca1bf1e984eb588f7c980dc810
+      internalID: -1703591597
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Traf_0025
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 273
+        width: 488
+        height: 750
+      alignment: 9
+      pivot: {x: 0.42008197, y: -0.00816}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f3855632e843eb34e88fcf7251c7cd83
+      internalID: -746435906
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 79d7676310adae84494d551c08b3c47c
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      Traf_0024: -1703591597
+      Traf_0025: -746435906
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking4.tpsheet

@@ -0,0 +1,17 @@
+#
+# Sprite sheet data for Unity.
+#
+# To import these sprites into your Unity project, download "TexturePackerImporter":
+# https://www.codeandweb.com/texturepacker/unity
+#
+# $TexturePacker:SmartUpdate:12cdac846eeb0ac92e8b589818b5b9fd:1617b416bec25e82693e9f78935249ba:a11e88a1024a8564f888a3954b97f2ab$
+#
+:format=40300
+:texture=Trafalgar-_Walking4.png
+:size=512x1024
+:pivotpoints=enabled
+:borders=disabled
+:alphahandling=ClearTransparentPixels
+
+Traf_0024;1;273;488;750; 0.42008196721311475;-0.008159999999999945; 0;0;0;0
+Traf_0025;1;273;488;750; 0.42008196721311475;-0.008159999999999945; 0;0;0;0

Assets/Art/Animations/Trafalgar/Trafalgar-_Walking4.tpsheet.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5f5d73421b606944bb2a2c34b4fc7117
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Textures/Cards/Backgrounds/LegendaryBackground.png.meta

@@ -122,6 +122,32 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WebGL
+    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:

Assets/Art/Textures/Cards/Frames/NormalFrame.png.meta

@@ -122,6 +122,32 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WebGL
+    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:

Assets/Art/UI/DR/ramasjang_icon.png.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 57224356af3d045dbbf8b420e13b4b10
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 2364528222304962155
+    second: ramasjang_icon_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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: ramasjang_icon_0
+      rect:
+        serializedVersion: 2
+        x: 4
+        y: 5
+        width: 334
+        height: 334
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: b668fdfe3ed70d020800000000000000
+      internalID: 2364528222304962155
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      ramasjang_icon_0: 2364528222304962155
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Bootstrap/Runtime/CustomBootSettings_Runtime.asset

@@ -18,13 +18,10 @@ MonoBehaviour:
   - {fileID: 458265635552197097, guid: a77d1e8b2fa8aa945a6f39b312536e0d, type: 3}
   - {fileID: 552225285624929822, guid: e39992796d5459442be9967c77e27066, type: 3}
   - {fileID: 7644433920135100480, guid: 12d242e44fe80ab44af852254b7cab0f, type: 3}
-  - {fileID: 1794231825201849485, guid: 6fb0d7fc6faad154b8c3e3cb7abb7c15, type: 3}
   - {fileID: 6399527186463168339, guid: ac41583865245bc4bb3de6c15929b9fc, type: 3}
   - {fileID: 2755712733105741372, guid: 70e6fca1164d9a140b271f4261f1f023, type: 3}
   - {fileID: 5034240524438268576, guid: adbb9bfd5489f3f4995966535ca5f24b, type: 3}
   - {fileID: 2326026072467672024, guid: c8d9eb8c3ca524b4eb67f6364b455b87, type: 3}
   - {fileID: 3528960956969533010, guid: 53eea3840d3cde34a9768b8773a3a7e8, type: 3}
-  - {fileID: 9076822654798104907, guid: 4684df63af6398f4f9f624a35023f8d2, type: 3}
-  - {fileID: 3863019143023165617, guid: 774e30e3f0b1d0d49bad0c2abf11038a, type: 3}
   - {fileID: 5034240524438268576, guid: b15ba9d3d508ef244b0eeb76404dc9de, type: 3}
   - {fileID: 7207007194116694737, guid: 7180ae585f0db8044ba048426f72d995, type: 3}

Assets/Editor/CardSystem/CardSystemLivePreview.cs

@@ -71,7 +71,6 @@ namespace AppleHills.Editor
             {
                 CardSystemManager.Instance.OnBoosterOpened += OnBoosterOpened;
                 CardSystemManager.Instance.OnCardCollected += OnCardCollected;
-                CardSystemManager.Instance.OnCardRarityUpgraded += OnCardRarityUpgraded;
                 CardSystemManager.Instance.OnBoosterCountChanged += OnBoosterCountChanged;
                 
                 isSubscribed = true;
@@ -87,7 +86,6 @@ namespace AppleHills.Editor
             {
                 CardSystemManager.Instance.OnBoosterOpened -= OnBoosterOpened;
                 CardSystemManager.Instance.OnCardCollected -= OnCardCollected;
-                CardSystemManager.Instance.OnCardRarityUpgraded -= OnCardRarityUpgraded;
                 CardSystemManager.Instance.OnBoosterCountChanged -= OnBoosterCountChanged;
             }
             
@@ -109,13 +107,6 @@ namespace AppleHills.Editor
             Repaint();
         }
         
-        private void OnCardRarityUpgraded(CardData card)
-        {
-            lastEventMessage = $"Card upgraded: {card.Name} → {card.Rarity}!";
-            RefreshData();
-            Repaint();
-        }
-        
         private void OnBoosterCountChanged(int count)
         {
             boosterCount = count;

Assets/Editor/CustomEditorsAndDrawers/InteractableEditor.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 
 namespace Interactions

Assets/Editor/CustomLogWindow.cs

@@ -0,0 +1,829 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using Core;
+
+namespace Editor
+{
+    /// <summary>
+    /// Custom dockable log window with advanced filtering capabilities.
+    /// Supports filtering by class, method, log level, time range, and text search.
+    /// Multiple instances can be opened with independent filter states.
+    /// 
+    /// PERFORMANCE NOTE: For large log counts (10,000+), consider implementing virtualized scrolling.
+    /// Only render visible entries within the scroll view to avoid GUI overhead.
+    /// See DrawLogEntries() method for potential optimization location.
+    /// </summary>
+    public class CustomLogWindow : EditorWindow
+    {
+        #region Window State
+        
+        private Vector2 scrollPosition;
+        private readonly List<LogEntry> allLogs = new List<LogEntry>();
+        
+        #endregion
+        
+        #region Filter State
+        
+        private HashSet<string> activeClassTags = new HashSet<string>();
+        private HashSet<string> activeMethodTags = new HashSet<string>();
+        private HashSet<string> selectedClassFilters = new HashSet<string>();
+        private HashSet<string> selectedMethodFilters = new HashSet<string>();
+        private HashSet<LogLevel> selectedLevelFilters = new HashSet<LogLevel> 
+        { 
+            LogLevel.Debug, LogLevel.Info, LogLevel.Warning, LogLevel.Error 
+        };
+        private string searchText = "";
+        private bool autoScroll = true;
+        
+        // Time range filtering
+        private bool enableTimeFilter = false;
+        private float minTimestamp = 0;
+        private float maxTimestamp = 0;
+        private float currentMaxTimestamp = 0;
+        
+        #endregion
+        
+        #region UI State
+        
+        // Colors for log levels
+        private readonly Color debugColor = Color.white;
+        private readonly Color infoColor = Color.white;
+        private readonly Color warningColor = Color.yellow;
+        private readonly Color errorColor = new Color(1f, 0.3f, 0.3f);
+        
+        // Alternating row background colors
+        private readonly Color evenRowColor = new Color(0.22f, 0.22f, 0.22f);
+        private readonly Color oddRowColor = new Color(0.26f, 0.26f, 0.26f);
+        
+        #endregion
+        
+        #region Menu Items
+        
+        [MenuItem("AppleHills/Custom Log Console")]
+        public static void ShowWindow()
+        {
+            var window = GetWindow<CustomLogWindow>("Custom Log");
+            window.Show();
+        }
+        
+        #endregion
+        
+        #region Unity Lifecycle
+        
+        private void OnEnable()
+        {
+            // Subscribe to new log events
+            Logging.OnLogEntryAdded += OnLogAdded;
+            
+            // Load existing logs
+            allLogs.AddRange(Logging.GetRecentLogs());
+            
+            // Build initial tag lists
+            RebuildTagLists();
+            
+            // Initialize time range
+            UpdateTimeRange();
+        }
+        
+        private void OnDisable()
+        {
+            Logging.OnLogEntryAdded -= OnLogAdded;
+        }
+        
+        private void OnLogAdded(LogEntry entry)
+        {
+            allLogs.Add(entry);
+            
+            // Update active tags
+            activeClassTags.Add(entry.ClassName);
+            activeMethodTags.Add(entry.MethodName);
+            
+            // Update time range
+            UpdateTimeRange();
+            
+            if (autoScroll)
+                scrollPosition.y = float.MaxValue;
+            
+            Repaint(); // Redraw window
+        }
+        
+        #endregion
+        
+        #region GUI Drawing
+        
+        private void OnGUI()
+        {
+            DrawToolbar();
+            DrawLogEntries();
+        }
+        
+        private void DrawToolbar()
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+            
+            // Clear button
+            if (GUILayout.Button("Clear", EditorStyles.toolbarButton, GUILayout.Width(50)))
+            {
+                allLogs.Clear();
+                activeClassTags.Clear();
+                activeMethodTags.Clear();
+                Logging.ClearLogs();
+                Repaint();
+            }
+            
+            // Auto-scroll toggle
+            autoScroll = GUILayout.Toggle(autoScroll, "Auto-scroll", EditorStyles.toolbarButton, GUILayout.Width(80));
+            
+            GUILayout.Space(10);
+            
+            // Class Filter Button
+            string classLabel = selectedClassFilters.Count == 0 ? "Classes: All" : 
+                               selectedClassFilters.Count == activeClassTags.Count ? "Classes: All" :
+                               $"Classes: {selectedClassFilters.Count}";
+            if (GUILayout.Button(new GUIContent(classLabel, "Filter by class"), EditorStyles.toolbarDropDown, GUILayout.Width(100)))
+            {
+                ShowClassFilterMenu();
+            }
+            
+            // Method Filter Button
+            string methodLabel = selectedMethodFilters.Count == 0 ? "Methods: All" : 
+                                selectedMethodFilters.Count == activeMethodTags.Count ? "Methods: All" :
+                                $"Methods: {selectedMethodFilters.Count}";
+            if (GUILayout.Button(new GUIContent(methodLabel, "Filter by method"), EditorStyles.toolbarDropDown, GUILayout.Width(110)))
+            {
+                ShowMethodFilterMenu();
+            }
+            
+            // Log Level Filter Button
+            string levelLabel = selectedLevelFilters.Count == 4 ? "Levels: All" :
+                               selectedLevelFilters.Count == 0 ? "Levels: None" :
+                               $"Levels: {selectedLevelFilters.Count}";
+            if (GUILayout.Button(new GUIContent(levelLabel, "Filter by log level"), EditorStyles.toolbarDropDown, GUILayout.Width(90)))
+            {
+                ShowLevelFilterMenu();
+            }
+            
+            // Time Range Filter Button
+            if (GUILayout.Button(new GUIContent("⏱", "Time range filter"), EditorStyles.toolbarButton, GUILayout.Width(25)))
+            {
+                ShowTimeRangeWindow();
+            }
+            
+            GUILayout.FlexibleSpace();
+            
+            // Search box
+            GUILayout.Label("Search:", GUILayout.Width(50));
+            searchText = GUILayout.TextField(searchText, EditorStyles.toolbarSearchField, GUILayout.Width(150));
+            
+            GUILayout.Space(10);
+            
+            // Export button
+            if (GUILayout.Button("Export", EditorStyles.toolbarButton, GUILayout.Width(60)))
+            {
+                ExportLogs();
+            }
+            
+            GUILayout.Space(5);
+            
+            // Log count
+            var filteredCount = GetFilteredLogs().Count();
+            GUILayout.Label($"{filteredCount}/{allLogs.Count}", GUILayout.Width(80));
+            
+            EditorGUILayout.EndHorizontal();
+        }
+        
+        private void ShowClassFilterMenu()
+        {
+            ClassFilterWindow.ShowWindow(this, activeClassTags, selectedClassFilters, 
+                (newSelection) =>
+                {
+                    selectedClassFilters = newSelection;
+                    Repaint();
+                });
+        }
+        
+        private void ShowMethodFilterMenu()
+        {
+            MethodFilterWindow.ShowWindow(this, activeMethodTags, selectedMethodFilters,
+                (newSelection) =>
+                {
+                    selectedMethodFilters = newSelection;
+                    Repaint();
+                });
+        }
+        
+        private void ShowLevelFilterMenu()
+        {
+            LevelFilterWindow.ShowWindow(this, selectedLevelFilters,
+                (newSelection) =>
+                {
+                    selectedLevelFilters = newSelection;
+                    Repaint();
+                });
+        }
+        
+        private void ShowTimeRangeWindow()
+        {
+            TimeRangeFilterWindow.ShowWindow(this, enableTimeFilter, minTimestamp, maxTimestamp, currentMaxTimestamp,
+                (enabled, min, max) =>
+                {
+                    enableTimeFilter = enabled;
+                    minTimestamp = min;
+                    maxTimestamp = max;
+                    Repaint();
+                });
+        }
+        
+        private void DrawLogEntries()
+        {
+            // PERFORMANCE NOTE: For 10,000+ logs, consider virtualized scrolling here.
+            // Only render entries visible within the scroll view rect.
+            // Current implementation renders all filtered logs which may cause GUI slowdown.
+            
+            scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition);
+            
+            var filteredLogs = GetFilteredLogs().ToList();
+            
+            for (int i = 0; i < filteredLogs.Count; i++)
+            {
+                DrawLogEntry(filteredLogs[i], i);
+            }
+            
+            EditorGUILayout.EndScrollView();
+        }
+        
+        private void DrawLogEntry(LogEntry entry, int index)
+        {
+            // Draw alternating row background
+            Color bgColor = (index % 2 == 0) ? evenRowColor : oddRowColor;
+            Rect rowRect = EditorGUILayout.BeginHorizontal();
+            EditorGUI.DrawRect(rowRect, bgColor);
+            
+            // Color-code by log level
+            Color color = GetColorForLevel(entry.Level);
+            var originalColor = GUI.contentColor;
+            GUI.contentColor = color;
+            
+            // Timestamp
+            GUILayout.Label($"[{entry.Timestamp:F2}s]", GUILayout.Width(80));
+            
+            // Level
+            GUILayout.Label($"[{entry.Level}]", GUILayout.Width(70));
+            
+            // Class
+            GUILayout.Label($"[{entry.ClassName}]", GUILayout.Width(150));
+            
+            // Method
+            GUILayout.Label($"[{entry.MethodName}]", GUILayout.Width(150));
+            
+            // Message
+            GUILayout.Label(entry.Message, GUILayout.ExpandWidth(true));
+            
+            EditorGUILayout.EndHorizontal();
+            
+            GUI.contentColor = originalColor;
+            
+            // Right-click context menu
+            if (Event.current.type == EventType.ContextClick && rowRect.Contains(Event.current.mousePosition))
+            {
+                GenericMenu menu = new GenericMenu();
+                
+                menu.AddItem(new GUIContent("Copy Full Message"), false, () => 
+                {
+                    EditorGUIUtility.systemCopyBuffer = entry.FullFormattedMessage;
+                });
+                
+                menu.AddItem(new GUIContent("Copy Message Only"), false, () =>
+                {
+                    EditorGUIUtility.systemCopyBuffer = entry.Message;
+                });
+                
+                menu.AddSeparator("");
+                
+                menu.AddItem(new GUIContent("Filter to this Class"), false, () =>
+                {
+                    selectedClassFilters.Clear();
+                    selectedClassFilters.Add(entry.ClassName);
+                    Repaint();
+                });
+                
+                menu.AddItem(new GUIContent("Filter to this Method"), false, () =>
+                {
+                    selectedMethodFilters.Clear();
+                    selectedMethodFilters.Add(entry.MethodName);
+                    Repaint();
+                });
+                
+                menu.AddItem(new GUIContent("Filter to this Class + Method"), false, () =>
+                {
+                    selectedClassFilters.Clear();
+                    selectedClassFilters.Add(entry.ClassName);
+                    selectedMethodFilters.Clear();
+                    selectedMethodFilters.Add(entry.MethodName);
+                    Repaint();
+                });
+                
+                menu.AddSeparator("");
+                
+                menu.AddItem(new GUIContent("Filter to this Log Level"), false, () =>
+                {
+                    selectedLevelFilters.Clear();
+                    selectedLevelFilters.Add(entry.Level);
+                    Repaint();
+                });
+                
+                menu.ShowAsContext();
+                Event.current.Use();
+            }
+        }
+        
+        #endregion
+        
+        #region Filtering Logic
+        
+        private IEnumerable<LogEntry> GetFilteredLogs()
+        {
+            return allLogs.Where(entry =>
+            {
+                // Filter by class (if any selected)
+                if (selectedClassFilters.Count > 0 && !selectedClassFilters.Contains(entry.ClassName))
+                    return false;
+                
+                // Filter by method (if any selected)
+                if (selectedMethodFilters.Count > 0 && !selectedMethodFilters.Contains(entry.MethodName))
+                    return false;
+                
+                // Filter by log level
+                if (!selectedLevelFilters.Contains(entry.Level))
+                    return false;
+                
+                // Filter by time range
+                if (enableTimeFilter)
+                {
+                    if (entry.Timestamp < minTimestamp || entry.Timestamp > maxTimestamp)
+                        return false;
+                }
+                
+                // Filter by search text
+                if (!string.IsNullOrEmpty(searchText))
+                {
+                    bool matchesSearch = 
+                        entry.ClassName.Contains(searchText, StringComparison.OrdinalIgnoreCase) ||
+                        entry.MethodName.Contains(searchText, StringComparison.OrdinalIgnoreCase) ||
+                        entry.Message.Contains(searchText, StringComparison.OrdinalIgnoreCase);
+                    
+                    if (!matchesSearch)
+                        return false;
+                }
+                
+                return true;
+            });
+        }
+        
+        #endregion
+        
+        #region Helper Methods
+        
+        private Color GetColorForLevel(LogLevel level)
+        {
+            return level switch
+            {
+                LogLevel.Debug => debugColor,
+                LogLevel.Info => infoColor,
+                LogLevel.Warning => warningColor,
+                LogLevel.Error => errorColor,
+                _ => infoColor
+            };
+        }
+        
+        private void RebuildTagLists()
+        {
+            activeClassTags.Clear();
+            activeMethodTags.Clear();
+            
+            foreach (var log in allLogs)
+            {
+                activeClassTags.Add(log.ClassName);
+                activeMethodTags.Add(log.MethodName);
+            }
+        }
+        
+        private void UpdateTimeRange()
+        {
+            if (allLogs.Count > 0)
+            {
+                currentMaxTimestamp = allLogs.Max(l => l.Timestamp);
+                
+                // Initialize time range on first log
+                if (maxTimestamp == 0)
+                {
+                    maxTimestamp = currentMaxTimestamp;
+                }
+                else
+                {
+                    // Auto-expand max range as new logs come in
+                    maxTimestamp = currentMaxTimestamp;
+                }
+            }
+        }
+        
+        private void ExportLogs()
+        {
+            string defaultFileName = $"logs_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.txt";
+            string path = EditorUtility.SaveFilePanel("Export Logs", "", defaultFileName, "txt");
+            
+            if (!string.IsNullOrEmpty(path))
+            {
+                try
+                {
+                    var filteredLogs = GetFilteredLogs().ToList();
+                    var lines = filteredLogs.Select(e => e.FullFormattedMessage);
+                    File.WriteAllLines(path, lines);
+                    
+                    EditorUtility.DisplayDialog("Export Successful", 
+                        $"Exported {filteredLogs.Count} log entries to:\n{path}", "OK");
+                }
+                catch (Exception ex)
+                {
+                    EditorUtility.DisplayDialog("Export Failed", 
+                        $"Failed to export logs:\n{ex.Message}", "OK");
+                }
+            }
+        }
+        
+        #endregion
+    }
+    
+    /// <summary>
+    /// Persistent popup window for class filtering with multi-selection support
+    /// </summary>
+    public class ClassFilterWindow : EditorWindow
+    {
+        private HashSet<string> availableTags;
+        private HashSet<string> selectedTags;
+        private System.Action<HashSet<string>> onApply;
+        private Vector2 scrollPosition;
+        private string searchFilter = "";
+        
+        public static void ShowWindow(CustomLogWindow parent, HashSet<string> available, HashSet<string> selected,
+            System.Action<HashSet<string>> applyCallback)
+        {
+            var window = CreateInstance<ClassFilterWindow>();
+            window.titleContent = new GUIContent("Class Filter");
+            window.availableTags = available;
+            window.selectedTags = new HashSet<string>(selected);
+            window.onApply = applyCallback;
+            
+            var parentRect = parent.position;
+            window.position = new Rect(parentRect.x + 50, parentRect.y + 50, 300, 400);
+            window.ShowUtility();
+        }
+        
+        private void OnGUI()
+        {
+            EditorGUILayout.Space(5);
+            
+            // Control buttons
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("All", GUILayout.Width(60)))
+            {
+                if (availableTags != null)
+                    selectedTags = new HashSet<string>(availableTags);
+            }
+            if (GUILayout.Button("None", GUILayout.Width(60)))
+            {
+                selectedTags.Clear();
+            }
+            GUILayout.FlexibleSpace();
+            searchFilter = EditorGUILayout.TextField(searchFilter, EditorStyles.toolbarSearchField, GUILayout.Width(150));
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(5);
+            
+            // Scrollable list of toggles
+            scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition);
+            
+            if (availableTags != null && availableTags.Count > 0)
+            {
+                var filteredTags = string.IsNullOrEmpty(searchFilter) 
+                    ? availableTags.OrderBy(t => t)
+                    : availableTags.Where(t => t.Contains(searchFilter, StringComparison.OrdinalIgnoreCase)).OrderBy(t => t);
+                
+                foreach (var tag in filteredTags)
+                {
+                    bool isSelected = selectedTags.Contains(tag);
+                    bool newSelection = EditorGUILayout.ToggleLeft(tag, isSelected);
+                    
+                    if (newSelection != isSelected)
+                    {
+                        if (newSelection)
+                            selectedTags.Add(tag);
+                        else
+                            selectedTags.Remove(tag);
+                    }
+                }
+            }
+            else
+            {
+                EditorGUILayout.HelpBox("No classes available", MessageType.Info);
+            }
+            
+            EditorGUILayout.EndScrollView();
+            
+            EditorGUILayout.Space(5);
+            
+            // Apply/Close buttons
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.FlexibleSpace();
+            
+            if (GUILayout.Button("Apply", GUILayout.Width(80)))
+            {
+                onApply?.Invoke(selectedTags);
+                Close();
+            }
+            
+            if (GUILayout.Button("Close", GUILayout.Width(80)))
+            {
+                Close();
+            }
+            
+            GUILayout.FlexibleSpace();
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(5);
+        }
+    }
+    
+    /// <summary>
+    /// Persistent popup window for method filtering with multi-selection support
+    /// </summary>
+    public class MethodFilterWindow : EditorWindow
+    {
+        private HashSet<string> availableTags;
+        private HashSet<string> selectedTags;
+        private System.Action<HashSet<string>> onApply;
+        private Vector2 scrollPosition;
+        private string searchFilter = "";
+        
+        public static void ShowWindow(CustomLogWindow parent, HashSet<string> available, HashSet<string> selected,
+            System.Action<HashSet<string>> applyCallback)
+        {
+            var window = CreateInstance<MethodFilterWindow>();
+            window.titleContent = new GUIContent("Method Filter");
+            window.availableTags = available;
+            window.selectedTags = new HashSet<string>(selected);
+            window.onApply = applyCallback;
+            
+            var parentRect = parent.position;
+            window.position = new Rect(parentRect.x + 50, parentRect.y + 50, 300, 400);
+            window.ShowUtility();
+        }
+        
+        private void OnGUI()
+        {
+            EditorGUILayout.Space(5);
+            
+            // Control buttons
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("All", GUILayout.Width(60)))
+            {
+                if (availableTags != null)
+                    selectedTags = new HashSet<string>(availableTags);
+            }
+            if (GUILayout.Button("None", GUILayout.Width(60)))
+            {
+                selectedTags.Clear();
+            }
+            GUILayout.FlexibleSpace();
+            searchFilter = EditorGUILayout.TextField(searchFilter, EditorStyles.toolbarSearchField, GUILayout.Width(150));
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(5);
+            
+            // Scrollable list of toggles
+            scrollPosition = EditorGUILayout.BeginScrollView(scrollPosition);
+            
+            if (availableTags != null && availableTags.Count > 0)
+            {
+                var filteredTags = string.IsNullOrEmpty(searchFilter) 
+                    ? availableTags.OrderBy(t => t)
+                    : availableTags.Where(t => t.Contains(searchFilter, StringComparison.OrdinalIgnoreCase)).OrderBy(t => t);
+                
+                foreach (var tag in filteredTags)
+                {
+                    bool isSelected = selectedTags.Contains(tag);
+                    bool newSelection = EditorGUILayout.ToggleLeft(tag, isSelected);
+                    
+                    if (newSelection != isSelected)
+                    {
+                        if (newSelection)
+                            selectedTags.Add(tag);
+                        else
+                            selectedTags.Remove(tag);
+                    }
+                }
+            }
+            else
+            {
+                EditorGUILayout.HelpBox("No methods available", MessageType.Info);
+            }
+            
+            EditorGUILayout.EndScrollView();
+            
+            EditorGUILayout.Space(5);
+            
+            // Apply/Close buttons
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.FlexibleSpace();
+            
+            if (GUILayout.Button("Apply", GUILayout.Width(80)))
+            {
+                onApply?.Invoke(selectedTags);
+                Close();
+            }
+            
+            if (GUILayout.Button("Close", GUILayout.Width(80)))
+            {
+                Close();
+            }
+            
+            GUILayout.FlexibleSpace();
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(5);
+        }
+    }
+    
+    /// <summary>
+    /// Persistent popup window for log level filtering with multi-selection support
+    /// </summary>
+    public class LevelFilterWindow : EditorWindow
+    {
+        private HashSet<LogLevel> selectedLevels;
+        private System.Action<HashSet<LogLevel>> onApply;
+        
+        public static void ShowWindow(CustomLogWindow parent, HashSet<LogLevel> selected,
+            System.Action<HashSet<LogLevel>> applyCallback)
+        {
+            var window = CreateInstance<LevelFilterWindow>();
+            window.titleContent = new GUIContent("Log Level Filter");
+            window.selectedLevels = new HashSet<LogLevel>(selected);
+            window.onApply = applyCallback;
+            
+            var parentRect = parent.position;
+            window.position = new Rect(parentRect.x + 50, parentRect.y + 50, 250, 180);
+            window.ShowUtility();
+        }
+        
+        private void OnGUI()
+        {
+            EditorGUILayout.Space(5);
+            
+            // Control buttons
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("All", GUILayout.Width(60)))
+            {
+                selectedLevels = new HashSet<LogLevel> 
+                { 
+                    LogLevel.Debug, LogLevel.Info, LogLevel.Warning, LogLevel.Error 
+                };
+            }
+            if (GUILayout.Button("None", GUILayout.Width(60)))
+            {
+                selectedLevels.Clear();
+            }
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(10);
+            
+            // Log level toggles
+            foreach (LogLevel level in Enum.GetValues(typeof(LogLevel)))
+            {
+                bool isSelected = selectedLevels.Contains(level);
+                bool newSelection = EditorGUILayout.ToggleLeft(level.ToString(), isSelected);
+                
+                if (newSelection != isSelected)
+                {
+                    if (newSelection)
+                        selectedLevels.Add(level);
+                    else
+                        selectedLevels.Remove(level);
+                }
+            }
+            
+            EditorGUILayout.Space(10);
+            
+            // Apply/Close buttons
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.FlexibleSpace();
+            
+            if (GUILayout.Button("Apply", GUILayout.Width(80)))
+            {
+                onApply?.Invoke(selectedLevels);
+                Close();
+            }
+            
+            if (GUILayout.Button("Close", GUILayout.Width(80)))
+            {
+                Close();
+            }
+            
+            GUILayout.FlexibleSpace();
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(5);
+        }
+    }
+    
+    /// <summary>
+    /// Popup window for configuring time range filters
+    /// </summary>
+    public class TimeRangeFilterWindow : EditorWindow
+    {
+        private bool enableTimeFilter;
+        private float minTimestamp;
+        private float maxTimestamp;
+        private float currentMaxTimestamp;
+        private System.Action<bool, float, float> onApply;
+        
+        public static void ShowWindow(CustomLogWindow parent, bool enabled, float min, float max, float currentMax,
+            System.Action<bool, float, float> applyCallback)
+        {
+            var window = CreateInstance<TimeRangeFilterWindow>();
+            window.titleContent = new GUIContent("Time Range Filter");
+            window.enableTimeFilter = enabled;
+            window.minTimestamp = min;
+            window.maxTimestamp = max;
+            window.currentMaxTimestamp = currentMax;
+            window.onApply = applyCallback;
+            
+            // Position near the parent window
+            var parentRect = parent.position;
+            window.position = new Rect(parentRect.x + 100, parentRect.y + 100, 350, 120);
+            
+            window.ShowUtility();
+        }
+        
+        private void OnGUI()
+        {
+            EditorGUILayout.Space(10);
+            
+            enableTimeFilter = EditorGUILayout.Toggle("Enable Time Filter", enableTimeFilter);
+            
+            EditorGUILayout.Space(5);
+            
+            if (enableTimeFilter && currentMaxTimestamp > 0)
+            {
+                EditorGUILayout.BeginHorizontal();
+                EditorGUILayout.LabelField($"Min: {minTimestamp:F2}s", GUILayout.Width(100));
+                EditorGUILayout.LabelField($"Max: {maxTimestamp:F2}s", GUILayout.Width(100));
+                EditorGUILayout.EndHorizontal();
+                
+                EditorGUILayout.MinMaxSlider(
+                    ref minTimestamp, 
+                    ref maxTimestamp, 
+                    0, 
+                    currentMaxTimestamp);
+                    
+                EditorGUILayout.Space(5);
+                
+                EditorGUILayout.BeginHorizontal();
+                if (GUILayout.Button("Reset Range"))
+                {
+                    minTimestamp = 0;
+                    maxTimestamp = currentMaxTimestamp;
+                }
+                EditorGUILayout.EndHorizontal();
+            }
+            else if (enableTimeFilter)
+            {
+                EditorGUILayout.HelpBox("No logs available for time filtering", MessageType.Info);
+            }
+            
+            EditorGUILayout.Space(10);
+            
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.FlexibleSpace();
+            
+            if (GUILayout.Button("Apply", GUILayout.Width(80)))
+            {
+                onApply?.Invoke(enableTimeFilter, minTimestamp, maxTimestamp);
+                Close();
+            }
+            
+            if (GUILayout.Button("Cancel", GUILayout.Width(80)))
+            {
+                Close();
+            }
+            
+            GUILayout.FlexibleSpace();
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space(10);
+        }
+    }
+}

Assets/Editor/CustomLogWindow.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 60a300585fef4ac990c963c8b37c3887
+timeCreated: 1762814971

Assets/Editor/Developer/StateMachineMigrationTool.cs

@@ -181,7 +181,7 @@ namespace Editor
                     string scenePath = AssetDatabase.GUIDToAssetPath(guid);
                     var scene = EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Additive);
 
-                    var allComponents = GameObject.FindObjectsOfType<Component>(true);
+                    var allComponents = GameObject.FindObjectsByType<Component>(FindObjectsInactive.Include, FindObjectsSortMode.None);
                     foreach (var component in allComponents)
                     {
                         if (component == null || component.gameObject.scene != scene) continue;

Assets/Editor/InteractionSystem.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cb41c852d70c4066bf510792ee19b3f5
+timeCreated: 1762866335

Assets/Editor/InteractionSystem/InteractableEditorWindow.cs

@@ -0,0 +1,748 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using Interactions;
+using System.Reflection;
+using System;
+
+namespace AppleHills.Editor.InteractionSystem
+{
+    /// <summary>
+    /// Editor utility for managing and debugging interactable objects in the scene.
+    /// Provides scene object locator, inspector editing, and runtime debugging capabilities.
+    /// </summary>
+    public class InteractableEditorWindow : EditorWindow
+    {
+        // Tab management
+        private int _selectedTab = 0;
+        private readonly string[] _tabNames = { "Scene", "Debug" };
+        
+        // Scene interactables tracking
+        private List<InteractableBase> _sceneInteractables = new List<InteractableBase>();
+        private InteractableBase _selectedInteractable;
+        private GameObject _selectedGameObject;
+        
+        // UI state
+        private Vector2 _listScrollPosition;
+        private Vector2 _inspectorScrollPosition;
+        private Vector2 _debugScrollPosition;
+        private string _searchQuery = "";
+        
+        // Runtime state
+        private bool _isPlaying = false;
+        
+        // Editor for selected interactable
+        private UnityEditor.Editor _cachedEditor;
+        
+        // Available interactable types for adding
+        private static readonly Type[] AvailableInteractableTypes = new Type[]
+        {
+            typeof(OneClickInteraction),
+            typeof(Pickup),
+            typeof(ItemSlot),
+            typeof(SaveableInteractable),
+            typeof(InteractableBase)
+        };
+        
+        [MenuItem("AppleHills/Interactable Editor")]
+        public static void ShowWindow()
+        {
+            var window = GetWindow<InteractableEditorWindow>("Interactable Editor");
+            window.minSize = new Vector2(900, 600);
+            window.Show();
+        }
+
+        private void OnEnable()
+        {
+            RefreshSceneInteractables();
+            
+            // Register for scene and selection changes
+            UnityEditor.SceneManagement.EditorSceneManager.sceneOpened += OnSceneOpened;
+            UnityEditor.SceneManagement.EditorSceneManager.sceneClosed += OnSceneClosed;
+            Selection.selectionChanged += OnSelectionChanged;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+            EditorApplication.hierarchyChanged += OnHierarchyChanged;
+        }
+
+        private void OnDisable()
+        {
+            UnityEditor.SceneManagement.EditorSceneManager.sceneOpened -= OnSceneOpened;
+            UnityEditor.SceneManagement.EditorSceneManager.sceneClosed -= OnSceneClosed;
+            Selection.selectionChanged -= OnSelectionChanged;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
+            EditorApplication.hierarchyChanged -= OnHierarchyChanged;
+            
+            // Clean up cached editor
+            if (_cachedEditor != null)
+            {
+                DestroyImmediate(_cachedEditor);
+                _cachedEditor = null;
+            }
+        }
+        
+        private void OnSceneOpened(UnityEngine.SceneManagement.Scene scene, UnityEditor.SceneManagement.OpenSceneMode mode)
+        {
+            RefreshSceneInteractables();
+        }
+        
+        private void OnSceneClosed(UnityEngine.SceneManagement.Scene scene)
+        {
+            RefreshSceneInteractables();
+        }
+        
+        private void OnHierarchyChanged()
+        {
+            RefreshSceneInteractables();
+        }
+        
+        private void OnSelectionChanged()
+        {
+            // Check if selected object has changed
+            if (Selection.activeGameObject != null && Selection.activeGameObject != _selectedGameObject)
+            {
+                var interactable = Selection.activeGameObject.GetComponent<InteractableBase>();
+                if (interactable != null)
+                {
+                    // GameObject has an interactable - select it
+                    SelectInteractable(interactable);
+                }
+                else
+                {
+                    // GameObject doesn't have an interactable - track it for add menu
+                    _selectedGameObject = Selection.activeGameObject;
+                    _selectedInteractable = null;
+                    
+                    // Clear cached editor
+                    if (_cachedEditor != null)
+                    {
+                        DestroyImmediate(_cachedEditor);
+                        _cachedEditor = null;
+                    }
+                }
+                Repaint();
+            }
+            else if (Selection.activeGameObject == null)
+            {
+                // Nothing selected - clear selection
+                _selectedGameObject = null;
+                _selectedInteractable = null;
+                
+                if (_cachedEditor != null)
+                {
+                    DestroyImmediate(_cachedEditor);
+                    _cachedEditor = null;
+                }
+                Repaint();
+            }
+        }
+        
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            _isPlaying = EditorApplication.isPlaying;
+            if (_isPlaying)
+            {
+                RefreshSceneInteractables();
+            }
+            Repaint();
+        }
+
+        private void OnGUI()
+        {
+            DrawHeader();
+            
+            _selectedTab = GUILayout.Toolbar(_selectedTab, _tabNames);
+            
+            EditorGUILayout.Space();
+            
+            switch (_selectedTab)
+            {
+                case 0: // Scene tab
+                    DrawSceneTab();
+                    break;
+                case 1: // Debug tab
+                    DrawDebugTab();
+                    break;
+            }
+        }
+        
+        #region Header UI
+        
+        private void DrawHeader()
+        {
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+            
+            if (GUILayout.Button("Refresh", EditorStyles.toolbarButton, GUILayout.Width(60)))
+            {
+                RefreshSceneInteractables();
+            }
+            
+            GUILayout.FlexibleSpace();
+            
+            // Tab-specific toolbar options
+            if (_selectedTab == 0) // Scene tab
+            {
+                EditorGUILayout.LabelField($"Found: {_sceneInteractables.Count} interactables", EditorStyles.toolbarButton, GUILayout.Width(150));
+            }
+            else if (_selectedTab == 1) // Debug tab
+            {
+                EditorGUILayout.LabelField(_isPlaying ? "Runtime Active" : "Editor Mode", EditorStyles.toolbarButton, GUILayout.Width(100));
+            }
+            
+            EditorGUILayout.EndHorizontal();
+        }
+        
+        #endregion
+        
+        #region Scene Tab
+        
+        private void DrawSceneTab()
+        {
+            EditorGUILayout.BeginHorizontal();
+            
+            // Left panel - interactable list
+            EditorGUILayout.BeginVertical(GUILayout.Width(300));
+            DrawInteractableListPanel();
+            EditorGUILayout.EndVertical();
+            
+            // Separator
+            EditorGUILayout.Space(5);
+            
+            // Right panel - inspector/editor
+            EditorGUILayout.BeginVertical();
+            DrawInspectorPanel();
+            EditorGUILayout.EndVertical();
+            
+            EditorGUILayout.EndHorizontal();
+        }
+        
+        private void DrawInteractableListPanel()
+        {
+            // Search field
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+            _searchQuery = EditorGUILayout.TextField(_searchQuery, EditorStyles.toolbarSearchField);
+            if (GUILayout.Button("×", EditorStyles.toolbarButton, GUILayout.Width(20)) && !string.IsNullOrEmpty(_searchQuery))
+            {
+                _searchQuery = "";
+                GUI.FocusControl(null);
+            }
+            EditorGUILayout.EndHorizontal();
+            
+            _listScrollPosition = EditorGUILayout.BeginScrollView(_listScrollPosition);
+            
+            // Filter interactables by search query
+            var filteredInteractables = string.IsNullOrEmpty(_searchQuery)
+                ? _sceneInteractables
+                : _sceneInteractables.Where(i => i != null && i.gameObject.name.ToLower().Contains(_searchQuery.ToLower())).ToList();
+            
+            if (filteredInteractables.Count == 0)
+            {
+                EditorGUILayout.HelpBox("No interactables found in scene", MessageType.Info);
+            }
+            else
+            {
+                foreach (var interactable in filteredInteractables)
+                {
+                    if (interactable == null) continue;
+                    
+                    if (DrawInteractableListItem(interactable))
+                    {
+                        SelectInteractable(interactable);
+                    }
+                }
+            }
+            
+            EditorGUILayout.EndScrollView();
+        }
+        
+        private bool DrawInteractableListItem(InteractableBase interactable)
+        {
+            bool isSelected = interactable == _selectedInteractable;
+            
+            Color originalColor = GUI.backgroundColor;
+            if (isSelected)
+                GUI.backgroundColor = new Color(0.3f, 0.5f, 0.8f);
+            
+            EditorGUILayout.BeginVertical(EditorStyles.helpBox);
+            GUI.backgroundColor = originalColor;
+            
+            EditorGUILayout.BeginHorizontal();
+            
+            // Interactable info
+            EditorGUILayout.BeginVertical();
+            EditorGUILayout.LabelField(interactable.gameObject.name, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(interactable.GetType().Name, EditorStyles.miniLabel);
+            
+            // Show additional info for specific types
+            if (interactable is Pickup pickup && pickup.itemData != null)
+            {
+                EditorGUILayout.LabelField($"Item: {pickup.itemData.itemName}", EditorStyles.miniLabel);
+            }
+            else if (interactable is ItemSlot slot && slot.itemData != null)
+            {
+                EditorGUILayout.LabelField($"Slot: {slot.itemData.itemName}", EditorStyles.miniLabel);
+            }
+            
+            EditorGUILayout.EndVertical();
+            
+            GUILayout.FlexibleSpace();
+            
+            // Ping button
+            if (GUILayout.Button("Ping", GUILayout.Width(50)))
+            {
+                EditorGUIUtility.PingObject(interactable.gameObject);
+                Selection.activeGameObject = interactable.gameObject;
+            }
+            
+            EditorGUILayout.EndHorizontal();
+            EditorGUILayout.EndVertical();
+            
+            Rect itemRect = GUILayoutUtility.GetLastRect();
+            bool wasClicked = Event.current.type == EventType.MouseDown && Event.current.button == 0 
+                && itemRect.Contains(Event.current.mousePosition);
+            
+            if (wasClicked)
+            {
+                Event.current.Use();
+            }
+            
+            return wasClicked;
+        }
+        
+        private void DrawInspectorPanel()
+        {
+            _inspectorScrollPosition = EditorGUILayout.BeginScrollView(_inspectorScrollPosition);
+            
+            if (_selectedInteractable == null && _selectedGameObject == null)
+            {
+                EditorGUILayout.HelpBox("Select an interactable from the list or in the scene hierarchy", MessageType.Info);
+            }
+            else if (_selectedGameObject != null && _selectedInteractable == null)
+            {
+                // Selected object doesn't have an interactable - show add menu
+                DrawAddInteractableMenu();
+            }
+            else if (_selectedInteractable != null)
+            {
+                // Draw custom inspector for the selected interactable
+                DrawInteractableInspector();
+            }
+            
+            EditorGUILayout.EndScrollView();
+        }
+        
+        private void DrawAddInteractableMenu()
+        {
+            EditorGUILayout.HelpBox($"GameObject '{_selectedGameObject.name}' doesn't have an Interactable component", MessageType.Info);
+            
+            EditorGUILayout.Space();
+            EditorGUILayout.LabelField("Add Interactable Component:", EditorStyles.boldLabel);
+            
+            foreach (var interactableType in AvailableInteractableTypes)
+            {
+                if (GUILayout.Button($"Add {interactableType.Name}", GUILayout.Height(30)))
+                {
+                    Undo.RecordObject(_selectedGameObject, $"Add {interactableType.Name}");
+                    var component = _selectedGameObject.AddComponent(interactableType) as InteractableBase;
+                    EditorUtility.SetDirty(_selectedGameObject);
+                    SelectInteractable(component);
+                    RefreshSceneInteractables();
+                }
+            }
+        }
+        
+        private void DrawInteractableInspector()
+        {
+            // Header
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField("Editing:", EditorStyles.boldLabel, GUILayout.Width(60));
+            EditorGUILayout.LabelField(_selectedInteractable.gameObject.name, EditorStyles.boldLabel);
+            
+            GUILayout.FlexibleSpace();
+            
+            if (GUILayout.Button("Ping", GUILayout.Width(50)))
+            {
+                EditorGUIUtility.PingObject(_selectedInteractable.gameObject);
+                Selection.activeGameObject = _selectedInteractable.gameObject;
+            }
+            
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space();
+            
+            // Draw default inspector using Editor
+            if (_cachedEditor == null || _cachedEditor.target != _selectedInteractable)
+            {
+                if (_cachedEditor != null)
+                {
+                    DestroyImmediate(_cachedEditor);
+                }
+                _cachedEditor = UnityEditor.Editor.CreateEditor(_selectedInteractable);
+            }
+            
+            if (_cachedEditor != null)
+            {
+                EditorGUI.BeginChangeCheck();
+                _cachedEditor.OnInspectorGUI();
+                if (EditorGUI.EndChangeCheck())
+                {
+                    EditorUtility.SetDirty(_selectedInteractable);
+                }
+            }
+            
+            EditorGUILayout.Space();
+            
+            // Additional info section
+            DrawAdditionalInfo();
+        }
+        
+        private void DrawAdditionalInfo()
+        {
+            EditorGUILayout.LabelField("Additional Information", EditorStyles.boldLabel);
+            EditorGUILayout.BeginVertical(EditorStyles.helpBox);
+            
+            // Show component information
+            EditorGUILayout.LabelField("Type:", _selectedInteractable.GetType().Name);
+            
+            // Show attached actions
+            var actions = _selectedInteractable.GetComponents<InteractionActionBase>();
+            if (actions.Length > 0)
+            {
+                EditorGUILayout.LabelField($"Actions: {actions.Length}");
+                EditorGUI.indentLevel++;
+                foreach (var action in actions)
+                {
+                    EditorGUILayout.BeginHorizontal();
+                    EditorGUILayout.LabelField(action.GetType().Name, EditorStyles.miniLabel);
+                    if (GUILayout.Button("Ping", GUILayout.Width(50)))
+                    {
+                        EditorGUIUtility.PingObject(action);
+                    }
+                    EditorGUILayout.EndHorizontal();
+                }
+                EditorGUI.indentLevel--;
+            }
+            
+            // Show specific type info
+            if (_selectedInteractable is Pickup pickup)
+            {
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField("Pickup Info:", EditorStyles.boldLabel);
+                if (pickup.itemData != null)
+                {
+                    EditorGUILayout.BeginHorizontal();
+                    EditorGUILayout.LabelField("Item Data:", GUILayout.Width(100));
+                    EditorGUILayout.ObjectField(pickup.itemData, typeof(PickupItemData), false);
+                    if (GUILayout.Button("Ping", GUILayout.Width(50)))
+                    {
+                        EditorGUIUtility.PingObject(pickup.itemData);
+                    }
+                    EditorGUILayout.EndHorizontal();
+                }
+            }
+            else if (_selectedInteractable is ItemSlot slot)
+            {
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField("Slot Info:", EditorStyles.boldLabel);
+                if (slot.itemData != null)
+                {
+                    EditorGUILayout.BeginHorizontal();
+                    EditorGUILayout.LabelField("Slot Data:", GUILayout.Width(100));
+                    EditorGUILayout.ObjectField(slot.itemData, typeof(PickupItemData), false);
+                    if (GUILayout.Button("Ping", GUILayout.Width(50)))
+                    {
+                        EditorGUIUtility.PingObject(slot.itemData);
+                    }
+                    EditorGUILayout.EndHorizontal();
+                }
+                
+                if (_isPlaying)
+                {
+                    var slottedObject = slot.GetSlottedObject();
+                    if (slottedObject != null)
+                    {
+                        EditorGUILayout.BeginHorizontal();
+                        EditorGUILayout.LabelField("Slotted Object:", GUILayout.Width(100));
+                        EditorGUILayout.ObjectField(slottedObject, typeof(GameObject), true);
+                        if (GUILayout.Button("Ping", GUILayout.Width(50)))
+                        {
+                            EditorGUIUtility.PingObject(slottedObject);
+                        }
+                        EditorGUILayout.EndHorizontal();
+                    }
+                }
+            }
+            
+            EditorGUILayout.EndVertical();
+        }
+        
+        #endregion
+        
+        #region Debug Tab
+        
+        private void DrawDebugTab()
+        {
+            if (!_isPlaying)
+            {
+                EditorGUILayout.HelpBox("Enter Play Mode to debug interactables at runtime", MessageType.Info);
+                return;
+            }
+            
+            _debugScrollPosition = EditorGUILayout.BeginScrollView(_debugScrollPosition);
+            
+            EditorGUILayout.LabelField("Scene Interactables", EditorStyles.boldLabel);
+            EditorGUILayout.HelpBox("Test interactions and trigger individual events", MessageType.Info);
+            
+            EditorGUILayout.Space();
+            
+            foreach (var interactable in _sceneInteractables)
+            {
+                if (interactable == null) continue;
+                
+                DrawDebugInteractableItem(interactable);
+            }
+            
+            EditorGUILayout.EndScrollView();
+        }
+        
+        private void DrawDebugInteractableItem(InteractableBase interactable)
+        {
+            EditorGUILayout.BeginVertical(EditorStyles.helpBox);
+            
+            // Header
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(interactable.gameObject.name, EditorStyles.boldLabel);
+            EditorGUILayout.LabelField($"({interactable.GetType().Name})", EditorStyles.miniLabel);
+            
+            GUILayout.FlexibleSpace();
+            
+            if (GUILayout.Button("Ping", GUILayout.Width(50)))
+            {
+                EditorGUIUtility.PingObject(interactable.gameObject);
+                Selection.activeGameObject = interactable.gameObject;
+            }
+            
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space();
+            
+            // Interaction buttons
+            EditorGUILayout.LabelField("Trigger Interaction:", EditorStyles.boldLabel);
+            
+            EditorGUILayout.BeginHorizontal();
+            
+            if (GUILayout.Button("Full Interaction", GUILayout.Height(25)))
+            {
+                TriggerFullInteraction(interactable);
+            }
+            
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.Space();
+            
+            // Event buttons
+            EditorGUILayout.LabelField("Trigger Individual Events:", EditorStyles.boldLabel);
+            
+            EditorGUILayout.BeginHorizontal();
+            
+            if (GUILayout.Button("Started"))
+            {
+                TriggerEvent(interactable, "OnInteractionStarted");
+                TriggerUnityEvent(interactable, "interactionStarted");
+            }
+            
+            if (GUILayout.Button("Arrived"))
+            {
+                TriggerEvent(interactable, "OnInteractingCharacterArrived");
+                TriggerUnityEvent(interactable, "characterArrived");
+            }
+            
+            if (GUILayout.Button("Do Interaction"))
+            {
+                TriggerEvent(interactable, "DoInteraction");
+            }
+            
+            EditorGUILayout.EndHorizontal();
+            
+            EditorGUILayout.BeginHorizontal();
+            
+            if (GUILayout.Button("Complete (Success)"))
+            {
+                TriggerEventWithParam(interactable, "OnInteractionFinished", true);
+                TriggerUnityEventWithParam(interactable, "interactionComplete", true);
+            }
+            
+            if (GUILayout.Button("Complete (Fail)"))
+            {
+                TriggerEventWithParam(interactable, "OnInteractionFinished", false);
+                TriggerUnityEventWithParam(interactable, "interactionComplete", false);
+            }
+            
+            if (GUILayout.Button("Interrupted"))
+            {
+                TriggerUnityEvent(interactable, "interactionInterrupted");
+            }
+            
+            EditorGUILayout.EndHorizontal();
+            
+            // Show registered actions
+            var actions = interactable.GetComponents<InteractionActionBase>();
+            if (actions.Length > 0)
+            {
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField($"Registered Actions ({actions.Length}):", EditorStyles.boldLabel);
+                
+                foreach (var action in actions)
+                {
+                    EditorGUILayout.BeginHorizontal(EditorStyles.helpBox);
+                    EditorGUILayout.LabelField(action.GetType().Name);
+                    
+                    if (action.respondToEvents != null && action.respondToEvents.Count > 0)
+                    {
+                        string events = string.Join(", ", action.respondToEvents);
+                        EditorGUILayout.LabelField($"Events: {events}", EditorStyles.miniLabel);
+                    }
+                    
+                    EditorGUILayout.EndHorizontal();
+                }
+            }
+            
+            EditorGUILayout.EndVertical();
+            EditorGUILayout.Space();
+        }
+        
+        #endregion
+        
+        #region Data Management
+        
+        private void RefreshSceneInteractables()
+        {
+            _sceneInteractables.Clear();
+            
+            // Find all interactables in the scene
+            var allInteractables = FindObjectsByType<InteractableBase>(FindObjectsSortMode.None);
+            _sceneInteractables.AddRange(allInteractables);
+            
+            // Sort by name for easier browsing
+            _sceneInteractables.Sort((a, b) => 
+            {
+                if (a == null || b == null) return 0;
+                return string.Compare(a.gameObject.name, b.gameObject.name, StringComparison.Ordinal);
+            });
+        }
+        
+        private void SelectInteractable(InteractableBase interactable)
+        {
+            _selectedInteractable = interactable;
+            _selectedGameObject = interactable?.gameObject;
+            
+            // Clear cached editor to force recreation
+            if (_cachedEditor != null)
+            {
+                DestroyImmediate(_cachedEditor);
+                _cachedEditor = null;
+            }
+        }
+        
+        #endregion
+        
+        #region Debug Helpers
+        
+        private void TriggerFullInteraction(InteractableBase interactable)
+        {
+            if (!_isPlaying || interactable == null) return;
+            
+            // Simulate a tap on the interactable
+            Vector3 worldPos = interactable.transform.position;
+            interactable.OnTap(new Vector2(worldPos.x, worldPos.y));
+            
+            Debug.Log($"[Interactable Editor] Triggered full interaction on {interactable.gameObject.name}");
+        }
+        
+        private void TriggerEvent(InteractableBase interactable, string methodName)
+        {
+            if (!_isPlaying || interactable == null) return;
+            
+            Type type = interactable.GetType();
+            MethodInfo method = type.GetMethod(methodName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            
+            if (method != null)
+            {
+                try
+                {
+                    method.Invoke(interactable, null);
+                    Debug.Log($"[Interactable Editor] Invoked {methodName} on {interactable.gameObject.name}");
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"[Interactable Editor] Error invoking {methodName}: {e.Message}");
+                }
+            }
+            else
+            {
+                Debug.LogWarning($"[Interactable Editor] Method {methodName} not found on {type.Name}");
+            }
+        }
+        
+        private void TriggerEventWithParam(InteractableBase interactable, string methodName, object param)
+        {
+            if (!_isPlaying || interactable == null) return;
+            
+            Type type = interactable.GetType();
+            MethodInfo method = type.GetMethod(methodName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            
+            if (method != null)
+            {
+                try
+                {
+                    method.Invoke(interactable, new object[] { param });
+                    Debug.Log($"[Interactable Editor] Invoked {methodName}({param}) on {interactable.gameObject.name}");
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"[Interactable Editor] Error invoking {methodName}: {e.Message}");
+                }
+            }
+            else
+            {
+                Debug.LogWarning($"[Interactable Editor] Method {methodName} not found on {type.Name}");
+            }
+        }
+        
+        private void TriggerUnityEvent(InteractableBase interactable, string fieldName)
+        {
+            if (!_isPlaying || interactable == null) return;
+            
+            Type type = interactable.GetType();
+            FieldInfo field = type.GetField(fieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            
+            if (field != null && field.GetValue(interactable) is UnityEngine.Events.UnityEventBase unityEvent)
+            {
+                // Use reflection to invoke the protected Invoke method
+                MethodInfo invokeMethod = unityEvent.GetType().GetMethod("Invoke", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+                if (invokeMethod != null)
+                {
+                    invokeMethod.Invoke(unityEvent, null);
+                    Debug.Log($"[Interactable Editor] Invoked UnityEvent {fieldName} on {interactable.gameObject.name}");
+                }
+            }
+        }
+        
+        private void TriggerUnityEventWithParam(InteractableBase interactable, string fieldName, bool param)
+        {
+            if (!_isPlaying || interactable == null) return;
+            
+            Type type = interactable.GetType();
+            FieldInfo field = type.GetField(fieldName, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            
+            if (field != null && field.GetValue(interactable) is UnityEngine.Events.UnityEvent<bool> unityEvent)
+            {
+                unityEvent.Invoke(param);
+                Debug.Log($"[Interactable Editor] Invoked UnityEvent<bool> {fieldName}({param}) on {interactable.gameObject.name}");
+            }
+        }
+        
+        #endregion
+    }
+}
+

Assets/Editor/InteractionSystem/InteractableEditorWindow.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3045d5bcf3e04203bfe060f80d8913ca
+timeCreated: 1762866335

Assets/Editor/Lifecycle.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c5d626da49844592981ef14524e3a308
+timeCreated: 1762332131

Assets/Editor/Lifecycle/EditorLifecycleBootstrap.cs

@@ -0,0 +1,144 @@
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using Core.Lifecycle;
+using Core.SaveLoad;
+using AppleHills.Core.Settings;
+using Bootstrap;
+
+namespace Editor.Lifecycle
+{
+    /// <summary>
+    /// Editor-only bootstrap that ensures OnSceneReady is triggered when playing directly from a scene in Unity Editor.
+    /// 
+    /// PROBLEM: When you press Play in the editor without going through the scene manager:
+    /// - CustomBoot runs and triggers OnBootCompletionTriggered (which broadcasts OnManagedStart)
+    /// - But BroadcastSceneReady is NEVER called for the initial scene
+    /// - Components in the scene never receive their OnSceneReady() callback
+    /// 
+    /// SOLUTION: After boot completes, detect the active scene and broadcast OnSceneReady for it.
+    /// This only runs in editor mode and mimics what SceneManagerService does during normal scene transitions.
+    /// </summary>
+    [InitializeOnLoad]
+    public static class EditorLifecycleBootstrap
+    {
+        private static bool hasTriggeredInitialSceneReady = false;
+        private static int framesSincePlayMode = 0;
+        private const int MaxFramesToWait = 300; // 5 seconds at 60fps
+
+        static EditorLifecycleBootstrap()
+        {
+            // Subscribe to play mode state changes
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
+        }
+
+        private static void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            // Reset flag when exiting play mode
+            if (state == PlayModeStateChange.ExitingPlayMode || state == PlayModeStateChange.EnteredEditMode)
+            {
+                hasTriggeredInitialSceneReady = false;
+                framesSincePlayMode = 0;
+                return;
+            }
+
+            // When we enter play mode, wait for boot to complete then trigger scene ready
+            if (state == PlayModeStateChange.EnteredPlayMode)
+            {
+                hasTriggeredInitialSceneReady = false;
+                framesSincePlayMode = 0;
+                
+                // Use EditorApplication.update to poll until boot completes
+                EditorApplication.update += WaitForBootAndTriggerSceneReady;
+            }
+        }
+
+        private static void WaitForBootAndTriggerSceneReady()
+        {
+            framesSincePlayMode++;
+            
+            // Safety timeout - if boot hasn't completed after 5 seconds, something is wrong
+            if (framesSincePlayMode > MaxFramesToWait)
+            {
+                Debug.LogError($"[EditorLifecycleBootstrap] Timed out waiting for boot completion after {MaxFramesToWait} frames. " +
+                              "CustomBoot may have failed to initialize properly.");
+                EditorApplication.update -= WaitForBootAndTriggerSceneReady;
+                return;
+            }
+            
+            // Check if boot has completed
+            if (!CustomBoot.Initialised)
+                return;
+
+            // Check if LifecycleManager exists
+            if (LifecycleManager.Instance == null)
+            {
+                Debug.LogWarning("[EditorLifecycleBootstrap] LifecycleManager instance not found. " +
+                               "Lifecycle may not be properly initialized.");
+                EditorApplication.update -= WaitForBootAndTriggerSceneReady;
+                return;
+            }
+
+            // Only trigger once per play session
+            if (hasTriggeredInitialSceneReady)
+            {
+                EditorApplication.update -= WaitForBootAndTriggerSceneReady;
+                return;
+            }
+
+            hasTriggeredInitialSceneReady = true;
+            EditorApplication.update -= WaitForBootAndTriggerSceneReady;
+
+            // Get the active scene
+            Scene activeScene = SceneManager.GetActiveScene();
+            
+            if (!activeScene.isLoaded)
+            {
+                Debug.LogWarning($"[EditorLifecycleBootstrap] Active scene '{activeScene.name}' is not loaded.");
+                return;
+            }
+
+            // Skip bootstrap scene - it doesn't need scene ready
+            // Note: BootstrapScene is the infrastructure scene, not a gameplay scene
+            if (activeScene.name == "BootstrapScene" || activeScene.name == "Bootstrap")
+            {
+                Debug.Log($"[EditorLifecycleBootstrap] Skipping OnSceneReady for infrastructure scene: {activeScene.name}");
+                return;
+            }
+
+            Debug.Log($"<color=cyan>[EditorLifecycleBootstrap] Triggering lifecycle for initial scene: {activeScene.name}</color>");
+            
+            // Broadcast scene ready for the initial scene
+            // This mimics what SceneManagerService does during scene transitions (Phase 10)
+            try
+            {
+                LifecycleManager.Instance.BroadcastSceneReady(activeScene.name);
+            }
+            catch (System.Exception ex)
+            {
+                Debug.LogError($"[EditorLifecycleBootstrap] Error broadcasting SceneReady: {ex.Message}\n{ex.StackTrace}");
+                return;
+            }
+            
+            // Restore scene-specific data via SaveLoadManager
+            // This mimics SceneManagerService Phase 11
+            if (SaveLoadManager.Instance != null)
+            {
+                var debugSettings = DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>();
+                if (debugSettings.useSaveLoadSystem)
+                {
+                    try
+                    {
+                        Debug.Log($"[EditorLifecycleBootstrap] Restoring scene data for: {activeScene.name}");
+                        SaveLoadManager.Instance.RestoreSceneData();
+                    }
+                    catch (System.Exception ex)
+                    {
+                        Debug.LogError($"[EditorLifecycleBootstrap] Error restoring scene data: {ex.Message}\n{ex.StackTrace}");
+                    }
+                }
+            }
+        }
+    }
+}
+

Assets/Editor/Lifecycle/EditorLifecycleBootstrap.cs.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7f3e8a9c4d5b6e7f8a9b0c1d2e3f4a5b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+

Assets/Editor/PuzzleSystem/PuzzleEditorWindow.cs

@@ -560,6 +560,15 @@ namespace AppleHills.Editor.PuzzleSystem
             
             EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
             EditorGUILayout.LabelField($"Current Level: {_runtimeLevelData.levelId}", EditorStyles.boldLabel);
+            
+            GUILayout.FlexibleSpace();
+            
+            // Unlock All button
+            if (GUILayout.Button("Unlock All", EditorStyles.toolbarButton, GUILayout.Width(100)))
+            {
+                UnlockAllPuzzles();
+            }
+            
             EditorGUILayout.EndHorizontal();
             
             _debugScrollPosition = EditorGUILayout.BeginScrollView(_debugScrollPosition);
@@ -870,6 +879,121 @@ namespace AppleHills.Editor.PuzzleSystem
             UpdateRuntimeData();
         }
         
+        private void UnlockAllPuzzles()
+        {
+            if (!_isPlaying || _runtimeLevelData == null) return;
+            
+            PuzzleManager puzzleManager = Object.FindFirstObjectByType<PuzzleManager>();
+            if (puzzleManager == null)
+            {
+                Debug.LogError("[Puzzle Editor] Cannot find PuzzleManager in scene");
+                return;
+            }
+            
+            Debug.Log("[Puzzle Editor] Starting to unlock all puzzles...");
+            
+            // Get all steps from the level data
+            List<PuzzleStepSO> allSteps = new List<PuzzleStepSO>(_runtimeLevelData.allSteps);
+            
+            // Track which steps we've processed
+            HashSet<string> processedSteps = new HashSet<string>();
+            bool madeProgress = true;
+            int maxIterations = 100; // Safety limit to prevent infinite loops
+            int iteration = 0;
+            
+            // Keep iterating until no more steps can be unlocked/completed
+            while (madeProgress && iteration < maxIterations)
+            {
+                madeProgress = false;
+                iteration++;
+                
+                foreach (var step in allSteps)
+                {
+                    if (step == null || processedSteps.Contains(step.stepId))
+                        continue;
+                    
+                    // Check if already completed
+                    if (puzzleManager.IsPuzzleStepCompleted(step.stepId))
+                    {
+                        processedSteps.Add(step.stepId);
+                        continue;
+                    }
+                    
+                    // Check if step is unlocked or can be unlocked
+                    bool isUnlocked = puzzleManager.IsStepUnlocked(step);
+                    
+                    if (!isUnlocked)
+                    {
+                        // Try to unlock it if dependencies are met
+                        // We need to check if all dependencies are completed
+                        bool canUnlock = CanUnlockStep(step, puzzleManager);
+                        
+                        if (canUnlock)
+                        {
+                            // Unlock the step using reflection
+                            System.Type managerType = puzzleManager.GetType();
+                            System.Reflection.MethodInfo unlockMethod = managerType.GetMethod("UnlockStep", 
+                                System.Reflection.BindingFlags.Instance | 
+                                System.Reflection.BindingFlags.Public | 
+                                System.Reflection.BindingFlags.NonPublic);
+                            
+                            if (unlockMethod != null)
+                            {
+                                unlockMethod.Invoke(puzzleManager, new object[] { step });
+                                Debug.Log($"[Puzzle Editor] Unlocked step: {step.stepId}");
+                                isUnlocked = true;
+                            }
+                        }
+                    }
+                    
+                    // If unlocked, complete it
+                    if (isUnlocked && !puzzleManager.IsPuzzleStepCompleted(step.stepId))
+                    {
+                        puzzleManager.MarkPuzzleStepCompleted(step);
+                        Debug.Log($"[Puzzle Editor] Completed step: {step.stepId}");
+                        processedSteps.Add(step.stepId);
+                        madeProgress = true;
+                    }
+                }
+            }
+            
+            if (iteration >= maxIterations)
+            {
+                Debug.LogWarning($"[Puzzle Editor] Reached maximum iterations ({maxIterations}). Some steps may not have been completed.");
+            }
+            
+            Debug.Log($"[Puzzle Editor] Unlock all complete. Processed {processedSteps.Count} steps in {iteration} iterations.");
+            
+            // Update runtime data to reflect all changes
+            UpdateRuntimeData();
+        }
+        
+        /// <summary>
+        /// Checks if a step can be unlocked by verifying all its dependencies are completed
+        /// </summary>
+        private bool CanUnlockStep(PuzzleStepSO step, PuzzleManager puzzleManager)
+        {
+            if (step == null || _runtimeLevelData == null) return false;
+            
+            // Initial steps can always be unlocked
+            if (_runtimeLevelData.IsInitialStep(step))
+                return true;
+            
+            // Check if all dependencies are completed
+            if (_runtimeLevelData.stepDependencies.TryGetValue(step.stepId, out string[] dependencies))
+            {
+                foreach (var depId in dependencies)
+                {
+                    if (!puzzleManager.IsPuzzleStepCompleted(depId))
+                    {
+                        return false;
+                    }
+                }
+            }
+            
+            return true;
+        }
+        
         #endregion
     }
 }

Assets/Editor/Settings/EditorSettingsProvider.cs

@@ -1,8 +1,6 @@
 using UnityEditor;
 using AppleHills.Core.Settings;
 using Core;
-using UnityEngine;
-using UnityEngine.Rendering.VirtualTexturing;
 
 namespace AppleHills.Editor
 {
@@ -65,7 +63,7 @@ namespace AppleHills.Editor
                 GetPuzzlePromptRange
             );
             
-            LogDebugMessage("Editor settings loaded for Scene View use");
+            Logging.Debug("Editor settings loaded for Scene View use");
         }
         
         public static void RefreshSceneViews()
@@ -102,14 +100,5 @@ namespace AppleHills.Editor
                 
             return null;
         }
-        
-        private static void LogDebugMessage(string message)
-        {
-            if (Application.isPlaying &&
-                DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().settingsLogVerbosity <= LogVerbosity.Debug)
-            {
-                Logging.Debug($"[EditorSettingsProvider] {message}");
-            }
-        }
     }
 }

Assets/Editor/Tools/ComponentSearchReplaceWindow.cs

@@ -19,6 +19,7 @@ namespace Editor.Tools
         private string searchTypeName = "Select a Component...";
         private string replaceTypeName = "Select a Component...";
         private List<Type> allMonoBehaviourTypes = new List<Type>();
+        private bool includeDerivedTypes = true;
 
         [MenuItem("Tools/Component Search & Replace")]
         public static void ShowWindow()
@@ -102,6 +103,15 @@ namespace Editor.Tools
             
             GUILayout.Space(5);
             
+            // Include Derived Types checkbox
+            includeDerivedTypes = EditorGUILayout.Toggle(
+                new GUIContent("Include Derived Types", 
+                    "When enabled, searches for the selected type and all types that inherit from it. " +
+                    "When disabled, searches only for the exact type."), 
+                includeDerivedTypes);
+            
+            GUILayout.Space(5);
+            
             EditorGUI.BeginDisabledGroup(selectedSearchType == null);
             if (GUILayout.Button("Search Scene", GUILayout.Height(30)))
             {
@@ -242,7 +252,20 @@ namespace Editor.Tools
             
             foreach (var go in allObjects)
             {
-                var component = go.GetComponent(selectedSearchType);
+                Component component = null;
+                
+                if (includeDerivedTypes)
+                {
+                    // Search for the type and all derived types
+                    component = go.GetComponent(selectedSearchType);
+                }
+                else
+                {
+                    // Search for exact type only
+                    var components = go.GetComponents<Component>();
+                    component = components.FirstOrDefault(c => c != null && c.GetType() == selectedSearchType);
+                }
+                
                 if (component != null)
                 {
                     foundComponents.Add(new ComponentInfo
@@ -256,7 +279,8 @@ namespace Editor.Tools
             
             foundComponents = foundComponents.OrderBy(c => c.hierarchyPath).ToList();
             
-            Debug.Log($"Found {foundComponents.Count} objects with component type '{selectedSearchType.Name}'");
+            string searchMode = includeDerivedTypes ? "including derived types" : "exact type only";
+            Debug.Log($"Found {foundComponents.Count} objects with component type '{selectedSearchType.Name}' ({searchMode})");
             Repaint();
         }
 

Assets/Editor/Tools/DebugSaveIds.cs

@@ -0,0 +1,31 @@
+using UnityEngine;
+using UnityEditor;
+using Core.Lifecycle;
+
+namespace Editor.Tools
+{
+    /// <summary>
+    /// Editor utility to debug SaveIds for all ManagedBehaviours in the scene
+    /// </summary>
+    public class DebugSaveIds : EditorWindow
+    {
+        [MenuItem("Tools/Debug/Log All SaveIds")]
+        public static void LogAllSaveIds()
+        {
+            var allManaged = FindObjectsByType<ManagedBehaviour>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+            
+            Debug.Log($"=== Found {allManaged.Length} ManagedBehaviours ===");
+            
+            foreach (var managed in allManaged)
+            {
+                if (managed.AutoRegisterForSave)
+                {
+                    Debug.Log($"GameObject: {managed.gameObject.name} | Component: {managed.GetType().Name} | SaveID: {managed.SaveId}");
+                }
+            }
+            
+            Debug.Log("=== End SaveIds ===");
+        }
+    }
+}
+

Assets/Editor/Tools/DebugSaveIds.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a34fbba4efbb4acd85d79a99abf00a08
+timeCreated: 1762358959

Assets/Editor/Tools/ItemPrefabEditor.cs

@@ -1,153 +0,0 @@
-using Interactions;
-using PuzzleS;
-using UnityEditor;
-using UnityEngine;
-
-namespace Editor
-{
-    public class ItemPrefabEditorWindow : EditorWindow
-    {
-        private GameObject _selectedGameObject;
-        private InteractableBase _interactable;
-        private PickupItemData _pickupData;
-        private PuzzleStepSO _objectiveData;
-        private UnityEditor.Editor _soEditor;
-        private string _pickupSoFolderPath = "Assets/Data/Items";
-        private string _puzzleSoFolderPath = "Assets/Data/Puzzles";
-
-        private enum ItemType { None, Pickup, ItemSlot }
-        private ItemType _itemType = ItemType.None;
-
-        [MenuItem("AppleHills/Item Prefab Editor")]
-        public static void ShowWindow()
-        {
-            var window = GetWindow<ItemPrefabEditorWindow>("Item Prefab Editor");
-            window.minSize = new Vector2(400, 400);
-        }
-
-        private void OnEnable()
-        {
-            Selection.selectionChanged += Repaint;
-        }
-
-        private void OnDisable()
-        {
-            Selection.selectionChanged -= Repaint;
-        }
-
-        private void OnGUI()
-        {
-            _selectedGameObject = null;
-            _interactable = null;
-            if (Selection.activeGameObject != null)
-            {
-                _selectedGameObject = Selection.activeGameObject;
-                _interactable = _selectedGameObject.GetComponent<InteractableBase>();
-            }
-            else if (Selection.activeObject is GameObject go)
-            {
-                _selectedGameObject = go;
-                _interactable = go.GetComponent<InteractableBase>();
-            }
-
-            if (_selectedGameObject == null || _interactable == null)
-            {
-                EditorGUILayout.HelpBox("Select a GameObject or prefab with an InteractableBase component to edit.", MessageType.Info);
-                return;
-            }
-
-            EditorGUILayout.LabelField("Editing: ", _selectedGameObject.name, EditorStyles.boldLabel);
-            EditorGUILayout.Space();
-
-            // Determine current type
-            bool hasPickup = _selectedGameObject.GetComponent<Pickup>() != null;
-            bool hasSlot = _selectedGameObject.GetComponent<ItemSlot>() != null;
-            if (hasSlot) _itemType = ItemType.ItemSlot;
-            else if (hasPickup) _itemType = ItemType.Pickup;
-            else _itemType = ItemType.None;
-
-            // Item type selection
-            var newType = (ItemType)EditorGUILayout.EnumPopup("Item Type", _itemType);
-            if (newType != _itemType)
-            {
-                // Remove both, then add selected
-                PrefabEditorUtility.RemoveComponent<Pickup>(_selectedGameObject);
-                PrefabEditorUtility.RemoveComponent<ItemSlot>(_selectedGameObject);
-                if (newType == ItemType.Pickup)
-                    PrefabEditorUtility.AddOrGetComponent<Pickup>(_selectedGameObject);
-                else if (newType == ItemType.ItemSlot)
-                    PrefabEditorUtility.AddOrGetComponent<ItemSlot>(_selectedGameObject);
-                _itemType = newType;
-            }
-
-            // ObjectiveStepBehaviour
-            bool hasObjective = _selectedGameObject.GetComponent<ObjectiveStepBehaviour>() != null;
-            bool addObjective = EditorGUILayout.Toggle("ObjectiveStepBehaviour", hasObjective);
-            if (addObjective && !hasObjective)
-            {
-                PrefabEditorUtility.AddOrGetComponent<ObjectiveStepBehaviour>(_selectedGameObject);
-            }
-            else if (!addObjective && hasObjective)
-            {
-                PrefabEditorUtility.RemoveComponent<ObjectiveStepBehaviour>(_selectedGameObject);
-            }
-
-            // Pickup Data (for Pickup or ItemSlot)
-            if (_itemType == ItemType.Pickup || _itemType == ItemType.ItemSlot)
-            {
-                var pickup = _selectedGameObject.GetComponent<Pickup>();
-                _pickupData = pickup.itemData;
-                EditorGUILayout.LabelField("Pickup Data:", EditorStyles.boldLabel);
-                _pickupData = (PickupItemData)EditorGUILayout.ObjectField("PickupItemData", _pickupData, typeof(PickupItemData), false);
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.PrefixLabel("Save To");
-                EditorGUILayout.SelectableLabel(_pickupSoFolderPath, EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                if (GUILayout.Button("Select...", GUILayout.Width(80)))
-                {
-                    _pickupSoFolderPath = PrefabEditorUtility.SelectFolder(_pickupSoFolderPath, "Data/Items");
-                }
-                EditorGUILayout.EndHorizontal();
-                if (_pickupData == null && GUILayout.Button("Create New PickupItemData"))
-                {
-                    _pickupData = PrefabEditorUtility.CreateScriptableAsset<PickupItemData>(_selectedGameObject.name + "_pickup", _pickupSoFolderPath);
-                }
-                if (_pickupData != null)
-                {
-                    PrefabEditorUtility.DrawScriptableObjectEditor(ref _soEditor, _pickupData);
-                    pickup.itemData = _pickupData;
-                }
-            }
-
-            // Objective Data
-            if (addObjective)
-            {
-                var obj = _selectedGameObject.GetComponent<ObjectiveStepBehaviour>();
-                _objectiveData = obj.stepData;
-                EditorGUILayout.LabelField("Objective Data:", EditorStyles.boldLabel);
-                _objectiveData = (PuzzleStepSO)EditorGUILayout.ObjectField("PuzzleStepSO", _objectiveData, typeof(PuzzleStepSO), false);
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.PrefixLabel("Save To");
-                EditorGUILayout.SelectableLabel(_puzzleSoFolderPath, EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                if (GUILayout.Button("Select...", GUILayout.Width(80)))
-                {
-                    _puzzleSoFolderPath = PrefabEditorUtility.SelectFolder(_puzzleSoFolderPath, "Data/Puzzles");
-                }
-                EditorGUILayout.EndHorizontal();
-                if (_objectiveData == null && GUILayout.Button("Create New PuzzleStepSO"))
-                {
-                    _objectiveData = PrefabEditorUtility.CreateScriptableAsset<PuzzleStepSO>(_selectedGameObject.name + "_puzzle", _puzzleSoFolderPath);
-                }
-                if (_objectiveData != null)
-                {
-                    PrefabEditorUtility.DrawScriptableObjectEditor(ref _soEditor, _objectiveData);
-                    obj.stepData = _objectiveData;
-                }
-            }
-            if (GUI.changed)
-            {
-                EditorUtility.SetDirty(_selectedGameObject);
-                PrefabUtility.RecordPrefabInstancePropertyModifications(_selectedGameObject);
-            }
-        }
-    }
-}

Assets/Editor/Tools/ItemPrefabEditor.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 943b203cde5343c68a6278c111fce2ed
-timeCreated: 1757508162

Assets/Editor/Tools/PrefabCreatorWindow.cs

@@ -1,168 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-using System.IO;
-using Interactions;
-using PuzzleS;
-
-namespace Editor
-{
-    public class PrefabCreatorWindow : EditorWindow
-    {
-        private string _prefabName = "NewPrefab";
-        private string _saveFolderPath = "Assets/Prefabs/Items";
-        private string _pickupSoFolderPath = "Assets/Data/Items";
-        private string _puzzleSoFolderPath = "Assets/Data/Puzzles";
-        private bool _addObjective;
-
-        private PickupItemData _pickupData;
-        private PuzzleStepSO _objectiveData;
-        private UnityEditor.Editor _soEditor;
-
-        private enum ItemType { None, Pickup, ItemSlot }
-        private ItemType _itemType = ItemType.None;
-
-        private bool _createNext = false;
-
-        [MenuItem("AppleHills/Item Prefab Creator")]
-        public static void ShowWindow()
-        {
-            var window = GetWindow<PrefabCreatorWindow>("Prefab Creator");
-            window.minSize = new Vector2(400, 400);
-            // Set default paths if not already set
-            if (string.IsNullOrEmpty(window._saveFolderPath))
-                window._saveFolderPath = "Assets/Prefabs/Items";
-            if (string.IsNullOrEmpty(window._pickupSoFolderPath))
-                window._pickupSoFolderPath = "Assets/Data/Items";
-            if (string.IsNullOrEmpty(window._puzzleSoFolderPath))
-                window._puzzleSoFolderPath = "Assets/Data/Puzzles";
-        }
-
-        private void OnGUI()
-        {
-            EditorGUILayout.LabelField("Prefab Creator", EditorStyles.boldLabel);
-            _prefabName = EditorGUILayout.TextField("Prefab Name", _prefabName);
-            // Prefab save folder
-            EditorGUILayout.BeginHorizontal();
-            EditorGUILayout.PrefixLabel("Save Folder");
-            EditorGUILayout.SelectableLabel(_saveFolderPath, EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-            if (GUILayout.Button("Select...", GUILayout.Width(80)))
-            {
-                _saveFolderPath = PrefabEditorUtility.SelectFolder(_saveFolderPath, "Prefabs/Items");
-            }
-            EditorGUILayout.EndHorizontal();
-            EditorGUILayout.Space();
-            EditorGUILayout.LabelField("Add Components:", EditorStyles.boldLabel);
-
-            // Item type selection
-            var newType = (ItemType)EditorGUILayout.EnumPopup("Item Type", _itemType);
-            if (newType != _itemType)
-            {
-                _itemType = newType;
-            }
-            bool addObjective = EditorGUILayout.Toggle("ObjectiveStepBehaviour", _addObjective);
-            _addObjective = addObjective;
-            EditorGUILayout.Space();
-
-            // Pickup Data (for Pickup or ItemSlot)
-            if (_itemType == ItemType.Pickup || _itemType == ItemType.ItemSlot)
-            {
-                EditorGUILayout.LabelField("Pickup Data:", EditorStyles.boldLabel);
-                _pickupData = (PickupItemData)EditorGUILayout.ObjectField("PickupItemData", _pickupData, typeof(PickupItemData), false);
-                // Pickup SO save folder
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.PrefixLabel("Save To");
-                EditorGUILayout.SelectableLabel(_pickupSoFolderPath, EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                if (GUILayout.Button("Select...", GUILayout.Width(80)))
-                {
-                    _pickupSoFolderPath = PrefabEditorUtility.SelectFolder(_pickupSoFolderPath, "Data/Items");
-                }
-                EditorGUILayout.EndHorizontal();
-                if (_pickupData == null && GUILayout.Button("Create New PickupItemData"))
-                {
-                    _pickupData = PrefabEditorUtility.CreateScriptableAsset<PickupItemData>(_prefabName + "_pickup", _pickupSoFolderPath);
-                }
-                if (_pickupData != null)
-                {
-                    PrefabEditorUtility.DrawScriptableObjectEditor(ref _soEditor, _pickupData);
-                }
-            }
-            // Objective Data
-            if (_addObjective)
-            {
-                EditorGUILayout.LabelField("Objective Data:", EditorStyles.boldLabel);
-                _objectiveData = (PuzzleStepSO)EditorGUILayout.ObjectField("PuzzleStepSO", _objectiveData, typeof(PuzzleStepSO), false);
-                // Puzzle SO save folder
-                EditorGUILayout.BeginHorizontal();
-                EditorGUILayout.PrefixLabel("Save To");
-                EditorGUILayout.SelectableLabel(_puzzleSoFolderPath, EditorStyles.textField, GUILayout.Height(EditorGUIUtility.singleLineHeight));
-                if (GUILayout.Button("Select...", GUILayout.Width(80)))
-                {
-                    _puzzleSoFolderPath = PrefabEditorUtility.SelectFolder(_puzzleSoFolderPath, "Data/Puzzles");
-                }
-                EditorGUILayout.EndHorizontal();
-                if (_objectiveData == null && GUILayout.Button("Create New PuzzleStepSO"))
-                {
-                    _objectiveData = PrefabEditorUtility.CreateScriptableAsset<PuzzleStepSO>(_prefabName + "_puzzle", _puzzleSoFolderPath);
-                }
-                if (_objectiveData != null)
-                {
-                    PrefabEditorUtility.DrawScriptableObjectEditor(ref _soEditor, _objectiveData);
-                }
-            }
-            GUILayout.FlexibleSpace();
-            EditorGUILayout.BeginHorizontal();
-            GUI.enabled = !string.IsNullOrEmpty(_prefabName) && !string.IsNullOrEmpty(_saveFolderPath);
-            if (GUILayout.Button("Create Prefab", GUILayout.Height(28)))
-            {
-                CreatePrefab();
-            }
-            _createNext = GUILayout.Toggle(_createNext, "Create Next", GUILayout.Width(100), GUILayout.Height(28));
-            GUI.enabled = true;
-            EditorGUILayout.EndHorizontal();
-        }
-
-        private void CreatePrefab()
-        {
-            var go = new GameObject(_prefabName);
-            // Note: No need to add InteractableBase separately - Pickup and ItemSlot inherit from it
-            go.AddComponent<BoxCollider>();
-            int interactableLayer = LayerMask.NameToLayer("Interactable");
-            if (interactableLayer != -1)
-                go.layer = interactableLayer;
-            go.AddComponent<SpriteRenderer>();
-            if (_itemType == ItemType.Pickup)
-            {
-                var pickup = go.AddComponent<Pickup>();
-                pickup.itemData = _pickupData;
-            }
-            else if (_itemType == ItemType.ItemSlot)
-            {
-                var slot = go.AddComponent<ItemSlot>();
-                slot.itemData = _pickupData;
-            }
-            if (_addObjective)
-            {
-                var obj = go.AddComponent<ObjectiveStepBehaviour>();
-                obj.stepData = _objectiveData;
-            }
-            string prefabPath = Path.Combine(_saveFolderPath, _prefabName + ".prefab").Replace("\\", "/");
-            var prefab = PrefabUtility.SaveAsPrefabAsset(go, prefabPath);
-            DestroyImmediate(go);
-            AssetDatabase.Refresh();
-            Selection.activeObject = prefab;
-            EditorGUIUtility.PingObject(prefab);
-            EditorUtility.DisplayDialog("Prefab Created", $"Prefab saved to {prefabPath}", "OK");
-            if (_createNext)
-            {
-                _prefabName = "NewPrefab";
-                _pickupData = null;
-                _objectiveData = null;
-                _itemType = ItemType.None;
-                _addObjective = false;
-                _soEditor = null;
-                GUI.FocusControl(null);
-                Repaint();
-            }
-        }
-    }
-}

Assets/Editor/Tools/PrefabCreatorWindow.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f67e06e997f642509ba61ea12b0f793e
-timeCreated: 1757503955

Assets/External/Plugins/codeandweb.com/Editor/SettingsTexturePackerImporter.txt

@@ -1,5 +1,9 @@
 version: 2
 tpsheetFileNames:
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking1.tpsheet
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking2.tpsheet
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking3.tpsheet
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking4.tpsheet
 - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_1.tpsheet
 - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_2.tpsheet
 - Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-IdleRun.tpsheet
@@ -30,6 +34,10 @@ tpsheetFileNames:
 - Assets/Art/Sprites/Spritesheets/Quarry/Trees&Bushes/Trees.tpsheet
 - Assets/External/Plugins/codeandweb.com/Example/SpriteSheet/sprites.tpsheet
 textureFileNames:
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking1.png
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking2.png
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking3.png
+- Assets/Art/Animations/Trafalgar/Trafalgar-_Walking4.png
 - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_1.png
 - Assets/Art/Sprites/Spritesheets/Characters/Annelise_Camera/Annelise_camera-AnneLise_2.png
 - Assets/Art/Sprites/Spritesheets/Characters/Gardener/Gardener-IdleRun.png
@@ -88,5 +96,9 @@ normalmapFileNames:
 - 
 - 
 - 
+- 
+- 
+- 
+- 
 - Assets/External/Plugins/codeandweb.com/Example/SpriteSheet/sprites_n.png
 enableDebugOutput: 0

Assets/Prefabs/Characters/Gardener.prefab

@@ -1978,11 +1978,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1.85
+      value: 0.09
       objectReference: {fileID: 0}
     - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 5.14
+      value: 3.44
       objectReference: {fileID: 0}
     - target: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/Prefabs/Characters/PlayerCharacter.prefab

@@ -313,14 +313,22 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 7
       objectReference: {fileID: 0}
+    - target: {fileID: 3714001194702331617, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6109476811019011833, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
       propertyPath: m_Size.x
-      value: 3.8700001
+      value: 4.97
       objectReference: {fileID: 0}
     - target: {fileID: 6109476811019011833, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
       propertyPath: m_Size.y
-      value: 7.55122
+      value: 7.53
       objectReference: {fileID: 0}
+    - target: {fileID: 6109476811019011833, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -1603423718, guid: e071f6ab7f5db5642bcf5502788a8b6e, type: 3}
     - target: {fileID: 6109476811019011833, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
       propertyPath: m_SortingOrder
       value: 1
@@ -329,6 +337,10 @@ PrefabInstance:
       propertyPath: m_SpriteSortPoint
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6109476811019011833, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7877460049793670011, guid: 361ccc9ef82acef4784b24b72013d971, type: 3}
       propertyPath: m_LocalScale.x
       value: 1

Assets/Prefabs/Characters/PulverCharacter.prefab

@@ -248,7 +248,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2bd397a60643eed45b586961ae6e3453, type: 3}
   m_Name: 
   m_EditorClassIdentifier: AppleHillsScripts::PulverAudioController
+  audioSource: {fileID: 887004370483616855}
   combineAudio: {fileID: 8300000, guid: 768a16f348fe1d94c9cc267dc7ecf3b5, type: 3}
+  itemManager: {fileID: 0}
 --- !u!82 &4467608046243604209
 AudioSource:
   m_ObjectHideFlags: 0

Assets/Prefabs/Environment/LureSpotA.prefab

@@ -105,7 +105,7 @@ GameObject:
   - component: {fileID: 3487003259787903584}
   - component: {fileID: 2277261512137882881}
   m_Layer: 10
-  m_Name: LureSpotA
+  m_Name: LureSpotA_Slot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -260,9 +260,9 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: aaf36cd26cf74334e9c7db6c1b03b3fb, type: 2}
   iconRenderer: {fileID: 6258593095132504700}
+  slottedItemRenderer: {fileID: 4110666412151536905}
   onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
@@ -314,7 +314,6 @@ MonoBehaviour:
   onForbiddenItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  slottedItemRenderer: {fileID: 4110666412151536905}
 --- !u!114 &3487003259787903584
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Environment/LuringSpotB.prefab

@@ -1069,7 +1069,7 @@ GameObject:
   - component: {fileID: 3093816592344978065}
   - component: {fileID: 8758136668472096799}
   m_Layer: 10
-  m_Name: LureSpotB
+  m_Name: LureSpotB_Slot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1168,9 +1168,9 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: f97b9e24d6dceb145b56426c1152ebeb, type: 2}
   iconRenderer: {fileID: 2343214996212089369}
+  slottedItemRenderer: {fileID: 7990414055343410434}
   onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
@@ -1234,7 +1234,6 @@ MonoBehaviour:
   onForbiddenItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  slottedItemRenderer: {fileID: 7990414055343410434}
 --- !u!114 &8758136668472096799
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Environment/LuringSpotC.prefab

@@ -247,7 +247,7 @@ GameObject:
   - component: {fileID: 3169137887822749614}
   - component: {fileID: 8370367816617117734}
   m_Layer: 10
-  m_Name: LureSpotC
+  m_Name: LureSpotC_Slot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -346,9 +346,9 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2}
   iconRenderer: {fileID: 2825253017896168654}
+  slottedItemRenderer: {fileID: 3806274462998212361}
   onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
@@ -412,7 +412,6 @@ MonoBehaviour:
   onForbiddenItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  slottedItemRenderer: {fileID: 3806274462998212361}
 --- !u!114 &6535246856440349519
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Environment/SoundBird.prefab

@@ -44,10 +44,10 @@ GameObject:
   - component: {fileID: 5057760771402457000}
   - component: {fileID: 2433130051631076285}
   - component: {fileID: 7290110366808972859}
-  - component: {fileID: 4831635791684479552}
   - component: {fileID: 9196152289301358918}
+  - component: {fileID: 2596311128101197840}
   m_Layer: 10
-  m_Name: SoundBird
+  m_Name: SoundBird_Slot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -201,9 +201,9 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: d28f5774afad9d14f823601707150700, type: 2}
   iconRenderer: {fileID: 8875860401447896107}
+  slottedItemRenderer: {fileID: 6941190210788968874}
   onItemSlotted:
     m_PersistentCalls:
       m_Calls: []
@@ -231,7 +231,6 @@ MonoBehaviour:
   onForbiddenItemSlotted:
     m_PersistentCalls:
       m_Calls: []
-  slottedItemRenderer: {fileID: 6941190210788968874}
 --- !u!114 &7290110366808972859
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -246,18 +245,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   luredBird: {fileID: 4624889622840393752}
   annaLiseSpot: {fileID: 22512726373136855}
---- !u!114 &4831635791684479552
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 588897581313790951}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!95 &9196152289301358918
 Animator:
   serializedVersion: 7
@@ -280,6 +267,18 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &2596311128101197840
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 588897581313790951}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
 --- !u!1 &4624889622840393752
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Items/BasePickup.prefab

@@ -166,7 +166,6 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: 0c6986639ca176a419c92f5a327d95ce, type: 2}
   iconRenderer: {fileID: 7494677664706785084}
 --- !u!1001 &8589202998731622905

Assets/Prefabs/Items/Basketball.prefab

@@ -140,6 +140,5 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: 43f22dbbb4c0eec4f8108d0f0eea43c2, type: 2}
   iconRenderer: {fileID: 4055726361761331703}

Assets/Prefabs/Items/BlueBall.prefab

@@ -140,6 +140,5 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: a8baa800efa25a344a95b190cf349e2d, type: 2}
   iconRenderer: {fileID: 4774534086162962138}

Assets/Prefabs/Items/BowlingBall.prefab

@@ -140,6 +140,5 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: 560ba2059ce14dc4da580e2f43b2e65f, type: 2}
   iconRenderer: {fileID: 4986096986936361008}

Assets/Prefabs/Items/Yellowball.prefab

@@ -140,6 +140,5 @@ MonoBehaviour:
   interactionComplete:
     m_PersistentCalls:
       m_Calls: []
-  customSaveId: 
   itemData: {fileID: 11400000, guid: 3b1f3472171abc943bb099ce31d6fc7c, type: 2}
   iconRenderer: {fileID: 4266110216568578813}

Assets/Prefabs/Managers/CinematicsManager.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 1965178107275650778}
   - component: {fileID: 2828019556092814789}
   - component: {fileID: 3751190220360366860}
-  - component: {fileID: 803378854493527400}
   m_Layer: 0
   m_Name: SpilSlut
   m_TagString: Untagged
@@ -93,7 +92,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 136.55
+  m_fontSize: 136.85
   m_fontSizeBase: 72
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -409,9 +408,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 754661265897109340}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 683.9956, y: -157.62965}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 640.62054, y: 0}
   m_SizeDelta: {x: 268, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1768576830901014477
@@ -974,15 +973,15 @@ RectTransform:
   m_GameObject: {fileID: 3935369085067290987}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 3, y: 3, z: 3}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 754661265897109340}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 174.99854, y: -157.62965}
-  m_SizeDelta: {x: 150, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 270.45056, y: 0}
+  m_SizeDelta: {x: 42, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2782310018074465201
 CanvasRenderer:
@@ -1121,15 +1120,15 @@ RectTransform:
   m_GameObject: {fileID: 4068599104538777648}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 3, y: 3, z: 3}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 754661265897109340}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1192.9927, y: -157.62965}
-  m_SizeDelta: {x: 150, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 1010.7905, y: 0}
+  m_SizeDelta: {x: 42, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8344156654954553365
 CanvasRenderer:
@@ -1249,7 +1248,6 @@ GameObject:
   m_Component:
   - component: {fileID: 754661265897109340}
   - component: {fileID: 7750609879083104855}
-  - component: {fileID: 5441545775684538830}
   m_Layer: 0
   m_Name: Buttons
   m_TagString: Untagged
@@ -1276,8 +1274,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.10938991, y: 0.11800001}
   m_AnchorMax: {x: 0.94400007, y: 0.41016972}
-  m_AnchoredPosition: {x: 0, y: 4}
-  m_SizeDelta: {x: 0, y: -4}
+  m_AnchoredPosition: {x: -0.00024414062, y: 0}
+  m_SizeDelta: {x: -86.75, y: -20.246}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &7750609879083104855
 MonoBehaviour:
@@ -1297,11 +1295,11 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 100
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
+  m_Spacing: 215.17
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0

Assets/Prefabs/Puzzles/AnneLise/AnneLiseBaseBush.prefab

@@ -221,12 +221,12 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2071071585578300598}
-  - component: {fileID: 1454372124634854912}
   - component: {fileID: 4122067414526815177}
   - component: {fileID: 2314863751758196186}
   - component: {fileID: 2741639361616064442}
   - component: {fileID: 4903273501345439385}
   - component: {fileID: 1054459649399154791}
+  - component: {fileID: 7319925080429004531}
   m_Layer: 10
   m_Name: Hidden
   m_TagString: Untagged
@@ -252,18 +252,6 @@ Transform:
   - {fileID: 852327051512792946}
   m_Father: {fileID: 8259693476957892150}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1454372124634854912
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1011363502278351410}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.State
 --- !u!61 &4122067414526815177
 BoxCollider2D:
   m_ObjectHideFlags: 0
@@ -463,6 +451,18 @@ MonoBehaviour:
   audioSource: {fileID: 0}
   clipPriority: 0
   sourcePriority: 1
+--- !u!114 &7319925080429004531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1011363502278351410}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
 --- !u!1 &1674229500073894281
 GameObject:
   m_ObjectHideFlags: 0
@@ -777,11 +777,11 @@ GameObject:
   m_Component:
   - component: {fileID: 8259693476957892150}
   - component: {fileID: 2995561023563842343}
-  - component: {fileID: 7053055077639234121}
   - component: {fileID: 578146208477020881}
   - component: {fileID: 1193493154550576580}
   - component: {fileID: 7652960462502122104}
   - component: {fileID: 989520896849684110}
+  - component: {fileID: 5862718108034728596}
   m_Layer: 0
   m_Name: AnneLiseBaseBush
   m_TagString: Untagged
@@ -818,42 +818,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.Initialization
---- !u!114 &7053055077639234121
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5943355783477523754}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.StateMachine
-  defaultState: {fileID: 1011363502278351410}
-  currentState: {fileID: 0}
-  _unityEventsFolded: 0
-  verbose: 0
-  allowReentry: 0
-  returnToDefaultOnDisable: 1
-  OnStateExited:
-    m_PersistentCalls:
-      m_Calls: []
-  OnStateEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  OnFirstStateEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  OnFirstStateExited:
-    m_PersistentCalls:
-      m_Calls: []
-  OnLastStateEntered:
-    m_PersistentCalls:
-      m_Calls: []
-  OnLastStateExited:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!114 &578146208477020881
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1001,6 +965,43 @@ MonoBehaviour:
   audioSource: {fileID: 0}
   clipPriority: 0
   sourcePriority: 0
+--- !u!114 &5862718108034728596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5943355783477523754}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine
+  defaultState: {fileID: 1011363502278351410}
+  currentState: {fileID: 0}
+  _unityEventsFolded: 0
+  verbose: 0
+  allowReentry: 0
+  returnToDefaultOnDisable: 1
+  OnStateExited:
+    m_PersistentCalls:
+      m_Calls: []
+  OnStateEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  OnFirstStateEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  OnFirstStateExited:
+    m_PersistentCalls:
+      m_Calls: []
+  OnLastStateEntered:
+    m_PersistentCalls:
+      m_Calls: []
+  OnLastStateExited:
+    m_PersistentCalls:
+      m_Calls: []
+  customSaveId: 
 --- !u!1 &6948354193133336628
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Puzzles/BirdEyes.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 2326086342663433936}
   - component: {fileID: 243176356944356711}
   - component: {fileID: 6657093817085841540}
-  - component: {fileID: 7932498922414502976}
+  - component: {fileID: 2239999147194587249}
   m_Layer: 0
   m_Name: BirdEyes
   m_TagString: Untagged
@@ -48,6 +48,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  correctItemIsIn: 0
+  bushAnimator: {fileID: 0}
 --- !u!114 &6657093817085841540
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -60,7 +62,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &7932498922414502976
+--- !u!114 &2239999147194587249
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -69,9 +71,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 1370564349707122423}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3}
+  m_Script: {fileID: 11500000, guid: 6f56763d30b94bf6873d395a6c116eb5, type: 3}
   m_Name: 
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleMachine
   defaultState: {fileID: 3532512445619884959}
   currentState: {fileID: 0}
   _unityEventsFolded: 0
@@ -96,6 +98,7 @@ MonoBehaviour:
   OnLastStateExited:
     m_PersistentCalls:
       m_Calls: []
+  customSaveId: 
 --- !u!1 &3532512445619884959
 GameObject:
   m_ObjectHideFlags: 0
@@ -107,7 +110,7 @@ GameObject:
   - component: {fileID: 4477179922705334961}
   - component: {fileID: 3013218424693156287}
   - component: {fileID: 7343439013600968102}
-  - component: {fileID: 3842054004304041864}
+  - component: {fileID: 4451815010323250894}
   m_Layer: 0
   m_Name: BirdHiding
   m_TagString: Untagged
@@ -150,6 +153,8 @@ SpriteRenderer:
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
   m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -171,6 +176,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 2
@@ -207,7 +213,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!114 &3842054004304041864
+--- !u!114 &4451815010323250894
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -216,9 +222,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 3532512445619884959}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
+  m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
   m_Name: 
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
 --- !u!1 &8828658103663197825
 GameObject:
   m_ObjectHideFlags: 0
@@ -230,7 +236,7 @@ GameObject:
   - component: {fileID: 7698905571408300091}
   - component: {fileID: 5210033153524231666}
   - component: {fileID: 4408373410605328204}
-  - component: {fileID: 3873868413538144635}
+  - component: {fileID: 2709364368411520279}
   m_Layer: 0
   m_Name: BirdSpawned
   m_TagString: Untagged
@@ -273,6 +279,8 @@ SpriteRenderer:
   m_RayTracingAccelStructBuildFlagsOverride: 0
   m_RayTracingAccelStructBuildFlags: 1
   m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -294,6 +302,7 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 2
@@ -330,7 +339,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!114 &3873868413538144635
+--- !u!114 &2709364368411520279
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -339,6 +348,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 8828658103663197825}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3}
+  m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3}
   m_Name: 
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState

Assets/Prefabs/Puzzles/Picnic.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 774e30e3f0b1d0d49bad0c2abf11038a
+guid: 97f767ded753d524086106f3c39a645f
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Prefabs/UI/AppSwitcher/AppSwitcher.controller

@@ -135,13 +135,13 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -7925442279578022247}
-    m_Position: {x: 400, y: 370, z: 0}
+    m_Position: {x: 410, y: 370, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -892202757677891130}
     m_Position: {x: -20, y: 260, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1937208649765278840}
-    m_Position: {x: 489.1548, y: 156.18289, z: 0}
+    m_Position: {x: 490, y: 150, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Prefabs/UI/AppSwitcher/AppSwitcher.prefab

@@ -120,6 +120,42 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &879012544333199198
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8293076336493130222}
+  m_Layer: 5
+  m_Name: Rainbows
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8293076336493130222
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 879012544333199198}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4136733570236406132}
+  m_Father: {fileID: 1315170081792486277}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &904161782565348054
 GameObject:
   m_ObjectHideFlags: 0
@@ -166,7 +202,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 200}
-  m_SizeDelta: {x: 1550, y: 700}
+  m_SizeDelta: {x: 1550, y: 750}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &4291423916360628965
 Canvas:
@@ -252,7 +288,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 350, y: 350}
-  m_Spacing: {x: 50, y: 0}
+  m_Spacing: {x: 50, y: 50}
   m_Constraint: 2
   m_ConstraintCount: 2
 --- !u!114 &7425566603516801919
@@ -281,7 +317,6 @@ GameObject:
   - component: {fileID: 6669614972729775195}
   - component: {fileID: 2981106092574900430}
   - component: {fileID: 8074691980395114238}
-  - component: {fileID: 1630362919770549177}
   m_Layer: 5
   m_Name: AppSwitcher
   m_TagString: Untagged
@@ -301,8 +336,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6108475066390421500}
-  - {fileID: 1495118611075801417}
+  - {fileID: 8293076336493130222}
   - {fileID: 808554455652734252}
   - {fileID: 2831878373711017175}
   m_Father: {fileID: 0}
@@ -364,36 +398,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bac6124b3ada8a048a0b87a729a22312, type: 3}
   m_Name: 
   m_EditorClassIdentifier: '::'
-  iconIdle: {fileID: 4900000, guid: 50e22b5bb8a496840952f2563758c13c, type: 3}
-  iconEstablish: {fileID: 4900000, guid: 975218623da47f8428c484d886554a6c, type: 3}
-  rainbowEstablish: {fileID: 4900000, guid: 622be2ef9d5e27d45a9deaf7ed805f5f, type: 3}
-  rainbowRemove: {fileID: 4900000, guid: 589505308c5daf449800f30dd4b92ce7, type: 3}
-  rainbow: {fileID: 5382650426034128680}
-  icon: {fileID: 6784053660381911346}
+  PageName: 
+  transitionDuration: 0.3
+  rainbowIn: {fileID: 0}
+  rainbowOut: {fileID: 0}
   gameLayoutContainer: {fileID: 904161782565348054}
   exitButton: {fileID: 8427602740714176801}
---- !u!95 &1630362919770549177
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1498581815400593087}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: fc380d833ededb441a23b106de60bedd, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 2
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  rectMask: {fileID: 7425566603516801919}
+  slideDuration: 0.6
 --- !u!1 &2426870979657684456
 GameObject:
   m_ObjectHideFlags: 0
@@ -634,6 +646,81 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &4404111907760364827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4136733570236406132}
+  - component: {fileID: 102352512179716898}
+  - component: {fileID: 3911817807614671446}
+  m_Layer: 5
+  m_Name: BackgroundOverlay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4136733570236406132
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4404111907760364827}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8293076336493130222}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &102352512179716898
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4404111907760364827}
+  m_CullTransparentMesh: 1
+--- !u!114 &3911817807614671446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4404111907760364827}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.5019608}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5189738780074141096
 GameObject:
   m_ObjectHideFlags: 0
@@ -754,99 +841,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &5382650426034128680
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6108475066390421500}
-  - component: {fileID: 2398693306920598044}
-  - component: {fileID: 7920249735731934357}
-  - component: {fileID: 3566391948883171773}
-  m_Layer: 5
-  m_Name: Rainbow
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6108475066390421500
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5382650426034128680}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1315170081792486277}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2398693306920598044
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5382650426034128680}
-  m_CullTransparentMesh: 1
---- !u!114 &7920249735731934357
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5382650426034128680}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: -1
---- !u!114 &3566391948883171773
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5382650426034128680}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2fd09147b9e9d42a48d6ddc915ddc3d2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: SkiaSharp.Unity::SkiaSharp.Unity.SkottiePlayerV2
-  lottieFile: {fileID: 4900000, guid: 622be2ef9d5e27d45a9deaf7ed805f5f, type: 3}
-  customResolution: 0
-  resWidth: 250
-  resHeight: 250
-  stateName: 
-  resetAfterFinished: 0
-  autoPlay: 0
-  loop: 0
 --- !u!1 &5867455130109727138
 GameObject:
   m_ObjectHideFlags: 0
@@ -967,156 +961,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &6784053660381911346
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1495118611075801417}
-  - component: {fileID: 9118909078554628244}
-  - component: {fileID: 8490254979303535795}
-  - component: {fileID: 4316986085632541161}
-  - component: {fileID: 6597789131808754055}
-  m_Layer: 5
-  m_Name: Icon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1495118611075801417
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6784053660381911346}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1315170081792486277}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -50, y: -50}
-  m_SizeDelta: {x: 200, y: 200}
-  m_Pivot: {x: 1, y: 1}
---- !u!222 &9118909078554628244
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6784053660381911346}
-  m_CullTransparentMesh: 1
---- !u!114 &8490254979303535795
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6784053660381911346}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.RawImage
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: -1
---- !u!114 &4316986085632541161
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6784053660381911346}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2fd09147b9e9d42a48d6ddc915ddc3d2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: SkiaSharp.Unity::SkiaSharp.Unity.SkottiePlayerV2
-  lottieFile: {fileID: 4900000, guid: 50e22b5bb8a496840952f2563758c13c, type: 3}
-  customResolution: 0
-  resWidth: 250
-  resHeight: 250
-  stateName: Idle
-  resetAfterFinished: 0
-  autoPlay: 1
-  loop: 1
---- !u!114 &6597789131808754055
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6784053660381911346}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 8490254979303535795}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 8074691980395114238}
-        m_TargetAssemblyTypeName: AppSwitcher, AppleHillsScripts
-        m_MethodName: OpenAppSwitcher
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!1 &7713997083397969887
 GameObject:
   m_ObjectHideFlags: 0
@@ -1489,6 +1333,7 @@ GameObject:
   - component: {fileID: 5972191288640444065}
   - component: {fileID: 236099612463072939}
   - component: {fileID: 447310668687539451}
+  - component: {fileID: 6704345904811573523}
   m_Layer: 5
   m_Name: CloseUIButton
   m_TagString: Untagged
@@ -1599,7 +1444,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 8074691980395114238}
         m_TargetAssemblyTypeName: AppSwitcher, AppleHillsScripts
-        m_MethodName: CloseAppSwitcher
+        m_MethodName: OnBackPressed
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -1609,3 +1454,15 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &6704345904811573523
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8427602740714176801}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 494d0aedce9744308499355006071138, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::UI.DummyInput

Assets/Prefabs/UI/CardsSystem/Boosters/BoosterOpeningPage.prefab

@@ -34,7 +34,9 @@ RectTransform:
   - {fileID: 5027301639700053608}
   - {fileID: 2081116343754364062}
   - {fileID: 4830022034953347571}
+  - {fileID: 4247146273316450423}
   - {fileID: 7968396929263690413}
+  - {fileID: 1477338421424306197}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -79,7 +81,7 @@ MonoBehaviour:
   boosterDisappearDuration: 0.5
   impulseSource: {fileID: 4448843358972162772}
   openingParticleSystem: {fileID: 0}
-  albumIcon: {fileID: 0}
+  albumIcon: {fileID: 2290549912955623947}
 --- !u!114 &4448843358972162772
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -214,6 +216,170 @@ MonoBehaviour:
     m_PostInfinity: 2
     m_RotationOrder: 4
   curveHeight: 50
+--- !u!1 &2290549912955623947
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4247146273316450423}
+  - component: {fileID: 5793188825053435727}
+  - component: {fileID: 5726314423424208945}
+  - component: {fileID: 299670167085314888}
+  - component: {fileID: 6513785969721658917}
+  m_Layer: 5
+  m_Name: ScrapbookButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4247146273316450423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2290549912955623947}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.06667, y: 1.06667, z: 1.06667}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5228380266581535650}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 80.000015, y: 79.999985}
+  m_SizeDelta: {x: 241, y: 239}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &5793188825053435727
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2290549912955623947}
+  m_CullTransparentMesh: 1
+--- !u!114 &5726314423424208945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2290549912955623947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: -4354454609415314374, guid: 1ba1f8cf73f79214190f1432fe1e3bc6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &299670167085314888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2290549912955623947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5726314423424208945}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &6513785969721658917
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2290549912955623947}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 494d0aedce9744308499355006071138, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::UI.DummyInput
+--- !u!1 &2898816812112041854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1477338421424306197}
+  m_Layer: 0
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1477338421424306197
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2898816812112041854}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -297.3595, y: -196.74738, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5228380266581535650}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4303341275909682426
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/CardsSystem/Boosters/MiniGameBoosterGiver.prefab

@@ -0,0 +1,483 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1439929750438628637
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1966378914653314124}
+  - component: {fileID: 1175208421330333144}
+  m_Layer: 0
+  m_Name: MiniGameBoosterGiver
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1966378914653314124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439929750438628637}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2499229096808986326}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1175208421330333144
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439929750438628637}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7d8f3e9a2b4c5f6d1a8e9c0b3d4f5a6b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::UI.CardSystem.MinigameBoosterGiver
+  visualContainer: {fileID: 8617171489468030463}
+  boosterImage: {fileID: 3680365639323743419}
+  glowImage: {fileID: 4006246129058447062}
+  continueButton: {fileID: 2988510625873934392}
+  hoverAmount: 20
+  hoverDuration: 1.5
+  glowPulseMin: 0.9
+  glowPulseMax: 1.1
+  glowPulseDuration: 1.2
+  targetBottomLeftOffset: {x: 100, y: 100}
+  disappearDuration: 0.8
+  disappearScale: 0.2
+--- !u!1 &2923535299741790846
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5109945643968698326}
+  m_Layer: 0
+  m_Name: BoosterContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5109945643968698326
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2923535299741790846}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4006246129058447062}
+  - {fileID: 3680365639323743419}
+  m_Father: {fileID: 2499229096808986326}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -300}
+  m_SizeDelta: {x: 750, y: 760}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!1 &4323719263405703996
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6841858894429745291}
+  - component: {fileID: 1590188508543769496}
+  - component: {fileID: 4489841151491567959}
+  - component: {fileID: 2988510625873934392}
+  m_Layer: 0
+  m_Name: Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6841858894429745291
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4323719263405703996}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2499229096808986326}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 160}
+  m_SizeDelta: {x: 250, y: 250}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &1590188508543769496
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4323719263405703996}
+  m_CullTransparentMesh: 1
+--- !u!114 &4489841151491567959
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4323719263405703996}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 2636902231072113825, guid: ee014bd71cac2bc4ab845f435726f383, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2988510625873934392
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4323719263405703996}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4489841151491567959}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5931931042366245593
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4006246129058447062}
+  - component: {fileID: 5796229481733252802}
+  - component: {fileID: 6215049078676414306}
+  m_Layer: 0
+  m_Name: Glow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4006246129058447062
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5931931042366245593}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5109945643968698326}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 800, y: 800}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5796229481733252802
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5931931042366245593}
+  m_CullTransparentMesh: 1
+--- !u!114 &6215049078676414306
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5931931042366245593}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: -8836962644236845764, guid: c5cc7367a37a7944abb3876352b0e0ff, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8617171489468030463
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2499229096808986326}
+  m_Layer: 0
+  m_Name: VisualContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2499229096808986326
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8617171489468030463}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1338508664922812659}
+  - {fileID: 6841858894429745291}
+  - {fileID: 5109945643968698326}
+  m_Father: {fileID: 1966378914653314124}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8914844459546715980
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1338508664922812659}
+  - component: {fileID: 4173866009683612467}
+  - component: {fileID: 570826085774513514}
+  m_Layer: 0
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1338508664922812659
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8914844459546715980}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2499229096808986326}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4173866009683612467
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8914844459546715980}
+  m_CullTransparentMesh: 1
+--- !u!114 &570826085774513514
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8914844459546715980}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.49411765}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &9035675646436554328
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3680365639323743419}
+  - component: {fileID: 8906420622179058179}
+  - component: {fileID: 3765065913677958559}
+  m_Layer: 0
+  m_Name: BoosterPack
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3680365639323743419
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9035675646436554328}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5109945643968698326}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 411, y: 729}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8906420622179058179
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9035675646436554328}
+  m_CullTransparentMesh: 1
+--- !u!114 &3765065913677958559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9035675646436554328}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 4365544765984126881, guid: 9dac643e78ad86e4988c11a92f9c7a6d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Prefabs/UI/CardsSystem/Boosters/MiniGameBoosterGiver.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a855ba60e86bf1e449197f1f5f9b9b73
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/CardsSystem/Cards/FlippableCardPrefab.prefab

@@ -285,8 +285,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 173}
-  m_SizeDelta: {x: 600, y: 150}
+  m_AnchoredPosition: {x: 0, y: 125}
+  m_SizeDelta: {x: 600, y: 120}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5545241165728741220
 CanvasRenderer:
@@ -343,8 +343,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 150
-  m_fontSizeBase: 150
+  m_fontSize: 125
+  m_fontSizeBase: 125
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -1053,6 +1053,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4925415087786595420, guid: 1d8cc8d9238eec34b8e600e7050e2979, type: 3}
+      propertyPath: m_fontSize
+      value: 54.45
+      objectReference: {fileID: 0}
     - target: {fileID: 5378230129755544441, guid: 1d8cc8d9238eec34b8e600e7050e2979, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0

Assets/Prefabs/UI/PauseMenu.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6fb0d7fc6faad154b8c3e3cb7abb7c15
+guid: fe049e0d73eadd7479140c8e7bd10efe
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Prefabs/UI/UIPageController.prefab

@@ -1,50 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3863019143023165617
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 272997100784137721}
-  - component: {fileID: 497632815361153787}
-  m_Layer: 5
-  m_Name: UIPageController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &272997100784137721
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3863019143023165617}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &497632815361153787
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3863019143023165617}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b1ae6c1745e44e22a0fa9209ebe45ee3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: AppleHillsScripts::UI.Core.UIPageController

Assets/Scenes/MiniGames/DivingForPictures.unity

@@ -305,6 +305,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1224833349}
+  - {fileID: 471921060}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -418,16 +419,16 @@ LineRenderer:
   m_SortingOrder: 0
   m_Positions:
   - {x: -0.15602553, y: 4.074945, z: 0}
-  - {x: -0.1566351, y: 3.9736383, z: 0}
-  - {x: -0.1572447, y: 3.8729858, 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.673644, z: 0}
-  - {x: -0.15907341, y: 3.5749543, z: 0}
-  - {x: -0.15968299, y: 3.4769197, 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
@@ -1098,6 +1099,112 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!1001 &471921059
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 116234201}
+    m_Modifications:
+    - target: {fileID: 1439929750438628637, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_Name
+      value: MiniGameBoosterGiver
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8617171489468030463, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+--- !u!224 &471921060 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1966378914653314124, guid: a855ba60e86bf1e449197f1f5f9b9b73, type: 3}
+  m_PrefabInstance: {fileID: 471921059}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &730962732
 GameObject:
   m_ObjectHideFlags: 0
@@ -1455,7 +1562,7 @@ AudioSource:
   OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2}
   m_audioClip: {fileID: 0}
   m_Resource: {fileID: 0}
-  m_PlayOnAwake: 1
+  m_PlayOnAwake: 0
   m_Volume: 1
   m_Pitch: 1
   Loop: 0
@@ -1783,14 +1890,14 @@ LineRenderer:
   - {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.5533104, z: 0}
-  - {x: 0.0015918687, y: 3.4223213, z: 0}
-  - {x: 0.040996216, y: 3.312776, 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.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.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
@@ -2503,14 +2610,14 @@ LineRenderer:
   - {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.54552, z: 0}
-  - {x: -0.29019317, y: 3.4129906, z: 0}
-  - {x: -0.32373506, y: 3.302433, z: 0}
-  - {x: -0.35727698, y: 3.213848, z: 0}
-  - {x: -0.39081886, y: 3.1472354, 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
@@ -3358,7 +3465,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:
@@ -3526,6 +3633,18 @@ PrefabInstance:
       propertyPath: m_Name
       value: Tutorial
       objectReference: {fileID: 0}
+    - target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
+      propertyPath: introVO
+      value: 
+      objectReference: {fileID: 8300000, guid: fca641cdc8dcd074483fad3db1cbe24c, type: 3}
+    - target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
+      propertyPath: playTutorial
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4267886887244421663, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
+      propertyPath: bottleAudioPlayer
+      value: 
+      objectReference: {fileID: 747976408}
     - target: {fileID: 8452897808363562605, guid: a4dd78ff48942854ebb4c65025a8dc36, type: 3}
       propertyPath: m_Sprite
       value: 

Assets/Scripts/Animation/BirdEyesBehavior.cs

@@ -1,43 +1,82 @@
+using Core.Lifecycle;
+using Core.SaveLoad;
 using UnityEngine;
-using Pixelplacement;
 
-public class BirdEyesBehavior : MonoBehaviour
+public class BirdEyesBehavior : ManagedBehaviour
 {
-    private StateMachine statemachine;
-    private Animator animator;
+    // Animator Hashes
+    private static readonly int RightGuess = Animator.StringToHash("RightGuess");
+    private static readonly int WrongGuess = Animator.StringToHash("WrongGuess");
+    private static readonly int NoGuess = Animator.StringToHash("NoGuess");
+    private static readonly int Wolterisout = Animator.StringToHash("wolterisout");
+
+    private AppleMachine _statemachine;
+    private Animator _animator;
     public bool correctItemIsIn;
     [SerializeField] private Animator bushAnimator; // Assign in Inspector
+
+    // Save state
+    private bool _wolterisoutTriggered;
+
+    // Enable save/load participation
+    public override bool AutoRegisterForSave => true;
+
     // Start is called once before the first execution of Update after the MonoBehaviour is created
     void Start()
     {
-        statemachine = GetComponent<StateMachine>();
-        animator = GetComponentInChildren<Animator>();
+        _statemachine = GetComponent<AppleMachine>();
+        _animator = GetComponentInChildren<Animator>();
     }
 
     public void CorrectItem()
     {
         correctItemIsIn = true;
-        animator.SetTrigger("RightGuess");
+        _animator.SetTrigger(RightGuess);
         BirdReveal();
     }
 
     public void IncorrectItem()
     {
         correctItemIsIn = false;
-        animator.SetTrigger("WrongGuess");
+        _animator.SetTrigger(WrongGuess);
     }
+
     public void NoItem()
     {
-        animator.SetTrigger("NoGuess");
+        _animator.SetTrigger(NoGuess);
     }
+
     public void BirdReveal()
     {
         if (bushAnimator != null)
         {
-            bushAnimator.SetTrigger("wolterisout");
-            statemachine.ChangeState("BirdSpawned");
-            return;
+            bushAnimator.SetTrigger(Wolterisout);
+            _wolterisoutTriggered = true;
         }
-        statemachine.ChangeState ("BirdSpawned"); 
+        _statemachine.ChangeState("BirdSpawned"); 
+    }
+
+    internal override void OnSceneRestoreRequested(string serializedData)
+    {
+        base.OnSceneRestoreRequested(serializedData);
+    
+        if (!string.IsNullOrEmpty(serializedData))
+        {
+            if (bool.TryParse(serializedData, out bool wasTriggered))
+            {
+                _wolterisoutTriggered = wasTriggered;
+            
+                // If it was triggered before, set it again on restore
+                if (_wolterisoutTriggered && bushAnimator != null)
+                {
+                    bushAnimator.SetTrigger(Wolterisout);
+                }
+            }
+        }
+    }
+
+    internal override string OnSceneSaveRequested()
+    {
+        return _wolterisoutTriggered.ToString();
     }
 }

Assets/Scripts/AppleHillsScripts.asmdef

@@ -11,9 +11,6 @@
         "OptimizedRope",
         "AudioSourceEvents",
         "NewAssembly",
-        "SkiaSharp.Unity",
-        "SkiaSharp.Editor",
-        "SkiaSharp",
         "Unity.Cinemachine"
     ],
     "includePlatforms": [],

Assets/Scripts/Bootstrap/BootCompletionService.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using AppleHills.Core.Settings;
-using Core;
-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;
-            
-            LogDebugMessage("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);
-            
-            LogDebugMessage("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
-                LogDebugMessage($"Executing late registration: {name} (Priority: {priority})");
-                try
-                {
-                    action();
-                }
-                catch (Exception ex)
-                {
-                    LogDebugMessage($"Error executing init action '{name}': {ex}");
-                }
-            }
-            else
-            {
-                // Otherwise add to the queue
-                _initializationActions.Add(initAction);
-                LogDebugMessage($"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
-                {
-                    LogDebugMessage($"Executing: {action.Name} (Priority: {action.Priority})");
-                    action.Action();
-                }
-                catch (Exception ex)
-                {
-                    LogDebugMessage($"Error executing init action '{action.Name}': {ex}");
-                }
-            }
-            
-            // Clear the list after execution
-            _initializationActions.Clear();
-        }
-        
-        private static void LogDebugMessage(string message)
-        {
-            if (DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().bootstrapLogVerbosity <=
-                LogVerbosity.Debug)
-            {
-                Logging.Debug($"[BootCompletionService] {message}");
-            }
-        }
-    }
-}

Assets/Scripts/Bootstrap/BootCompletionService.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: aa0228cf33a64515bc166b7a9bc8c0b9
-timeCreated: 1760606319

Assets/Scripts/Bootstrap/BootSceneController.cs

@@ -1,18 +1,18 @@
 using System;
 using AppleHills.Core.Settings;
 using UnityEngine;
-using UI;
 using Core;
+using Core.Lifecycle;
 using UnityEngine.SceneManagement;
 using Cinematics;
-using UnityEngine.Serialization;
+using Core.SaveLoad;
 
 namespace Bootstrap
 {
     /// <summary>
     /// Controller for the boot scene that coordinates bootstrap initialization with loading screen
     /// </summary>
-    public class BootSceneController : MonoBehaviour
+    public class BootSceneController : ManagedBehaviour
     {
         [SerializeField] private string mainSceneName = "AppleHillsOverworld";
         [SerializeField] private float minDelayAfterBoot = 0.5f; // Small delay after boot to ensure smooth transition
@@ -30,36 +30,35 @@ namespace Bootstrap
         private float _sceneLoadingProgress = 0f;
         private LogVerbosity _logVerbosity = LogVerbosity.Warning;
 
-        private void Start()
-        {
-            LogDebugMessage("Boot scene started");
 
-            // Ensure the initial loading screen exists
+        internal override void OnManagedAwake()
+        {
+            Logging.Debug("BootSceneController.Awake() - Initializing loading screen DURING bootstrap");
+            
+            // Validate 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
+            // This needs to happen DURING bootstrap to show progress
             initialLoadingScreen.ShowLoadingScreen(GetCombinedProgress);
             
-            // Subscribe to boot progress events
+            // Subscribe to loading screen completion event
+            initialLoadingScreen.OnLoadingScreenFullyHidden += OnInitialLoadingComplete;
+            
+            // Subscribe to boot progress for real-time updates during bootstrap
             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"
-            );
-
-            _logVerbosity = DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().bootstrapLogVerbosity;
+            #if UNITY_EDITOR
+                _logVerbosity = DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().bootstrapLogVerbosity;
+            #elif DEVELOPMENT_BUILD
+                _logVerbosity = LogVerbosity.Debug;
+            #elif RELEASE_BUILD
+                _logVerbosity = LogVerbosity.Warning;
+            #endif
             
             // In debug mode, log additional information
             if (debugMode)
@@ -68,17 +67,41 @@ namespace Bootstrap
             }
         }
 
+        internal override void OnManagedStart()
+        {
+            Logging.Debug("BootSceneController.OnManagedStart() - Boot is GUARANTEED complete, starting scene loading");
+            
+            // Boot is GUARANTEED complete at this point - that's the whole point of OnManagedStart!
+            // No need to subscribe to OnBootCompleted or check CustomBoot.Initialised
+            _bootComplete = true;
+            _currentPhase = LoadingPhase.SceneLoading;
+            
+            // Start loading the main scene after a small delay
+            // This prevents jerky transitions if boot happens very quickly
+            Invoke(nameof(StartLoadingMainMenu), minDelayAfterBoot);
+        }
+
+        internal override void OnManagedDestroy()
+        {
+            // Manual cleanup for events
+            if (initialLoadingScreen != null)
+            {
+                initialLoadingScreen.OnLoadingScreenFullyHidden -= OnInitialLoadingComplete;
+            }
+            CustomBoot.OnBootProgressChanged -= OnBootProgressChanged;
+        }
+        
         /// <summary>
         /// Called when the initial loading screen is fully hidden
         /// </summary>
         private void OnInitialLoadingComplete()
         {
-            LogDebugMessage("Initial loading screen fully hidden, boot sequence completed");
+            Logging.Debug("Initial loading screen fully hidden, boot sequence completed");
             
             // Play the intro cinematic if available
             if (CinematicsManager.Instance != null)
             {
-                LogDebugMessage("Attempting to play intro cinematic");
+                Logging.Debug("Attempting to play intro cinematic");
 
                 // Use LoadAndPlayCinematic to play the intro sequence
                 CinematicsManager.Instance.LoadAndPlayCinematic("IntroSequence", false);
@@ -96,23 +119,6 @@ namespace Bootstrap
             }
         }
         
-        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>
@@ -137,28 +143,16 @@ namespace Bootstrap
         {
             if (debugMode)
             {
-                LogDebugMessage($"Bootstrap progress: {progress:P0}, Combined: {GetCombinedProgress():P0}");
+                Logging.Debug($"Bootstrap progress: {progress:P0}, Combined: {GetCombinedProgress():P0}");
             }
         }
         
         private void LogDebugInfo()
         {
-            LogDebugMessage($"Debug - Phase: {_currentPhase}, Bootstrap: {CustomBoot.CurrentProgress:P0}, " +
+            Logging.Debug($"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;
-            
-            LogDebugMessage("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()
         {
@@ -172,7 +166,7 @@ namespace Bootstrap
         
         private async void LoadMainScene()
         {
-            LogDebugMessage($"Loading main menu scene: {mainSceneName}");
+            Logging.Debug($"Loading main menu scene: {mainSceneName}");
             
             try
             {
@@ -186,7 +180,7 @@ namespace Bootstrap
                     
                     if (debugMode)
                     {
-                        LogDebugMessage($"Scene loading raw: {value:P0}, Combined: {GetCombinedProgress():P0}");
+                        Logging.Debug($"Scene loading raw: {value:P0}, Combined: {GetCombinedProgress():P0}");
                     }
                 });
 
@@ -209,6 +203,17 @@ namespace Bootstrap
                 // Ensure progress is complete
                 _sceneLoadingProgress = 1f;
                 
+                // CRITICAL: Broadcast lifecycle events so components get their OnSceneReady callbacks
+                Logging.Debug($"Broadcasting OnSceneReady for: {mainSceneName}");
+                LifecycleManager.Instance?.BroadcastSceneReady(mainSceneName);
+                
+                // Restore scene data for the main menu
+                if (SaveLoadManager.Instance != null)
+                {
+                    Logging.Debug($"Restoring scene data for: {mainSceneName}");
+                    SaveLoadManager.Instance.RestoreSceneData();
+                }
+                
                 // Step 2: Scene is fully loaded, now hide the loading screen
                 // This will trigger OnInitialLoadingComplete via the event when animation completes
                 initialLoadingScreen.HideLoadingScreen();
@@ -235,7 +240,7 @@ namespace Bootstrap
                 Scene currentScene = SceneManager.GetActiveScene();
                 string startingSceneName = currentScene.name;
                 
-                LogDebugMessage($"Unloading StartingScene: {startingSceneName}");
+                Logging.Debug($"Unloading StartingScene: {startingSceneName}");
                 
                 // Unload the StartingScene
                 await SceneManager.UnloadSceneAsync(startingSceneName);
@@ -244,14 +249,14 @@ namespace Bootstrap
                 Scene mainMenuScene = SceneManager.GetSceneByName(mainSceneName);
                 SceneManager.SetActiveScene(mainMenuScene);
                 
-                LogDebugMessage($"Transition complete: {startingSceneName} unloaded, {mainSceneName} is now active");
+                Logging.Debug($"Transition complete: {startingSceneName} unloaded, {mainSceneName} 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}");
+                Logging.Warning($"Error unloading StartingScene: {e.Message}");
             }
         }
         
@@ -272,13 +277,5 @@ namespace Bootstrap
                 _progressAction?.Invoke(value);
             }
         }
-        
-        private void LogDebugMessage(string message)
-        {
-            if ( _logVerbosity <= LogVerbosity.Debug)
-            {
-                Logging.Debug($"[BootSceneController] {message}");
-            }
-        }
     }
 }

Assets/Scripts/Bootstrap/CustomBoot.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using AppleHills.Core.Settings;
 using Core;
+using Core.Lifecycle;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
@@ -39,6 +39,10 @@ namespace Bootstrap
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)]
         private static void Initialise()
         {
+            // Create LifecycleManager FIRST - before any bootstrap logic
+            // This ensures it exists when boot completes
+             LifecycleManager.CreateInstance();
+            
             //We should always clean up after Addressables, so let's take care of that immediately
             Application.quitting += ApplicationOnUnloading;
 
@@ -97,12 +101,14 @@ namespace Bootstrap
             OnBootProgressChanged?.Invoke(1f);
             OnBootCompleted?.Invoke();
             
-            // Notify the BootCompletionService that boot is complete
+            // Notify the LifecycleManager that boot is complete
             if (Application.isPlaying)
             {
-                // Direct call to boot completion service
-                LogDebugMessage("Calling BootCompletionService.HandleBootCompleted()");
-                BootCompletionService.HandleBootCompleted();
+                Logging.Debug("Calling LifecycleManager.OnBootCompletionTriggered()");
+                if (LifecycleManager.Instance != null)
+                {
+                    LifecycleManager.Instance.OnBootCompletionTriggered();
+                }
             }
         }
 
@@ -117,12 +123,14 @@ namespace Bootstrap
             OnBootProgressChanged?.Invoke(1f);
             OnBootCompleted?.Invoke();
             
-            // Notify the BootCompletionService that boot is complete
+            // Notify the LifecycleManager that boot is complete
             if (Application.isPlaying)
             {
-                // Direct call to boot completion service
-                LogDebugMessage("Calling BootCompletionService.HandleBootCompleted()");
-                BootCompletionService.HandleBootCompleted();
+                Logging.Debug("Calling LifecycleManager.OnBootCompletionTriggered()");
+                if (LifecycleManager.Instance != null)
+                {
+                    LifecycleManager.Instance.OnBootCompletionTriggered();
+                }
             }
         }
 
@@ -229,16 +237,7 @@ namespace Bootstrap
         {
             CurrentProgress = Mathf.Clamp01(progress);
             OnBootProgressChanged?.Invoke(CurrentProgress);
-            LogDebugMessage($"Progress: {CurrentProgress:P0}");
-        }
-        
-        private static void LogDebugMessage(string message)
-        {
-            if (DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().bootstrapLogVerbosity <=
-                LogVerbosity.Debug)
-            {
-                Logging.Debug($"[CustomBoot] {message}");
-            }
+            Logging.Debug($"Progress: {CurrentProgress:P0}");
         }
     }
 }

Assets/Scripts/Bootstrap/InitialLoadingScreen.cs

@@ -138,7 +138,7 @@ namespace Bootstrap
                 float displayProgress = Mathf.Min(steadyProgress, actualProgress);
                 
                 // Log the progress values for debugging
-                LogDebugMessage($"Progress - Default: {steadyProgress:F2}, Actual: {actualProgress:F2}, Display: {displayProgress:F2}");
+                Logging.Debug($"Progress - Default: {steadyProgress:F2}, Actual: {actualProgress:F2}, Display: {displayProgress:F2}");
                 
                 // Directly set the progress bar fill amount without smoothing
                 if (progressBarImage != null)
@@ -151,7 +151,7 @@ namespace Bootstrap
                 if (steadyProgress >= 1.0f && displayProgress >= 1.0f)
                 {
                     _animationComplete = true;
-                    LogDebugMessage("Animation complete");
+                    Logging.Debug("Animation complete");
                     break;
                 }
                 
@@ -163,7 +163,7 @@ namespace Bootstrap
             if (progressBarImage != null)
             {
                 progressBarImage.fillAmount = 1.0f;
-                LogDebugMessage("Final progress set to 1.0");
+                Logging.Debug("Final progress set to 1.0");
             }
             
             // Hide the screen if loading is also complete
@@ -172,7 +172,7 @@ namespace Bootstrap
                 if (loadingScreenContainer != null)
                 {
                     loadingScreenContainer.SetActive(false);
-                    LogDebugMessage("Animation AND loading complete, hiding screen");
+                    Logging.Debug("Animation AND loading complete, hiding screen");
                     
                     // Invoke the callback when fully hidden
                     _onLoadingScreenFullyHidden?.Invoke();
@@ -189,7 +189,7 @@ namespace Bootstrap
         /// </summary>
         public void HideLoadingScreen()
         {
-            LogDebugMessage("Loading complete, marking loading as finished");
+            Logging.Debug("Loading complete, marking loading as finished");
             
             // Mark that loading is complete
             _loadingComplete = true;
@@ -200,7 +200,7 @@ namespace Bootstrap
                 if (loadingScreenContainer != null)
                 {
                     loadingScreenContainer.SetActive(false);
-                    LogDebugMessage("Animation already complete, hiding screen immediately");
+                    Logging.Debug("Animation already complete, hiding screen immediately");
                     
                     // Invoke the callback when fully hidden
                     _onLoadingScreenFullyHidden?.Invoke();
@@ -210,7 +210,7 @@ namespace Bootstrap
             }
             else
             {
-                LogDebugMessage("Animation still in progress, waiting for it to complete");
+                Logging.Debug("Animation still in progress, waiting for it to complete");
                 // The coroutine will handle hiding when animation completes
             }
         }
@@ -244,13 +244,5 @@ namespace Bootstrap
             
             return tcs.Task;
         }
-        
-        private void LogDebugMessage(string message)
-        {
-            if ( _logVerbosity <= LogVerbosity.Debug)
-            {
-                Logging.Debug($"[InitialLoadingScreen] {message}");
-            }
-        }
     }
 }

Assets/Scripts/Cinematics/CinematicsManager.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Bootstrap;
 using Core;
+using Core.Lifecycle;
 using UI;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
@@ -14,7 +14,7 @@ namespace Cinematics
     /// <summary>
     /// Handles loading, playing and unloading cinematics
     /// </summary>
-    public class CinematicsManager : MonoBehaviour
+    public class CinematicsManager : ManagedBehaviour
     {
         public event System.Action OnCinematicStarted;
         public event System.Action OnCinematicStopped;
@@ -37,21 +37,18 @@ namespace Cinematics
         
         public PlayableDirector playableDirector;
         
-        private void Awake()
+        internal override void OnManagedAwake()
         {
+            // Set instance immediately (early initialization)
             _instance = this;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
         }
         
-        private void InitializePostBoot()
+        internal override void OnManagedStart()
         {
-            // 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");
+            Logging.Debug("[CinematicsManager] Initialized");
         }
         
+
         private void OnEnable()
         {
             // Subscribe to application quit event to ensure cleanup
@@ -85,7 +82,7 @@ namespace Cinematics
                 // If still null, try to add the component
                 if (playableDirector == null)
                 {
-                    Debug.Log("[CinematicsManager] Could not find Playable Director on the PlayerHudManager");
+                    Logging.Debug("[CinematicsManager] Could not find Playable Director on the PlayerHudManager");
                 }
             }
             
@@ -98,7 +95,7 @@ namespace Cinematics
                 // If still null, return error
                 if (_cinematicSprites == null)
                 {
-                    Debug.LogWarning("[CinematicsManager] No Image found for cinematics display. Cinematics may not display correctly.");
+                    Logging.Warning("[CinematicsManager] No Image found for cinematics display. Cinematics may not display correctly.");
                 }
             }
 
@@ -146,6 +143,8 @@ namespace Cinematics
         /// </summary>
         public PlayableDirector LoadAndPlayCinematic(string key, bool playPortraitMode)
         {
+            InitializeComponents();
+            
             // Load the asset via addressables
             var handle = Addressables.LoadAssetAsync<PlayableAsset>(key);
             var result = handle.WaitForCompletion();
@@ -206,6 +205,9 @@ namespace Cinematics
 
         public void ShowGameOverScreen()
         {
+            // Diagnostic: log time and call stack to track when/why game over is triggered
+            Logging.Debug($"[CinematicsManager] ShowGameOverScreen called at time={Time.time:F2}");
+            
             if (divingGameOverScreen != null && UIPageController.Instance != null)
             {
                 UIPageController.Instance.PushPage(divingGameOverScreen);

Assets/Scripts/Cinematics/SkipCinematic.cs

@@ -1,12 +1,12 @@
-using Bootstrap;
 using Core;
+using Core.Lifecycle;
 using Input;
 using UnityEngine;
 using UnityEngine.UI;
 
 namespace Cinematics
 {
-    public class SkipCinematic : MonoBehaviour, ITouchInputConsumer
+    public class SkipCinematic : ManagedBehaviour, ITouchInputConsumer
     {
         [Header("Configuration")]
         [SerializeField] private float holdDuration = 2.0f;
@@ -15,41 +15,25 @@ 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()
+        internal override void OnManagedStart()
         {
             // Reset the progress bar
             if (radialProgressBar != null)
             {
                 radialProgressBar.fillAmount = 0f;
             }
-        }
-
-        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");
+            Logging.Debug("[SkipCinematic] Initialized");
+        }
+        
+        internal override void OnManagedDestroy()
+        {
+            // Clean up subscriptions
+            UnsubscribeFromCinematicsEvents();
         }
     
         private void SubscribeToCinematicsEvents()

Assets/Scripts/Core/GameManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using AppleHills.Core.Interfaces;
 using AppleHills.Core.Settings;
-using Bootstrap;
+using Core.Lifecycle;
 using Core.Settings;
 using Input;
 using UnityEngine;
@@ -12,7 +12,7 @@ namespace Core
     /// <summary>
     /// Singleton manager for global game state and settings. Provides accessors for various gameplay parameters.
     /// </summary>
-    public class GameManager : MonoBehaviour
+    public class GameManager : ManagedBehaviour
     {
         // Singleton implementation
         private static GameManager _instance;
@@ -34,33 +34,29 @@ namespace Core
         public event Action OnGamePaused;
         public event Action OnGameResumed;
 
-        void Awake()
+
+        internal override void OnManagedAwake()
         {
+            // Set instance immediately (early initialization)
             _instance = this;
             
-            // Create settings providers if it doesn't exist
+            // Create settings providers - must happen in OnManagedAwake so other managers can access settings in their ManagedStart
             SettingsProvider.Instance.gameObject.name = "Settings Provider";
             DeveloperSettingsProvider.Instance.gameObject.name = "Developer Settings Provider";
         
-            // Load all settings synchronously during Awake
+            // Load all settings synchronously - critical infrastructure for other managers
             InitializeSettings();
             InitializeDeveloperSettings();
             
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
-        
-            // DontDestroyOnLoad(gameObject);
-        }
-
-        private void Start()
-        {
+            // Load verbosity settings early
             _settingsLogVerbosity = DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().settingsLogVerbosity;
             _managerLogVerbosity = DeveloperSettingsProvider.Instance.GetSettings<DebugSettings>().gameManagerLogVerbosity;
         }
 
-        private void InitializePostBoot()
+        internal override void OnManagedStart()
         {
-            // For post-boot correct initialization order
+            // Settings are already initialized in OnManagedAwake()
+            // This is available for future initialization that depends on other managers
         }
 
         /// <summary>
@@ -79,7 +75,7 @@ namespace Core
                     component.Pause();
                 }
             
-                LogDebugMessage($"Registered pausable component: {(component as MonoBehaviour)?.name ?? "Unknown"}");
+                Logging.Debug($"Registered pausable component: {(component as MonoBehaviour)?.name ?? "Unknown"}");
             }
         }
     
@@ -92,7 +88,7 @@ namespace Core
             if (component != null && _pausableComponents.Contains(component))
             {
                 _pausableComponents.Remove(component);
-                LogDebugMessage($"Unregistered pausable component: {(component as MonoBehaviour)?.name ?? "Unknown"}");
+                Logging.Debug($"Unregistered pausable component: {(component as MonoBehaviour)?.name ?? "Unknown"}");
             }
         }
     
@@ -108,7 +104,7 @@ namespace Core
                 ApplyPause(true);
             }
 
-            LogDebugMessage($"Pause requested by {requester?.ToString() ?? "Unknown"}. pauseCount = {_pauseCount}");
+            Logging.Debug($"Pause requested by {requester?.ToString() ?? "Unknown"}. pauseCount = {_pauseCount}");
         }
 
         /// <summary>
@@ -123,7 +119,7 @@ namespace Core
                 ApplyPause(false);
             }
 
-            LogDebugMessage($"Pause released by {requester?.ToString() ?? "Unknown"}. pauseCount = {_pauseCount}");
+            Logging.Debug($"Pause released by {requester?.ToString() ?? "Unknown"}. pauseCount = {_pauseCount}");
         }
 
         /// <summary>
@@ -162,12 +158,12 @@ namespace Core
                 OnGameResumed?.Invoke();
             }
             
-            LogDebugMessage($"Game {(shouldPause ? "paused" : "resumed")}. Paused {_pausableComponents.Count} components.");
+            Logging.Debug($"Game {(shouldPause ? "paused" : "resumed")}. Paused {_pausableComponents.Count} components.");
         }
 
         private void InitializeSettings()
         {
-            LogDebugMessage("Starting settings initialization...", "SettingsInitialization", _settingsLogVerbosity);
+            Logging.Debug("Starting settings initialization...");
         
             // Load settings synchronously
             var playerSettings = SettingsProvider.Instance.LoadSettingsSynchronous<PlayerFollowerSettings>();
@@ -178,7 +174,7 @@ namespace Core
             if (playerSettings != null)
             {
                 ServiceLocator.Register<IPlayerFollowerSettings>(playerSettings);
-                LogDebugMessage("PlayerFollowerSettings registered successfully", "SettingsInitialization", _settingsLogVerbosity);
+                Logging.Debug("PlayerFollowerSettings registered successfully");
             }
             else
             {
@@ -188,7 +184,7 @@ namespace Core
             if (interactionSettings != null)
             {
                 ServiceLocator.Register<IInteractionSettings>(interactionSettings);
-                LogDebugMessage("InteractionSettings registered successfully", "SettingsInitialization", _settingsLogVerbosity);
+                Logging.Debug("InteractionSettings registered successfully");
             }
             else
             {
@@ -198,7 +194,7 @@ namespace Core
             if (minigameSettings != null)
             {
                 ServiceLocator.Register<IDivingMinigameSettings>(minigameSettings);
-                LogDebugMessage("MinigameSettings registered successfully", "SettingsInitialization", _settingsLogVerbosity);
+                Logging.Debug("MinigameSettings registered successfully");
             }
             else
             {
@@ -209,7 +205,7 @@ namespace Core
             _settingsLoaded = playerSettings != null && interactionSettings != null && minigameSettings != null;
             if (_settingsLoaded)
             {
-                LogDebugMessage("All settings loaded and registered with ServiceLocator", "SettingsInitialization", _settingsLogVerbosity);
+                Logging.Debug("All settings loaded and registered with ServiceLocator");
             }
             else
             {
@@ -222,7 +218,7 @@ namespace Core
         /// </summary>
         private void InitializeDeveloperSettings()
         {
-            LogDebugMessage("Starting developer settings initialization...", "SettingsInitialization", _settingsLogVerbosity);
+            Logging.Debug("Starting developer settings initialization...");
         
             // Load developer settings
             var divingDevSettings = DeveloperSettingsProvider.Instance.GetSettings<DivingDeveloperSettings>();
@@ -232,7 +228,7 @@ namespace Core
         
             if (_developerSettingsLoaded)
             {
-                LogDebugMessage("All developer settings loaded successfully", "SettingsInitialization", _settingsLogVerbosity);
+                Logging.Debug("All developer settings loaded successfully");
             }
             else
             {
@@ -267,19 +263,6 @@ namespace Core
             return DeveloperSettingsProvider.Instance?.GetSettings<T>();
         }
         
-        private void LogDebugMessage(string message, string prefix = "GameManager", LogVerbosity verbosity = LogVerbosity.None)
-        {
-            if (verbosity == LogVerbosity.None)
-            {
-                verbosity = _managerLogVerbosity;
-            }
-            
-            if ( verbosity <= LogVerbosity.Debug)
-            {
-                Logging.Debug($"[{prefix}] {message}");
-            }
-        }
-        
         // LEFTOVER LEGACY SETTINGS
         public float PlayerStopDistance => GetSettings<IInteractionSettings>()?.PlayerStopDistance ?? 6.0f;
         public float PlayerStopDistanceDirectInteraction => GetSettings<IInteractionSettings>()?.PlayerStopDistanceDirectInteraction ?? 2.0f;

Assets/Scripts/Core/ItemManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using Interactions;
-using Bootstrap;
+using Core.Lifecycle;
 using Core.SaveLoad;
 
 namespace Core
@@ -11,7 +11,7 @@ namespace Core
     /// Central registry for pickups and item slots.
     /// Mirrors the singleton pattern used by PuzzleManager.
     /// </summary>
-    public class ItemManager : MonoBehaviour
+    public class ItemManager : ManagedBehaviour
     {
         private static ItemManager _instance;
 
@@ -48,35 +48,26 @@ namespace Core
         // Args: first item data, second item data, result item data
         public event Action<PickupItemData, PickupItemData, PickupItemData> OnItemsCombined;
         
-        void Awake()
+        internal override void OnManagedAwake()
         {
+            // Set instance immediately (early initialization)
             _instance = this;
-            
-            // Register for post-boot initialization
-            BootCompletionService.RegisterInitAction(InitializePostBoot);
         }
         
-        private void InitializePostBoot()
+        internal override void OnManagedStart()
         {
-            // Subscribe to scene load completed so we can clear registrations when scenes change
-            SceneManagerService.Instance.SceneLoadStarted += OnSceneLoadStarted;
-            
-            Logging.Debug("[ItemManager] Subscribed to SceneManagerService events");
+            Logging.Debug("[ItemManager] Initialized");
         }
         
-        void OnDestroy()
+        internal override void OnSceneReady()
         {
-            // Unsubscribe from SceneManagerService
-            if (SceneManagerService.Instance != null)
-                SceneManagerService.Instance.SceneLoadStarted -= OnSceneLoadStarted;
-
-            // Ensure we clean up any subscriptions from registered items when the manager is destroyed
+            // Replaces SceneLoadStarted subscription for clearing registrations
             ClearAllRegistrations();
         }
         
-        private void OnSceneLoadStarted(string sceneName)
+        internal override void OnManagedDestroy()
         {
-            // Clear all registrations when a new scene is loaded, so no stale references persist
+            // Ensure we clean up any subscriptions from registered items when the manager is destroyed
             ClearAllRegistrations();
         }
 
@@ -147,7 +138,6 @@ namespace Core
                 {
                     s.OnCorrectItemSlotted -= ItemSlot_OnCorrectItemSlotted;
                     s.OnIncorrectItemSlotted -= ItemSlot_OnIncorrectItemSlotted;
-                    s.OnForbiddenItemSlotted -= ItemSlot_OnForbiddenItemSlotted;
                     s.OnItemSlotRemoved -= ItemSlot_OnItemSlotRemoved;
                 }
             }
@@ -194,7 +184,6 @@ namespace Core
                 // Subscribe to all slot events
                 slot.OnCorrectItemSlotted += ItemSlot_OnCorrectItemSlotted;
                 slot.OnIncorrectItemSlotted += ItemSlot_OnIncorrectItemSlotted;
-                slot.OnForbiddenItemSlotted += ItemSlot_OnForbiddenItemSlotted;
                 slot.OnItemSlotRemoved += ItemSlot_OnItemSlotRemoved;
             }
         }
@@ -207,7 +196,6 @@ namespace Core
                 // Unsubscribe from all slot events
                 slot.OnCorrectItemSlotted -= ItemSlot_OnCorrectItemSlotted;
                 slot.OnIncorrectItemSlotted -= ItemSlot_OnIncorrectItemSlotted;
-                slot.OnForbiddenItemSlotted -= ItemSlot_OnForbiddenItemSlotted;
                 slot.OnItemSlotRemoved -= ItemSlot_OnItemSlotRemoved;
             }
         }
@@ -269,7 +257,7 @@ namespace Core
             // Search through all registered pickups
             foreach (var pickup in _pickups)
             {
-                if (pickup is SaveableInteractable saveable && saveable.GetSaveId() == saveId)
+                if (pickup is SaveableInteractable saveable && saveable.SaveId == saveId)
                 {
                     return pickup.gameObject;
                 }

Assets/Scripts/Core/Lifecycle.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 06a2c07342e5422eae1eb613f614ed61
+timeCreated: 1762206473

Assets/Scripts/Core/Lifecycle/LifecycleEnums.cs

@@ -0,0 +1,55 @@
+namespace Core.Lifecycle
+{
+    /// <summary>
+    /// Defines the different lifecycle phases that can be broadcast by the LifecycleManager.
+    /// All ManagedBehaviours participate in all lifecycle phases by default.
+    /// </summary>
+    public enum LifecyclePhase
+    {
+        /// <summary>
+        /// Called immediately during registration (during Awake).
+        /// Use for early initialization such as setting singleton instances.
+        /// NOT ordered - fires whenever Unity calls this component's Awake().
+        /// </summary>
+        ManagedAwake,
+        
+        /// <summary>
+        /// Called once per component after bootstrap completes.
+        /// Guaranteed to be called after all bootstrap resources are loaded.
+        /// For late-registered components, called immediately upon registration.
+        /// </summary>
+        ManagedStart,
+        
+        /// <summary>
+        /// Called before a scene is unloaded.
+        /// Only called for components in the scene being unloaded.
+        /// </summary>
+        SceneUnloading,
+        
+        /// <summary>
+        /// Called after a scene has finished loading.
+        /// Only called for components in the scene being loaded.
+        /// </summary>
+        SceneReady,
+        
+        /// <summary>
+        /// Called before scene unloads to save data via SaveLoadManager.
+        /// Integrates with existing SaveLoadManager save system.
+        /// </summary>
+        SaveRequested,
+        
+        /// <summary>
+        /// Called after scene loads to restore data via SaveLoadManager.
+        /// Integrates with existing SaveLoadManager restore system.
+        /// </summary>
+        RestoreRequested,
+        
+        /// <summary>
+        /// Called during OnDestroy before component is destroyed.
+        /// Use for custom cleanup logic.
+        /// Most cleanup is automatic (managed events, auto-registrations).
+        /// </summary>
+        ManagedDestroy
+    }
+}
+

Assets/Scripts/Core/Lifecycle/LifecycleEnums.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5f5f0f19f08240d4d9863b6be6a3cf03