diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity
index a858149c..7a4e23a8 100644
--- a/Assets/01_Scenes/Cave_Test_2.unity
+++ b/Assets/01_Scenes/Cave_Test_2.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01dc71f932eb55a37ad06c3233ec111ee46eecac67233d26fc9f71e43746c237
-size 1056085
+oid sha256:1772e755e8f9662001c6ac3b0dab414981cd77f927d74389fe73ef29f41dd307
+size 1077526
diff --git a/Assets/01_Scenes/InventoryTest.meta b/Assets/01_Scenes/InventoryTest.meta
new file mode 100644
index 00000000..c74826d9
--- /dev/null
+++ b/Assets/01_Scenes/InventoryTest.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07411883afd0e9042a8a0d7b5f5b387a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/01_Scenes/InventoryTest.unity b/Assets/01_Scenes/InventoryTest.unity
index f42cde82..14cdbedf 100644
--- a/Assets/01_Scenes/InventoryTest.unity
+++ b/Assets/01_Scenes/InventoryTest.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca0c2bc9936d4565d95fae6da943601351072ecfd860b9960b0a1941bda6e78d
-size 137666
+oid sha256:84a44ba920f2b7eba394f0d3bfedc3319db5a0840362a42c10ca409f068c66e7
+size 153302
diff --git a/Assets/01_Scenes/InventoryTest/Global Volume Profile.asset b/Assets/01_Scenes/InventoryTest/Global Volume Profile.asset
new file mode 100644
index 00000000..0128e02e
--- /dev/null
+++ b/Assets/01_Scenes/InventoryTest/Global Volume Profile.asset	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ce536e8471da930a3a89b250326973dba64b05f6dddd187fcd764c3d5a529d8
+size 1670
diff --git a/Assets/01_Scenes/InventoryTest/Global Volume Profile.asset.meta b/Assets/01_Scenes/InventoryTest/Global Volume Profile.asset.meta
new file mode 100644
index 00000000..635456b1
--- /dev/null
+++ b/Assets/01_Scenes/InventoryTest/Global Volume Profile.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 60b952ebf3e21e64e81ea8118924376f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/02_Scripts/Cave/ClamOpenClose.cs b/Assets/02_Scripts/Cave/ClamOpenClose.cs
index b88ae29b..1ea75db0 100644
--- a/Assets/02_Scripts/Cave/ClamOpenClose.cs
+++ b/Assets/02_Scripts/Cave/ClamOpenClose.cs
@@ -38,6 +38,36 @@ public class ClamOpenClose : MonoBehaviour
     [Tooltip("쾅 하고 닫힌 뒤 원래 닫힌 위치로 돌아오는 시간입니다.")]
     [SerializeField] private float snapCloseOvershootDuration = 0.02f;
 
+    [Header("Sound")]
+    [SerializeField] private AudioSource audioSource;
+
+    [Tooltip("조개가 닫히며 입이 부딪힐 때 재생할 사운드입니다. 여러 개를 넣으면 랜덤 재생됩니다.")]
+    [SerializeField] private AudioClip[] closeImpactSounds;
+
+    [Tooltip("조개가 닫히기 시작할 때 재생할 예고/마찰 사운드입니다. 필요 없으면 비워두세요.")]
+    [SerializeField] private AudioClip closeStartSound;
+
+    [Range(0f, 1f)]
+    [SerializeField] private float closeImpactVolume = 1f;
+
+    [Range(0f, 1f)]
+    [SerializeField] private float closeStartVolume = 0.5f;
+
+    [Tooltip("닫힘 충격음의 최소 피치입니다.")]
+    [SerializeField] private float minImpactPitch = 0.9f;
+
+    [Tooltip("닫힘 충격음의 최대 피치입니다.")]
+    [SerializeField] private float maxImpactPitch = 1.1f;
+
+    [Tooltip("닫힘 충격음의 볼륨을 살짝 랜덤하게 줄지 여부입니다.")]
+    [SerializeField] private bool randomizeImpactVolume = true;
+
+    [Tooltip("볼륨 랜덤 적용 시 최소 배율입니다.")]
+    [SerializeField] private float minImpactVolumeMultiplier = 0.85f;
+
+    [Tooltip("볼륨 랜덤 적용 시 최대 배율입니다.")]
+    [SerializeField] private float maxImpactVolumeMultiplier = 1.0f;
+
     [Header("Start Option")]
     [SerializeField] private bool startAutomatically = true;
     [SerializeField] private bool startOpened = false;
@@ -74,6 +104,17 @@ private void Awake()
             if (found != null) downShell = found;
         }
 
+        if (audioSource == null)
+        {
+            audioSource = GetComponent<AudioSource>();
+        }
+
+        if (audioSource != null)
+        {
+            audioSource.playOnAwake = false;
+            audioSource.loop = false;
+        }
+
         if (upShell == null)
         {
             Debug.LogWarning("[ClamOpenClose] UpShell이 연결되지 않았습니다.", this);
@@ -145,6 +186,7 @@ private IEnumerator OpenCloseRoutine()
             yield return new WaitForSeconds(openWait);
 
             isClosing = true;
+            PlayCloseStartSound();
             onCloseStarted?.Invoke();
 
             yield return MoveShells(
@@ -158,6 +200,10 @@ private IEnumerator OpenCloseRoutine()
 
             isOpen = false;
 
+            // 실제 입이 맞닿는 타이밍.
+            // 랜덤으로 닫혀도 항상 닫힘 동작이 끝난 직후 실행됨.
+            PlayCloseImpactSound();
+
             if (useSnapClose)
             {
                 yield return SnapCloseEffect();
@@ -225,6 +271,47 @@ private IEnumerator SnapCloseEffect()
             downShell.localRotation = downClosedRot;
     }
 
+    private void PlayCloseStartSound()
+    {
+        if (audioSource == null || closeStartSound == null)
+            return;
+
+        audioSource.pitch = 1f;
+        audioSource.PlayOneShot(closeStartSound, closeStartVolume);
+    }
+
+    private void PlayCloseImpactSound()
+    {
+        if (audioSource == null)
+            return;
+
+        if (closeImpactSounds == null || closeImpactSounds.Length == 0)
+            return;
+
+        AudioClip clip = closeImpactSounds[Random.Range(0, closeImpactSounds.Length)];
+
+        if (clip == null)
+            return;
+
+        float originalPitch = audioSource.pitch;
+
+        audioSource.pitch = Random.Range(minImpactPitch, maxImpactPitch);
+
+        float volume = closeImpactVolume;
+
+        if (randomizeImpactVolume)
+        {
+            float volumeMultiplier = Random.Range(minImpactVolumeMultiplier, maxImpactVolumeMultiplier);
+            volume *= volumeMultiplier;
+        }
+
+        audioSource.PlayOneShot(clip, volume);
+
+        // PlayOneShot은 재생 직후 피치를 바꿔도 이미 재생 중인 소리에 영향이 적지만,
+        // 다음 사운드 재생을 위해 기본 피치로 복구.
+        audioSource.pitch = originalPitch;
+    }
+
     private void SetClosedImmediately()
     {
         if (upShell != null)
diff --git a/Assets/02_Scripts/Cave/FallingStalactite.cs b/Assets/02_Scripts/Cave/FallingStalactite.cs
index 71aabb1f..a7554be1 100644
--- a/Assets/02_Scripts/Cave/FallingStalactite.cs
+++ b/Assets/02_Scripts/Cave/FallingStalactite.cs
@@ -23,6 +23,24 @@ public class FallingStalactite : MonoBehaviour
     [Tooltip("떨어지기 전에는 데미지를 끄고, 떨어질 때 켭니다.")]
     [SerializeField] private bool damageOnlyWhileFalling = true;
 
+    [Header("Sound")]
+    [SerializeField] private AudioSource audioSource;
+
+    [Tooltip("종유석이 떨어지기 시작할 때 재생할 소리입니다.")]
+    [SerializeField] private AudioClip fallSound;
+
+    [Range(0f, 1f)]
+    [SerializeField] private float fallSoundVolume = 1f;
+
+    [Tooltip("리셋 후 다시 떨어질 때도 소리를 재생할지 여부입니다.")]
+    [SerializeField] private bool playSoundEveryFall = true;
+
+    [Tooltip("Play through the shared 2D SFX pool when available so the fall cue is always audible.")]
+    [SerializeField] private bool playThroughSoundManager = true;
+
+    [Tooltip("Force the fallback AudioSource to 2D playback.")]
+    [SerializeField] private bool playFallSoundAs2D = true;
+
     [Header("Reset Option")]
     [SerializeField] private bool resetAfterFall = true;
 
@@ -38,6 +56,7 @@ public class FallingStalactite : MonoBehaviour
     private Vector3 startPosition;
     private Quaternion startRotation;
     private bool hasFallen;
+    private bool hasPlayedSound;
     private Coroutine fallRoutine;
 
     public bool HasFallen => hasFallen;
@@ -62,6 +81,9 @@ private void ResolveReferences()
 
         if (damageObstacle == null)
             damageObstacle = GetComponent<DamageObstacle>();
+
+        if (audioSource == null)
+            audioSource = GetComponent<AudioSource>();
     }
 
     private void PrepareStalactite()
@@ -85,7 +107,21 @@ private void PrepareStalactite()
             damageCollider.enabled = true;
         }
 
+        if (audioSource != null)
+        {
+            audioSource.playOnAwake = false;
+            audioSource.mute = false;
+
+            if (playFallSoundAs2D)
+                audioSource.spatialBlend = 0f;
+        }
+
+        PreloadFallSound();
+
         hasFallen = false;
+
+        if (playSoundEveryFall)
+            hasPlayedSound = false;
     }
 
     public void TriggerFall()
@@ -106,6 +142,8 @@ private IEnumerator FallRoutine()
         if (fallDelay > 0f)
             yield return new WaitForSeconds(fallDelay);
 
+        PlayFallSound();
+
         if (damageObstacle != null)
         {
             damageObstacle.SetDamage(damage);
@@ -137,6 +175,71 @@ private IEnumerator FallRoutine()
         fallRoutine = null;
     }
 
+    private AudioClip GetFallClip()
+    {
+        if (fallSound != null)
+            return fallSound;
+
+        if (audioSource != null)
+            return audioSource.clip;
+
+        return null;
+    }
+
+    private void PreloadFallSound()
+    {
+        AudioClip clipToLoad = GetFallClip();
+
+        if (clipToLoad != null && clipToLoad.loadState == AudioDataLoadState.Unloaded)
+            clipToLoad.LoadAudioData();
+    }
+
+    private void PlayFallSound()
+    {
+        if (hasPlayedSound && !playSoundEveryFall)
+            return;
+
+        AudioClip clipToPlay = GetFallClip();
+
+        if (clipToPlay == null)
+        {
+            if (showDebugLog)
+                Debug.LogWarning($"[FallingStalactite] {name} Fall Sound가 연결되지 않았습니다.", this);
+
+            return;
+        }
+
+        if (clipToPlay.loadState == AudioDataLoadState.Unloaded)
+            clipToPlay.LoadAudioData();
+
+        if (playThroughSoundManager && SoundManager.Instance != null)
+        {
+            SoundManager.Instance.PlaySFX(clipToPlay, fallSoundVolume);
+        }
+        else if (audioSource != null)
+        {
+            audioSource.enabled = true;
+            audioSource.mute = false;
+            audioSource.playOnAwake = false;
+
+            if (audioSource.volume <= 0f)
+                audioSource.volume = 1f;
+
+            if (playFallSoundAs2D)
+                audioSource.spatialBlend = 0f;
+
+            audioSource.PlayOneShot(clipToPlay, fallSoundVolume);
+        }
+        else
+        {
+            AudioSource.PlayClipAtPoint(clipToPlay, transform.position, fallSoundVolume);
+        }
+
+        hasPlayedSound = true;
+
+        if (showDebugLog)
+            Debug.Log($"[FallingStalactite] {name} 낙하 사운드 재생: {clipToPlay.name}", this);
+    }
     public void ResetStalactite()
     {
         if (rb != null)
@@ -161,6 +264,11 @@ public void ResetStalactite()
             hasFallen = false;
         }
 
+        if (playSoundEveryFall)
+        {
+            hasPlayedSound = false;
+        }
+
         if (showDebugLog)
             Debug.Log($"[FallingStalactite] {name} 원위치 리셋", this);
     }
diff --git a/Assets/02_Scripts/Cave/SteeringKeyGrabMusic.cs b/Assets/02_Scripts/Cave/SteeringKeyGrabMusic.cs
new file mode 100644
index 00000000..3684f29f
--- /dev/null
+++ b/Assets/02_Scripts/Cave/SteeringKeyGrabMusic.cs
@@ -0,0 +1,158 @@
+using System.Collections;
+using UnityEngine;
+using UnityEngine.XR.Interaction.Toolkit;
+using UnityEngine.XR.Interaction.Toolkit.Interactables;
+
+public class SteeringKeyGrabMusic : MonoBehaviour
+{
+    [Header("References")]
+    [SerializeField] private XRGrabInteractable grabInteractable;
+    [SerializeField] private AudioSource audioSource;
+
+    [Header("Playback")]
+    [SerializeField] private bool playOnGrab = true;
+    [SerializeField] private bool stopOnRelease = true;
+
+    [Tooltip("키를 잡았을 때 음악을 처음부터 다시 재생할지 여부입니다.")]
+    [SerializeField] private bool restartFromBeginningOnGrab = false;
+
+    [Header("Fade")]
+    [SerializeField] private bool useFade = true;
+    [SerializeField] private float fadeInDuration = 0.4f;
+    [SerializeField] private float fadeOutDuration = 0.5f;
+
+    [Range(0f, 1f)]
+    [SerializeField] private float targetVolume = 1f;
+
+    [Header("Debug")]
+    [SerializeField] private bool showDebugLog = true;
+
+    private Coroutine fadeRoutine;
+    private bool isGrabbed;
+
+    private void Awake()
+    {
+        if (grabInteractable == null)
+            grabInteractable = GetComponentInChildren<XRGrabInteractable>(true);
+
+        if (audioSource == null)
+            audioSource = GetComponent<AudioSource>();
+
+        if (audioSource != null)
+        {
+            audioSource.playOnAwake = false;
+            audioSource.loop = true;
+
+            if (useFade)
+                audioSource.volume = 0f;
+            else
+                audioSource.volume = targetVolume;
+        }
+    }
+
+    private void OnEnable()
+    {
+        if (grabInteractable != null)
+        {
+            grabInteractable.selectEntered.AddListener(OnKeyGrabbed);
+            grabInteractable.selectExited.AddListener(OnKeyReleased);
+        }
+    }
+
+    private void OnDisable()
+    {
+        if (grabInteractable != null)
+        {
+            grabInteractable.selectEntered.RemoveListener(OnKeyGrabbed);
+            grabInteractable.selectExited.RemoveListener(OnKeyReleased);
+        }
+    }
+
+    private void OnKeyGrabbed(SelectEnterEventArgs args)
+    {
+        isGrabbed = true;
+
+        if (!playOnGrab)
+            return;
+
+        if (audioSource == null)
+        {
+            if (showDebugLog)
+                Debug.LogWarning("[SteeringKeyGrabMusic] AudioSource가 연결되지 않았습니다.", this);
+
+            return;
+        }
+
+        if (restartFromBeginningOnGrab)
+            audioSource.time = 0f;
+
+        if (!audioSource.isPlaying)
+            audioSource.Play();
+
+        if (useFade)
+            StartFade(targetVolume, fadeInDuration);
+        else
+            audioSource.volume = targetVolume;
+
+        if (showDebugLog)
+            Debug.Log("[SteeringKeyGrabMusic] 키 잡음. 음악 재생.", this);
+    }
+
+    private void OnKeyReleased(SelectExitEventArgs args)
+    {
+        isGrabbed = false;
+
+        if (!stopOnRelease)
+            return;
+
+        if (audioSource == null)
+            return;
+
+        if (useFade)
+            StartFade(0f, fadeOutDuration, stopAfterFade: true);
+        else
+            audioSource.Stop();
+
+        if (showDebugLog)
+            Debug.Log("[SteeringKeyGrabMusic] 키 놓음. 음악 정지.", this);
+    }
+
+    private void StartFade(float target, float duration, bool stopAfterFade = false)
+    {
+        if (fadeRoutine != null)
+            StopCoroutine(fadeRoutine);
+
+        fadeRoutine = StartCoroutine(FadeRoutine(target, duration, stopAfterFade));
+    }
+
+    private IEnumerator FadeRoutine(float target, float duration, bool stopAfterFade)
+    {
+        if (audioSource == null)
+            yield break;
+
+        float startVolume = audioSource.volume;
+        float timer = 0f;
+        float safeDuration = Mathf.Max(0.01f, duration);
+
+        while (timer < safeDuration)
+        {
+            timer += Time.deltaTime;
+
+            float t = Mathf.Clamp01(timer / safeDuration);
+            float smoothT = t * t * (3f - 2f * t);
+
+            audioSource.volume = Mathf.Lerp(startVolume, target, smoothT);
+
+            yield return null;
+        }
+
+        audioSource.volume = target;
+
+        if (stopAfterFade && !isGrabbed)
+        {
+            audioSource.Stop();
+        }
+
+        fadeRoutine = null;
+    }
+}
diff --git a/Assets/02_Scripts/Cave/SteeringKeyGrabMusic.cs.meta b/Assets/02_Scripts/Cave/SteeringKeyGrabMusic.cs.meta
new file mode 100644
index 00000000..c4b6f780
--- /dev/null
+++ b/Assets/02_Scripts/Cave/SteeringKeyGrabMusic.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3a3e3221faafc724c82b5b177b84072e
\ No newline at end of file
diff --git a/Assets/02_Scripts/Managers/GameClear.cs b/Assets/02_Scripts/Managers/GameClear.cs
index c0e7e3ee..840eb45d 100644
--- a/Assets/02_Scripts/Managers/GameClear.cs
+++ b/Assets/02_Scripts/Managers/GameClear.cs
@@ -66,8 +66,10 @@ public void Relocate(GameObject target, Transform destination)
 
         if (target.TryGetComponent(out NavMeshAgent agent) && agent.isOnNavMesh)
         {
+            Debug.Log($"엔드포지션 : {destination.position}");
             agent.Warp(destination.position);
             target.transform.rotation = destination.rotation;
+            Debug.Log($"이동한포지션 : {target.transform.position}");
         }
         else
         {
diff --git a/Assets/04_Models/Cave/Sound.meta b/Assets/04_Models/Cave/Sound.meta
new file mode 100644
index 00000000..b32a509b
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dee9cf61a8aadaf429e8bbc70324fdd0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/Kim Lightyear - Now Or Never.mp3 b/Assets/04_Models/Cave/Sound/Kim Lightyear - Now Or Never.mp3
new file mode 100644
index 00000000..582d4cbf
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/Kim Lightyear - Now Or Never.mp3	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64f260361b370023ef06a86d21aa222f5371c7ef90546a47063748d2f8eda398
+size 7516597
diff --git a/Assets/04_Models/Cave/Sound/Kim Lightyear - Now Or Never.mp3.meta b/Assets/04_Models/Cave/Sound/Kim Lightyear - Now Or Never.mp3.meta
new file mode 100644
index 00000000..97ec9aa7
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/Kim Lightyear - Now Or Never.mp3.meta	
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 0d93a658fb069d14b94baf8f6370e4d2
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/Kim Lightyear - Waltz No. I.mp3 b/Assets/04_Models/Cave/Sound/Kim Lightyear - Waltz No. I.mp3
new file mode 100644
index 00000000..b42a57e8
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/Kim Lightyear - Waltz No. I.mp3	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efba5bf812989383f587c8a17c0fd3bdfd9f12970be66fc5752a6cfeab916041
+size 5812304
diff --git a/Assets/04_Models/Cave/Sound/Kim Lightyear - Waltz No. I.mp3.meta b/Assets/04_Models/Cave/Sound/Kim Lightyear - Waltz No. I.mp3.meta
new file mode 100644
index 00000000..2edb9521
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/Kim Lightyear - Waltz No. I.mp3.meta	
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e7d9d8354a2109f4ba357fc917160258
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/countdown.ogg b/Assets/04_Models/Cave/Sound/countdown.ogg
new file mode 100644
index 00000000..81dab392
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/countdown.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f60feb6d0e950b9075562c9ca185fa9fb2234e60db82ab98ea9b7736b3f8dd75
+size 86750
diff --git a/Assets/04_Models/Cave/Sound/countdown.ogg.meta b/Assets/04_Models/Cave/Sound/countdown.ogg.meta
new file mode 100644
index 00000000..b39d26ab
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/countdown.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 412c85a028de51b4cafafae492cadcde
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/fullmoonmix.ogg b/Assets/04_Models/Cave/Sound/fullmoonmix.ogg
new file mode 100644
index 00000000..0c385ac8
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/fullmoonmix.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6639abb11d89ffc399fac143c3f84a94e1b9652cbd7f4ecd3157f1d64cf1d2bb
+size 6627833
diff --git a/Assets/04_Models/Cave/Sound/fullmoonmix.ogg.meta b/Assets/04_Models/Cave/Sound/fullmoonmix.ogg.meta
new file mode 100644
index 00000000..9b5a992f
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/fullmoonmix.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ee3d441de1fde154683ccc675676911b
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/handleSmallLeather.ogg b/Assets/04_Models/Cave/Sound/handleSmallLeather.ogg
new file mode 100644
index 00000000..1afc2d53
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/handleSmallLeather.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae3cbf695aa0a8b98b5a80a835be5a3ccbd5446a24db2235cd4c3cd6fc92ed96
+size 10492
diff --git a/Assets/04_Models/Cave/Sound/handleSmallLeather.ogg.meta b/Assets/04_Models/Cave/Sound/handleSmallLeather.ogg.meta
new file mode 100644
index 00000000..ea2559b5
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/handleSmallLeather.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 0291ad2a65220ce419ab44320662568d
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/handleSmallLeather2.ogg b/Assets/04_Models/Cave/Sound/handleSmallLeather2.ogg
new file mode 100644
index 00000000..3be1b7da
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/handleSmallLeather2.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a66f6db5918ad016c28a9f2768f127a7f39b5fa04481e5a3b4e78ebe2a1c282d
+size 10028
diff --git a/Assets/04_Models/Cave/Sound/handleSmallLeather2.ogg.meta b/Assets/04_Models/Cave/Sound/handleSmallLeather2.ogg.meta
new file mode 100644
index 00000000..9974f77f
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/handleSmallLeather2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ed3213baaf41a2c49855f4169e4335e6
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/metalLatch.ogg b/Assets/04_Models/Cave/Sound/metalLatch.ogg
new file mode 100644
index 00000000..08b6eea1
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/metalLatch.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba9ba60b172b3ebc131a940f25793cd2e207aca7af73dc80d637277f060f1708
+size 10208
diff --git a/Assets/04_Models/Cave/Sound/metalLatch.ogg.meta b/Assets/04_Models/Cave/Sound/metalLatch.ogg.meta
new file mode 100644
index 00000000..641ec193
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/metalLatch.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 68eae6eb893a8a14ca5f9cf96bc4a3ca
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/race.mp3 b/Assets/04_Models/Cave/Sound/race.mp3
new file mode 100644
index 00000000..01af6e12
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/race.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5653426689978a4d07f0b7703ef5c7f8e67544f220c155c9d30a9af5b0edc4ee
+size 2200448
diff --git a/Assets/04_Models/Cave/Sound/race.mp3.meta b/Assets/04_Models/Cave/Sound/race.mp3.meta
new file mode 100644
index 00000000..98e605c1
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/race.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 32b693b7b610e06409cbeee291ac1891
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/shake.flac b/Assets/04_Models/Cave/Sound/shake.flac
new file mode 100644
index 00000000..686ce815
Binary files /dev/null and b/Assets/04_Models/Cave/Sound/shake.flac differ
diff --git a/Assets/04_Models/Cave/Sound/shake.flac.meta b/Assets/04_Models/Cave/Sound/shake.flac.meta
new file mode 100644
index 00000000..ac5fa375
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/shake.flac.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 405c61493d6a8bf49abb93262757461d
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 1
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Cave/Sound/졸졸졸.mp3 b/Assets/04_Models/Cave/Sound/졸졸졸.mp3
new file mode 100644
index 00000000..99365c24
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/졸졸졸.mp3
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d6039fbf01f6b64191d813bfbc9ac70f6749e5bb183d2807fb5cb117c10fd94
+size 12260589
diff --git a/Assets/04_Models/Cave/Sound/졸졸졸.mp3.meta b/Assets/04_Models/Cave/Sound/졸졸졸.mp3.meta
new file mode 100644
index 00000000..bf947114
--- /dev/null
+++ b/Assets/04_Models/Cave/Sound/졸졸졸.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: c382f26bd2a3f1148a62c975bfa95e08
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Characters/Fariy/Portrait/Fairy.png b/Assets/04_Models/Characters/Fariy/Portrait/Fairy.png
new file mode 100644
index 00000000..ec20a2f2
--- /dev/null
+++ b/Assets/04_Models/Characters/Fariy/Portrait/Fairy.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae2d69b1b93ebeaf3a2cc50c4e65e1a52122f918e82796635fd320c47063bd4f
+size 44434
diff --git a/Assets/04_Models/Characters/Fariy/Portrait/Fairy.png.meta b/Assets/04_Models/Characters/Fariy/Portrait/Fairy.png.meta
new file mode 100644
index 00000000..3b94b760
--- /dev/null
+++ b/Assets/04_Models/Characters/Fariy/Portrait/Fairy.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: c9a19c73d7aab0741afe8d852260749e
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Characters/Fariy/Portrait/PortraitFairy.png b/Assets/04_Models/Characters/Fariy/Portrait/PortraitFairy.png
deleted file mode 100644
index e8fe0f8e..00000000
--- a/Assets/04_Models/Characters/Fariy/Portrait/PortraitFairy.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80b1e7700d315501d9da7520e6b42827358bd04a0a1021225629d8a95a10fffc
-size 103805
diff --git a/Assets/04_Models/Objects/Coin.meta b/Assets/04_Models/Objects/Coin.meta
new file mode 100644
index 00000000..9a3ede54
--- /dev/null
+++ b/Assets/04_Models/Objects/Coin.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4bb0e920c399f6145a22564e7657b739
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Coin/Prefabs.meta b/Assets/04_Models/Objects/Coin/Prefabs.meta
new file mode 100644
index 00000000..972b74df
--- /dev/null
+++ b/Assets/04_Models/Objects/Coin/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9d91aa0966798154e902671e2b853748
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Coin/Prefabs/Coin.prefab b/Assets/04_Models/Objects/Coin/Prefabs/Coin.prefab
new file mode 100644
index 00000000..53547d7c
--- /dev/null
+++ b/Assets/04_Models/Objects/Coin/Prefabs/Coin.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:088461ab035a8cd7fd543ced07ef65bd9ece89025332fc8ee238a18ad15eb9f1
+size 4698
diff --git a/Assets/04_Models/Objects/Coin/Prefabs/Coin.prefab.meta b/Assets/04_Models/Objects/Coin/Prefabs/Coin.prefab.meta
new file mode 100644
index 00000000..bd1d8648
--- /dev/null
+++ b/Assets/04_Models/Objects/Coin/Prefabs/Coin.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 849ef977269c80240943faeafd08b54d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass.meta b/Assets/04_Models/Objects/Compass.meta
new file mode 100644
index 00000000..9fe1e529
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ffa37096907950c4aa658590259f8a22
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Compass.fbx b/Assets/04_Models/Objects/Compass/Compass.fbx
new file mode 100644
index 00000000..b2fbbd5d
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Compass.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8afed58062c39e06f8c0596dffe6ea4f1f67b1b45ae4687df462a618597d98db
+size 3305612
diff --git a/Assets/04_Models/Objects/Compass/Compass.fbx.meta b/Assets/04_Models/Objects/Compass/Compass.fbx.meta
new file mode 100644
index 00000000..f1a6d637
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Compass.fbx.meta
@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 9913b4e7fafa4a64bbd36c9a45c4a3a4
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Black
+    second: {fileID: 2100000, guid: 1a8de9091f72de642ae5573136d1665b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Dark blue
+    second: {fileID: 2100000, guid: f8938c9758fa37a4da3717f05741156e, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Gold
+    second: {fileID: 2100000, guid: 03f36afde4783104e92ba0568742b46b, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Red
+    second: {fileID: 2100000, guid: d6d3fef86baf01f478d20f456428953a, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: White
+    second: {fileID: 2100000, guid: 00e34c3f093649240aa45690e9cbe03d, type: 2}
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: gray
+    second: {fileID: 2100000, guid: 34bc18eb99ce3f14387a953e79886570, type: 2}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 0.1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 0.001
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials.meta b/Assets/04_Models/Objects/Compass/Materials.meta
new file mode 100644
index 00000000..cfb27fce
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f07fdfac494a1a24e9031c751748339c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials/Black.mat b/Assets/04_Models/Objects/Compass/Materials/Black.mat
new file mode 100644
index 00000000..9fc2616d
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Black.mat
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Black
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.14466995, g: 0.14466995, b: 0.14466995, a: 1}
+    - _Color: {r: 0.14466992, g: 0.14466992, b: 0.14466992, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &1028533970570792611
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
diff --git a/Assets/04_Models/Objects/Compass/Materials/Black.mat.meta b/Assets/04_Models/Objects/Compass/Materials/Black.mat.meta
new file mode 100644
index 00000000..6e2c22d4
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Black.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1a8de9091f72de642ae5573136d1665b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials/Dark blue.mat b/Assets/04_Models/Objects/Compass/Materials/Dark blue.mat
new file mode 100644
index 00000000..64d8d37c
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Dark blue.mat	
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2308815351894969385
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Dark blue
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.028877458, g: 0.06677327, b: 0.18391529, a: 1}
+    - _Color: {r: 0.028877458, g: 0.06677325, b: 0.18391526, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/04_Models/Objects/Compass/Materials/Dark blue.mat.meta b/Assets/04_Models/Objects/Compass/Materials/Dark blue.mat.meta
new file mode 100644
index 00000000..e4aaf8eb
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Dark blue.mat.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f8938c9758fa37a4da3717f05741156e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials/Gold.mat b/Assets/04_Models/Objects/Compass/Materials/Gold.mat
new file mode 100644
index 00000000..c9ba0465
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Gold.mat
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Gold
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.65
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.65
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 0.8516126, b: 0.73885804, a: 1}
+    - _Color: {r: 1, g: 0.8516126, b: 0.73885804, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &8116706486225992084
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
diff --git a/Assets/04_Models/Objects/Compass/Materials/Gold.mat.meta b/Assets/04_Models/Objects/Compass/Materials/Gold.mat.meta
new file mode 100644
index 00000000..9820da01
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Gold.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03f36afde4783104e92ba0568742b46b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials/Red.mat b/Assets/04_Models/Objects/Compass/Materials/Red.mat
new file mode 100644
index 00000000..60cd10c2
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Red.mat
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Red
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.9063317, g: 0.29322496, b: 0.29322496, a: 1}
+    - _Color: {r: 0.9063317, g: 0.2932249, b: 0.2932249, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &7243207145921113161
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
diff --git a/Assets/04_Models/Objects/Compass/Materials/Red.mat.meta b/Assets/04_Models/Objects/Compass/Materials/Red.mat.meta
new file mode 100644
index 00000000..f50e4e5e
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/Red.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d6d3fef86baf01f478d20f456428953a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials/White.mat b/Assets/04_Models/Objects/Compass/Materials/White.mat
new file mode 100644
index 00000000..0ab1e329
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/White.mat
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: White
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &8005775589462170591
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
diff --git a/Assets/04_Models/Objects/Compass/Materials/White.mat.meta b/Assets/04_Models/Objects/Compass/Materials/White.mat.meta
new file mode 100644
index 00000000..3727ac9f
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/White.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 00e34c3f093649240aa45690e9cbe03d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Materials/gray.mat b/Assets/04_Models/Objects/Compass/Materials/gray.mat
new file mode 100644
index 00000000..a234ccf2
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/gray.mat
@@ -0,0 +1,139 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4487342273543906093
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: gray
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.5812741, g: 0.5812741, b: 0.5812741, a: 1}
+    - _Color: {r: 0.5812741, g: 0.5812741, b: 0.5812741, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/04_Models/Objects/Compass/Materials/gray.mat.meta b/Assets/04_Models/Objects/Compass/Materials/gray.mat.meta
new file mode 100644
index 00000000..8317b0c0
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Materials/gray.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 34bc18eb99ce3f14387a953e79886570
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Prefabs.meta b/Assets/04_Models/Objects/Compass/Prefabs.meta
new file mode 100644
index 00000000..f62f36ad
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2f25a922cfcead74aad3edb2f211ad9d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Compass/Prefabs/Compass.prefab b/Assets/04_Models/Objects/Compass/Prefabs/Compass.prefab
new file mode 100644
index 00000000..be1631b4
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Prefabs/Compass.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1164e981afb4b21c6ad2a2d54f250c4a6b4bd17e1d854fd0e94a914ab453c78f
+size 5065
diff --git a/Assets/04_Models/Objects/Compass/Prefabs/Compass.prefab.meta b/Assets/04_Models/Objects/Compass/Prefabs/Compass.prefab.meta
new file mode 100644
index 00000000..8efcc6db
--- /dev/null
+++ b/Assets/04_Models/Objects/Compass/Prefabs/Compass.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8160b02adc548d944a4c000d06310e0f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish.meta b/Assets/04_Models/Objects/Fish.meta
new file mode 100644
index 00000000..3cc7ef78
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c35d16788ecec4d488974a851fe9b066
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Fish.fbx b/Assets/04_Models/Objects/Fish/Fish.fbx
new file mode 100644
index 00000000..a55801a4
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Fish.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d7aa91e857f447bdd1b2700ea984903d70ef3c421ba450353d3e2bf714d4e40
+size 40492
diff --git a/Assets/04_Models/Objects/Fish/Fish.fbx.meta b/Assets/04_Models/Objects/Fish/Fish.fbx.meta
new file mode 100644
index 00000000..494436c0
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Fish.fbx.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 30759966c9f90b140b1b9a2fec4ad9bd
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Material
+    second: {fileID: 2100000, guid: dde97a45ad7ce4f419cfebff8dd8e75f, type: 2}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Materials.meta b/Assets/04_Models/Objects/Fish/Materials.meta
new file mode 100644
index 00000000..06ffd1ca
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e0e4621475f88d9459192dd95f6aea27
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Materials/Material.mat b/Assets/04_Models/Objects/Fish/Materials/Material.mat
new file mode 100644
index 00000000..d33e33a0
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Materials/Material.mat
@@ -0,0 +1,143 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-9035946152128689496
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Material
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  - DepthOnly
+  - SHADOWCASTER
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: c3b5e888cd42d974a9f17f51588c5253, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: c3b5e888cd42d974a9f17f51588c5253, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _DstBlendAlpha: 10
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.6
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 1
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _EmissionColor: {r: 0.03773582, g: 0.03755782, b: 0.03755782, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/04_Models/Objects/Fish/Materials/Material.mat.meta b/Assets/04_Models/Objects/Fish/Materials/Material.mat.meta
new file mode 100644
index 00000000..300c56fa
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Materials/Material.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dde97a45ad7ce4f419cfebff8dd8e75f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Prefabs.meta b/Assets/04_Models/Objects/Fish/Prefabs.meta
new file mode 100644
index 00000000..734da019
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e905a106f953fd64288eedc95976f5f8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Prefabs/Fish.prefab b/Assets/04_Models/Objects/Fish/Prefabs/Fish.prefab
new file mode 100644
index 00000000..d47ea32c
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Prefabs/Fish.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cead168ca362bf336bad9163896d0409f71b7f12068ef8c38b36ee0c77beca4
+size 5641
diff --git a/Assets/04_Models/Objects/Fish/Prefabs/Fish.prefab.meta b/Assets/04_Models/Objects/Fish/Prefabs/Fish.prefab.meta
new file mode 100644
index 00000000..376d512e
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Prefabs/Fish.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c5ebd07deed95714ea97c9841c62e40e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Textures.meta b/Assets/04_Models/Objects/Fish/Textures.meta
new file mode 100644
index 00000000..964d573d
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3c59922f4c231c140b83d4a0d2fd0911
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Fish/Textures/bugill.png b/Assets/04_Models/Objects/Fish/Textures/bugill.png
new file mode 100644
index 00000000..df383145
--- /dev/null
+++ b/Assets/04_Models/Objects/Fish/Textures/bugill.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f20e54080b7465ead5a7d146af4a6cf30459f742470b3345aeae0300a6aa0fc9
+size 351363
diff --git a/Assets/04_Models/Characters/Fariy/Portrait/PortraitFairy.png.meta b/Assets/04_Models/Objects/Fish/Textures/bugill.png.meta
similarity index 98%
rename from Assets/04_Models/Characters/Fariy/Portrait/PortraitFairy.png.meta
rename to Assets/04_Models/Objects/Fish/Textures/bugill.png.meta
index fd77efa7..820fce20 100644
--- a/Assets/04_Models/Characters/Fariy/Portrait/PortraitFairy.png.meta
+++ b/Assets/04_Models/Objects/Fish/Textures/bugill.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: db353d4be915bfc4fac873cee55ffd1b
+guid: c3b5e888cd42d974a9f17f51588c5253
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -44,7 +44,7 @@ TextureImporter:
   lightmap: 0
   compressionQuality: 50
   spriteMode: 1
-  spriteExtrude: 0
+  spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
diff --git a/Assets/04_Models/Objects/Star.meta b/Assets/04_Models/Objects/Star.meta
new file mode 100644
index 00000000..f8b0a028
--- /dev/null
+++ b/Assets/04_Models/Objects/Star.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e234c1bb31a097445823e018a47638ed
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Materials.meta b/Assets/04_Models/Objects/Star/Materials.meta
new file mode 100644
index 00000000..23c852d3
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c62c5c4cda8379d4b80d3bf8849e568e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Materials/Star.mat b/Assets/04_Models/Objects/Star/Materials/Star.mat
new file mode 100644
index 00000000..7d34ac9b
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Materials/Star.mat
@@ -0,0 +1,142 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Star
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _METALLICSPECGLOSSMAP
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 9110849bd0e911940ac3bc45910b9a55, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 8462aaabec7ef2e48b721684a9659757, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 9110849bd0e911940ac3bc45910b9a55, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 2800000, guid: 669ae748d9998fa4b8ef30b8ee4e4177, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _EmissionColor: {r: 2.9960787, g: 2.6248112, b: 0.12719196, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+--- !u!114 &2087539054387982311
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
diff --git a/Assets/04_Models/Objects/Star/Materials/Star.mat.meta b/Assets/04_Models/Objects/Star/Materials/Star.mat.meta
new file mode 100644
index 00000000..237b6e31
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Materials/Star.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7415d67adb394384f876cddfbcb5b5fb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Prefabs.meta b/Assets/04_Models/Objects/Star/Prefabs.meta
new file mode 100644
index 00000000..56a8a183
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1ee919a05d3f0074d95b8447dcb8eab1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Prefabs/StarPiece.prefab b/Assets/04_Models/Objects/Star/Prefabs/StarPiece.prefab
new file mode 100644
index 00000000..b0bfd1c7
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Prefabs/StarPiece.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96cfa22174695d8c7ee0cfc7d529f7a875e8abaa616f00b9e711f7ee307dbaa2
+size 5647
diff --git a/Assets/04_Models/Objects/Star/Prefabs/StarPiece.prefab.meta b/Assets/04_Models/Objects/Star/Prefabs/StarPiece.prefab.meta
new file mode 100644
index 00000000..552d155d
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Prefabs/StarPiece.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a0d191b2a9fd35a4c853beafc12ccd57
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Textures.meta b/Assets/04_Models/Objects/Star/Textures.meta
new file mode 100644
index 00000000..f32b80e3
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec3247cd81bff9544a57297d6f3179de
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_BaseColor.png b/Assets/04_Models/Objects/Star/Textures/gold star_Star_BaseColor.png
new file mode 100644
index 00000000..ec147fd7
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_BaseColor.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b86a76fa109354762fefd4cd0b0f599551a6ab315879a04886a23600227b031
+size 758049
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_BaseColor.png.meta b/Assets/04_Models/Objects/Star/Textures/gold star_Star_BaseColor.png.meta
new file mode 100644
index 00000000..8cbd8dc6
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_BaseColor.png.meta	
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 9110849bd0e911940ac3bc45910b9a55
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_Metallic.png b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Metallic.png
new file mode 100644
index 00000000..30292873
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Metallic.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ea72adab41824a5fef4ccce96ed993b54329c1b40654d6c2e5696eda9d67d9c
+size 8575
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_Metallic.png.meta b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Metallic.png.meta
new file mode 100644
index 00000000..cf2b023a
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Metallic.png.meta	
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 669ae748d9998fa4b8ef30b8ee4e4177
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_Normal.png b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Normal.png
new file mode 100644
index 00000000..89eb1aeb
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Normal.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b80f1056ee6224f5b1ceadf3a613f5d60a34f2315fd95ef598513ad734fba9c
+size 1127480
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_Normal.png.meta b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Normal.png.meta
new file mode 100644
index 00000000..d4ad66ad
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Normal.png.meta	
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 8462aaabec7ef2e48b721684a9659757
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_Roughness.png b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Roughness.png
new file mode 100644
index 00000000..0fea1d00
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Roughness.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:360e7b20f16b2595f64ce4e1a0cd24dcc6bace8adbeb3a81f52ee477c8906335
+size 721254
diff --git a/Assets/04_Models/Objects/Star/Textures/gold star_Star_Roughness.png.meta b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Roughness.png.meta
new file mode 100644
index 00000000..434b199b
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/Textures/gold star_Star_Roughness.png.meta	
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: e7211f393bc971143b07dd58fc0fbbff
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/gold star.fbx b/Assets/04_Models/Objects/Star/gold star.fbx
new file mode 100644
index 00000000..c04faebe
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/gold star.fbx	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17998869d23e0e7bb801d98b1676e7653e039d7ed998ef04af49ad3d3a58daca
+size 2638380
diff --git a/Assets/04_Models/Objects/Star/gold star.fbx.meta b/Assets/04_Models/Objects/Star/gold star.fbx.meta
new file mode 100644
index 00000000..e51996f6
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/gold star.fbx.meta	
@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 2b52df9ce3a315b4bacdc93997e2b7ab
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Star
+    second: {fileID: 2100000, guid: 7415d67adb394384f876cddfbcb5b5fb, type: 2}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: gold star_Star_BaseColor
+    second: {fileID: 2800000, guid: 9110849bd0e911940ac3bc45910b9a55, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: gold star_Star_Metallic
+    second: {fileID: 2800000, guid: 669ae748d9998fa4b8ef30b8ee4e4177, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: gold star_Star_Normal
+    second: {fileID: 2800000, guid: 8462aaabec7ef2e48b721684a9659757, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: gold star_Star_Roughness
+    second: {fileID: 2800000, guid: e7211f393bc971143b07dd58fc0fbbff, type: 3}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Star/star_piece.fbx b/Assets/04_Models/Objects/Star/star_piece.fbx
new file mode 100644
index 00000000..00218fb1
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/star_piece.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce2c1f9f50365b79dd8a388f05fbc427327b45ddb1391bae5ca476a7d4dea9f3
+size 22172
diff --git a/Assets/04_Models/Objects/Star/star_piece.fbx.meta b/Assets/04_Models/Objects/Star/star_piece.fbx.meta
new file mode 100644
index 00000000..601d03f1
--- /dev/null
+++ b/Assets/04_Models/Objects/Star/star_piece.fbx.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: c747f1fdcc3498b4485d968ca0e58928
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: Star
+    second: {fileID: 2100000, guid: 7415d67adb394384f876cddfbcb5b5fb, type: 2}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash.meta b/Assets/04_Models/Objects/Trash.meta
new file mode 100644
index 00000000..dc32a0d8
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 14dfe05be21d8134c800ef8a34aedbde
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/CrumbledPaper.fbx b/Assets/04_Models/Objects/Trash/CrumbledPaper.fbx
new file mode 100644
index 00000000..143de412
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/CrumbledPaper.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9451cacd78606cdd131427a5ea9ce7a046d530a678b263038326cf0fcc9f095
+size 7171548
diff --git a/Assets/04_Models/Objects/Trash/CrumbledPaper.fbx.meta b/Assets/04_Models/Objects/Trash/CrumbledPaper.fbx.meta
new file mode 100644
index 00000000..ef2ad21e
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/CrumbledPaper.fbx.meta
@@ -0,0 +1,125 @@
+fileFormatVersion: 2
+guid: ff11b9d539f5b5240ad50ad686ae80c2
+ModelImporter:
+  serializedVersion: 24200
+  internalIDToNameTable: []
+  externalObjects:
+  - first:
+      type: UnityEngine:Material
+      assembly: UnityEngine.CoreModule
+      name: papersheets
+    second: {fileID: 2100000, guid: 51ce456bcf9711940a32511568c8a4e2, type: 2}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: paper_sketches
+    second: {fileID: 2800000, guid: 3cf7e4b367077f047a2ff7dcc88e7dc3, type: 3}
+  - first:
+      type: UnityEngine:Texture2D
+      assembly: UnityEngine.CoreModule
+      name: papersheets_Normal
+    second: {fileID: 2800000, guid: 45e085b01ac9d734d9cee78fb09b9676, type: 3}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    generateMeshLods: 0
+    meshLodGenerationFlags: 0
+    maximumMeshLod: -1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Materials.meta b/Assets/04_Models/Objects/Trash/Materials.meta
new file mode 100644
index 00000000..9ca4add6
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 67e831203af89514b97250224e9ac7af
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Materials/papersheets.mat b/Assets/04_Models/Objects/Trash/Materials/papersheets.mat
new file mode 100644
index 00000000..05bb615f
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Materials/papersheets.mat
@@ -0,0 +1,140 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2993478500133361681
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: papersheets
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 3cf7e4b367077f047a2ff7dcc88e7dc3, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 45e085b01ac9d734d9cee78fb09b9676, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 3cf7e4b367077f047a2ff7dcc88e7dc3, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.2
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/04_Models/Objects/Trash/Materials/papersheets.mat.meta b/Assets/04_Models/Objects/Trash/Materials/papersheets.mat.meta
new file mode 100644
index 00000000..f79bda5c
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Materials/papersheets.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 51ce456bcf9711940a32511568c8a4e2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Prefabs.meta b/Assets/04_Models/Objects/Trash/Prefabs.meta
new file mode 100644
index 00000000..b4f80652
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 743afced418312740819b50a3c96e35b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Prefabs/Trash.prefab b/Assets/04_Models/Objects/Trash/Prefabs/Trash.prefab
new file mode 100644
index 00000000..a73670fd
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Prefabs/Trash.prefab
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d27fcea49a3c8202bc37e24526b45704ab750c74668581e470430c88c5455f92
+size 5061
diff --git a/Assets/04_Models/Objects/Trash/Prefabs/Trash.prefab.meta b/Assets/04_Models/Objects/Trash/Prefabs/Trash.prefab.meta
new file mode 100644
index 00000000..05250637
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Prefabs/Trash.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2659fa13ce1dee140906102e44a9f420
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Textures.meta b/Assets/04_Models/Objects/Trash/Textures.meta
new file mode 100644
index 00000000..f98fc81c
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fc8a8ae573abb8f459b6cffb10df053f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Textures/paper_sketches.png b/Assets/04_Models/Objects/Trash/Textures/paper_sketches.png
new file mode 100644
index 00000000..e820d4b1
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Textures/paper_sketches.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76ba3b8746c0164bce9efa7d5e42b0bda19a135d1c74c22cec886757ed7147bb
+size 2762135
diff --git a/Assets/04_Models/Objects/Trash/Textures/paper_sketches.png.meta b/Assets/04_Models/Objects/Trash/Textures/paper_sketches.png.meta
new file mode 100644
index 00000000..29726282
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Textures/paper_sketches.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 3cf7e4b367077f047a2ff7dcc88e7dc3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/04_Models/Objects/Trash/Textures/papersheets_Normal.png b/Assets/04_Models/Objects/Trash/Textures/papersheets_Normal.png
new file mode 100644
index 00000000..e0832883
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Textures/papersheets_Normal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93db3e9a87041e009c4f378c763ab063216c90042aaae9a6db9257708ec924e0
+size 4261361
diff --git a/Assets/04_Models/Objects/Trash/Textures/papersheets_Normal.png.meta b/Assets/04_Models/Objects/Trash/Textures/papersheets_Normal.png.meta
new file mode 100644
index 00000000..54e9b115
--- /dev/null
+++ b/Assets/04_Models/Objects/Trash/Textures/papersheets_Normal.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 45e085b01ac9d734d9cee78fb09b9676
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon.meta b/Assets/05_Textures/Icon.meta
new file mode 100644
index 00000000..0dbc77b5
--- /dev/null
+++ b/Assets/05_Textures/Icon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 21d434067d4dd0c4d91d84a2e345c52c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon/Items.meta b/Assets/05_Textures/Icon/Items.meta
new file mode 100644
index 00000000..12064326
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ceb117588ce61f741a0012e947579b3d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon/Items/Coin_Pickup.png b/Assets/05_Textures/Icon/Items/Coin_Pickup.png
new file mode 100644
index 00000000..24ad3dd7
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/Coin_Pickup.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d5e87df863bd067e245b132a9d1e94a898241759f209a2de46376985c43e838
+size 16359
diff --git a/Assets/05_Textures/Icon/Items/Coin_Pickup.png.meta b/Assets/05_Textures/Icon/Items/Coin_Pickup.png.meta
new file mode 100644
index 00000000..667d4ea2
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/Coin_Pickup.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 34e8933e28ced1c469fd2ec8aaa43751
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon/Items/Compass.png b/Assets/05_Textures/Icon/Items/Compass.png
new file mode 100644
index 00000000..16a880a8
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/Compass.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:387a21ced612f0940042f772cad6affd21b23461b639aa35a081b79374fc7e6b
+size 30326
diff --git a/Assets/05_Textures/Icon/Items/Compass.png.meta b/Assets/05_Textures/Icon/Items/Compass.png.meta
new file mode 100644
index 00000000..a3d7055b
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/Compass.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: f39bc234c71b41c4eb9cac7506921bf2
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon/Items/CrumbledPaper.png b/Assets/05_Textures/Icon/Items/CrumbledPaper.png
new file mode 100644
index 00000000..4f5fea13
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/CrumbledPaper.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fbadb180377187291f96de43b88efb4960a292fa46459a328259f6bebe01e86
+size 53511
diff --git a/Assets/05_Textures/Icon/Items/CrumbledPaper.png.meta b/Assets/05_Textures/Icon/Items/CrumbledPaper.png.meta
new file mode 100644
index 00000000..07efdc45
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/CrumbledPaper.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 2dffb8e9e1330554f9073f94341d710c
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon/Items/Fish.png b/Assets/05_Textures/Icon/Items/Fish.png
new file mode 100644
index 00000000..e4d1eaf9
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/Fish.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fd3c0c39e3a8b0e36be018c688d1768b87252f64c5b8f61e515400b57722325
+size 47598
diff --git a/Assets/05_Textures/Icon/Items/Fish.png.meta b/Assets/05_Textures/Icon/Items/Fish.png.meta
new file mode 100644
index 00000000..6c517304
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/Fish.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 047f00921d656a94f9656bc8cdad3ff4
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/05_Textures/Icon/Items/star_piece.png b/Assets/05_Textures/Icon/Items/star_piece.png
new file mode 100644
index 00000000..01685193
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/star_piece.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85ee9df41e2ce8571c298045be50637607b0bab5e78b15761183ecabbbb341b8
+size 5602
diff --git a/Assets/05_Textures/Icon/Items/star_piece.png.meta b/Assets/05_Textures/Icon/Items/star_piece.png.meta
new file mode 100644
index 00000000..61e7e5e0
--- /dev/null
+++ b/Assets/05_Textures/Icon/Items/star_piece.png.meta
@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 25dbddb542f32874ab794aa846d8dd9d
+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: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - 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: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/07_Data/Character/Fairy.asset b/Assets/07_Data/Character/Fairy.asset
index c89fcabd..c9e54b01 100644
--- a/Assets/07_Data/Character/Fairy.asset
+++ b/Assets/07_Data/Character/Fairy.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77350c7e0b867242c416868125762ee83841eb1c6b603656e5f4ca6cceeed685
+oid sha256:6f35deb24c21afd8bda3a420b2678ecc747dddb33142456786ba7d4d2027c049
 size 551
diff --git a/Assets/My project/Fonts/Pretendard-Black SDF.asset b/Assets/My project/Fonts/Pretendard-Black SDF.asset
index 01c41b88..e69de29b 100644
--- a/Assets/My project/Fonts/Pretendard-Black SDF.asset	
+++ b/Assets/My project/Fonts/Pretendard-Black SDF.asset	
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ccacb1210dcf44733789ba71297189031135924fe6ed6583eeb1e00733943c15
-size 41394890
diff --git a/Assets/My project/Inventory/Prefabs/InventoryMiniUI.prefab.meta b/Assets/My project/Inventory/Prefabs/InventoryMiniUI.prefab.meta
index 4ff5fb16..02c69322 100644
--- a/Assets/My project/Inventory/Prefabs/InventoryMiniUI.prefab.meta	
+++ b/Assets/My project/Inventory/Prefabs/InventoryMiniUI.prefab.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b48b2192c45050d4592c9211d7817e28
+guid: f0db9ef8810ed2e4fad874ce8a39d817
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/Assets/My project/Inventory/Scripts/InventoryItemType.cs.meta b/Assets/My project/Inventory/Scripts/InventoryItemType.cs.meta
index 709ea638..07801a9b 100644
--- a/Assets/My project/Inventory/Scripts/InventoryItemType.cs.meta	
+++ b/Assets/My project/Inventory/Scripts/InventoryItemType.cs.meta	
@@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: 9fc654a578c829244936abec2cf40091
\ No newline at end of file
+guid: a363e83699ebc374c8aab5d2859976cd
\ No newline at end of file
diff --git a/Assets/My project/Inventory/Scripts/InventoryManager.cs b/Assets/My project/Inventory/Scripts/InventoryManager.cs
index 2d5c0c14..e2cb36c8 100644
--- a/Assets/My project/Inventory/Scripts/InventoryManager.cs	
+++ b/Assets/My project/Inventory/Scripts/InventoryManager.cs	
@@ -3,6 +3,33 @@
 using UnityEngine;
 using UnityEngine.Events;
 
+/// <summary>
+/// 인벤토리에서 관리할 아이템 종류입니다.
+/// 아이템을 추가하려면 여기에 enum 값을 추가하고, InventoryManager의 itemDefinitions에도 데이터를 추가하세요.
+/// </summary>
+public enum InventoryItemType
+{
+    Fish,
+    OldCompass,
+    Trash,
+    Bottle,
+    MemoryPiece
+}
+
+/// <summary>
+/// 인벤토리 UI 필터/정렬에 사용할 간단한 카테고리입니다.
+/// </summary>
+public enum InventoryItemCategory
+{
+    All,
+    Consumable,
+    Quest,
+    Collectible,
+    KeyItem,
+    Material,
+    Other
+}
+
 [Serializable]
 public class InventoryItemStack
 {
@@ -11,40 +38,212 @@ public class InventoryItemStack
 }
 
 [Serializable]
-public class InventoryItemChangedEvent : UnityEvent<InventoryItemType, int>
+public class InventoryItemDefinition
 {
+    [Header("Identity")]
+    public InventoryItemType itemType;
+    public string displayName;
+    [TextArea(2, 5)] public string description;
+    [TextArea(1, 3)] public string goalHint;
+
+    [Header("Visuals")]
+    public Sprite icon;
+    public Sprite slotBackground;
+    public bool importantItem;
+
+    [Header("Rules")]
+    public InventoryItemCategory category = InventoryItemCategory.Other;
+    [Tooltip("0 이하이면 InventoryManager의 기본 최대 소지 수량을 사용합니다.")]
+    public int maxCount = 99;
+    public bool usable = false;
+    public bool consumeOnUse = true;
+    public bool requireUseConfirmation = false;
+    public string useLabel = "사용";
+    public string useSuccessMessage;
+    public string useFailMessage;
+
+    [Header("Audio")]
+    public AudioClip acquisitionClip;
+    public AudioClip useClip;
+
+    [Header("Slot Display Override")]
+    public bool overrideSlotDisplaySettings = false;
+    public bool hideWhenZero = false;
+    public bool dimWhenZero = true;
+    [Range(0f, 1f)] public float zeroAlpha = 0.35f;
+    [Range(0f, 1f)] public float ownedAlpha = 1f;
+
+    public string SafeDisplayName => string.IsNullOrWhiteSpace(displayName) ? itemType.ToString() : displayName;
 }
 
+[Serializable]
+public class InventoryLogEntry
+{
+    public InventoryItemType itemType;
+    public int amount;
+    public string action;
+    public string displayName;
+    public string timeText;
+
+    public InventoryLogEntry() { }
+
+    public InventoryLogEntry(InventoryItemType itemType, int amount, string action, string displayName)
+    {
+        this.itemType = itemType;
+        this.amount = amount;
+        this.action = action;
+        this.displayName = displayName;
+        timeText = DateTime.Now.ToString("HH:mm:ss");
+    }
+
+    public override string ToString()
+    {
+        string amountText = amount > 0 ? $" x{amount}" : string.Empty;
+        return $"[{timeText}] {displayName}{amountText} {action}";
+    }
+}
+
+[Serializable] public class InventoryItemChangedEvent : UnityEvent<InventoryItemType, int> { }
+[Serializable] public class InventoryItemAmountEvent : UnityEvent<InventoryItemType, int, int> { }
+[Serializable] public class InventoryStringEvent : UnityEvent<string> { }
+[Serializable] public class InventoryProgressEvent : UnityEvent<int, int> { }
+
 /// <summary>
 /// 실제 아이템 개수를 관리하는 중심 스크립트입니다.
-/// UI를 직접 수정하지 않고, 아이템 개수 변경 이벤트만 알려줍니다.
+/// 기능: 싱글톤, 저장/불러오기, 최대 소지 수량, 사용, 부족 안내, 획득 로그, 기억의 조각 진행도 이벤트.
 /// </summary>
 [DisallowMultipleComponent]
 public class InventoryManager : MonoBehaviour
 {
+    public static InventoryManager Instance { get; private set; }
+
+    [Header("Singleton")]
+    [SerializeField] private bool useSingleton = true;
+    [SerializeField] private bool dontDestroyOnLoad = true;
+    [SerializeField] private bool destroyDuplicateManagers = true;
+
     [Header("Initial Items")]
     [SerializeField] private List<InventoryItemStack> initialItems = new List<InventoryItemStack>();
 
+    [Header("Item Definitions")]
+    [SerializeField] private List<InventoryItemDefinition> itemDefinitions = new List<InventoryItemDefinition>()
+    {
+        new InventoryItemDefinition { itemType = InventoryItemType.Fish, displayName = "생선", description = "고양이 합창단이 좋아합니다.", goalHint = "고양이에게 줄 수 있습니다.", category = InventoryItemCategory.Consumable, maxCount = 99, usable = true, consumeOnUse = true, useSuccessMessage = "생선을 사용했습니다." },
+        new InventoryItemDefinition { itemType = InventoryItemType.OldCompass, displayName = "낡은 나침반", description = "미로에서 길을 찾는 데 도움이 됩니다.", goalHint = "미로에서 힌트를 볼 때 필요합니다.", category = InventoryItemCategory.KeyItem, maxCount = 1, usable = true, consumeOnUse = false, importantItem = true, useSuccessMessage = "나침반이 방향을 가리킵니다." },
+        new InventoryItemDefinition { itemType = InventoryItemType.Trash, displayName = "쓰레기", description = "낚시터를 정화하는 데 필요합니다.", goalHint = "정화 장치에 넣을 수 있습니다.", category = InventoryItemCategory.Material, maxCount = 99, usable = true, consumeOnUse = true, useSuccessMessage = "쓰레기를 사용했습니다." },
+        new InventoryItemDefinition { itemType = InventoryItemType.Bottle, displayName = "마법병", description = "바다 속에서 발견한 수상한 병입니다.", goalHint = "특정 이벤트에서 사용할 수 있습니다.", category = InventoryItemCategory.KeyItem, maxCount = 1, usable = true, consumeOnUse = false, importantItem = true, requireUseConfirmation = true, useSuccessMessage = "마법병을 사용했습니다." },
+        new InventoryItemDefinition { itemType = InventoryItemType.MemoryPiece, displayName = "기억의 조각", description = "제페토를 구출하기 위한 중요한 조각입니다.", goalHint = "모든 조각을 모으면 중요한 이벤트가 열립니다.", category = InventoryItemCategory.Quest, maxCount = 5, usable = false, consumeOnUse = false, importantItem = true }
+    };
+
+    [Header("Limits")]
+    [Tooltip("0 이하이면 기본 최대 수량 제한을 사용하지 않습니다. 아이템 정의의 maxCount가 있으면 그것이 우선됩니다.")]
+    [SerializeField] private int defaultMaxCount = 999;
+
+    [Header("Memory Piece Progress")]
+    [SerializeField] private InventoryItemType memoryPieceItemType = InventoryItemType.MemoryPiece;
+    [Min(1)] [SerializeField] private int memoryPieceTargetCount = 5;
+
+    [Header("Save / Load")]
+    [SerializeField] private bool loadOnAwake = true;
+    [SerializeField] private bool saveOnChange = true;
+    [Tooltip("Persistent Pickup/Reward 완료 상태는 아이템 수량 자동 저장을 꺼도 저장하는 것을 권장합니다.")]
+    [SerializeField] private bool forceSavePersistentState = true;
+    [SerializeField] private string saveKey = "Inventory_SaveData";
+
+    [Header("Recent Log")]
+    [SerializeField] private bool keepRecentLogs = true;
+    [SerializeField] private int maxRecentLogCount = 5;
+
     [Header("Events")]
     public InventoryItemChangedEvent onItemCountChanged;
+    public InventoryItemAmountEvent onItemAdded;
+    public InventoryItemAmountEvent onItemRemoved;
+    public InventoryItemChangedEvent onItemUsed;
+    public InventoryStringEvent onMessageRequested;
+    public InventoryProgressEvent onMemoryPieceProgressChanged;
+    public UnityEvent onMemoryPieceCompleted;
     public UnityEvent onInventoryChanged;
 
+    [Header("UI")]
+    [SerializeField] private InventoryUI _inventoryUI;
+
     [Header("Debug")]
     [SerializeField] private bool showDebugLog = true;
 
     private readonly Dictionary<InventoryItemType, int> itemCounts = new Dictionary<InventoryItemType, int>();
+    private readonly HashSet<string> consumedPersistentKeys = new HashSet<string>();
+    private readonly List<InventoryLogEntry> recentLogs = new List<InventoryLogEntry>();
 
     public event Action<InventoryItemType, int> ItemCountChanged;
+    public event Action<InventoryItemType, int, int> ItemAdded;
+    public event Action<InventoryItemType, int, int> ItemRemoved;
+    public event Action<InventoryItemType, int> ItemUsed;
     public event Action InventoryChanged;
+    public event Action<string> MessageRequested;
+    public event Action<InventoryLogEntry> LogAdded;
+    public event Action<int, int> MemoryPieceProgressChanged;
+    public event Action MemoryPieceCompleted;
+
+    private bool memoryPieceCompletedNotified;
+
+    public int MemoryPieceTargetCount => memoryPieceTargetCount;
+    public InventoryItemType MemoryPieceItemType => memoryPieceItemType;
 
     private void Awake()
     {
+        if (useSingleton)
+        {
+            if (Instance != null && Instance != this)
+            {
+                if (showDebugLog)
+                    Debug.LogWarning($"[InventoryManager] 중복 InventoryManager 발견: {name}");
+
+                if (destroyDuplicateManagers)
+                {
+                    Destroy(gameObject);
+                    return;
+                }
+            }
+            else
+            {
+                Instance = this;
+
+                if (dontDestroyOnLoad)
+                    DontDestroyOnLoad(gameObject);
+            }
+        }
+
+        EnsureItemDefinitions();
         InitializeFromInspector();
+
+        if (loadOnAwake)
+            LoadInventory(false);
     }
 
     private void Start()
     {
         NotifyAllItemsChanged();
+        NotifyMemoryPieceProgress();
+    }
+
+    private void EnsureItemDefinitions()
+    {
+        if (itemDefinitions == null)
+            itemDefinitions = new List<InventoryItemDefinition>();
+
+        foreach (InventoryItemType itemType in Enum.GetValues(typeof(InventoryItemType)))
+        {
+            if (GetDefinitionInternal(itemType) == null)
+            {
+                itemDefinitions.Add(new InventoryItemDefinition
+                {
+                    itemType = itemType,
+                    displayName = itemType.ToString(),
+                    maxCount = defaultMaxCount,
+                    category = InventoryItemCategory.Other
+                });
+            }
+        }
     }
 
     private void InitializeFromInspector()
@@ -60,7 +259,7 @@ private void InitializeFromInspector()
             if (stack == null)
                 continue;
 
-            itemCounts[stack.itemType] = Mathf.Max(0, stack.count);
+            itemCounts[stack.itemType] = ClampCount(stack.itemType, stack.count);
         }
     }
 
@@ -71,14 +270,43 @@ public void AddItem(InventoryItemType itemType)
 
     public void AddItem(InventoryItemType itemType, int amount)
     {
-        if (amount <= 0)
-            return;
+        AddItemAndGetAddedAmount(itemType, amount);
+    }
 
-        int newCount = GetItemCount(itemType) + amount;
-        SetItemCount(itemType, newCount);
+    /// <summary>
+    /// 실제로 추가된 개수를 반환합니다. 최대 소지 수량에 막히면 요청량보다 적을 수 있습니다.
+    /// </summary>
+    public int AddItemAndGetAddedAmount(InventoryItemType itemType, int amount)
+    {
+        if (amount <= 0)
+            return 0;
+
+        int previousCount = GetItemCount(itemType);
+        int newCount = ClampCount(itemType, previousCount + amount);
+        int addedAmount = Mathf.Max(0, newCount - previousCount);
+
+        if (addedAmount <= 0)
+        {
+            RequestMessage($"{GetDisplayName(itemType)}은(는) 더 이상 가질 수 없습니다.");
+
+            if (showDebugLog)
+                Debug.Log($"[InventoryManager] {itemType} 최대 소지 수량 도달: {previousCount}");
+
+            return 0;
+        }
+
+        itemCounts[itemType] = newCount;
+        NotifyItemChanged(itemType, newCount);
+        NotifyItemAdded(itemType, addedAmount, newCount);
+        AddLog(itemType, addedAmount, "획득");
+
+        if (saveOnChange)
+            SaveInventory();
 
         if (showDebugLog)
-            Debug.Log($"[InventoryManager] {itemType} +{amount} => {newCount}");
+            Debug.Log($"[InventoryManager] {itemType} +{addedAmount} => {newCount}");
+
+        return addedAmount;
     }
 
     public bool RemoveItem(InventoryItemType itemType)
@@ -95,19 +323,84 @@ public bool RemoveItem(InventoryItemType itemType, int amount)
 
         if (current < amount)
         {
+            RequestMessage(GetInsufficientMessage(itemType, amount));
+
             if (showDebugLog)
                 Debug.LogWarning($"[InventoryManager] {itemType} 부족: 현재 {current}, 필요 {amount}");
 
             return false;
         }
 
-        SetItemCount(itemType, current - amount);
+        int newCount = current - amount;
+        itemCounts[itemType] = newCount;
+        NotifyItemChanged(itemType, newCount);
+        NotifyItemRemoved(itemType, amount, newCount);
+        AddLog(itemType, amount, "소모");
+
+        if (saveOnChange)
+            SaveInventory();
+
+        return true;
+    }
+
+    public bool UseItem(InventoryItemType itemType)
+    {
+        return UseItem(itemType, 1);
+    }
+
+    public bool UseItem(InventoryItemType itemType, int amount)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        bool consume = definition == null || definition.consumeOnUse;
+        return TryUseItem(itemType, amount, consume, true, true);
+    }
+
+    /// <summary>
+    /// 아이템을 사용합니다. 실제 게임 효과는 성공 이벤트나 외부 스크립트에서 처리하세요.
+    /// consume=false이면 보유 여부만 확인하고 개수는 줄이지 않습니다.
+    /// showMessages=false이면 부족/성공 안내를 표시하지 않습니다.
+    /// </summary>
+    public bool TryUseItem(InventoryItemType itemType, int amount, bool consume, bool showMessages = true, bool addUseLog = true)
+    {
+        amount = Mathf.Max(1, amount);
+
+        if (!HasItem(itemType, amount))
+        {
+            if (showMessages)
+                RequestMessage(GetInsufficientMessage(itemType, amount));
+
+            return false;
+        }
+
+        if (consume && !RemoveItem(itemType, amount))
+            return false;
+
+        ItemUsed?.Invoke(itemType, GetItemCount(itemType));
+        onItemUsed?.Invoke(itemType, GetItemCount(itemType));
+
+        // consume=true인 경우 RemoveItem에서 이미 "소모" 로그가 남습니다.
+        // consume=false인 빠른 사용(예: 나침반 확인)은 별도 "사용" 로그를 남깁니다.
+        if (addUseLog && !consume)
+            AddLog(itemType, amount, "사용");
+
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        if (showMessages)
+        {
+            string message = definition != null && !string.IsNullOrWhiteSpace(definition.useSuccessMessage)
+                ? definition.useSuccessMessage
+                : $"{GetDisplayName(itemType)}을(를) 사용했습니다.";
+            RequestMessage(message);
+        }
+
+        if (saveOnChange)
+            SaveInventory();
+
         return true;
     }
 
     public void SetItemCount(InventoryItemType itemType, int count)
     {
-        int clampedCount = Mathf.Max(0, count);
+        int clampedCount = ClampCount(itemType, count);
         int previousCount = GetItemCount(itemType);
 
         if (previousCount == clampedCount)
@@ -115,6 +408,9 @@ public void SetItemCount(InventoryItemType itemType, int count)
 
         itemCounts[itemType] = clampedCount;
         NotifyItemChanged(itemType, clampedCount);
+
+        if (saveOnChange)
+            SaveInventory();
     }
 
     public int GetItemCount(InventoryItemType itemType)
@@ -135,17 +431,331 @@ public bool HasItem(InventoryItemType itemType, int requiredAmount)
         return GetItemCount(itemType) >= Mathf.Max(1, requiredAmount);
     }
 
+    public int GetMaxCount(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+
+        if (definition != null && definition.maxCount > 0)
+            return definition.maxCount;
+
+        return Mathf.Max(0, defaultMaxCount);
+    }
+
+    /// <summary>
+    /// 현재 소지 수량과 최대 소지 수량을 기준으로 실제로 더 넣을 수 있는 개수를 반환합니다.
+    /// maxCount가 0 이하이면 제한 없음으로 취급합니다.
+    /// </summary>
+    public int GetAddableAmount(InventoryItemType itemType, int requestedAmount)
+    {
+        requestedAmount = Mathf.Max(0, requestedAmount);
+        if (requestedAmount <= 0)
+            return 0;
+
+        int maxCount = GetMaxCount(itemType);
+        if (maxCount <= 0)
+            return requestedAmount;
+
+        int current = GetItemCount(itemType);
+        return Mathf.Clamp(maxCount - current, 0, requestedAmount);
+    }
+
+    public bool CanAddItem(InventoryItemType itemType, int amount = 1, bool requireFullAmount = false)
+    {
+        amount = Mathf.Max(1, amount);
+        int addableAmount = GetAddableAmount(itemType, amount);
+        return requireFullAmount ? addableAmount >= amount : addableAmount > 0;
+    }
+
+    public InventoryItemDefinition GetDefinition(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinitionInternal(itemType);
+        return definition;
+    }
+
+    private InventoryItemDefinition GetDefinitionInternal(InventoryItemType itemType)
+    {
+        if (itemDefinitions == null)
+            return null;
+
+        for (int i = 0; i < itemDefinitions.Count; i++)
+        {
+            if (itemDefinitions[i] != null && itemDefinitions[i].itemType == itemType)
+                return itemDefinitions[i];
+        }
+
+        return null;
+    }
+
+    public string GetDisplayName(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null && !string.IsNullOrWhiteSpace(definition.displayName)
+            ? definition.displayName
+            : itemType.ToString();
+    }
+
+    public string GetDescription(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.description : string.Empty;
+    }
+
+    public string GetGoalHint(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.goalHint : string.Empty;
+    }
+
+    public Sprite GetIcon(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.icon : null;
+    }
+
+    public Sprite GetSlotBackground(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.slotBackground : null;
+    }
+
+    public AudioClip GetAcquisitionClip(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.acquisitionClip : null;
+    }
+
+    public AudioClip GetUseClip(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.useClip : null;
+    }
+
+    public bool IsImportantItem(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null && definition.importantItem;
+    }
+
+    public InventoryItemCategory GetCategory(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null ? definition.category : InventoryItemCategory.Other;
+    }
+
+    public bool IsUsable(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null && definition.usable;
+    }
+
+    public bool RequiresUseConfirmation(InventoryItemType itemType)
+    {
+        InventoryItemDefinition definition = GetDefinition(itemType);
+        return definition != null && definition.requireUseConfirmation;
+    }
+
+    public string GetInsufficientMessage(InventoryItemType itemType, int requiredAmount)
+    {
+        int current = GetItemCount(itemType);
+        return $"{GetDisplayName(itemType)}이(가) 부족합니다. 필요: {Mathf.Max(1, requiredAmount)}개 / 현재: {current}개";
+    }
+
+    public IReadOnlyList<InventoryLogEntry> GetRecentLogs()
+    {
+        return new List<InventoryLogEntry>(recentLogs);
+    }
+
+    public IReadOnlyDictionary<InventoryItemType, int> GetAllItemCounts()
+    {
+        return new Dictionary<InventoryItemType, int>(itemCounts);
+    }
+
     public void ClearInventory()
     {
         foreach (InventoryItemType itemType in Enum.GetValues(typeof(InventoryItemType)))
             itemCounts[itemType] = 0;
 
         NotifyAllItemsChanged();
+        NotifyMemoryPieceProgress();
+
+        if (saveOnChange)
+            SaveInventory();
     }
 
-    public IReadOnlyDictionary<InventoryItemType, int> GetAllItemCounts()
+    public void ResetToInitialItems()
     {
-        return itemCounts;
+        InitializeFromInspector();
+        NotifyAllItemsChanged();
+        NotifyMemoryPieceProgress();
+
+        if (saveOnChange)
+            SaveInventory();
+    }
+
+    public bool IsPersistentKeyConsumed(string key)
+    {
+        if (string.IsNullOrWhiteSpace(key))
+            return false;
+
+        return consumedPersistentKeys.Contains(key);
+    }
+
+    public void MarkPersistentKeyConsumed(string key)
+    {
+        if (string.IsNullOrWhiteSpace(key))
+            return;
+
+        if (consumedPersistentKeys.Add(key) && (saveOnChange || forceSavePersistentState))
+            SaveInventory();
+    }
+
+    public void ResetPersistentKey(string key)
+    {
+        if (string.IsNullOrWhiteSpace(key))
+            return;
+
+        if (consumedPersistentKeys.Remove(key) && (saveOnChange || forceSavePersistentState))
+            SaveInventory();
+    }
+
+    public void RequestMessage(string message)
+    {
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        MessageRequested?.Invoke(message);
+        onMessageRequested?.Invoke(message);
+
+        if (showDebugLog)
+            Debug.Log($"[InventoryManager] Message: {message}");
+    }
+
+    private void AddLog(InventoryItemType itemType, int amount, string action)
+    {
+        if (!keepRecentLogs)
+            return;
+
+        InventoryLogEntry entry = new InventoryLogEntry(itemType, amount, action, GetDisplayName(itemType));
+        recentLogs.Insert(0, entry);
+
+        while (recentLogs.Count > Mathf.Max(1, maxRecentLogCount))
+            recentLogs.RemoveAt(recentLogs.Count - 1);
+
+        LogAdded?.Invoke(entry);
+    }
+
+    public void SaveInventory()
+    {
+        InventorySaveData saveData = new InventorySaveData();
+
+        foreach (KeyValuePair<InventoryItemType, int> pair in itemCounts)
+        {
+            saveData.items.Add(new InventorySavedItemCount
+            {
+                itemTypeName = pair.Key.ToString(),
+                count = Mathf.Max(0, pair.Value)
+            });
+        }
+
+        foreach (string key in consumedPersistentKeys)
+            saveData.consumedPersistentKeys.Add(key);
+
+        string json = JsonUtility.ToJson(saveData);
+        PlayerPrefs.SetString(saveKey, json);
+        PlayerPrefs.Save();
+
+        if (showDebugLog)
+            Debug.Log("[InventoryManager] 인벤토리 저장 완료");
+    }
+
+    public bool LoadInventory()
+    {
+        return LoadInventory(true);
+    }
+
+    private bool LoadInventory(bool notify)
+    {
+        if (!PlayerPrefs.HasKey(saveKey))
+            return false;
+
+        string json = PlayerPrefs.GetString(saveKey, string.Empty);
+        if (string.IsNullOrWhiteSpace(json))
+            return false;
+
+        InventorySaveData saveData;
+
+        try
+        {
+            saveData = JsonUtility.FromJson<InventorySaveData>(json);
+        }
+        catch (Exception exception)
+        {
+            Debug.LogWarning($"[InventoryManager] 저장 데이터 읽기 실패: {exception.Message}");
+            return false;
+        }
+
+        InitializeFromInspector();
+        consumedPersistentKeys.Clear();
+
+        if (saveData != null)
+        {
+            for (int i = 0; i < saveData.items.Count; i++)
+            {
+                InventorySavedItemCount savedItem = saveData.items[i];
+                if (savedItem == null || string.IsNullOrWhiteSpace(savedItem.itemTypeName))
+                    continue;
+
+                if (Enum.TryParse(savedItem.itemTypeName, out InventoryItemType itemType))
+                    itemCounts[itemType] = ClampCount(itemType, savedItem.count);
+            }
+
+            for (int i = 0; i < saveData.consumedPersistentKeys.Count; i++)
+            {
+                string key = saveData.consumedPersistentKeys[i];
+                if (!string.IsNullOrWhiteSpace(key))
+                    consumedPersistentKeys.Add(key);
+            }
+        }
+
+        if (notify)
+        {
+            NotifyAllItemsChanged();
+            NotifyMemoryPieceProgress();
+        }
+
+        if (showDebugLog)
+            Debug.Log("[InventoryManager] 인벤토리 불러오기 완료");
+
+        return true;
+    }
+
+    public void DeleteSavedInventory()
+    {
+        PlayerPrefs.DeleteKey(saveKey);
+        PlayerPrefs.Save();
+
+        consumedPersistentKeys.Clear();
+        recentLogs.Clear();
+        memoryPieceCompletedNotified = false;
+
+        // ResetToInitialItems()를 호출하면 saveOnChange가 true일 때 삭제 직후 다시 저장 파일을 만들 수 있으므로
+        // 여기서는 직접 초기화와 알림만 수행합니다.
+        InitializeFromInspector();
+        NotifyAllItemsChanged();
+        NotifyMemoryPieceProgress();
+
+        RequestMessage("인벤토리 저장 데이터를 삭제했습니다.");
+    }
+
+    private int ClampCount(InventoryItemType itemType, int count)
+    {
+        int safeCount = Mathf.Max(0, count);
+        int maxCount = GetMaxCount(itemType);
+
+        if (maxCount > 0)
+            safeCount = Mathf.Min(safeCount, maxCount);
+
+        return safeCount;
     }
 
     private void NotifyItemChanged(InventoryItemType itemType, int count)
@@ -155,6 +765,21 @@ private void NotifyItemChanged(InventoryItemType itemType, int count)
 
         onItemCountChanged?.Invoke(itemType, count);
         onInventoryChanged?.Invoke();
+
+        if (itemType == memoryPieceItemType)
+            NotifyMemoryPieceProgress();
+    }
+
+    private void NotifyItemAdded(InventoryItemType itemType, int addedAmount, int totalCount)
+    {
+        ItemAdded?.Invoke(itemType, addedAmount, totalCount);
+        onItemAdded?.Invoke(itemType, addedAmount, totalCount);
+    }
+
+    private void NotifyItemRemoved(InventoryItemType itemType, int removedAmount, int totalCount)
+    {
+        ItemRemoved?.Invoke(itemType, removedAmount, totalCount);
+        onItemRemoved?.Invoke(itemType, removedAmount, totalCount);
     }
 
     private void NotifyAllItemsChanged()
@@ -169,17 +794,91 @@ private void NotifyAllItemsChanged()
         onInventoryChanged?.Invoke();
     }
 
+<<<<<<< HEAD
+    private void NotifyMemoryPieceProgress()
+    {
+        int current = GetItemCount(memoryPieceItemType);
+        int target = Mathf.Max(1, memoryPieceTargetCount);
+
+        MemoryPieceProgressChanged?.Invoke(current, target);
+        onMemoryPieceProgressChanged?.Invoke(current, target);
+
+        if (current < target)
+        {
+            memoryPieceCompletedNotified = false;
+            return;
+        }
+
+        if (!memoryPieceCompletedNotified)
+        {
+            memoryPieceCompletedNotified = true;
+            MemoryPieceCompleted?.Invoke();
+            onMemoryPieceCompleted?.Invoke();
+        }
+    }
+
+    // 개발용 버튼/UnityEvent 연결용 메서드입니다.
+    public void DebugAddFish() => AddItem(InventoryItemType.Fish, 1);
+    public void DebugAddCompass() => AddItem(InventoryItemType.OldCompass, 1);
+    public void DebugAddTrash() => AddItem(InventoryItemType.Trash, 1);
+    public void DebugAddBottle() => AddItem(InventoryItemType.Bottle, 1);
+    public void DebugAddMemoryPiece() => AddItem(InventoryItemType.MemoryPiece, 1);
+    public void DebugClearInventory() => ClearInventory();
+    public void DebugDeleteSave() => DeleteSavedInventory();
+
+=======
+    public void InventoryUIToggle()
+    {
+        _inventoryUI.gameObject.SetActive(!_inventoryUI.gameObject.activeSelf);
+    }
+
+>>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
 #if UNITY_EDITOR
     private void OnValidate()
     {
-        if (initialItems == null)
-            return;
+        if (defaultMaxCount < 0)
+            defaultMaxCount = 0;
 
-        for (int i = 0; i < initialItems.Count; i++)
+        if (memoryPieceTargetCount < 1)
+            memoryPieceTargetCount = 1;
+
+        if (maxRecentLogCount < 1)
+            maxRecentLogCount = 1;
+
+        if (string.IsNullOrWhiteSpace(saveKey))
+            saveKey = "Inventory_SaveData";
+
+        if (initialItems != null)
         {
-            if (initialItems[i] != null)
-                initialItems[i].count = Mathf.Max(0, initialItems[i].count);
+            for (int i = 0; i < initialItems.Count; i++)
+            {
+                if (initialItems[i] != null)
+                    initialItems[i].count = Mathf.Max(0, initialItems[i].count);
+            }
+        }
+
+        if (itemDefinitions != null)
+        {
+            for (int i = 0; i < itemDefinitions.Count; i++)
+            {
+                if (itemDefinitions[i] != null)
+                    itemDefinitions[i].maxCount = Mathf.Max(0, itemDefinitions[i].maxCount);
+            }
         }
     }
 #endif
+
+    [Serializable]
+    private class InventorySaveData
+    {
+        public List<InventorySavedItemCount> items = new List<InventorySavedItemCount>();
+        public List<string> consumedPersistentKeys = new List<string>();
+    }
+
+    [Serializable]
+    private class InventorySavedItemCount
+    {
+        public string itemTypeName;
+        public int count;
+    }
 }
diff --git a/Assets/My project/Inventory/Scripts/InventorySlotUI.cs b/Assets/My project/Inventory/Scripts/InventorySlotUI.cs
index fbbd8b76..a8644876 100644
--- a/Assets/My project/Inventory/Scripts/InventorySlotUI.cs	
+++ b/Assets/My project/Inventory/Scripts/InventorySlotUI.cs	
@@ -4,12 +4,19 @@
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
+public enum InventorySlotClickMode
+{
+    None,
+    ShowDetail,
+    RequestUse
+}
+
 /// <summary>
 /// 인벤토리 슬롯 하나를 담당하는 UI 스크립트입니다.
-/// FishSlot, CompassSlot, TrashSlot, BottleSlot 등에 각각 붙입니다.
+/// VR 포인터 Hover/Select, NEW 배지, 0개 흐림 표시, 중요 아이템 강조, 상세보기/사용 클릭을 지원합니다.
 /// </summary>
 [DisallowMultipleComponent]
-public class InventorySlotUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, ISelectHandler, IDeselectHandler
+public class InventorySlotUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerClickHandler, ISelectHandler, IDeselectHandler, ISubmitHandler
 {
     [Header("Item")]
     [SerializeField] private InventoryItemType itemType;
@@ -20,30 +27,75 @@ public class InventorySlotUI : MonoBehaviour, IPointerEnterHandler, IPointerExit
     [SerializeField] private TMP_Text countText;
     [SerializeField] private GameObject newBadge;
     [SerializeField] private CanvasGroup canvasGroup;
+    [SerializeField] private GameObject importantGlowObject;
+    [SerializeField] private GameObject filteredOutOverlay;
 
-    [Header("Tooltip")]
+    [Header("Tooltip / Parent UI")]
     [SerializeField] private InventoryTooltipUI tooltipUI;
+    [SerializeField] private InventoryUI inventoryUI;
+
+    [Header("Click")]
+    [SerializeField] private InventorySlotClickMode clickMode = InventorySlotClickMode.ShowDetail;
 
     [Header("Settings")]
+    [Tooltip("VR에서는 false 권장. 슬롯이 사라지면 Ray 조작 위치가 바뀌어 불편할 수 있습니다.")]
     [SerializeField] private bool hideWhenZero = false;
     [SerializeField] private bool dimWhenZero = true;
     [SerializeField] private float zeroAlpha = 0.35f;
     [SerializeField] private float ownedAlpha = 1f;
+    [SerializeField] private float filteredAlpha = 0.15f;
+    [SerializeField] private bool showCountWhenZero = true;
+    [SerializeField] private bool showMaxCount = false;
     [SerializeField] private float newBadgeShowTime = 1.2f;
 
+    [Header("Hover Effect")]
+    [SerializeField] private bool useHoverScale = true;
+    [SerializeField] private float hoverScale = 1.08f;
+    [SerializeField] private bool bringToFrontOnHover = true;
+
     private int currentCount;
+    private int currentMaxCount;
+    private bool filteredOut;
     private Coroutine newBadgeRoutine;
+    private Vector3 originalScale;
+    private InventoryItemDefinition definition;
 
     public InventoryItemType ItemType => itemType;
     public int CurrentCount => currentCount;
+    public InventoryItemCategory Category => definition != null ? definition.category : InventoryItemCategory.Other;
 
     private void Awake()
     {
+        originalScale = transform.localScale;
+
         if (canvasGroup == null)
             canvasGroup = GetComponent<CanvasGroup>();
 
+        if (slotBackground == null)
+            slotBackground = GetComponent<Image>();
+
+        if (inventoryUI == null)
+            inventoryUI = GetComponentInParent<InventoryUI>();
+
+        if (tooltipUI == null)
+            tooltipUI = GetComponentInParent<InventoryTooltipUI>();
+
         if (newBadge != null)
             newBadge.SetActive(false);
+
+        UpdateVisualState();
+    }
+
+    private void OnDisable()
+    {
+        HideNewBadge();
+        HideTooltip();
+        ResetHoverVisual();
+    }
+
+    public void SetInventoryUI(InventoryUI ui)
+    {
+        inventoryUI = ui;
     }
 
     public void SetItemType(InventoryItemType newItemType)
@@ -51,10 +103,52 @@ public void SetItemType(InventoryItemType newItemType)
         itemType = newItemType;
     }
 
+    public void SetDefinition(InventoryItemDefinition newDefinition)
+    {
+        definition = newDefinition;
+
+        if (definition == null)
+        {
+            UpdateVisualState();
+            return;
+        }
+
+        if (itemIcon != null)
+        {
+            itemIcon.sprite = definition.icon;
+            itemIcon.enabled = definition.icon != null;
+        }
+
+        if (slotBackground != null && definition.slotBackground != null)
+        {
+            slotBackground.sprite = definition.slotBackground;
+            slotBackground.enabled = true;
+        }
+
+        if (definition.overrideSlotDisplaySettings)
+        {
+            hideWhenZero = definition.hideWhenZero;
+            dimWhenZero = definition.dimWhenZero;
+            zeroAlpha = definition.zeroAlpha;
+            ownedAlpha = definition.ownedAlpha;
+        }
+
+        if (importantGlowObject != null)
+            importantGlowObject.SetActive(definition.importantItem);
+
+        UpdateVisualState();
+    }
+
     public void SetCount(int count, bool showNewBadge)
+    {
+        SetCount(count, showNewBadge, currentMaxCount);
+    }
+
+    public void SetCount(int count, bool showNewBadge, int maxCount)
     {
         int previousCount = currentCount;
         currentCount = Mathf.Max(0, count);
+        currentMaxCount = Mathf.Max(0, maxCount);
 
         UpdateVisualState();
 
@@ -80,6 +174,23 @@ public void SetSlotBackground(Sprite sprite)
         slotBackground.enabled = sprite != null;
     }
 
+    public void SetFilteredOut(bool value)
+    {
+        filteredOut = value;
+
+        if (filteredOutOverlay != null)
+            filteredOutOverlay.SetActive(value);
+
+        UpdateVisualState();
+    }
+
+    public void SetHoverSettings(bool useScale, float scale, bool bringToFront)
+    {
+        useHoverScale = useScale;
+        hoverScale = Mathf.Max(1f, scale);
+        bringToFrontOnHover = bringToFront;
+    }
+
     public void ShowNewBadge()
     {
         if (newBadge == null)
@@ -106,7 +217,7 @@ public void HideNewBadge()
     private IEnumerator NewBadgeRoutine()
     {
         newBadge.SetActive(true);
-        yield return new WaitForSeconds(newBadgeShowTime);
+        yield return new WaitForSecondsRealtime(newBadgeShowTime);
         newBadge.SetActive(false);
         newBadgeRoutine = null;
     }
@@ -116,39 +227,108 @@ private void UpdateVisualState()
         bool hasItem = currentCount > 0;
 
         if (countText != null)
-            countText.text = $"x{currentCount}";
+        {
+            if (!showCountWhenZero && currentCount <= 0)
+                countText.text = string.Empty;
+            else if (showMaxCount && currentMaxCount > 0)
+                countText.text = $"x{currentCount}/{currentMaxCount}";
+            else
+                countText.text = $"x{currentCount}";
+        }
 
         if (hideWhenZero)
             gameObject.SetActive(hasItem);
 
         if (canvasGroup != null && dimWhenZero)
-            canvasGroup.alpha = hasItem ? ownedAlpha : zeroAlpha;
+        {
+            float targetAlpha = hasItem ? ownedAlpha : zeroAlpha;
+            if (filteredOut)
+                targetAlpha = Mathf.Min(targetAlpha, filteredAlpha);
+
+            canvasGroup.alpha = targetAlpha;
+            canvasGroup.interactable = !filteredOut;
+            canvasGroup.blocksRaycasts = !filteredOut;
+        }
     }
 
     public void OnPointerEnter(PointerEventData eventData)
     {
+        ApplyHoverVisual();
         ShowTooltip();
     }
 
     public void OnPointerExit(PointerEventData eventData)
     {
+        ResetHoverVisual();
         HideTooltip();
     }
 
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        ActivateSlot();
+    }
+
     public void OnSelect(BaseEventData eventData)
     {
+        ApplyHoverVisual();
         ShowTooltip();
     }
 
     public void OnDeselect(BaseEventData eventData)
     {
+        ResetHoverVisual();
         HideTooltip();
     }
 
+    public void OnSubmit(BaseEventData eventData)
+    {
+        ActivateSlot();
+    }
+
+    private void ActivateSlot()
+    {
+        if (filteredOut)
+            return;
+
+        if (inventoryUI == null)
+            inventoryUI = GetComponentInParent<InventoryUI>();
+
+        if (inventoryUI == null)
+            return;
+
+        switch (clickMode)
+        {
+            case InventorySlotClickMode.ShowDetail:
+                inventoryUI.ShowItemDetail(itemType);
+                break;
+            case InventorySlotClickMode.RequestUse:
+                inventoryUI.RequestUseItem(itemType, 1);
+                break;
+        }
+    }
+
+    private void ApplyHoverVisual()
+    {
+        if (bringToFrontOnHover)
+            transform.SetAsLastSibling();
+
+        if (useHoverScale)
+            transform.localScale = originalScale * hoverScale;
+    }
+
+    private void ResetHoverVisual()
+    {
+        if (useHoverScale)
+            transform.localScale = originalScale;
+    }
+
     public void ShowTooltip()
     {
+        if (tooltipUI == null)
+            tooltipUI = GetComponentInParent<InventoryTooltipUI>();
+
         if (tooltipUI != null)
-            tooltipUI.ShowTooltip(itemType, currentCount);
+            tooltipUI.ShowTooltip(itemType, currentCount, currentMaxCount);
     }
 
     public void HideTooltip()
diff --git a/Assets/My project/Inventory/Scripts/InventoryTooltipUI.cs b/Assets/My project/Inventory/Scripts/InventoryTooltipUI.cs
index ef8f7dce..79c749ba 100644
--- a/Assets/My project/Inventory/Scripts/InventoryTooltipUI.cs	
+++ b/Assets/My project/Inventory/Scripts/InventoryTooltipUI.cs	
@@ -1,19 +1,10 @@
-using System;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 
-[Serializable]
-public class InventoryTooltipEntry
-{
-    public InventoryItemType itemType;
-    public string displayName;
-    [TextArea(2, 4)] public string description;
-}
-
 /// <summary>
 /// 아이템 슬롯에 마우스/VR 포인터가 올라갔을 때 간단한 설명을 표시합니다.
-/// InventorySlotUI에서 ShowTooltip, HideTooltip을 호출합니다.
+/// InventoryManager의 ItemDefinition 데이터를 우선 사용합니다.
 /// </summary>
 [DisallowMultipleComponent]
 public class InventoryTooltipUI : MonoBehaviour
@@ -23,39 +14,68 @@ public class InventoryTooltipUI : MonoBehaviour
     [SerializeField] private TMP_Text titleText;
     [SerializeField] private TMP_Text descriptionText;
     [SerializeField] private TMP_Text countText;
+    [SerializeField] private TMP_Text goalHintText;
+    [SerializeField] private TMP_Text useHintText;
 
-    [Header("Entries")]
-    [SerializeField] private List<InventoryTooltipEntry> entries = new List<InventoryTooltipEntry>()
-    {
-        new InventoryTooltipEntry { itemType = InventoryItemType.Fish, displayName = "생선", description = "고양이 합창단이 좋아합니다." },
-        new InventoryTooltipEntry { itemType = InventoryItemType.OldCompass, displayName = "낡은 나침반", description = "미로에서 길을 찾는 데 도움이 됩니다." },
-        new InventoryTooltipEntry { itemType = InventoryItemType.Trash, displayName = "쓰레기", description = "낚시터를 정화하는 데 필요합니다." },
-        new InventoryTooltipEntry { itemType = InventoryItemType.Bottle, displayName = "마법병", description = "바다 속에서 발견한 수상한 병입니다." },
-        new InventoryTooltipEntry { itemType = InventoryItemType.MemoryPiece, displayName = "기억의 조각", description = "제페토를 구출하기 위한 중요한 조각입니다." }
-    };
+    [Header("Reference")]
+    [SerializeField] private InventoryManager inventoryManager;
+    [SerializeField] private bool autoFindManager = true;
 
     private void Awake()
     {
+        ResolveManager();
         HideTooltip();
     }
 
     public void ShowTooltip(InventoryItemType itemType, int count)
     {
-        InventoryTooltipEntry entry = FindEntry(itemType);
+        int maxCount = ResolveManager() != null ? inventoryManager.GetMaxCount(itemType) : 0;
+        ShowTooltip(itemType, count, maxCount);
+    }
+
+    public void ShowTooltip(InventoryItemType itemType, int count, int maxCount)
+    {
+        ResolveManager();
+
+        string displayName = itemType.ToString();
+        string description = string.Empty;
+        string goalHint = string.Empty;
+        string useHint = string.Empty;
+
+        InventoryItemDefinition definition = inventoryManager != null ? inventoryManager.GetDefinition(itemType) : null;
+        if (definition != null)
+        {
+            displayName = definition.SafeDisplayName;
+            description = definition.description;
+            goalHint = definition.goalHint;
+
+            if (definition.usable)
+                useHint = string.IsNullOrWhiteSpace(definition.useLabel) ? "사용 가능" : definition.useLabel;
+        }
 
         if (tooltipPanel != null)
             tooltipPanel.SetActive(true);
 
         if (titleText != null)
-            titleText.text = entry != null && !string.IsNullOrWhiteSpace(entry.displayName)
-                ? entry.displayName
-                : itemType.ToString();
+            titleText.text = displayName;
 
         if (descriptionText != null)
-            descriptionText.text = entry != null ? entry.description : string.Empty;
+            descriptionText.text = description;
 
         if (countText != null)
-            countText.text = $"보유: x{Mathf.Max(0, count)}";
+            countText.text = maxCount > 0 ? $"보유: x{Mathf.Max(0, count)} / {maxCount}" : $"보유: x{Mathf.Max(0, count)}";
+
+        if (goalHintText != null)
+        {
+            goalHintText.text = goalHint;
+            goalHintText.gameObject.SetActive(!string.IsNullOrWhiteSpace(goalHint));
+        }
+
+        if (useHintText != null)
+        {
+            useHintText.text = useHint;
+            useHintText.gameObject.SetActive(!string.IsNullOrWhiteSpace(useHint));
+        }
     }
 
     public void HideTooltip()
@@ -64,14 +84,16 @@ public void HideTooltip()
             tooltipPanel.SetActive(false);
     }
 
-    private InventoryTooltipEntry FindEntry(InventoryItemType itemType)
+    private InventoryManager ResolveManager()
     {
-        for (int i = 0; i < entries.Count; i++)
-        {
-            if (entries[i] != null && entries[i].itemType == itemType)
-                return entries[i];
-        }
+        if (inventoryManager != null)
+            return inventoryManager;
 
-        return null;
+        if (InventoryManager.Instance != null)
+            inventoryManager = InventoryManager.Instance;
+        else if (autoFindManager)
+            inventoryManager = FindFirstObjectByType<InventoryManager>();
+
+        return inventoryManager;
     }
 }
diff --git a/Assets/My project/Inventory/Scripts/InventoryUI.cs b/Assets/My project/Inventory/Scripts/InventoryUI.cs
index 62767035..9855fc9a 100644
--- a/Assets/My project/Inventory/Scripts/InventoryUI.cs	
+++ b/Assets/My project/Inventory/Scripts/InventoryUI.cs	
@@ -1,31 +1,158 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 /// <summary>
 /// 전체 인벤토리 UI를 갱신하는 스크립트입니다.
-/// InventoryManager의 변경 이벤트를 받아 각 InventorySlotUI에 전달합니다.
+/// 기능: 패널 열기/닫기, 슬롯 갱신, 획득 팝업, 부족 안내 메시지, 확인창, 상세보기, 획득 로그, 기억의 조각 진행도, 간단한 손목/타겟 추적.
+/// InventoryUI가 붙은 오브젝트는 항상 켜두고, 실제 보이는 inventoryPanel만 켜고 끄는 구조를 권장합니다.
 /// </summary>
 [DisallowMultipleComponent]
 public class InventoryUI : MonoBehaviour
 {
     [Header("References")]
     [SerializeField] private InventoryManager inventoryManager;
+    [Tooltip("실제로 보이거나 숨겨질 자식 패널입니다. InventoryUI가 붙은 자기 자신을 넣지 않는 것을 권장합니다.")]
     [SerializeField] private GameObject inventoryPanel;
     [SerializeField] private InventorySlotUI[] slots;
 
-    [Header("Settings")]
+    [Header("Panel Settings")]
     [SerializeField] private bool autoFindManager = true;
+    [SerializeField] private bool autoFindPanelChild = true;
+    [SerializeField] private string autoPanelChildName = "InventoryPanel";
+    [SerializeField] private bool visibleOnStart = false;
     [SerializeField] private bool refreshOnEnable = true;
     [SerializeField] private bool showNewBadgeOnIncrease = true;
+    [SerializeField] private bool preventDisablingSelf = true;
+
+    [Header("Filter")]
+    [SerializeField] private InventoryItemCategory currentFilter = InventoryItemCategory.All;
+    [SerializeField] private bool hideSlotsOutsideFilter = false;
+
+    [Header("Acquisition Popup")]
+    [SerializeField] private GameObject acquisitionPopupPanel;
+    [SerializeField] private CanvasGroup acquisitionPopupCanvasGroup;
+    [SerializeField] private Image acquisitionIconImage;
+    [SerializeField] private TMP_Text acquisitionText;
+    [SerializeField] private float acquisitionPopupTime = 1.4f;
+    [SerializeField] private string acquisitionFormat = "{0} x{1} 획득!";
+
+    [Header("Message Popup")]
+    [SerializeField] private GameObject messagePanel;
+    [SerializeField] private CanvasGroup messageCanvasGroup;
+    [SerializeField] private TMP_Text messageText;
+    [SerializeField] private float messageShowTime = 1.5f;
+
+    [Header("Confirmation UI")]
+    [SerializeField] private GameObject confirmationPanel;
+    [SerializeField] private TMP_Text confirmationTitleText;
+    [SerializeField] private TMP_Text confirmationBodyText;
+    [SerializeField] private Button confirmationYesButton;
+    [SerializeField] private Button confirmationNoButton;
+
+    [Header("Detail UI")]
+    [SerializeField] private GameObject detailPanel;
+    [SerializeField] private Image detailIconImage;
+    [SerializeField] private TMP_Text detailTitleText;
+    [SerializeField] private TMP_Text detailDescriptionText;
+    [SerializeField] private TMP_Text detailCountText;
+    [SerializeField] private TMP_Text detailGoalText;
+    [SerializeField] private Button detailUseButton;
+
+    [Header("Recent Log UI")]
+    [SerializeField] private TMP_Text[] recentLogTexts;
+
+    [Header("Memory Piece UI")]
+    [SerializeField] private TMP_Text memoryProgressText;
+    [SerializeField] private Slider memoryProgressSlider;
+    [SerializeField] private string memoryProgressFormat = "기억의 조각 {0} / {1}";
+
+    [Header("Audio")]
+    [SerializeField] private AudioSource uiAudioSource;
+    [SerializeField] private AudioClip defaultAcquisitionClip;
+    [SerializeField] private AudioClip defaultUseClip;
+    [SerializeField] private AudioClip defaultErrorClip;
+
+    [Header("Optional Follow Target / Wrist UI")]
+    [SerializeField] private bool followTarget = false;
+    [SerializeField] private Transform targetToFollow;
+    [SerializeField] private Vector3 localPositionOffset = new Vector3(0f, 0.08f, 0.12f);
+    [SerializeField] private Vector3 localEulerOffset = Vector3.zero;
+    [SerializeField] private bool faceMainCamera = false;
+
+    [Header("Editor Test Toggle")]
+    [SerializeField] private bool enableKeyboardToggleForTesting = false;
+    [SerializeField] private KeyCode keyboardToggleKey = KeyCode.I;
 
     private bool subscribed;
+    private Coroutine acquisitionRoutine;
+    private Coroutine messageRoutine;
+    private InventoryItemType pendingUseItemType;
+    private int pendingUseAmount = 1;
+    private bool hasPendingUse;
+    private InventoryItemType currentDetailItemType;
+    private bool hasDetailItem;
 
     private void Awake()
     {
-        if (inventoryPanel == null)
-            inventoryPanel = gameObject;
+        if (inventoryManager == null && InventoryManager.Instance != null)
+            inventoryManager = InventoryManager.Instance;
 
         if (inventoryManager == null && autoFindManager)
             inventoryManager = FindFirstObjectByType<InventoryManager>();
+
+        if (inventoryPanel == null && autoFindPanelChild)
+        {
+            Transform panelTransform = transform.Find(autoPanelChildName);
+            if (panelTransform != null)
+                inventoryPanel = panelTransform.gameObject;
+        }
+
+        if (uiAudioSource == null)
+            uiAudioSource = GetComponent<AudioSource>();
+
+        if (acquisitionPopupPanel != null)
+            acquisitionPopupPanel.SetActive(false);
+
+        if (messagePanel != null)
+            messagePanel.SetActive(false);
+
+        if (confirmationPanel != null)
+            confirmationPanel.SetActive(false);
+
+        if (detailPanel != null)
+            detailPanel.SetActive(false);
+
+        if (confirmationYesButton != null)
+        {
+            confirmationYesButton.onClick.RemoveListener(ConfirmPendingUse);
+            confirmationYesButton.onClick.AddListener(ConfirmPendingUse);
+        }
+
+        if (confirmationNoButton != null)
+        {
+            confirmationNoButton.onClick.RemoveListener(CancelPendingUse);
+            confirmationNoButton.onClick.AddListener(CancelPendingUse);
+        }
+
+        if (detailUseButton != null)
+        {
+            detailUseButton.onClick.RemoveListener(UseCurrentDetailItem);
+            detailUseButton.onClick.AddListener(UseCurrentDetailItem);
+        }
+
+        ApplyItemDataToSlots();
+    }
+
+    private void Start()
+    {
+        SetVisible(visibleOnStart);
+        RefreshAllSlots();
+        RefreshRecentLogs();
+        RefreshMemoryProgress();
     }
 
     private void OnEnable()
@@ -41,18 +168,54 @@ private void OnDisable()
         Unsubscribe();
     }
 
+    private void Update()
+    {
+        if (enableKeyboardToggleForTesting && Input.GetKeyDown(keyboardToggleKey))
+            ToggleVisible();
+    }
+
+    private void LateUpdate()
+    {
+        if (!followTarget || targetToFollow == null)
+            return;
+
+        transform.position = targetToFollow.TransformPoint(localPositionOffset);
+        transform.rotation = targetToFollow.rotation * Quaternion.Euler(localEulerOffset);
+
+        if (faceMainCamera && Camera.main != null)
+        {
+            Vector3 direction = transform.position - Camera.main.transform.position;
+            if (direction.sqrMagnitude > 0.0001f)
+                transform.rotation = Quaternion.LookRotation(direction.normalized, Vector3.up);
+        }
+    }
+
     public void SetVisible(bool visible)
     {
-        if (inventoryPanel != null)
-            inventoryPanel.SetActive(visible);
+        if (inventoryPanel == null)
+            return;
+
+        if (preventDisablingSelf && inventoryPanel == gameObject)
+        {
+            Debug.LogWarning("[InventoryUI] InventoryPanel에 자기 자신이 들어가 있습니다. InventoryRoot는 항상 켜두고 자식 InventoryPanel만 연결하세요.", this);
+            return;
+        }
+
+        inventoryPanel.SetActive(visible);
+
+        if (visible)
+            RefreshAllSlots();
     }
 
     public void ToggleVisible()
     {
         if (inventoryPanel != null)
-            inventoryPanel.SetActive(!inventoryPanel.activeSelf);
+            SetVisible(!inventoryPanel.activeSelf);
     }
 
+    public void ShowInventory() => SetVisible(true);
+    public void HideInventory() => SetVisible(false);
+
     public void SetManager(InventoryManager manager)
     {
         if (inventoryManager == manager)
@@ -61,9 +224,22 @@ public void SetManager(InventoryManager manager)
         Unsubscribe();
         inventoryManager = manager;
         Subscribe();
+        ApplyItemDataToSlots();
         RefreshAllSlots();
     }
 
+    public void SetFilterAll() => SetFilter(InventoryItemCategory.All);
+    public void SetFilterConsumable() => SetFilter(InventoryItemCategory.Consumable);
+    public void SetFilterQuest() => SetFilter(InventoryItemCategory.Quest);
+    public void SetFilterKeyItem() => SetFilter(InventoryItemCategory.KeyItem);
+    public void SetFilterMaterial() => SetFilter(InventoryItemCategory.Material);
+
+    public void SetFilter(InventoryItemCategory category)
+    {
+        currentFilter = category;
+        ApplyFilterToSlots();
+    }
+
     public void RefreshAllSlots()
     {
         if (inventoryManager == null || slots == null)
@@ -75,9 +251,16 @@ public void RefreshAllSlots()
             if (slot == null)
                 continue;
 
+            InventoryItemDefinition definition = inventoryManager.GetDefinition(slot.ItemType);
+            slot.SetInventoryUI(this);
+            slot.SetDefinition(definition);
+
             int count = inventoryManager.GetItemCount(slot.ItemType);
-            slot.SetCount(count, false);
+            int maxCount = inventoryManager.GetMaxCount(slot.ItemType);
+            slot.SetCount(count, false, maxCount);
         }
+
+        ApplyFilterToSlots();
     }
 
     private void RefreshSlot(InventoryItemType itemType, int count)
@@ -85,13 +268,53 @@ private void RefreshSlot(InventoryItemType itemType, int count)
         if (slots == null)
             return;
 
+        int maxCount = inventoryManager != null ? inventoryManager.GetMaxCount(itemType) : 0;
+
         for (int i = 0; i < slots.Length; i++)
         {
             InventorySlotUI slot = slots[i];
             if (slot == null || slot.ItemType != itemType)
                 continue;
 
-            slot.SetCount(count, showNewBadgeOnIncrease);
+            slot.SetCount(count, showNewBadgeOnIncrease, maxCount);
+        }
+
+        if (hasDetailItem && currentDetailItemType == itemType)
+            ShowItemDetail(itemType);
+    }
+
+    private void ApplyItemDataToSlots()
+    {
+        if (inventoryManager == null || slots == null)
+            return;
+
+        for (int i = 0; i < slots.Length; i++)
+        {
+            InventorySlotUI slot = slots[i];
+            if (slot == null)
+                continue;
+
+            slot.SetInventoryUI(this);
+            slot.SetDefinition(inventoryManager.GetDefinition(slot.ItemType));
+        }
+    }
+
+    private void ApplyFilterToSlots()
+    {
+        if (slots == null)
+            return;
+
+        for (int i = 0; i < slots.Length; i++)
+        {
+            InventorySlotUI slot = slots[i];
+            if (slot == null)
+                continue;
+
+            bool visible = currentFilter == InventoryItemCategory.All || slot.Category == currentFilter;
+            if (hideSlotsOutsideFilter)
+                slot.gameObject.SetActive(visible);
+            else
+                slot.SetFilteredOut(!visible);
         }
     }
 
@@ -101,6 +324,11 @@ private void Subscribe()
             return;
 
         inventoryManager.ItemCountChanged += RefreshSlot;
+        inventoryManager.ItemAdded += HandleItemAdded;
+        inventoryManager.ItemUsed += HandleItemUsed;
+        inventoryManager.MessageRequested += ShowMessage;
+        inventoryManager.LogAdded += HandleLogAdded;
+        inventoryManager.MemoryPieceProgressChanged += HandleMemoryPieceProgressChanged;
         subscribed = true;
     }
 
@@ -110,6 +338,306 @@ private void Unsubscribe()
             return;
 
         inventoryManager.ItemCountChanged -= RefreshSlot;
+        inventoryManager.ItemAdded -= HandleItemAdded;
+        inventoryManager.ItemUsed -= HandleItemUsed;
+        inventoryManager.MessageRequested -= ShowMessage;
+        inventoryManager.LogAdded -= HandleLogAdded;
+        inventoryManager.MemoryPieceProgressChanged -= HandleMemoryPieceProgressChanged;
         subscribed = false;
     }
+
+    private void HandleItemAdded(InventoryItemType itemType, int addedAmount, int totalCount)
+    {
+        ShowAcquisitionPopup(itemType, addedAmount);
+    }
+
+    private void HandleItemUsed(InventoryItemType itemType, int count)
+    {
+        AudioClip clip = inventoryManager != null ? inventoryManager.GetUseClip(itemType) : null;
+        PlayUIClip(clip != null ? clip : defaultUseClip);
+    }
+
+    private void HandleLogAdded(InventoryLogEntry entry)
+    {
+        RefreshRecentLogs();
+    }
+
+    private void HandleMemoryPieceProgressChanged(int current, int target)
+    {
+        RefreshMemoryProgress(current, target);
+    }
+
+    public void ShowAcquisitionPopup(InventoryItemType itemType, int amount)
+    {
+        if (inventoryManager == null)
+            return;
+
+        string displayName = inventoryManager.GetDisplayName(itemType);
+        Sprite icon = inventoryManager.GetIcon(itemType);
+
+        if (acquisitionIconImage != null)
+        {
+            acquisitionIconImage.sprite = icon;
+            acquisitionIconImage.enabled = icon != null;
+        }
+
+        if (acquisitionText != null)
+            acquisitionText.text = string.Format(acquisitionFormat, displayName, Mathf.Max(1, amount));
+
+        AudioClip clip = inventoryManager.GetAcquisitionClip(itemType);
+        PlayUIClip(clip != null ? clip : defaultAcquisitionClip);
+
+        if (acquisitionRoutine != null)
+            StopCoroutine(acquisitionRoutine);
+
+        acquisitionRoutine = StartCoroutine(ShowPanelRoutine(acquisitionPopupPanel, acquisitionPopupCanvasGroup, acquisitionPopupTime));
+    }
+
+    public void ShowMessage(string message)
+    {
+        if (string.IsNullOrWhiteSpace(message))
+            return;
+
+        if (messageText != null)
+            messageText.text = message;
+
+        if (messageRoutine != null)
+            StopCoroutine(messageRoutine);
+
+        messageRoutine = StartCoroutine(ShowPanelRoutine(messagePanel, messageCanvasGroup, messageShowTime));
+    }
+
+    private IEnumerator ShowPanelRoutine(GameObject panel, CanvasGroup canvasGroup, float showTime)
+    {
+        if (panel == null)
+            yield break;
+
+        panel.SetActive(true);
+
+        if (canvasGroup != null)
+            canvasGroup.alpha = 1f;
+
+        yield return new WaitForSecondsRealtime(Mathf.Max(0.05f, showTime));
+
+        if (canvasGroup != null)
+            canvasGroup.alpha = 0f;
+
+        panel.SetActive(false);
+    }
+
+    public void RequestUseItem(InventoryItemType itemType)
+    {
+        RequestUseItem(itemType, 1);
+    }
+
+    public void RequestUseItem(InventoryItemType itemType, int amount)
+    {
+        if (inventoryManager == null)
+            return;
+
+        if (!inventoryManager.IsUsable(itemType))
+        {
+            ShowMessage($"{inventoryManager.GetDisplayName(itemType)}은(는) 지금 사용할 수 없습니다.");
+            PlayUIClip(defaultErrorClip);
+            return;
+        }
+
+        if (!inventoryManager.HasItem(itemType, amount))
+        {
+            ShowMessage(inventoryManager.GetInsufficientMessage(itemType, amount));
+            PlayUIClip(defaultErrorClip);
+            return;
+        }
+
+        if (inventoryManager.RequiresUseConfirmation(itemType))
+        {
+            pendingUseItemType = itemType;
+            pendingUseAmount = Mathf.Max(1, amount);
+            ShowConfirmation(itemType, amount);
+        }
+        else
+        {
+            bool result = inventoryManager.UseItem(itemType, amount);
+            if (!result)
+                PlayUIClip(defaultErrorClip);
+        }
+    }
+
+    private void ShowConfirmation(InventoryItemType itemType, int amount)
+    {
+        pendingUseItemType = itemType;
+        pendingUseAmount = Mathf.Max(1, amount);
+        hasPendingUse = true;
+
+        if (confirmationPanel == null)
+        {
+            ConfirmPendingUse();
+            return;
+        }
+
+        string displayName = inventoryManager != null ? inventoryManager.GetDisplayName(itemType) : itemType.ToString();
+
+        if (confirmationTitleText != null)
+            confirmationTitleText.text = "아이템 사용";
+
+        if (confirmationBodyText != null)
+            confirmationBodyText.text = $"{displayName}을(를) 사용하시겠습니까?";
+
+        confirmationPanel.SetActive(true);
+    }
+
+    public void ConfirmPendingUse()
+    {
+        if (confirmationPanel != null)
+            confirmationPanel.SetActive(false);
+
+        if (!hasPendingUse)
+            return;
+
+        InventoryItemType itemType = pendingUseItemType;
+        int amount = Mathf.Max(1, pendingUseAmount);
+        hasPendingUse = false;
+
+        if (inventoryManager != null)
+        {
+            bool result = inventoryManager.UseItem(itemType, amount);
+            if (!result)
+                PlayUIClip(defaultErrorClip);
+        }
+    }
+
+    public void CancelPendingUse()
+    {
+        hasPendingUse = false;
+
+        if (confirmationPanel != null)
+            confirmationPanel.SetActive(false);
+    }
+
+    public void ShowItemDetail(InventoryItemType itemType)
+    {
+        hasDetailItem = true;
+        currentDetailItemType = itemType;
+
+        if (inventoryManager == null || detailPanel == null)
+            return;
+
+        InventoryItemDefinition definition = inventoryManager.GetDefinition(itemType);
+        int count = inventoryManager.GetItemCount(itemType);
+        int maxCount = inventoryManager.GetMaxCount(itemType);
+        Sprite icon = inventoryManager.GetIcon(itemType);
+
+        if (detailIconImage != null)
+        {
+            detailIconImage.sprite = icon;
+            detailIconImage.enabled = icon != null;
+        }
+
+        if (detailTitleText != null)
+            detailTitleText.text = inventoryManager.GetDisplayName(itemType);
+
+        if (detailDescriptionText != null)
+            detailDescriptionText.text = inventoryManager.GetDescription(itemType);
+
+        if (detailCountText != null)
+            detailCountText.text = maxCount > 0 ? $"보유: x{count} / {maxCount}" : $"보유: x{count}";
+
+        if (detailGoalText != null)
+            detailGoalText.text = inventoryManager.GetGoalHint(itemType);
+
+        if (detailUseButton != null)
+        {
+            bool usable = definition != null && definition.usable && count > 0;
+            detailUseButton.gameObject.SetActive(definition != null && definition.usable);
+            detailUseButton.interactable = usable;
+        }
+
+        detailPanel.SetActive(true);
+    }
+
+    public void HideItemDetail()
+    {
+        hasDetailItem = false;
+        if (detailPanel != null)
+            detailPanel.SetActive(false);
+    }
+
+    public void UseCurrentDetailItem()
+    {
+        if (!hasDetailItem)
+            return;
+
+        RequestUseItem(currentDetailItemType, 1);
+    }
+
+    private void RefreshRecentLogs()
+    {
+        if (recentLogTexts == null || recentLogTexts.Length == 0 || inventoryManager == null)
+            return;
+
+        IReadOnlyList<InventoryLogEntry> logs = inventoryManager.GetRecentLogs();
+
+        for (int i = 0; i < recentLogTexts.Length; i++)
+        {
+            if (recentLogTexts[i] == null)
+                continue;
+
+            recentLogTexts[i].text = i < logs.Count && logs[i] != null ? logs[i].ToString() : string.Empty;
+        }
+    }
+
+    private void RefreshMemoryProgress()
+    {
+        if (inventoryManager == null)
+            return;
+
+        RefreshMemoryProgress(inventoryManager.GetItemCount(inventoryManager.MemoryPieceItemType), inventoryManager.MemoryPieceTargetCount);
+    }
+
+    private void RefreshMemoryProgress(int current, int target)
+    {
+        target = Mathf.Max(1, target);
+        current = Mathf.Clamp(current, 0, target);
+
+        if (memoryProgressText != null)
+            memoryProgressText.text = string.Format(memoryProgressFormat, current, target);
+
+        if (memoryProgressSlider != null)
+        {
+            memoryProgressSlider.minValue = 0f;
+            memoryProgressSlider.maxValue = target;
+            memoryProgressSlider.value = current;
+        }
+    }
+
+    private void PlayUIClip(AudioClip clip)
+    {
+        if (clip == null)
+            return;
+
+        if (uiAudioSource != null)
+            uiAudioSource.PlayOneShot(clip);
+        else
+            AudioSource.PlayClipAtPoint(clip, transform.position);
+    }
+
+    public void CheckVRUISetup()
+    {
+        Canvas canvas = GetComponentInParent<Canvas>();
+        if (canvas == null)
+        {
+            Debug.LogWarning("[InventoryUI] Canvas가 없습니다.", this);
+            return;
+        }
+
+        if (canvas.renderMode != RenderMode.WorldSpace)
+            Debug.LogWarning("[InventoryUI] VR UI에서는 Canvas Render Mode를 World Space로 권장합니다.", canvas);
+
+        if (EventSystem.current == null)
+            Debug.LogWarning("[InventoryUI] EventSystem이 없습니다. VR 포인터 UI가 동작하지 않을 수 있습니다.", this);
+
+        GraphicRaycaster graphicRaycaster = canvas.GetComponent<GraphicRaycaster>();
+        if (graphicRaycaster == null)
+            Debug.LogWarning("[InventoryUI] Canvas에 GraphicRaycaster 또는 Tracked Device Graphic Raycaster가 필요합니다.", canvas);
+    }
 }
diff --git a/Assets/My project/Inventory/Scripts/InventoryUILayoutController.cs b/Assets/My project/Inventory/Scripts/InventoryUILayoutController.cs
new file mode 100644
index 00000000..8d660641
--- /dev/null
+++ b/Assets/My project/Inventory/Scripts/InventoryUILayoutController.cs	
@@ -0,0 +1,2242 @@
+using System;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
+public enum InventoryRootUIMode
+{
+    TestMode,
+    PlayMode,
+    BuildMode,
+    HiddenMode,
+    LayoutOnly
+}
+
+public enum InventoryUIAnchorPreset
+{
+    Custom,
+    MiddleCenter,
+    TopLeft,
+    TopCenter,
+    TopRight,
+    MiddleLeft,
+    MiddleRight,
+    BottomLeft,
+    BottomCenter,
+    BottomRight,
+    StretchAll
+}
+
+[Serializable]
+public class InventoryControlledRectTarget
+{
+    [Header("Target")]
+    public string name;
+    public RectTransform rectTransform;
+    public GameObject activeTarget;
+
+    [Header("Rect Layout")]
+    public bool applyRect = true;
+    public InventoryUIAnchorPreset anchorPreset = InventoryUIAnchorPreset.MiddleCenter;
+    public Vector2 customAnchorMin = new Vector2(0.5f, 0.5f);
+    public Vector2 customAnchorMax = new Vector2(0.5f, 0.5f);
+    public Vector2 customPivot = new Vector2(0.5f, 0.5f);
+    public Vector2 size = new Vector2(100f, 100f);
+    public Vector2 anchoredPosition = Vector2.zero;
+
+    [Header("Transform")]
+    public bool resetScaleToOne = true;
+    public bool applyLocalScale = false;
+    public Vector3 localScale = Vector3.one;
+    public bool applyLocalRotation = false;
+    public Vector3 localEulerAngles = Vector3.zero;
+    public bool applySiblingIndex = false;
+    public int siblingIndex = 0;
+
+    [Header("Active By Mode")]
+    public bool controlActiveState = false;
+    public bool activeInTestMode = true;
+    public bool activeInPlayMode = true;
+    public bool activeInBuildMode = true;
+    public bool activeInHiddenMode = false;
+
+    [Header("CanvasGroup")]
+    public bool applyCanvasGroup = false;
+    public bool addCanvasGroupIfMissing = true;
+    [Range(0f, 1f)] public float canvasAlpha = 1f;
+    public bool canvasInteractable = false;
+    public bool canvasBlocksRaycasts = false;
+
+    [Header("Raycast")]
+    public bool applySelfImageRaycast = false;
+    public bool selfImageRaycastTarget = false;
+    public bool applyChildImageRaycasts = false;
+    public bool childImageRaycastTarget = false;
+    public bool preserveButtonImageRaycasts = true;
+    public bool applyChildTextRaycasts = false;
+    public bool childTextRaycastTarget = false;
+}
+
+[Serializable]
+public class InventoryControlledTextTarget
+{
+    [Header("Target")]
+    public string name;
+    public TMP_Text text;
+
+    [Header("Rect Layout")]
+    public bool applyRect = false;
+    public InventoryUIAnchorPreset anchorPreset = InventoryUIAnchorPreset.MiddleCenter;
+    public Vector2 customAnchorMin = new Vector2(0.5f, 0.5f);
+    public Vector2 customAnchorMax = new Vector2(0.5f, 0.5f);
+    public Vector2 customPivot = new Vector2(0.5f, 0.5f);
+    public Vector2 size = new Vector2(100f, 30f);
+    public Vector2 anchoredPosition = Vector2.zero;
+
+    [Header("Text Settings")]
+    public bool applyFontSize = false;
+    public float fontSize = 20f;
+    public bool applyAlignment = false;
+    public TextAlignmentOptions alignment = TextAlignmentOptions.Center;
+    public bool applyColor = false;
+    public Color color = Color.white;
+    public bool applyRaycastTarget = true;
+    public bool raycastTarget = false;
+    public bool resetScaleToOne = true;
+
+    [Header("Outline / Shadow")]
+    public bool applyOutline = false;
+    public bool addOutlineIfMissing = true;
+    public Color outlineColor = new Color(0f, 0.75f, 1f, 0.8f);
+    public Vector2 outlineEffectDistance = new Vector2(1f, -1f);
+    public bool outlineUseGraphicAlpha = true;
+    public bool applyShadow = false;
+    public bool addShadowIfMissing = true;
+    public Color shadowColor = new Color(0f, 0f, 0f, 0.65f);
+    public Vector2 shadowEffectDistance = new Vector2(2f, -2f);
+    public bool shadowUseGraphicAlpha = true;
+}
+
+[Serializable]
+public class InventoryControlledImageTarget
+{
+    [Header("Target")]
+    public string name;
+    public Image image;
+
+    [Header("Rect Layout")]
+    public bool applyRect = false;
+    public InventoryUIAnchorPreset anchorPreset = InventoryUIAnchorPreset.MiddleCenter;
+    public Vector2 customAnchorMin = new Vector2(0.5f, 0.5f);
+    public Vector2 customAnchorMax = new Vector2(0.5f, 0.5f);
+    public Vector2 customPivot = new Vector2(0.5f, 0.5f);
+    public Vector2 size = new Vector2(64f, 64f);
+    public Vector2 anchoredPosition = Vector2.zero;
+
+    [Header("Image Settings")]
+    public bool applyColor = false;
+    public Color color = Color.white;
+    public bool applySprite = false;
+    public Sprite sprite;
+    public bool applyRaycastTarget = true;
+    public bool raycastTarget = false;
+    public bool resetScaleToOne = true;
+
+    [Header("Outline / Shadow")]
+    public bool applyOutline = false;
+    public bool addOutlineIfMissing = true;
+    public Color outlineColor = new Color(0f, 0.75f, 1f, 0.8f);
+    public Vector2 outlineEffectDistance = new Vector2(1f, -1f);
+    public bool outlineUseGraphicAlpha = true;
+    public bool applyShadow = false;
+    public bool addShadowIfMissing = true;
+    public Color shadowColor = new Color(0f, 0f, 0f, 0.55f);
+    public Vector2 shadowEffectDistance = new Vector2(2f, -2f);
+    public bool shadowUseGraphicAlpha = true;
+}
+
+[Serializable]
+public class InventoryControlledButtonTarget
+{
+    [Header("Target")]
+    public string name;
+    public Button button;
+
+    [Header("Rect Layout")]
+    public bool applyRect = false;
+    public InventoryUIAnchorPreset anchorPreset = InventoryUIAnchorPreset.MiddleCenter;
+    public Vector2 customAnchorMin = new Vector2(0.5f, 0.5f);
+    public Vector2 customAnchorMax = new Vector2(0.5f, 0.5f);
+    public Vector2 customPivot = new Vector2(0.5f, 0.5f);
+    public Vector2 size = new Vector2(100f, 35f);
+    public Vector2 anchoredPosition = Vector2.zero;
+
+    [Header("Button Settings")]
+    public bool applyInteractable = false;
+    public bool interactable = true;
+    public bool applyImageRaycastTarget = true;
+    public bool imageRaycastTarget = true;
+    public bool disableChildTextRaycasts = true;
+    public bool resetScaleToOne = true;
+
+    [Header("Button Colors")]
+    public bool applyButtonColors = false;
+    public Color normalColor = new Color(0.07f, 0.18f, 0.30f, 0.90f);
+    public Color highlightedColor = new Color(0.12f, 0.42f, 0.70f, 1f);
+    public Color pressedColor = new Color(0.04f, 0.12f, 0.20f, 1f);
+    public Color selectedColor = new Color(0.15f, 0.50f, 0.85f, 1f);
+    public Color disabledColor = new Color(0.20f, 0.20f, 0.20f, 0.45f);
+    public float colorMultiplier = 1f;
+    public float fadeDuration = 0.1f;
+
+    [Header("Outline / Shadow")]
+    public bool applyOutline = false;
+    public bool addOutlineIfMissing = true;
+    public Color outlineColor = new Color(0f, 0.75f, 1f, 0.8f);
+    public Vector2 outlineEffectDistance = new Vector2(1f, -1f);
+    public bool outlineUseGraphicAlpha = true;
+    public bool applyShadow = false;
+    public bool addShadowIfMissing = true;
+    public Color shadowColor = new Color(0f, 0f, 0f, 0.55f);
+    public Vector2 shadowEffectDistance = new Vector2(2f, -2f);
+    public bool shadowUseGraphicAlpha = true;
+}
+
+[Serializable]
+public class InventoryLayoutPadding
+{
+    public int left;
+    public int right;
+    public int top;
+    public int bottom;
+
+    public InventoryLayoutPadding() { }
+
+    public InventoryLayoutPadding(int left, int right, int top, int bottom)
+    {
+        this.left = left;
+        this.right = right;
+        this.top = top;
+        this.bottom = bottom;
+    }
+
+    public RectOffset ToRectOffset()
+    {
+        return new RectOffset(left, right, top, bottom);
+    }
+}
+
+[Serializable]
+public class InventoryControlledGridLayoutTarget
+{
+    [Header("Target")]
+    public string name;
+    public GridLayoutGroup grid;
+
+    [Header("Grid Settings")]
+    public bool applyGrid = true;
+    public Vector2 cellSize = new Vector2(100f, 100f);
+    public Vector2 spacing = Vector2.zero;
+    public TextAnchor childAlignment = TextAnchor.MiddleCenter;
+    public GridLayoutGroup.Constraint constraint = GridLayoutGroup.Constraint.FixedColumnCount;
+    public int constraintCount = 5;
+    public InventoryLayoutPadding padding;
+}
+
+/// <summary>
+/// InventoryRoot 아래 UI를 한 곳에서 정리하는 컨트롤러입니다.
+/// - 기본 인벤토리 패널들의 위치/크기/배치를 제어합니다.
+/// - Inspector에 직접 연결한 Rect/Text/Image/Button/Grid 대상도 제어합니다.
+/// - 없는 CanvasGroup, Image, GridLayoutGroup, AudioSource 등을 자동으로 붙일 수 있습니다.
+/// - Text 내용 자체는 바꾸지 않습니다. 내용 변경은 InventoryUI가 담당하게 두는 것을 권장합니다.
+/// </summary>
+[ExecuteAlways]
+[DisallowMultipleComponent]
+public class InventoryUILayoutController : MonoBehaviour
+{
+    [Header("Root / Canvas")]
+    [SerializeField] private bool configureRootCanvas = true;
+    [SerializeField] private Vector2 rootCanvasSize = new Vector2(800f, 500f);
+    [SerializeField] private bool applyRootWorldScale = false;
+    [SerializeField] private Vector3 rootWorldScale = new Vector3(0.0015f, 0.0015f, 0.0015f);
+    [SerializeField] private bool addGraphicRaycasterIfMissing = true;
+    [SerializeField] private bool addTrackedDeviceGraphicRaycasterIfAvailable = true;
+
+    [Header("Known UI References")]
+    [SerializeField] private RectTransform inventoryPanel;
+    [SerializeField] private RectTransform titleText;
+    [SerializeField] private RectTransform closeButton;
+    [SerializeField] private RectTransform categoryButtons;
+    [SerializeField] private RectTransform memoryProgressArea;
+    [SerializeField] private RectTransform slotContainer;
+    [SerializeField] private RectTransform recentLogArea;
+    [SerializeField] private RectTransform debugPanel;
+    [SerializeField] private RectTransform quickUseButtons;
+
+    [Header("Popup / Floating Panels")]
+    [SerializeField] private RectTransform tooltipPanel;
+    [SerializeField] private RectTransform acquisitionPopupPanel;
+    [SerializeField] private RectTransform messagePanel;
+    [SerializeField] private RectTransform confirmationPanel;
+    [SerializeField] private RectTransform detailPanel;
+
+    [Header("Inventory Scripts")]
+    [SerializeField] private InventoryUI inventoryUI;
+    [SerializeField] private InventorySlotUI[] slots;
+
+    [Header("Auto Find Names")]
+    [SerializeField] private string inventoryPanelName = "InventoryPanel";
+    [SerializeField] private string titleTextName = "TitleText";
+    [SerializeField] private string closeButtonName = "CloseButton";
+    [SerializeField] private string categoryButtonsName = "CategoryButtons";
+    [SerializeField] private string memoryProgressAreaName = "MemoryProgressArea";
+    [SerializeField] private string slotContainerName = "SlotContainer";
+    [SerializeField] private string recentLogAreaName = "RecentLogArea";
+    [SerializeField] private string debugPanelName = "DebugPanel";
+    [SerializeField] private string quickUseButtonsName = "QuickUseButtons";
+    [SerializeField] private string tooltipPanelName = "TooltipPanel";
+    [SerializeField] private string acquisitionPopupPanelName = "AcquisitionPopupPanel";
+    [SerializeField] private string messagePanelName = "MessagePanel";
+    [SerializeField] private string confirmationPanelName = "ConfirmationPanel";
+    [SerializeField] private string detailPanelName = "DetailPanel";
+
+    [Header("Apply Settings")]
+    [SerializeField] private bool autoFindReferences = true;
+    [SerializeField] private bool autoAddMissingComponents = true;
+    [SerializeField] private bool applyKnownLayout = true;
+    [SerializeField] private bool applyCustomControlledTargets = true;
+    [SerializeField] private bool resetChildScaleToOne = true;
+    [SerializeField] private bool applyLayoutOnAwake = true;
+    [SerializeField] private bool applyModeOnAwake = true;
+    [Tooltip("InventoryUI.Start()의 visibleOnStart 처리 이후에 모드를 한 번 더 적용해 패널 ON/OFF 충돌을 줄입니다.")]
+    [SerializeField] private bool applyModeAfterOneFrame = true;
+    [SerializeField] private bool applyInEditor = true;
+    [SerializeField] private InventoryRootUIMode initialMode = InventoryRootUIMode.TestMode;
+
+    [Header("Known Panel Layout")]
+    [SerializeField] private Vector2 inventoryPanelSize = new Vector2(760f, 460f);
+    [SerializeField] private Vector2 inventoryPanelPos = Vector2.zero;
+    [SerializeField] private Vector2 titleTextSize = new Vector2(360f, 50f);
+    [SerializeField] private Vector2 titleTextPos = new Vector2(0f, -18f);
+    [SerializeField] private Vector2 closeButtonSize = new Vector2(70f, 38f);
+    [SerializeField] private Vector2 closeButtonPos = new Vector2(-18f, -18f);
+    [SerializeField] private Vector2 categoryButtonsSize = new Vector2(620f, 45f);
+    [SerializeField] private Vector2 categoryButtonsPos = new Vector2(0f, -75f);
+    [SerializeField] private Vector2 memoryProgressAreaSize = new Vector2(620f, 55f);
+    [SerializeField] private Vector2 memoryProgressAreaPos = new Vector2(0f, -125f);
+    [SerializeField] private Vector2 slotContainerSize = new Vector2(500f, 145f);
+    [SerializeField] private Vector2 slotContainerPos = new Vector2(-80f, 20f);
+    [SerializeField] private Vector2 recentLogSize = new Vector2(340f, 110f);
+    [SerializeField] private Vector2 recentLogPos = new Vector2(25f, 25f);
+    [SerializeField] private Vector2 debugPanelSize = new Vector2(300f, 110f);
+    [SerializeField] private Vector2 debugPanelPos = new Vector2(-25f, 25f);
+    [SerializeField] private Vector2 quickUseButtonsSize = new Vector2(130f, 160f);
+    [SerializeField] private Vector2 quickUseButtonsPos = new Vector2(-20f, -35f);
+
+    [Header("Known Popup / Detail Layout")]
+    [SerializeField] private Vector2 tooltipPanelSize = new Vector2(520f, 120f);
+    [SerializeField] private Vector2 tooltipPanelPos = new Vector2(0f, -15f);
+    [SerializeField] private Vector2 acquisitionPopupSize = new Vector2(360f, 70f);
+    [SerializeField] private Vector2 acquisitionPopupPos = new Vector2(0f, 40f);
+    [SerializeField] private Vector2 messagePanelSize = new Vector2(460f, 60f);
+    [SerializeField] private Vector2 messagePanelPos = new Vector2(0f, -85f);
+    [SerializeField] private Vector2 confirmationPanelSize = new Vector2(420f, 220f);
+    [SerializeField] private Vector2 confirmationPanelPos = Vector2.zero;
+    [SerializeField] private Vector2 detailPanelSize = new Vector2(260f, 340f);
+    [SerializeField] private Vector2 detailPanelPos = new Vector2(-25f, 0f);
+
+    [Header("Known LayoutGroup Defaults")]
+    [SerializeField] private Vector2 slotCellSize = new Vector2(85f, 120f);
+    [SerializeField] private Vector2 slotSpacing = new Vector2(8f, 0f);
+    [SerializeField] private int slotColumnCount = 5;
+    [SerializeField] private Vector2 debugButtonCellSize = new Vector2(85f, 28f);
+    [SerializeField] private Vector2 debugButtonSpacing = new Vector2(5f, 5f);
+    [SerializeField] private int debugButtonColumnCount = 3;
+    [SerializeField] private Vector2 quickUseButtonCellSize = new Vector2(115f, 26f);
+    [SerializeField] private Vector2 quickUseButtonSpacing = new Vector2(0f, 5f);
+
+    [Header("Known Slot Child Layout")]
+    [SerializeField] private bool arrangeSlotChildren = true;
+    [SerializeField] private Vector2 slotIconSize = new Vector2(64f, 64f);
+    [SerializeField] private Vector2 slotIconPos = new Vector2(0f, 18f);
+    [SerializeField] private Vector2 slotCountTextSize = new Vector2(100f, 28f);
+    [SerializeField] private Vector2 slotCountTextPos = new Vector2(0f, 8f);
+    [SerializeField] private Vector2 slotNewBadgeSize = new Vector2(52f, 24f);
+    [SerializeField] private Vector2 slotNewBadgePos = new Vector2(-4f, -4f);
+
+    [Header("Mode Active States")]
+    [SerializeField] private bool testShowInventoryPanel = true;
+    [SerializeField] private bool testShowDebugPanel = true;
+    [SerializeField] private bool testShowRecentLogArea = true;
+    [SerializeField] private bool testShowCategoryButtons = true;
+    [SerializeField] private bool testShowMemoryProgressArea = true;
+    [SerializeField] private bool testShowQuickUseButtons = false;
+
+    [SerializeField] private bool playShowInventoryPanel = false;
+    [SerializeField] private bool playShowDebugPanel = false;
+    [SerializeField] private bool playShowRecentLogArea = true;
+    [SerializeField] private bool playShowCategoryButtons = true;
+    [SerializeField] private bool playShowMemoryProgressArea = true;
+    [SerializeField] private bool playShowQuickUseButtons = false;
+
+    [SerializeField] private bool buildShowInventoryPanel = false;
+    [SerializeField] private bool buildShowDebugPanel = false;
+    [SerializeField] private bool buildShowRecentLogArea = true;
+    [SerializeField] private bool buildShowCategoryButtons = true;
+    [SerializeField] private bool buildShowMemoryProgressArea = true;
+    [SerializeField] private bool buildShowQuickUseButtons = false;
+
+    [Header("Custom Inspector-Controlled Targets")]
+    [Tooltip("패널, 영역, 빈 오브젝트 등 RectTransform 기준으로 제어할 대상입니다.")]
+    [SerializeField] private List<InventoryControlledRectTarget> controlledRects = new List<InventoryControlledRectTarget>();
+    [Tooltip("패널 자식 TMP_Text의 위치, 크기, 폰트 크기, 정렬, Raycast를 제어합니다. Text 내용은 바꾸지 않습니다.")]
+    [SerializeField] private List<InventoryControlledTextTarget> controlledTexts = new List<InventoryControlledTextTarget>();
+    [Tooltip("패널 자식 Image의 위치, 크기, 색상, Raycast를 제어합니다. Sprite는 Apply Sprite를 켰을 때만 바꿉니다.")]
+    [SerializeField] private List<InventoryControlledImageTarget> controlledImages = new List<InventoryControlledImageTarget>();
+    [Tooltip("패널 자식 Button의 위치, 크기, Interactable, Raycast를 제어합니다.")]
+    [SerializeField] private List<InventoryControlledButtonTarget> controlledButtons = new List<InventoryControlledButtonTarget>();
+    [Tooltip("SlotContainer, DebugPanel 같은 GridLayoutGroup의 Cell Size, Spacing, Count를 제어합니다.")]
+    [SerializeField] private List<InventoryControlledGridLayoutTarget> controlledGridLayouts = new List<InventoryControlledGridLayoutTarget>();
+
+    [Header("Basic Visual Theme")]
+    [SerializeField] private bool applyBasicVisualTheme = true;
+    [SerializeField] private bool styleKnownPanels = true;
+    [SerializeField] private bool styleKnownButtons = true;
+    [SerializeField] private bool styleKnownTexts = true;
+    [SerializeField] private bool styleKnownSlots = true;
+    [SerializeField] private bool addOutlineToKnownGraphics = true;
+    [SerializeField] private bool addShadowToKnownTexts = true;
+
+    [Header("Theme Colors - Ocean VR")]
+    [SerializeField] private Color mainPanelColor = new Color(0.03f, 0.08f, 0.15f, 0.88f);
+    [SerializeField] private Color subPanelColor = new Color(0.04f, 0.14f, 0.24f, 0.82f);
+    [SerializeField] private Color popupPanelColor = new Color(0.02f, 0.10f, 0.18f, 0.92f);
+    [SerializeField] private Color slotColor = new Color(0.05f, 0.16f, 0.26f, 0.90f);
+    [SerializeField] private Color slotImportantGlowColor = new Color(1.0f, 0.72f, 0.20f, 0.38f);
+    [SerializeField] private Color filteredOverlayColor = new Color(0f, 0f, 0f, 0.55f);
+    [SerializeField] private Color newBadgeColor = new Color(1.0f, 0.82f, 0.12f, 0.95f);
+    [SerializeField] private Color mainTextColor = new Color(0.95f, 0.92f, 0.82f, 1f);
+    [SerializeField] private Color accentTextColor = new Color(1.0f, 0.78f, 0.35f, 1f);
+    [SerializeField] private Color mutedTextColor = new Color(0.70f, 0.86f, 0.95f, 1f);
+    [SerializeField] private Color outlineColor = new Color(0.18f, 0.76f, 1f, 0.65f);
+    [SerializeField] private Color goldOutlineColor = new Color(1.0f, 0.72f, 0.20f, 0.80f);
+    [SerializeField] private Color shadowColor = new Color(0f, 0f, 0f, 0.62f);
+
+    [Header("Theme Button Colors")]
+    [SerializeField] private Color buttonNormalColor = new Color(0.06f, 0.20f, 0.33f, 0.95f);
+    [SerializeField] private Color buttonHighlightedColor = new Color(0.12f, 0.44f, 0.74f, 1f);
+    [SerializeField] private Color buttonPressedColor = new Color(0.03f, 0.12f, 0.22f, 1f);
+    [SerializeField] private Color buttonSelectedColor = new Color(0.16f, 0.50f, 0.82f, 1f);
+    [SerializeField] private Color buttonDisabledColor = new Color(0.20f, 0.22f, 0.24f, 0.45f);
+    [SerializeField] private Color debugButtonColor = new Color(0.07f, 0.22f, 0.32f, 0.95f);
+    [SerializeField] private Color dangerButtonColor = new Color(0.45f, 0.10f, 0.12f, 0.95f);
+
+    [Header("Popup Groups")]
+    [SerializeField] private GameObject[] extraPopupPanelsToHide;
+
+    [Header("Raycast / Component Fix")]
+    [SerializeField] private bool fixRaycastTargets = true;
+    [SerializeField] private bool fixCanvasGroups = true;
+    [SerializeField] private bool disableTextRaycasts = true;
+    [SerializeField] private bool disableNonInteractiveImageRaycasts = true;
+    [SerializeField] private bool setSliderInteractableFalse = true;
+    [SerializeField] private bool setSlotHoverSafeValues = true;
+    [SerializeField] private bool slotUseHoverScale = true;
+    [SerializeField] private float slotHoverScale = 1.03f;
+    [SerializeField] private bool slotBringToFrontOnHover = false;
+
+    private bool isApplying;
+
+    private void Reset()
+    {
+        AutoFindReferences();
+    }
+
+    private void Awake()
+    {
+        if (!Application.isPlaying)
+            return;
+
+        if (autoFindReferences)
+            AutoFindReferences();
+
+        if (autoAddMissingComponents)
+            AutoSetupMissingComponents();
+
+        if (applyLayoutOnAwake)
+            ApplyFullInventoryRootLayout();
+
+        if (applyModeOnAwake)
+            ApplyInitialMode();
+    }
+
+    private System.Collections.IEnumerator Start()
+    {
+        if (!Application.isPlaying || !applyModeAfterOneFrame)
+            yield break;
+
+        // InventoryUI.Start()의 visibleOnStart 적용이 끝난 뒤 모드를 다시 적용합니다.
+        yield return null;
+        ApplyInitialMode();
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        if (!applyInEditor)
+            return;
+
+        EditorApplication.delayCall -= DelayedApplyInEditor;
+        EditorApplication.delayCall += DelayedApplyInEditor;
+    }
+
+    private void DelayedApplyInEditor()
+    {
+        if (this == null || isApplying)
+            return;
+
+        ApplyFullInventoryRootLayout();
+    }
+#endif
+
+    [ContextMenu("Inventory UI/Apply Full Inventory Root Layout")]
+    public void ApplyFullInventoryRootLayout()
+    {
+        if (isApplying)
+            return;
+
+        isApplying = true;
+
+        if (autoFindReferences)
+            AutoFindReferences();
+
+        if (autoAddMissingComponents)
+            AutoSetupMissingComponents();
+
+        if (configureRootCanvas)
+            ConfigureRootCanvas();
+
+        if (applyKnownLayout)
+            ApplyKnownLayout();
+
+        if (arrangeSlotChildren)
+            ArrangeSlotChildren();
+
+        if (applyCustomControlledTargets)
+            ApplyCustomTargets();
+
+        if (applyBasicVisualTheme)
+            ApplyBasicVisualTheme();
+
+        if (fixRaycastTargets)
+            FixAllRaycastTargets();
+
+        isApplying = false;
+    }
+
+    [ContextMenu("Inventory UI/Apply Custom Inspector Targets Only")]
+    public void ApplyCustomTargets()
+    {
+        ApplyControlledRectTargets();
+        ApplyControlledTextTargets();
+        ApplyControlledImageTargets();
+        ApplyControlledButtonTargets();
+        ApplyControlledGridLayoutTargets();
+    }
+
+    [ContextMenu("Inventory UI/Auto Find References")]
+    public void AutoFindReferences()
+    {
+        inventoryPanel = FindRectIfNull(inventoryPanel, inventoryPanelName);
+        titleText = FindRectIfNull(titleText, titleTextName);
+        closeButton = FindRectIfNull(closeButton, closeButtonName);
+        categoryButtons = FindRectIfNull(categoryButtons, categoryButtonsName);
+        memoryProgressArea = FindRectIfNull(memoryProgressArea, memoryProgressAreaName);
+        slotContainer = FindRectIfNull(slotContainer, slotContainerName);
+        recentLogArea = FindRectIfNull(recentLogArea, recentLogAreaName);
+        debugPanel = FindRectIfNull(debugPanel, debugPanelName);
+        quickUseButtons = FindRectIfNull(quickUseButtons, quickUseButtonsName);
+        tooltipPanel = FindRectIfNull(tooltipPanel, tooltipPanelName);
+        acquisitionPopupPanel = FindRectIfNull(acquisitionPopupPanel, acquisitionPopupPanelName);
+        messagePanel = FindRectIfNull(messagePanel, messagePanelName);
+        confirmationPanel = FindRectIfNull(confirmationPanel, confirmationPanelName);
+        detailPanel = FindRectIfNull(detailPanel, detailPanelName);
+
+        if (inventoryUI == null)
+            inventoryUI = GetComponent<InventoryUI>();
+
+        if (slots == null || slots.Length == 0)
+            slots = GetComponentsInChildren<InventorySlotUI>(true);
+    }
+
+    [ContextMenu("Inventory UI/Auto Setup Missing Components")]
+    public void AutoSetupMissingComponents()
+    {
+        Canvas canvas = GetOrAdd<Canvas>(gameObject);
+        canvas.renderMode = RenderMode.WorldSpace;
+
+        GetOrAdd<CanvasScaler>(gameObject);
+
+        if (addGraphicRaycasterIfMissing)
+            GetOrAdd<GraphicRaycaster>(gameObject);
+
+        if (addTrackedDeviceGraphicRaycasterIfAvailable)
+            TryAddComponentByTypeName(gameObject, "UnityEngine.XR.Interaction.Toolkit.UI.TrackedDeviceGraphicRaycaster");
+
+        GetOrAdd<AudioSource>(gameObject).playOnAwake = false;
+
+        AddCanvasGroupIfNeeded(tooltipPanel, false, false);
+        AddCanvasGroupIfNeeded(acquisitionPopupPanel, false, false);
+        AddCanvasGroupIfNeeded(messagePanel, false, false);
+        AddCanvasGroupIfNeeded(confirmationPanel, true, true);
+        AddCanvasGroupIfNeeded(detailPanel, true, true);
+
+        if (slotContainer != null)
+            GetOrAdd<GridLayoutGroup>(slotContainer.gameObject);
+
+        if (debugPanel != null)
+            GetOrAdd<GridLayoutGroup>(debugPanel.gameObject);
+
+        if (quickUseButtons != null && quickUseButtons.GetComponent<LayoutGroup>() == null)
+            quickUseButtons.gameObject.AddComponent<VerticalLayoutGroup>();
+    }
+
+    [ContextMenu("Inventory UI/Add Default Known Targets To Inspector Lists")]
+    public void AddDefaultKnownTargetsToInspectorLists()
+    {
+        AutoFindReferences();
+
+        AddControlledRect("InventoryPanel", inventoryPanel, null, InventoryUIAnchorPreset.MiddleCenter, inventoryPanelSize, inventoryPanelPos, false, true, true, true, false);
+        AddControlledRect("TitleText", titleText, null, InventoryUIAnchorPreset.TopCenter, titleTextSize, titleTextPos, false, true, true, true, false);
+        AddControlledRect("CloseButton", closeButton, null, InventoryUIAnchorPreset.TopRight, closeButtonSize, closeButtonPos, false, true, true, true, false);
+        AddControlledRect("CategoryButtons", categoryButtons, null, InventoryUIAnchorPreset.TopCenter, categoryButtonsSize, categoryButtonsPos, true, testShowCategoryButtons, playShowCategoryButtons, buildShowCategoryButtons, false);
+        AddControlledRect("MemoryProgressArea", memoryProgressArea, null, InventoryUIAnchorPreset.TopCenter, memoryProgressAreaSize, memoryProgressAreaPos, true, testShowMemoryProgressArea, playShowMemoryProgressArea, buildShowMemoryProgressArea, false);
+        AddControlledRect("SlotContainer", slotContainer, null, InventoryUIAnchorPreset.MiddleCenter, slotContainerSize, slotContainerPos, false, true, true, true, false);
+        AddControlledRect("RecentLogArea", recentLogArea, null, InventoryUIAnchorPreset.BottomLeft, recentLogSize, recentLogPos, true, testShowRecentLogArea, playShowRecentLogArea, buildShowRecentLogArea, false);
+        AddControlledRect("DebugPanel", debugPanel, null, InventoryUIAnchorPreset.BottomRight, debugPanelSize, debugPanelPos, true, testShowDebugPanel, playShowDebugPanel, buildShowDebugPanel, false);
+        AddControlledRect("QuickUseButtons", quickUseButtons, null, InventoryUIAnchorPreset.MiddleRight, quickUseButtonsSize, quickUseButtonsPos, true, testShowQuickUseButtons, playShowQuickUseButtons, buildShowQuickUseButtons, false);
+        AddControlledRect("TooltipPanel", tooltipPanel, null, InventoryUIAnchorPreset.BottomCenter, tooltipPanelSize, tooltipPanelPos, true, false, false, false, false);
+        AddControlledRect("AcquisitionPopupPanel", acquisitionPopupPanel, null, InventoryUIAnchorPreset.TopCenter, acquisitionPopupSize, acquisitionPopupPos, true, false, false, false, false);
+        AddControlledRect("MessagePanel", messagePanel, null, InventoryUIAnchorPreset.BottomCenter, messagePanelSize, messagePanelPos, true, false, false, false, false);
+        AddControlledRect("ConfirmationPanel", confirmationPanel, null, InventoryUIAnchorPreset.MiddleCenter, confirmationPanelSize, confirmationPanelPos, true, false, false, false, false);
+        AddControlledRect("DetailPanel", detailPanel, null, InventoryUIAnchorPreset.MiddleRight, detailPanelSize, detailPanelPos, true, false, false, false, false);
+
+        AddGrid("SlotContainer Grid", slotContainer != null ? slotContainer.GetComponent<GridLayoutGroup>() : null, slotCellSize, slotSpacing, GridLayoutGroup.Constraint.FixedColumnCount, slotColumnCount);
+        AddGrid("DebugPanel Grid", debugPanel != null ? debugPanel.GetComponent<GridLayoutGroup>() : null, debugButtonCellSize, debugButtonSpacing, GridLayoutGroup.Constraint.FixedColumnCount, debugButtonColumnCount);
+
+        AddChildrenOfPanelsToInspectorLists();
+    }
+
+    [ContextMenu("Inventory UI/Add Current Panel Children Texts Images Buttons")]
+    public void AddChildrenOfPanelsToInspectorLists()
+    {
+        RectTransform[] panels = new[] { inventoryPanel, tooltipPanel, acquisitionPopupPanel, messagePanel, confirmationPanel, detailPanel, recentLogArea, debugPanel };
+
+        foreach (RectTransform panel in panels)
+        {
+            if (panel == null)
+                continue;
+
+            foreach (TMP_Text text in panel.GetComponentsInChildren<TMP_Text>(true))
+                AddText(text.name, text);
+
+            foreach (Image image in panel.GetComponentsInChildren<Image>(true))
+                AddImage(image.name, image);
+
+            foreach (Button button in panel.GetComponentsInChildren<Button>(true))
+                AddButton(button.name, button);
+        }
+    }
+
+    [ContextMenu("Inventory UI/Clear Custom Inspector Lists")]
+    public void ClearCustomInspectorLists()
+    {
+        controlledRects.Clear();
+        controlledTexts.Clear();
+        controlledImages.Clear();
+        controlledButtons.Clear();
+        controlledGridLayouts.Clear();
+    }
+
+    /// <summary>
+    /// Scene View/RectTransform에서 직접 옮긴 현재 위치와 크기를 컨트롤러 값으로 저장합니다.
+    /// 이후 Apply Full Inventory Root Layout을 실행해도 캡처한 위치가 유지됩니다.
+    /// </summary>
+    [ContextMenu("Inventory UI/Capture Current Layout")]
+    public void CaptureCurrentLayout()
+    {
+        if (autoFindReferences)
+            AutoFindReferences();
+
+        CaptureKnownLayoutValues();
+        CaptureCustomTargetLayoutValues();
+        CaptureKnownGridLayoutValues();
+
+        MarkControllerDirty();
+        Debug.Log("[InventoryUILayoutController] 현재 UI 위치/크기/배치 값을 컨트롤러에 저장했습니다.", this);
+    }
+
+    [ContextMenu("Inventory UI/Capture Current Known Layout")]
+    public void CaptureCurrentKnownLayout()
+    {
+        if (autoFindReferences)
+            AutoFindReferences();
+
+        CaptureKnownLayoutValues();
+        CaptureKnownGridLayoutValues();
+        MarkControllerDirty();
+        Debug.Log("[InventoryUILayoutController] Known UI References의 현재 위치/크기를 저장했습니다.", this);
+    }
+
+    [ContextMenu("Inventory UI/Capture Current Custom Targets")]
+    public void CaptureCurrentCustomTargets()
+    {
+        CaptureCustomTargetLayoutValues();
+        MarkControllerDirty();
+        Debug.Log("[InventoryUILayoutController] Custom Inspector-Controlled Targets의 현재 위치/크기를 저장했습니다.", this);
+    }
+
+    [ContextMenu("Inventory UI/Capture Known Layout Into Controlled Rects")]
+    public void CaptureKnownLayoutIntoControlledRects()
+    {
+        if (autoFindReferences)
+            AutoFindReferences();
+
+        CaptureOrAddControlledRect("InventoryPanel", inventoryPanel, false, true, true, true, false);
+        CaptureOrAddControlledRect("TitleText", titleText, false, true, true, true, false);
+        CaptureOrAddControlledRect("CloseButton", closeButton, false, true, true, true, false);
+        CaptureOrAddControlledRect("CategoryButtons", categoryButtons, true, testShowCategoryButtons, playShowCategoryButtons, buildShowCategoryButtons, false);
+        CaptureOrAddControlledRect("MemoryProgressArea", memoryProgressArea, true, testShowMemoryProgressArea, playShowMemoryProgressArea, buildShowMemoryProgressArea, false);
+        CaptureOrAddControlledRect("SlotContainer", slotContainer, false, true, true, true, false);
+        CaptureOrAddControlledRect("RecentLogArea", recentLogArea, true, testShowRecentLogArea, playShowRecentLogArea, buildShowRecentLogArea, false);
+        CaptureOrAddControlledRect("DebugPanel", debugPanel, true, testShowDebugPanel, playShowDebugPanel, buildShowDebugPanel, false);
+        CaptureOrAddControlledRect("QuickUseButtons", quickUseButtons, true, testShowQuickUseButtons, playShowQuickUseButtons, buildShowQuickUseButtons, false);
+        CaptureOrAddControlledRect("TooltipPanel", tooltipPanel, true, false, false, false, false);
+        CaptureOrAddControlledRect("AcquisitionPopupPanel", acquisitionPopupPanel, true, false, false, false, false);
+        CaptureOrAddControlledRect("MessagePanel", messagePanel, true, false, false, false, false);
+        CaptureOrAddControlledRect("ConfirmationPanel", confirmationPanel, true, false, false, false, false);
+        CaptureOrAddControlledRect("DetailPanel", detailPanel, true, false, false, false, false);
+
+        MarkControllerDirty();
+        Debug.Log("[InventoryUILayoutController] 현재 Known UI 위치를 Controlled Rects에 저장했습니다.", this);
+    }
+
+    private void CaptureKnownLayoutValues()
+    {
+        RectTransform rootRect = GetComponent<RectTransform>();
+        if (rootRect != null)
+        {
+            rootCanvasSize = rootRect.sizeDelta;
+            rootWorldScale = rootRect.localScale;
+        }
+
+        CaptureKnownRect(inventoryPanel, ref inventoryPanelSize, ref inventoryPanelPos);
+        CaptureKnownRect(titleText, ref titleTextSize, ref titleTextPos);
+        CaptureKnownRect(closeButton, ref closeButtonSize, ref closeButtonPos);
+        CaptureKnownRect(categoryButtons, ref categoryButtonsSize, ref categoryButtonsPos);
+        CaptureKnownRect(memoryProgressArea, ref memoryProgressAreaSize, ref memoryProgressAreaPos);
+        CaptureKnownRect(slotContainer, ref slotContainerSize, ref slotContainerPos);
+        CaptureKnownRect(recentLogArea, ref recentLogSize, ref recentLogPos);
+        CaptureKnownRect(debugPanel, ref debugPanelSize, ref debugPanelPos);
+        CaptureKnownRect(quickUseButtons, ref quickUseButtonsSize, ref quickUseButtonsPos);
+        CaptureKnownRect(tooltipPanel, ref tooltipPanelSize, ref tooltipPanelPos);
+        CaptureKnownRect(acquisitionPopupPanel, ref acquisitionPopupSize, ref acquisitionPopupPos);
+        CaptureKnownRect(messagePanel, ref messagePanelSize, ref messagePanelPos);
+        CaptureKnownRect(confirmationPanel, ref confirmationPanelSize, ref confirmationPanelPos);
+        CaptureKnownRect(detailPanel, ref detailPanelSize, ref detailPanelPos);
+    }
+
+    private void CaptureKnownRect(RectTransform rect, ref Vector2 sizeField, ref Vector2 posField)
+    {
+        if (rect == null)
+            return;
+
+        sizeField = rect.sizeDelta;
+        posField = rect.anchoredPosition;
+    }
+
+    private void CaptureCustomTargetLayoutValues()
+    {
+        if (controlledRects != null)
+        {
+            foreach (InventoryControlledRectTarget target in controlledRects)
+            {
+                if (target == null || target.rectTransform == null)
+                    continue;
+
+                CaptureRectData(target.rectTransform, target);
+            }
+        }
+
+        if (controlledTexts != null)
+        {
+            foreach (InventoryControlledTextTarget target in controlledTexts)
+            {
+                if (target == null || target.text == null)
+                    continue;
+
+                CaptureRectData(target.text.rectTransform, target);
+            }
+        }
+
+        if (controlledImages != null)
+        {
+            foreach (InventoryControlledImageTarget target in controlledImages)
+            {
+                if (target == null || target.image == null)
+                    continue;
+
+                CaptureRectData(target.image.rectTransform, target);
+            }
+        }
+
+        if (controlledButtons != null)
+        {
+            foreach (InventoryControlledButtonTarget target in controlledButtons)
+            {
+                if (target == null || target.button == null)
+                    continue;
+
+                CaptureRectData(target.button.GetComponent<RectTransform>(), target);
+            }
+        }
+
+        if (controlledGridLayouts != null)
+        {
+            foreach (InventoryControlledGridLayoutTarget target in controlledGridLayouts)
+            {
+                if (target == null || target.grid == null)
+                    continue;
+
+                CaptureGridData(target.grid, target);
+            }
+        }
+    }
+
+    private void CaptureKnownGridLayoutValues()
+    {
+        GridLayoutGroup slotGrid = slotContainer != null ? slotContainer.GetComponent<GridLayoutGroup>() : null;
+        if (slotGrid != null)
+        {
+            slotCellSize = slotGrid.cellSize;
+            slotSpacing = slotGrid.spacing;
+            slotColumnCount = Mathf.Max(1, slotGrid.constraintCount);
+        }
+
+        GridLayoutGroup debugGrid = debugPanel != null ? debugPanel.GetComponent<GridLayoutGroup>() : null;
+        if (debugGrid != null)
+        {
+            debugButtonCellSize = debugGrid.cellSize;
+            debugButtonSpacing = debugGrid.spacing;
+            debugButtonColumnCount = Mathf.Max(1, debugGrid.constraintCount);
+        }
+
+        GridLayoutGroup quickUseGrid = quickUseButtons != null ? quickUseButtons.GetComponent<GridLayoutGroup>() : null;
+        if (quickUseGrid != null)
+        {
+            quickUseButtonCellSize = quickUseGrid.cellSize;
+            quickUseButtonSpacing = quickUseGrid.spacing;
+        }
+        else if (quickUseButtons != null)
+        {
+            VerticalLayoutGroup vertical = quickUseButtons.GetComponent<VerticalLayoutGroup>();
+            if (vertical != null)
+                quickUseButtonSpacing = new Vector2(quickUseButtonSpacing.x, vertical.spacing);
+        }
+    }
+
+    private void CaptureRectData(RectTransform rect, InventoryControlledRectTarget target)
+    {
+        if (rect == null || target == null)
+            return;
+
+        target.applyRect = true;
+        target.anchorPreset = DetectAnchorPreset(rect);
+        target.customAnchorMin = rect.anchorMin;
+        target.customAnchorMax = rect.anchorMax;
+        target.customPivot = rect.pivot;
+        target.size = rect.sizeDelta;
+        target.anchoredPosition = rect.anchoredPosition;
+        target.localScale = rect.localScale;
+        target.localEulerAngles = rect.localEulerAngles;
+        target.siblingIndex = rect.GetSiblingIndex();
+    }
+
+    private void CaptureRectData(RectTransform rect, InventoryControlledTextTarget target)
+    {
+        if (rect == null || target == null)
+            return;
+
+        target.applyRect = true;
+        target.anchorPreset = DetectAnchorPreset(rect);
+        target.customAnchorMin = rect.anchorMin;
+        target.customAnchorMax = rect.anchorMax;
+        target.customPivot = rect.pivot;
+        target.size = rect.sizeDelta;
+        target.anchoredPosition = rect.anchoredPosition;
+    }
+
+    private void CaptureRectData(RectTransform rect, InventoryControlledImageTarget target)
+    {
+        if (rect == null || target == null)
+            return;
+
+        target.applyRect = true;
+        target.anchorPreset = DetectAnchorPreset(rect);
+        target.customAnchorMin = rect.anchorMin;
+        target.customAnchorMax = rect.anchorMax;
+        target.customPivot = rect.pivot;
+        target.size = rect.sizeDelta;
+        target.anchoredPosition = rect.anchoredPosition;
+    }
+
+    private void CaptureRectData(RectTransform rect, InventoryControlledButtonTarget target)
+    {
+        if (rect == null || target == null)
+            return;
+
+        target.applyRect = true;
+        target.anchorPreset = DetectAnchorPreset(rect);
+        target.customAnchorMin = rect.anchorMin;
+        target.customAnchorMax = rect.anchorMax;
+        target.customPivot = rect.pivot;
+        target.size = rect.sizeDelta;
+        target.anchoredPosition = rect.anchoredPosition;
+    }
+
+    private void CaptureGridData(GridLayoutGroup grid, InventoryControlledGridLayoutTarget target)
+    {
+        if (grid == null || target == null)
+            return;
+
+        target.applyGrid = true;
+        target.cellSize = grid.cellSize;
+        target.spacing = grid.spacing;
+        target.childAlignment = grid.childAlignment;
+        target.constraint = grid.constraint;
+        target.constraintCount = Mathf.Max(1, grid.constraintCount);
+        target.padding = new InventoryLayoutPadding(grid.padding.left, grid.padding.right, grid.padding.top, grid.padding.bottom);
+    }
+
+    private void CaptureOrAddControlledRect(string targetName, RectTransform rect, bool controlActive, bool testActive, bool playActive, bool buildActive, bool hiddenActive)
+    {
+        if (rect == null)
+            return;
+
+        if (controlledRects == null)
+            controlledRects = new List<InventoryControlledRectTarget>();
+
+        InventoryControlledRectTarget target = FindControlledRect(rect);
+        if (target == null)
+        {
+            target = new InventoryControlledRectTarget();
+            controlledRects.Add(target);
+        }
+
+        target.name = targetName;
+        target.rectTransform = rect;
+        target.activeTarget = rect.gameObject;
+        target.controlActiveState = controlActive;
+        target.activeInTestMode = testActive;
+        target.activeInPlayMode = playActive;
+        target.activeInBuildMode = buildActive;
+        target.activeInHiddenMode = hiddenActive;
+        CaptureRectData(rect, target);
+    }
+
+    private InventoryControlledRectTarget FindControlledRect(RectTransform rect)
+    {
+        if (rect == null || controlledRects == null)
+            return null;
+
+        foreach (InventoryControlledRectTarget target in controlledRects)
+        {
+            if (target != null && target.rectTransform == rect)
+                return target;
+        }
+
+        return null;
+    }
+
+    private InventoryUIAnchorPreset DetectAnchorPreset(RectTransform rect)
+    {
+        if (rect == null)
+            return InventoryUIAnchorPreset.MiddleCenter;
+
+        if (Approximately(rect.anchorMin, Vector2.zero) && Approximately(rect.anchorMax, Vector2.one))
+            return InventoryUIAnchorPreset.StretchAll;
+
+        if (!Approximately(rect.anchorMin, rect.anchorMax))
+            return InventoryUIAnchorPreset.Custom;
+
+        Vector2 anchor = rect.anchorMin;
+        Vector2 pivot = rect.pivot;
+
+        if (Approximately(anchor, new Vector2(0.5f, 0.5f)) && Approximately(pivot, new Vector2(0.5f, 0.5f))) return InventoryUIAnchorPreset.MiddleCenter;
+        if (Approximately(anchor, new Vector2(0f, 1f)) && Approximately(pivot, new Vector2(0f, 1f))) return InventoryUIAnchorPreset.TopLeft;
+        if (Approximately(anchor, new Vector2(0.5f, 1f)) && Approximately(pivot, new Vector2(0.5f, 1f))) return InventoryUIAnchorPreset.TopCenter;
+        if (Approximately(anchor, new Vector2(1f, 1f)) && Approximately(pivot, new Vector2(1f, 1f))) return InventoryUIAnchorPreset.TopRight;
+        if (Approximately(anchor, new Vector2(0f, 0.5f)) && Approximately(pivot, new Vector2(0f, 0.5f))) return InventoryUIAnchorPreset.MiddleLeft;
+        if (Approximately(anchor, new Vector2(1f, 0.5f)) && Approximately(pivot, new Vector2(1f, 0.5f))) return InventoryUIAnchorPreset.MiddleRight;
+        if (Approximately(anchor, new Vector2(0f, 0f)) && Approximately(pivot, new Vector2(0f, 0f))) return InventoryUIAnchorPreset.BottomLeft;
+        if (Approximately(anchor, new Vector2(0.5f, 0f)) && Approximately(pivot, new Vector2(0.5f, 0f))) return InventoryUIAnchorPreset.BottomCenter;
+        if (Approximately(anchor, new Vector2(1f, 0f)) && Approximately(pivot, new Vector2(1f, 0f))) return InventoryUIAnchorPreset.BottomRight;
+
+        return InventoryUIAnchorPreset.Custom;
+    }
+
+    private bool Approximately(Vector2 a, Vector2 b)
+    {
+        return Mathf.Abs(a.x - b.x) <= 0.0001f && Mathf.Abs(a.y - b.y) <= 0.0001f;
+    }
+
+    private void MarkControllerDirty()
+    {
+#if UNITY_EDITOR
+        if (!Application.isPlaying)
+        {
+            EditorUtility.SetDirty(this);
+            PrefabUtility.RecordPrefabInstancePropertyModifications(this);
+            UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(gameObject.scene);
+        }
+#endif
+    }
+
+    private void ConfigureRootCanvas()
+    {
+        RectTransform rootRect = GetComponent<RectTransform>();
+        if (rootRect != null)
+        {
+            rootRect.sizeDelta = rootCanvasSize;
+            if (applyRootWorldScale)
+                rootRect.localScale = rootWorldScale;
+        }
+
+        Canvas canvas = GetComponent<Canvas>();
+        if (canvas != null)
+            canvas.renderMode = RenderMode.WorldSpace;
+    }
+
+    private void ApplyKnownLayout()
+    {
+        ApplyRect(inventoryPanel, InventoryUIAnchorPreset.MiddleCenter, inventoryPanelSize, inventoryPanelPos);
+        ApplyRect(titleText, InventoryUIAnchorPreset.TopCenter, titleTextSize, titleTextPos);
+        ApplyRect(closeButton, InventoryUIAnchorPreset.TopRight, closeButtonSize, closeButtonPos);
+        ApplyRect(categoryButtons, InventoryUIAnchorPreset.TopCenter, categoryButtonsSize, categoryButtonsPos);
+        ApplyRect(memoryProgressArea, InventoryUIAnchorPreset.TopCenter, memoryProgressAreaSize, memoryProgressAreaPos);
+        ApplyRect(slotContainer, InventoryUIAnchorPreset.MiddleCenter, slotContainerSize, slotContainerPos);
+        ApplyRect(recentLogArea, InventoryUIAnchorPreset.BottomLeft, recentLogSize, recentLogPos);
+        ApplyRect(debugPanel, InventoryUIAnchorPreset.BottomRight, debugPanelSize, debugPanelPos);
+        ApplyRect(quickUseButtons, InventoryUIAnchorPreset.MiddleRight, quickUseButtonsSize, quickUseButtonsPos);
+        ApplyRect(tooltipPanel, InventoryUIAnchorPreset.BottomCenter, tooltipPanelSize, tooltipPanelPos);
+        ApplyRect(acquisitionPopupPanel, InventoryUIAnchorPreset.TopCenter, acquisitionPopupSize, acquisitionPopupPos);
+        ApplyRect(messagePanel, InventoryUIAnchorPreset.BottomCenter, messagePanelSize, messagePanelPos);
+        ApplyRect(confirmationPanel, InventoryUIAnchorPreset.MiddleCenter, confirmationPanelSize, confirmationPanelPos);
+        ApplyRect(detailPanel, InventoryUIAnchorPreset.MiddleRight, detailPanelSize, detailPanelPos);
+
+        ConfigureKnownLayoutGroups();
+    }
+
+    private void ConfigureKnownLayoutGroups()
+    {
+        if (slotContainer != null)
+        {
+            GridLayoutGroup grid = GetOrAdd<GridLayoutGroup>(slotContainer.gameObject);
+            ConfigureGrid(grid, slotCellSize, slotSpacing, GridLayoutGroup.Constraint.FixedColumnCount, slotColumnCount, TextAnchor.MiddleCenter, new InventoryLayoutPadding(0, 0, 0, 0));
+        }
+
+        if (debugPanel != null)
+        {
+            GridLayoutGroup grid = GetOrAdd<GridLayoutGroup>(debugPanel.gameObject);
+            ConfigureGrid(grid, debugButtonCellSize, debugButtonSpacing, GridLayoutGroup.Constraint.FixedColumnCount, debugButtonColumnCount, TextAnchor.MiddleCenter, new InventoryLayoutPadding(0, 0, 0, 0));
+        }
+
+        ConfigureQuickUseButtonsLayout();
+    }
+
+    private void ConfigureQuickUseButtonsLayout()
+    {
+        if (quickUseButtons == null)
+            return;
+
+        // Unity UI는 한 GameObject에 LayoutGroup을 하나만 붙일 수 있습니다.
+        // QuickUseButtons에 이미 GridLayoutGroup이 있으면 VerticalLayoutGroup을 추가하지 않고 GridLayoutGroup을 그대로 설정합니다.
+        VerticalLayoutGroup vertical = quickUseButtons.GetComponent<VerticalLayoutGroup>();
+        if (vertical != null)
+        {
+            vertical.childAlignment = TextAnchor.MiddleCenter;
+            vertical.spacing = quickUseButtonSpacing.y;
+            vertical.childControlWidth = true;
+            vertical.childControlHeight = true;
+            vertical.childForceExpandWidth = false;
+            vertical.childForceExpandHeight = false;
+            return;
+        }
+
+        GridLayoutGroup grid = quickUseButtons.GetComponent<GridLayoutGroup>();
+        if (grid != null)
+        {
+            ConfigureGrid(grid, quickUseButtonCellSize, quickUseButtonSpacing, GridLayoutGroup.Constraint.FixedColumnCount, 1, TextAnchor.MiddleCenter, new InventoryLayoutPadding(0, 0, 0, 0));
+            return;
+        }
+
+        LayoutGroup existingLayoutGroup = quickUseButtons.GetComponent<LayoutGroup>();
+        if (existingLayoutGroup != null)
+        {
+            Debug.LogWarning($"[InventoryUILayoutController] QuickUseButtons에 지원하지 않는 LayoutGroup({existingLayoutGroup.GetType().Name})이 이미 있습니다. 자동 배치를 건너뜁니다.", quickUseButtons);
+            return;
+        }
+
+        VerticalLayoutGroup added = quickUseButtons.gameObject.AddComponent<VerticalLayoutGroup>();
+        if (added == null)
+            return;
+
+        added.childAlignment = TextAnchor.MiddleCenter;
+        added.spacing = quickUseButtonSpacing.y;
+        added.childControlWidth = true;
+        added.childControlHeight = true;
+        added.childForceExpandWidth = false;
+        added.childForceExpandHeight = false;
+    }
+
+    private void ArrangeSlotChildren()
+    {
+        if (slots == null || slots.Length == 0)
+            slots = GetComponentsInChildren<InventorySlotUI>(true);
+
+        foreach (InventorySlotUI slot in slots)
+        {
+            if (slot == null)
+                continue;
+
+            RectTransform slotRect = slot.GetComponent<RectTransform>();
+            if (slotRect != null && resetChildScaleToOne)
+                slotRect.localScale = Vector3.one;
+
+            RectTransform icon = FindChildRect(slot.transform, "Icon");
+            RectTransform count = FindChildRect(slot.transform, "CountText");
+            RectTransform newBadge = FindChildRect(slot.transform, "NewBadge");
+            RectTransform importantGlow = FindChildRect(slot.transform, "ImportantGlow");
+            RectTransform filteredOverlay = FindChildRect(slot.transform, "FilteredOutOverlay");
+
+            ApplyRect(icon, InventoryUIAnchorPreset.MiddleCenter, slotIconSize, slotIconPos);
+            ApplyRect(count, InventoryUIAnchorPreset.BottomCenter, slotCountTextSize, slotCountTextPos);
+            ApplyRect(newBadge, InventoryUIAnchorPreset.TopRight, slotNewBadgeSize, slotNewBadgePos);
+            ApplyStretch(importantGlow, new Vector2(-4f, -4f), new Vector2(4f, 4f));
+            ApplyStretch(filteredOverlay, Vector2.zero, Vector2.zero);
+        }
+    }
+
+    private void ApplyControlledRectTargets()
+    {
+        if (controlledRects == null)
+            return;
+
+        foreach (InventoryControlledRectTarget target in controlledRects)
+        {
+            if (target == null)
+                continue;
+
+            RectTransform rect = target.rectTransform;
+            if (rect == null)
+                continue;
+
+            if (target.applyRect)
+                ApplyRect(rect, target.anchorPreset, target.size, target.anchoredPosition, target.customAnchorMin, target.customAnchorMax, target.customPivot);
+
+            if (target.resetScaleToOne)
+                rect.localScale = Vector3.one;
+
+            if (target.applyLocalScale)
+                rect.localScale = target.localScale;
+
+            if (target.applyLocalRotation)
+                rect.localEulerAngles = target.localEulerAngles;
+
+            if (target.applySiblingIndex)
+                rect.SetSiblingIndex(Mathf.Max(0, target.siblingIndex));
+
+            if (target.applyCanvasGroup)
+            {
+                CanvasGroup group = target.addCanvasGroupIfMissing ? GetOrAdd<CanvasGroup>(rect.gameObject) : rect.GetComponent<CanvasGroup>();
+                if (group != null)
+                {
+                    group.alpha = target.canvasAlpha;
+                    group.interactable = target.canvasInteractable;
+                    group.blocksRaycasts = target.canvasBlocksRaycasts;
+                }
+            }
+
+            if (target.applySelfImageRaycast)
+            {
+                Image image = rect.GetComponent<Image>();
+                if (image != null)
+                    image.raycastTarget = target.selfImageRaycastTarget;
+            }
+
+            if (target.applyChildImageRaycasts)
+            {
+                foreach (Image image in rect.GetComponentsInChildren<Image>(true))
+                {
+                    if (target.preserveButtonImageRaycasts && image.GetComponentInParent<Button>() != null)
+                        continue;
+
+                    image.raycastTarget = target.childImageRaycastTarget;
+                }
+            }
+
+            if (target.applyChildTextRaycasts)
+            {
+                foreach (TMP_Text text in rect.GetComponentsInChildren<TMP_Text>(true))
+                    text.raycastTarget = target.childTextRaycastTarget;
+            }
+        }
+    }
+
+    private void ApplyControlledTextTargets()
+    {
+        if (controlledTexts == null)
+            return;
+
+        foreach (InventoryControlledTextTarget target in controlledTexts)
+        {
+            if (target == null || target.text == null)
+                continue;
+
+            RectTransform rect = target.text.rectTransform;
+            if (target.applyRect)
+                ApplyRect(rect, target.anchorPreset, target.size, target.anchoredPosition, target.customAnchorMin, target.customAnchorMax, target.customPivot);
+
+            if (target.resetScaleToOne && rect != null)
+                rect.localScale = Vector3.one;
+
+            if (target.applyFontSize)
+                target.text.fontSize = target.fontSize;
+
+            if (target.applyAlignment)
+                target.text.alignment = target.alignment;
+
+            if (target.applyColor)
+                target.text.color = target.color;
+
+            if (target.applyRaycastTarget)
+                target.text.raycastTarget = target.raycastTarget;
+
+            if (target.applyOutline)
+                ApplyOutline(target.text.gameObject, target.outlineColor, target.outlineEffectDistance, target.outlineUseGraphicAlpha, target.addOutlineIfMissing);
+
+            if (target.applyShadow)
+                ApplyShadow(target.text.gameObject, target.shadowColor, target.shadowEffectDistance, target.shadowUseGraphicAlpha, target.addShadowIfMissing);
+        }
+    }
+
+    private void ApplyControlledImageTargets()
+    {
+        if (controlledImages == null)
+            return;
+
+        foreach (InventoryControlledImageTarget target in controlledImages)
+        {
+            if (target == null || target.image == null)
+                continue;
+
+            RectTransform rect = target.image.rectTransform;
+            if (target.applyRect)
+                ApplyRect(rect, target.anchorPreset, target.size, target.anchoredPosition, target.customAnchorMin, target.customAnchorMax, target.customPivot);
+
+            if (target.resetScaleToOne && rect != null)
+                rect.localScale = Vector3.one;
+
+            if (target.applyColor)
+                target.image.color = target.color;
+
+            if (target.applySprite)
+                target.image.sprite = target.sprite;
+
+            if (target.applyRaycastTarget)
+                target.image.raycastTarget = target.raycastTarget;
+
+            if (target.applyOutline)
+                ApplyOutline(target.image.gameObject, target.outlineColor, target.outlineEffectDistance, target.outlineUseGraphicAlpha, target.addOutlineIfMissing);
+
+            if (target.applyShadow)
+                ApplyShadow(target.image.gameObject, target.shadowColor, target.shadowEffectDistance, target.shadowUseGraphicAlpha, target.addShadowIfMissing);
+        }
+    }
+
+    private void ApplyControlledButtonTargets()
+    {
+        if (controlledButtons == null)
+            return;
+
+        foreach (InventoryControlledButtonTarget target in controlledButtons)
+        {
+            if (target == null || target.button == null)
+                continue;
+
+            RectTransform rect = target.button.GetComponent<RectTransform>();
+            if (target.applyRect)
+                ApplyRect(rect, target.anchorPreset, target.size, target.anchoredPosition, target.customAnchorMin, target.customAnchorMax, target.customPivot);
+
+            if (target.resetScaleToOne && rect != null)
+                rect.localScale = Vector3.one;
+
+            if (target.applyInteractable)
+                target.button.interactable = target.interactable;
+
+            if (target.applyImageRaycastTarget)
+            {
+                Image image = target.button.GetComponent<Image>();
+                if (image != null)
+                    image.raycastTarget = target.imageRaycastTarget;
+            }
+
+            if (target.applyButtonColors)
+                ApplyButtonColorBlock(target.button, target.normalColor, target.highlightedColor, target.pressedColor, target.selectedColor, target.disabledColor, target.colorMultiplier, target.fadeDuration);
+
+            if (target.disableChildTextRaycasts)
+            {
+                foreach (TMP_Text text in target.button.GetComponentsInChildren<TMP_Text>(true))
+                    text.raycastTarget = false;
+            }
+
+            if (target.applyOutline)
+                ApplyOutline(target.button.gameObject, target.outlineColor, target.outlineEffectDistance, target.outlineUseGraphicAlpha, target.addOutlineIfMissing);
+
+            if (target.applyShadow)
+                ApplyShadow(target.button.gameObject, target.shadowColor, target.shadowEffectDistance, target.shadowUseGraphicAlpha, target.addShadowIfMissing);
+        }
+    }
+
+    private void ApplyControlledGridLayoutTargets()
+    {
+        if (controlledGridLayouts == null)
+            return;
+
+        foreach (InventoryControlledGridLayoutTarget target in controlledGridLayouts)
+        {
+            if (target == null || target.grid == null || !target.applyGrid)
+                continue;
+
+            ConfigureGrid(target.grid, target.cellSize, target.spacing, target.constraint, target.constraintCount, target.childAlignment, target.padding);
+        }
+    }
+
+    [ContextMenu("Inventory UI/Apply Basic Visual Theme")]
+    public void ApplyBasicVisualTheme()
+    {
+        if (styleKnownPanels)
+            ApplyKnownPanelTheme();
+
+        if (styleKnownButtons)
+            ApplyKnownButtonTheme();
+
+        if (styleKnownTexts)
+            ApplyKnownTextTheme();
+
+        if (styleKnownSlots)
+            ApplyKnownSlotTheme();
+    }
+
+    private void ApplyKnownPanelTheme()
+    {
+        ApplyImageColor(inventoryPanel, mainPanelColor, false);
+        ApplyImageColor(recentLogArea, subPanelColor, false);
+        ApplyImageColor(debugPanel, subPanelColor, false);
+        ApplyImageColor(tooltipPanel, popupPanelColor, false);
+        ApplyImageColor(acquisitionPopupPanel, popupPanelColor, false);
+        ApplyImageColor(messagePanel, popupPanelColor, false);
+        ApplyImageColor(confirmationPanel, popupPanelColor, true);
+        ApplyImageColor(detailPanel, popupPanelColor, true);
+        ApplyImageColor(memoryProgressArea, new Color(subPanelColor.r, subPanelColor.g, subPanelColor.b, Mathf.Min(subPanelColor.a, 0.55f)), false);
+
+        if (addOutlineToKnownGraphics)
+        {
+            ApplyOutline(inventoryPanel != null ? inventoryPanel.gameObject : null, outlineColor, new Vector2(2f, -2f), true, true);
+            ApplyOutline(recentLogArea != null ? recentLogArea.gameObject : null, outlineColor, new Vector2(1f, -1f), true, true);
+            ApplyOutline(debugPanel != null ? debugPanel.gameObject : null, outlineColor, new Vector2(1f, -1f), true, true);
+            ApplyOutline(detailPanel != null ? detailPanel.gameObject : null, goldOutlineColor, new Vector2(1.5f, -1.5f), true, true);
+            ApplyOutline(confirmationPanel != null ? confirmationPanel.gameObject : null, goldOutlineColor, new Vector2(1.5f, -1.5f), true, true);
+        }
+    }
+
+    private void ApplyKnownButtonTheme()
+    {
+        ApplyButtonTheme(closeButton != null ? closeButton.GetComponent<Button>() : null, buttonNormalColor, false);
+        ApplyButtonsIn(categoryButtons, buttonNormalColor, false);
+        ApplyButtonsIn(detailPanel, buttonNormalColor, false);
+        ApplyButtonsIn(confirmationPanel, buttonNormalColor, false);
+        ApplyButtonsIn(quickUseButtons, buttonNormalColor, false);
+        ApplyButtonsIn(debugPanel, debugButtonColor, true);
+    }
+
+    private void ApplyButtonsIn(RectTransform root, Color baseColor, bool allowDangerColor)
+    {
+        if (root == null)
+            return;
+
+        Button[] buttons = root.GetComponentsInChildren<Button>(true);
+        foreach (Button button in buttons)
+            ApplyButtonTheme(button, baseColor, allowDangerColor);
+    }
+
+    private void ApplyButtonTheme(Button button, Color baseColor, bool allowDangerColor)
+    {
+        if (button == null)
+            return;
+
+        Color chosenNormal = baseColor;
+        if (allowDangerColor && IsDangerButton(button))
+            chosenNormal = dangerButtonColor;
+
+        ColorBlock colors = button.colors;
+        colors.normalColor = chosenNormal;
+        colors.highlightedColor = buttonHighlightedColor;
+        colors.pressedColor = buttonPressedColor;
+        colors.selectedColor = buttonSelectedColor;
+        colors.disabledColor = buttonDisabledColor;
+        colors.colorMultiplier = 1f;
+        colors.fadeDuration = 0.1f;
+        button.colors = colors;
+
+        Image image = button.GetComponent<Image>();
+        if (image != null)
+        {
+            image.color = chosenNormal;
+            image.raycastTarget = true;
+        }
+
+        if (addOutlineToKnownGraphics)
+            ApplyOutline(button.gameObject, outlineColor, new Vector2(1f, -1f), true, true);
+
+        TMP_Text[] texts = button.GetComponentsInChildren<TMP_Text>(true);
+        foreach (TMP_Text text in texts)
+        {
+            text.color = mainTextColor;
+            text.raycastTarget = false;
+
+            if (addShadowToKnownTexts)
+                ApplyShadow(text.gameObject, shadowColor, new Vector2(1.5f, -1.5f), true, true);
+        }
+    }
+
+    private bool IsDangerButton(Button button)
+    {
+        if (button == null)
+            return false;
+
+        string lowerName = button.name.ToLowerInvariant();
+        if (lowerName.Contains("delete") || lowerName.Contains("reset") || lowerName.Contains("clear"))
+            return true;
+
+        TMP_Text[] texts = button.GetComponentsInChildren<TMP_Text>(true);
+        foreach (TMP_Text text in texts)
+        {
+            if (text == null || string.IsNullOrEmpty(text.text))
+                continue;
+
+            if (text.text.Contains("삭제") || text.text.Contains("초기화") || text.text.Contains("저장삭제"))
+                return true;
+        }
+
+        return false;
+    }
+
+    private void ApplyKnownTextTheme()
+    {
+        TMP_Text[] texts = GetComponentsInChildren<TMP_Text>(true);
+        foreach (TMP_Text text in texts)
+        {
+            if (text == null)
+                continue;
+
+            text.raycastTarget = false;
+            text.color = IsAccentText(text) ? accentTextColor : mainTextColor;
+
+            if (IsMutedText(text))
+                text.color = mutedTextColor;
+
+            if (addShadowToKnownTexts)
+                ApplyShadow(text.gameObject, shadowColor, new Vector2(1.5f, -1.5f), true, true);
+        }
+    }
+
+    private bool IsAccentText(TMP_Text text)
+    {
+        if (text == null)
+            return false;
+
+        string lowerName = text.name.ToLowerInvariant();
+        return text.rectTransform == titleText || lowerName.Contains("title") || lowerName.Contains("goal") || lowerName.Contains("new");
+    }
+
+    private bool IsMutedText(TMP_Text text)
+    {
+        if (text == null)
+            return false;
+
+        string lowerName = text.name.ToLowerInvariant();
+        return lowerName.Contains("description") || lowerName.Contains("desc") || lowerName.Contains("count") || lowerName.Contains("log");
+    }
+
+    private void ApplyKnownSlotTheme()
+    {
+        if (slots == null || slots.Length == 0)
+            slots = GetComponentsInChildren<InventorySlotUI>(true);
+
+        foreach (InventorySlotUI slot in slots)
+        {
+            if (slot == null)
+                continue;
+
+            Image slotImage = slot.GetComponent<Image>();
+            if (slotImage != null)
+            {
+                slotImage.color = slotColor;
+                slotImage.raycastTarget = true;
+            }
+
+            if (addOutlineToKnownGraphics)
+                ApplyOutline(slot.gameObject, outlineColor, new Vector2(1f, -1f), true, true);
+
+            foreach (Transform child in slot.GetComponentsInChildren<Transform>(true))
+            {
+                if (child == null || child == slot.transform)
+                    continue;
+
+                string lowerName = child.name.ToLowerInvariant();
+                Image image = child.GetComponent<Image>();
+                TMP_Text text = child.GetComponent<TMP_Text>();
+
+                if (image != null)
+                {
+                    if (lowerName.Contains("glow") || lowerName.Contains("important"))
+                        image.color = slotImportantGlowColor;
+                    else if (lowerName.Contains("new"))
+                        image.color = newBadgeColor;
+                    else if (lowerName.Contains("overlay") || lowerName.Contains("filter"))
+                        image.color = filteredOverlayColor;
+
+                    image.raycastTarget = false;
+                }
+
+                if (text != null)
+                {
+                    text.color = lowerName.Contains("new") ? new Color(0.08f, 0.06f, 0.02f, 1f) : mainTextColor;
+                    text.raycastTarget = false;
+
+                    if (addShadowToKnownTexts)
+                        ApplyShadow(text.gameObject, shadowColor, new Vector2(1.2f, -1.2f), true, true);
+                }
+            }
+        }
+    }
+
+    [ContextMenu("Inventory UI/Apply Initial Mode")]
+    public void ApplyInitialMode()
+    {
+        ApplyMode(initialMode);
+    }
+
+    [ContextMenu("Inventory UI/Apply Test Mode")]
+    public void ApplyTestMode() => ApplyMode(InventoryRootUIMode.TestMode);
+
+    [ContextMenu("Inventory UI/Apply Play Mode")]
+    public void ApplyPlayMode() => ApplyMode(InventoryRootUIMode.PlayMode);
+
+    [ContextMenu("Inventory UI/Apply Build Mode")]
+    public void ApplyBuildMode() => ApplyMode(InventoryRootUIMode.BuildMode);
+
+    [ContextMenu("Inventory UI/Apply Hidden Mode")]
+    public void ApplyHiddenMode() => ApplyMode(InventoryRootUIMode.HiddenMode);
+
+    public void ApplyMode(InventoryRootUIMode mode)
+    {
+        if (mode == InventoryRootUIMode.LayoutOnly)
+            return;
+
+        switch (mode)
+        {
+            case InventoryRootUIMode.TestMode:
+                SetActive(inventoryPanel, testShowInventoryPanel);
+                SetActive(debugPanel, testShowDebugPanel);
+                SetActive(recentLogArea, testShowRecentLogArea);
+                SetActive(categoryButtons, testShowCategoryButtons);
+                SetActive(memoryProgressArea, testShowMemoryProgressArea);
+                SetActive(quickUseButtons, testShowQuickUseButtons);
+                HideAllPopups();
+                break;
+
+            case InventoryRootUIMode.PlayMode:
+                SetActive(inventoryPanel, playShowInventoryPanel);
+                SetActive(debugPanel, playShowDebugPanel);
+                SetActive(recentLogArea, playShowRecentLogArea);
+                SetActive(categoryButtons, playShowCategoryButtons);
+                SetActive(memoryProgressArea, playShowMemoryProgressArea);
+                SetActive(quickUseButtons, playShowQuickUseButtons);
+                HideAllPopups();
+                break;
+
+            case InventoryRootUIMode.BuildMode:
+                SetActive(inventoryPanel, buildShowInventoryPanel);
+                SetActive(debugPanel, buildShowDebugPanel);
+                SetActive(recentLogArea, buildShowRecentLogArea);
+                SetActive(categoryButtons, buildShowCategoryButtons);
+                SetActive(memoryProgressArea, buildShowMemoryProgressArea);
+                SetActive(quickUseButtons, buildShowQuickUseButtons);
+                HideAllPopups();
+                break;
+
+            case InventoryRootUIMode.HiddenMode:
+                SetActive(inventoryPanel, false);
+                SetActive(debugPanel, false);
+                SetActive(recentLogArea, false);
+                SetActive(categoryButtons, false);
+                SetActive(memoryProgressArea, false);
+                SetActive(quickUseButtons, false);
+                HideAllPopups();
+                break;
+        }
+
+        ApplyControlledActiveStates(mode);
+    }
+
+    private void ApplyControlledActiveStates(InventoryRootUIMode mode)
+    {
+        if (controlledRects == null)
+            return;
+
+        foreach (InventoryControlledRectTarget target in controlledRects)
+        {
+            if (target == null || !target.controlActiveState)
+                continue;
+
+            GameObject go = target.activeTarget != null ? target.activeTarget : target.rectTransform != null ? target.rectTransform.gameObject : null;
+            if (go == null)
+                continue;
+
+            bool active = true;
+            switch (mode)
+            {
+                case InventoryRootUIMode.TestMode:
+                    active = target.activeInTestMode;
+                    break;
+                case InventoryRootUIMode.PlayMode:
+                    active = target.activeInPlayMode;
+                    break;
+                case InventoryRootUIMode.BuildMode:
+                    active = target.activeInBuildMode;
+                    break;
+                case InventoryRootUIMode.HiddenMode:
+                    active = target.activeInHiddenMode;
+                    break;
+            }
+
+            go.SetActive(active);
+        }
+    }
+
+    [ContextMenu("Inventory UI/Hide All Popups")]
+    public void HideAllPopups()
+    {
+        SetActive(tooltipPanel, false);
+        SetActive(acquisitionPopupPanel, false);
+        SetActive(messagePanel, false);
+        SetActive(confirmationPanel, false);
+        SetActive(detailPanel, false);
+
+        if (extraPopupPanelsToHide != null)
+        {
+            foreach (GameObject panel in extraPopupPanelsToHide)
+            {
+                if (panel != null)
+                    panel.SetActive(false);
+            }
+        }
+    }
+
+    [ContextMenu("Inventory UI/Show Inventory Panel")]
+    public void ShowInventoryPanel() => SetActive(inventoryPanel, true);
+
+    [ContextMenu("Inventory UI/Hide Inventory Panel")]
+    public void HideInventoryPanel() => SetActive(inventoryPanel, false);
+
+    [ContextMenu("Inventory UI/Show Debug Panel")]
+    public void ShowDebugPanel() => SetActive(debugPanel, true);
+
+    [ContextMenu("Inventory UI/Hide Debug Panel")]
+    public void HideDebugPanel() => SetActive(debugPanel, false);
+
+    [ContextMenu("Inventory UI/Toggle Debug Panel")]
+    public void ToggleDebugPanel()
+    {
+        if (debugPanel != null)
+            debugPanel.gameObject.SetActive(!debugPanel.gameObject.activeSelf);
+    }
+
+
+    [ContextMenu("Inventory UI/Check Setup")]
+    public void CheckSetup()
+    {
+        if (inventoryUI == null)
+            Debug.LogWarning("[InventoryUILayoutController] InventoryUI가 연결되어 있지 않습니다.", this);
+
+        if (inventoryPanel == null)
+            Debug.LogWarning("[InventoryUILayoutController] InventoryPanel이 연결되어 있지 않습니다.", this);
+
+        if (slots == null || slots.Length == 0)
+            Debug.LogWarning("[InventoryUILayoutController] Slots 배열이 비어 있습니다.", this);
+
+        if (tooltipPanel != null)
+        {
+            CanvasGroup group = tooltipPanel.GetComponent<CanvasGroup>();
+            if (group != null && group.blocksRaycasts)
+                Debug.LogWarning("[InventoryUILayoutController] TooltipPanel CanvasGroup Blocks Raycasts가 켜져 있습니다. 슬롯 Hover 흔들림 원인이 될 수 있습니다.", tooltipPanel);
+        }
+
+        Slider[] sliders = GetComponentsInChildren<Slider>(true);
+        foreach (Slider slider in sliders)
+        {
+            if (slider != null && slider.interactable)
+                Debug.LogWarning($"[InventoryUILayoutController] Slider '{slider.name}'의 Interactable이 켜져 있습니다. 진행도 표시용이면 꺼두는 것을 권장합니다.", slider);
+        }
+
+        if (debugPanel != null && buildShowDebugPanel)
+            Debug.LogWarning("[InventoryUILayoutController] BuildMode에서도 DebugPanel이 보이도록 설정되어 있습니다.", debugPanel);
+    }
+
+    [ContextMenu("Inventory UI/Fix All Raycast Targets")]
+    public void FixAllRaycastTargets()
+    {
+        if (disableTextRaycasts)
+        {
+            TMP_Text[] texts = GetComponentsInChildren<TMP_Text>(true);
+            foreach (TMP_Text text in texts)
+                text.raycastTarget = false;
+        }
+
+        if (disableNonInteractiveImageRaycasts)
+        {
+            Image[] images = GetComponentsInChildren<Image>(true);
+            foreach (Image image in images)
+            {
+                if (image == null)
+                    continue;
+
+                Button buttonOnSameObject = image.GetComponent<Button>();
+                if (buttonOnSameObject != null)
+                {
+                    image.raycastTarget = true;
+                    continue;
+                }
+
+                InventorySlotUI slotOnSameObject = image.GetComponent<InventorySlotUI>();
+                if (slotOnSameObject != null)
+                {
+                    image.raycastTarget = true;
+                    continue;
+                }
+
+                image.raycastTarget = false;
+            }
+        }
+
+        if (fixCanvasGroups)
+        {
+            ConfigurePassiveCanvasGroup(tooltipPanel);
+            ConfigurePassiveCanvasGroup(acquisitionPopupPanel);
+            ConfigurePassiveCanvasGroup(messagePanel);
+            ConfigureInteractiveCanvasGroup(confirmationPanel);
+            ConfigureInteractiveCanvasGroup(detailPanel);
+        }
+
+        if (setSliderInteractableFalse)
+            FixSlidersForDisplayOnly();
+
+        if (setSlotHoverSafeValues)
+            ApplySlotHoverSettings();
+    }
+
+
+    private void ApplyImageColor(RectTransform rect, Color color, bool raycastTarget)
+    {
+        if (rect == null)
+            return;
+
+        Image image = rect.GetComponent<Image>();
+        if (image == null && autoAddMissingComponents)
+            image = rect.gameObject.AddComponent<Image>();
+
+        if (image == null)
+            return;
+
+        image.color = color;
+        image.raycastTarget = raycastTarget;
+    }
+
+    private void ApplyButtonColorBlock(Button button, Color normal, Color highlighted, Color pressed, Color selected, Color disabled, float multiplier, float fade)
+    {
+        if (button == null)
+            return;
+
+        ColorBlock colors = button.colors;
+        colors.normalColor = normal;
+        colors.highlightedColor = highlighted;
+        colors.pressedColor = pressed;
+        colors.selectedColor = selected;
+        colors.disabledColor = disabled;
+        colors.colorMultiplier = Mathf.Max(0f, multiplier);
+        colors.fadeDuration = Mathf.Max(0f, fade);
+        button.colors = colors;
+
+        Image image = button.GetComponent<Image>();
+        if (image != null)
+            image.color = normal;
+    }
+
+    private void ApplyOutline(GameObject target, Color color, Vector2 effectDistance, bool useGraphicAlpha, bool addIfMissing)
+    {
+        if (target == null)
+            return;
+
+        Outline outline = target.GetComponent<Outline>();
+        if (outline == null && addIfMissing)
+            outline = target.AddComponent<Outline>();
+
+        if (outline == null)
+            return;
+
+        outline.effectColor = color;
+        outline.effectDistance = effectDistance;
+        outline.useGraphicAlpha = useGraphicAlpha;
+    }
+
+    private void ApplyShadow(GameObject target, Color color, Vector2 effectDistance, bool useGraphicAlpha, bool addIfMissing)
+    {
+        if (target == null)
+            return;
+
+        Shadow shadow = GetPlainShadow(target);
+        if (shadow == null && addIfMissing)
+            shadow = target.AddComponent<Shadow>();
+
+        if (shadow == null)
+            return;
+
+        shadow.effectColor = color;
+        shadow.effectDistance = effectDistance;
+        shadow.useGraphicAlpha = useGraphicAlpha;
+    }
+
+    private Shadow GetPlainShadow(GameObject target)
+    {
+        if (target == null)
+            return null;
+
+        Shadow[] shadows = target.GetComponents<Shadow>();
+        foreach (Shadow shadow in shadows)
+        {
+            if (shadow != null && shadow.GetType() == typeof(Shadow))
+                return shadow;
+        }
+
+        return null;
+    }
+
+    private void FixSlidersForDisplayOnly()
+    {
+        Slider[] sliders = GetComponentsInChildren<Slider>(true);
+        foreach (Slider slider in sliders)
+        {
+            if (slider == null)
+                continue;
+
+            slider.interactable = false;
+
+            foreach (Graphic graphic in slider.GetComponentsInChildren<Graphic>(true))
+            {
+                if (graphic != null)
+                    graphic.raycastTarget = false;
+            }
+        }
+    }
+
+    private void ApplySlotHoverSettings()
+    {
+        if (slots == null || slots.Length == 0)
+            slots = GetComponentsInChildren<InventorySlotUI>(true);
+
+        foreach (InventorySlotUI slot in slots)
+        {
+            if (slot == null)
+                continue;
+
+            slot.SetHoverSettings(slotUseHoverScale, slotHoverScale, slotBringToFrontOnHover);
+        }
+    }
+
+    private void ApplyRect(RectTransform rect, InventoryUIAnchorPreset preset, Vector2 size, Vector2 pos)
+    {
+        ApplyRect(rect, preset, size, pos, new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f));
+    }
+
+    private void ApplyRect(RectTransform rect, InventoryUIAnchorPreset preset, Vector2 size, Vector2 pos, Vector2 customMin, Vector2 customMax, Vector2 customPivot)
+    {
+        if (rect == null)
+            return;
+
+        SetAnchorPreset(rect, preset, customMin, customMax, customPivot);
+
+        if (preset == InventoryUIAnchorPreset.StretchAll)
+        {
+            rect.offsetMin = Vector2.zero;
+            rect.offsetMax = Vector2.zero;
+        }
+        else
+        {
+            rect.sizeDelta = size;
+            rect.anchoredPosition = pos;
+        }
+
+        if (resetChildScaleToOne)
+            rect.localScale = Vector3.one;
+    }
+
+    private void ApplyStretch(RectTransform rect, Vector2 offsetMin, Vector2 offsetMax)
+    {
+        if (rect == null)
+            return;
+
+        rect.anchorMin = Vector2.zero;
+        rect.anchorMax = Vector2.one;
+        rect.pivot = new Vector2(0.5f, 0.5f);
+        rect.offsetMin = offsetMin;
+        rect.offsetMax = offsetMax;
+
+        if (resetChildScaleToOne)
+            rect.localScale = Vector3.one;
+    }
+
+    private void SetAnchorPreset(RectTransform rect, InventoryUIAnchorPreset preset, Vector2 customMin, Vector2 customMax, Vector2 customPivot)
+    {
+        switch (preset)
+        {
+            case InventoryUIAnchorPreset.TopLeft:
+                rect.anchorMin = rect.anchorMax = new Vector2(0f, 1f);
+                rect.pivot = new Vector2(0f, 1f);
+                break;
+            case InventoryUIAnchorPreset.TopCenter:
+                rect.anchorMin = rect.anchorMax = new Vector2(0.5f, 1f);
+                rect.pivot = new Vector2(0.5f, 1f);
+                break;
+            case InventoryUIAnchorPreset.TopRight:
+                rect.anchorMin = rect.anchorMax = new Vector2(1f, 1f);
+                rect.pivot = new Vector2(1f, 1f);
+                break;
+            case InventoryUIAnchorPreset.MiddleLeft:
+                rect.anchorMin = rect.anchorMax = new Vector2(0f, 0.5f);
+                rect.pivot = new Vector2(0f, 0.5f);
+                break;
+            case InventoryUIAnchorPreset.MiddleRight:
+                rect.anchorMin = rect.anchorMax = new Vector2(1f, 0.5f);
+                rect.pivot = new Vector2(1f, 0.5f);
+                break;
+            case InventoryUIAnchorPreset.BottomLeft:
+                rect.anchorMin = rect.anchorMax = new Vector2(0f, 0f);
+                rect.pivot = new Vector2(0f, 0f);
+                break;
+            case InventoryUIAnchorPreset.BottomCenter:
+                rect.anchorMin = rect.anchorMax = new Vector2(0.5f, 0f);
+                rect.pivot = new Vector2(0.5f, 0f);
+                break;
+            case InventoryUIAnchorPreset.BottomRight:
+                rect.anchorMin = rect.anchorMax = new Vector2(1f, 0f);
+                rect.pivot = new Vector2(1f, 0f);
+                break;
+            case InventoryUIAnchorPreset.StretchAll:
+                rect.anchorMin = Vector2.zero;
+                rect.anchorMax = Vector2.one;
+                rect.pivot = new Vector2(0.5f, 0.5f);
+                break;
+            case InventoryUIAnchorPreset.Custom:
+                rect.anchorMin = customMin;
+                rect.anchorMax = customMax;
+                rect.pivot = customPivot;
+                break;
+            default:
+                rect.anchorMin = rect.anchorMax = new Vector2(0.5f, 0.5f);
+                rect.pivot = new Vector2(0.5f, 0.5f);
+                break;
+        }
+    }
+
+    private void ConfigureGrid(GridLayoutGroup grid, Vector2 cell, Vector2 spacingValue, GridLayoutGroup.Constraint constraint, int count, TextAnchor alignment, InventoryLayoutPadding padding)
+    {
+        if (grid == null)
+            return;
+
+        grid.cellSize = cell;
+        grid.spacing = spacingValue;
+        grid.constraint = constraint;
+        grid.constraintCount = Mathf.Max(1, count);
+        grid.childAlignment = alignment;
+        grid.padding = padding != null ? padding.ToRectOffset() : new RectOffset(0, 0, 0, 0);
+    }
+
+    private CanvasGroup AddCanvasGroupIfNeeded(RectTransform rect, bool interactable, bool blocksRaycasts)
+    {
+        if (rect == null)
+            return null;
+
+        CanvasGroup group = GetOrAdd<CanvasGroup>(rect.gameObject);
+        group.interactable = interactable;
+        group.blocksRaycasts = blocksRaycasts;
+        return group;
+    }
+
+    private void ConfigurePassiveCanvasGroup(RectTransform rect)
+    {
+        CanvasGroup group = AddCanvasGroupIfNeeded(rect, false, false);
+        if (group != null)
+            group.alpha = 1f;
+    }
+
+    private void ConfigureInteractiveCanvasGroup(RectTransform rect)
+    {
+        CanvasGroup group = AddCanvasGroupIfNeeded(rect, true, true);
+        if (group != null)
+            group.alpha = 1f;
+    }
+
+    private T GetOrAdd<T>(GameObject target) where T : Component
+    {
+        if (target == null)
+            return null;
+
+        T component = target.GetComponent<T>();
+        if (component == null)
+            component = target.AddComponent<T>();
+
+        return component;
+    }
+
+    private void TryAddComponentByTypeName(GameObject target, string typeName)
+    {
+        if (target == null || string.IsNullOrWhiteSpace(typeName))
+            return;
+
+        Type type = Type.GetType(typeName);
+        if (type == null)
+        {
+            foreach (System.Reflection.Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                type = assembly.GetType(typeName);
+                if (type != null)
+                    break;
+            }
+        }
+
+        if (type == null || !typeof(Component).IsAssignableFrom(type))
+            return;
+
+        if (target.GetComponent(type) == null)
+            target.AddComponent(type);
+    }
+
+    private RectTransform FindRectIfNull(RectTransform current, string objectName)
+    {
+        if (current != null)
+            return current;
+
+        Transform found = FindDeepChild(transform, objectName);
+        return found != null ? found.GetComponent<RectTransform>() : null;
+    }
+
+    private RectTransform FindChildRect(Transform parent, string objectName)
+    {
+        Transform found = FindDeepChild(parent, objectName);
+        return found != null ? found.GetComponent<RectTransform>() : null;
+    }
+
+    private Transform FindDeepChild(Transform parent, string objectName)
+    {
+        if (parent == null || string.IsNullOrWhiteSpace(objectName))
+            return null;
+
+        foreach (Transform child in parent)
+        {
+            if (child.name == objectName)
+                return child;
+
+            Transform result = FindDeepChild(child, objectName);
+            if (result != null)
+                return result;
+        }
+
+        return null;
+    }
+
+    private void SetActive(RectTransform rect, bool active)
+    {
+        if (rect != null)
+            rect.gameObject.SetActive(active);
+    }
+
+    private void AddControlledRect(string targetName, RectTransform rect, GameObject activeObject, InventoryUIAnchorPreset preset, Vector2 size, Vector2 pos, bool controlActive, bool testActive, bool playActive, bool buildActive, bool hiddenActive)
+    {
+        if (rect == null || ContainsRectTarget(rect))
+            return;
+
+        controlledRects.Add(new InventoryControlledRectTarget
+        {
+            name = targetName,
+            rectTransform = rect,
+            activeTarget = activeObject != null ? activeObject : rect.gameObject,
+            applyRect = true,
+            anchorPreset = preset,
+            size = size,
+            anchoredPosition = pos,
+            controlActiveState = controlActive,
+            activeInTestMode = testActive,
+            activeInPlayMode = playActive,
+            activeInBuildMode = buildActive,
+            activeInHiddenMode = hiddenActive,
+            resetScaleToOne = true
+        });
+    }
+
+    private void AddText(string targetName, TMP_Text text)
+    {
+        if (text == null || ContainsTextTarget(text))
+            return;
+
+        controlledTexts.Add(new InventoryControlledTextTarget
+        {
+            name = targetName,
+            text = text,
+            applyRect = false,
+            applyRaycastTarget = true,
+            raycastTarget = false,
+            resetScaleToOne = true
+        });
+    }
+
+    private void AddImage(string targetName, Image image)
+    {
+        if (image == null || ContainsImageTarget(image))
+            return;
+
+        bool shouldRaycast = image.GetComponent<Button>() != null || image.GetComponent<InventorySlotUI>() != null;
+        controlledImages.Add(new InventoryControlledImageTarget
+        {
+            name = targetName,
+            image = image,
+            applyRect = false,
+            applyRaycastTarget = true,
+            raycastTarget = shouldRaycast,
+            resetScaleToOne = true
+        });
+    }
+
+    private void AddButton(string targetName, Button button)
+    {
+        if (button == null || ContainsButtonTarget(button))
+            return;
+
+        controlledButtons.Add(new InventoryControlledButtonTarget
+        {
+            name = targetName,
+            button = button,
+            applyRect = false,
+            applyInteractable = false,
+            applyImageRaycastTarget = true,
+            imageRaycastTarget = true,
+            disableChildTextRaycasts = true,
+            resetScaleToOne = true
+        });
+    }
+
+    private void AddGrid(string targetName, GridLayoutGroup grid, Vector2 cellSize, Vector2 spacing, GridLayoutGroup.Constraint constraint, int count)
+    {
+        if (grid == null || ContainsGridTarget(grid))
+            return;
+
+        controlledGridLayouts.Add(new InventoryControlledGridLayoutTarget
+        {
+            name = targetName,
+            grid = grid,
+            applyGrid = true,
+            cellSize = cellSize,
+            spacing = spacing,
+            constraint = constraint,
+            constraintCount = count,
+            childAlignment = TextAnchor.MiddleCenter,
+            padding = new InventoryLayoutPadding(0, 0, 0, 0)
+        });
+    }
+
+    private bool ContainsRectTarget(RectTransform rect)
+    {
+        foreach (InventoryControlledRectTarget target in controlledRects)
+        {
+            if (target != null && target.rectTransform == rect)
+                return true;
+        }
+        return false;
+    }
+
+    private bool ContainsTextTarget(TMP_Text text)
+    {
+        foreach (InventoryControlledTextTarget target in controlledTexts)
+        {
+            if (target != null && target.text == text)
+                return true;
+        }
+        return false;
+    }
+
+    private bool ContainsImageTarget(Image image)
+    {
+        foreach (InventoryControlledImageTarget target in controlledImages)
+        {
+            if (target != null && target.image == image)
+                return true;
+        }
+        return false;
+    }
+
+    private bool ContainsButtonTarget(Button button)
+    {
+        foreach (InventoryControlledButtonTarget target in controlledButtons)
+        {
+            if (target != null && target.button == button)
+                return true;
+        }
+        return false;
+    }
+
+    private bool ContainsGridTarget(GridLayoutGroup grid)
+    {
+        foreach (InventoryControlledGridLayoutTarget target in controlledGridLayouts)
+        {
+            if (target != null && target.grid == grid)
+                return true;
+        }
+        return false;
+    }
+
+    private void SetPrivateFieldIfExists(object target, string fieldName, object value)
+    {
+        if (target == null || string.IsNullOrWhiteSpace(fieldName))
+            return;
+
+        System.Reflection.FieldInfo field = target.GetType().GetField(fieldName, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Public);
+        if (field != null)
+            field.SetValue(target, value);
+    }
+}
diff --git a/Assets/My project/Inventory/Scripts/InventoryUILayoutController.cs.meta b/Assets/My project/Inventory/Scripts/InventoryUILayoutController.cs.meta
new file mode 100644
index 00000000..82931c0b
--- /dev/null
+++ b/Assets/My project/Inventory/Scripts/InventoryUILayoutController.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 996c6570686bac84698afebe0aff7bad
\ No newline at end of file
diff --git a/Assets/My project/Inventory/Scripts/ItemPickup.cs b/Assets/My project/Inventory/Scripts/ItemPickup.cs
index 83c48284..d4c20cf6 100644
--- a/Assets/My project/Inventory/Scripts/ItemPickup.cs	
+++ b/Assets/My project/Inventory/Scripts/ItemPickup.cs	
@@ -1,11 +1,18 @@
+using System.Collections;
 using UnityEngine;
 using UnityEngine.Events;
 
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
 /// <summary>
 /// 월드에 떠 있는 아이템 오브젝트를 직접 주울 때 사용합니다.
-/// Collider의 Is Trigger를 켜고, Player 태그와 충돌하면 인벤토리에 추가됩니다.
+/// VR에서는 Player 태그만 쓰기보다 PlayerInventoryCollector 또는 LayerMask를 함께 쓰는 것을 권장합니다.
+/// 기능: 중복 획득 저장, 획득 연출, 사운드, 컨트롤러 햅틱, 최대 소지 수량 차단.
 /// </summary>
 [DisallowMultipleComponent]
+[RequireComponent(typeof(Collider))]
 public class ItemPickup : MonoBehaviour
 {
     [Header("Reference")]
@@ -15,24 +22,83 @@ public class ItemPickup : MonoBehaviour
     [SerializeField] private InventoryItemType itemType = InventoryItemType.Fish;
     [SerializeField] private int amount = 1;
 
-    [Header("Pickup Settings")]
+    [Header("Pickup Detection")]
+    [Tooltip("true면 충돌한 대상 또는 부모에 PlayerInventoryCollector가 있어야 획득됩니다. VR 손/몸 Collider에 붙이면 안정적입니다.")]
+    [SerializeField] private bool requirePlayerInventoryCollector = true;
+    [SerializeField] private bool acceptPlayerInventoryCollector = true;
+
+    [Tooltip("LayerMask 검사 사용 여부입니다. Player/Hand 같은 전용 Layer를 만들었다면 사용하는 것을 권장합니다.")]
+    [SerializeField] private bool useLayerMask = false;
+    [SerializeField] private LayerMask pickupLayerMask = ~0;
+
+    [Tooltip("기존 Player 태그 방식과의 호환용입니다. VR에서는 Collector 또는 LayerMask가 더 안정적입니다.")]
+    [SerializeField] private bool usePlayerTagFallback = true;
     [SerializeField] private string playerTag = "Player";
+
+    [Header("Persistent Pickup")]
+    [Tooltip("true면 한 번 획득한 아이템은 저장 후 다시 나타나지 않게 할 수 있습니다.")]
+    [SerializeField] private bool persistPickupState = false;
+    [SerializeField] private string persistentPickupKey;
+    [SerializeField] private bool disableIfAlreadyPickedUp = true;
+
+    [Header("Pickup Result")]
     [SerializeField] private bool destroyAfterPickup = true;
     [SerializeField] private bool disableAfterPickup = false;
     [SerializeField] private bool autoFindManager = true;
 
+    [Header("Pickup Animation")]
+    [SerializeField] private bool playPickupAnimation = true;
+    [SerializeField] private float animationDuration = 0.25f;
+    [SerializeField] private AnimationCurve scaleCurve = AnimationCurve.EaseInOut(0f, 1f, 1f, 0f);
+    [SerializeField] private bool moveTowardCollector = true;
+    [SerializeField] private Transform animationTargetOverride;
+
+    [Header("Feedback")]
+    [SerializeField] private AudioSource audioSource;
+    [SerializeField] private AudioClip pickupClipOverride;
+    [SerializeField] private bool playCollectorHaptic = true;
+    [Range(0f, 1f)] [SerializeField] private float hapticAmplitude = 0.35f;
+    [SerializeField] private float hapticDuration = 0.08f;
+
     [Header("Events")]
     public UnityEvent onPickedUp;
+    public UnityEvent onPickupBlocked;
+    public UnityEvent onPickupAlreadyConsumed;
 
     [Header("Debug")]
     [SerializeField] private bool showDebugLog = true;
 
     private bool pickedUp;
+    private Collider cachedCollider;
+    private Renderer[] renderers;
+    private Vector3 originalScale;
 
     private void Awake()
     {
-        if (inventoryManager == null && autoFindManager)
-            inventoryManager = FindFirstObjectByType<InventoryManager>();
+        cachedCollider = GetComponent<Collider>();
+        renderers = GetComponentsInChildren<Renderer>();
+        originalScale = transform.localScale;
+
+        if (audioSource == null)
+            audioSource = GetComponent<AudioSource>();
+
+        if (cachedCollider != null && !cachedCollider.isTrigger)
+            Debug.LogWarning("[ItemPickup] Collider의 Is Trigger가 꺼져 있습니다. 자동 획득 방식이면 Is Trigger를 켜세요.", this);
+
+        ResolveManager();
+    }
+
+    private void Start()
+    {
+        ResolvePersistentKey();
+
+        if (persistPickupState && ResolveManager() != null && inventoryManager.IsPersistentKeyConsumed(persistentPickupKey))
+        {
+            onPickupAlreadyConsumed?.Invoke();
+
+            if (disableIfAlreadyPickedUp)
+                gameObject.SetActive(false);
+        }
     }
 
     private void OnTriggerEnter(Collider other)
@@ -40,41 +106,243 @@ private void OnTriggerEnter(Collider other)
         if (pickedUp)
             return;
 
-        if (!other.CompareTag(playerTag))
+        PlayerInventoryCollector collector = other.GetComponentInParent<PlayerInventoryCollector>();
+
+        if (!CanBePickedUpBy(other, collector))
             return;
 
-        PickUp();
+        PickUp(collector);
     }
 
     public void PickUp()
+    {
+        PickUp(null);
+    }
+
+    public void PickUp(PlayerInventoryCollector collector)
     {
         if (pickedUp)
             return;
 
         pickedUp = true;
 
-        if (inventoryManager == null)
+        InventoryManager manager = ResolveManager();
+        if (collector != null && collector.InventoryManagerOverride != null)
+            manager = collector.InventoryManagerOverride;
+
+        if (manager == null)
         {
-            Debug.LogWarning("[ItemPickup] InventoryManager가 연결되지 않았습니다.");
+            Debug.LogWarning("[ItemPickup] InventoryManager가 연결되지 않았습니다.", this);
             pickedUp = false;
+            onPickupBlocked?.Invoke();
             return;
         }
 
         int addAmount = Mathf.Max(1, amount);
-        inventoryManager.AddItem(itemType, addAmount);
-        onPickedUp?.Invoke();
+        int actuallyAdded = manager.AddItemAndGetAddedAmount(itemType, addAmount);
+
+        if (actuallyAdded <= 0)
+        {
+            pickedUp = false;
+            onPickupBlocked?.Invoke();
+            return;
+        }
+
+        if (persistPickupState)
+            manager.MarkPersistentKeyConsumed(persistentPickupKey);
 
         if (showDebugLog)
-            Debug.Log($"[ItemPickup] {itemType} +{addAmount}");
+            Debug.Log($"[ItemPickup] {itemType} +{actuallyAdded}", this);
 
+        PlayFeedback(manager, collector);
+        onPickedUp?.Invoke();
+
+        if (cachedCollider != null)
+            cachedCollider.enabled = false;
+
+        if (playPickupAnimation)
+            StartCoroutine(PickupAnimationRoutine(collector));
+        else
+            FinishPickup();
+    }
+
+    private bool CanBePickedUpBy(Collider other, PlayerInventoryCollector collector)
+    {
+        if (collector != null && !collector.CanCollectItems)
+            return false;
+
+        bool collectorAccepted = acceptPlayerInventoryCollector && collector != null;
+        bool layerAccepted = useLayerMask && other != null && (pickupLayerMask.value & (1 << other.gameObject.layer)) != 0;
+        bool tagAccepted = usePlayerTagFallback && !string.IsNullOrWhiteSpace(playerTag)
+            && (SafeCompareTag(other, playerTag) || SafeCompareTag(other != null ? other.transform.root : null, playerTag));
+
+        // true이면 VR 손/몸 Collider에 PlayerInventoryCollector가 붙어 있어야만 획득됩니다.
+        // false이면 Collector, LayerMask, Tag 중 하나만 맞아도 획득됩니다.
+        if (requirePlayerInventoryCollector)
+            return collectorAccepted;
+
+        return collectorAccepted || layerAccepted || tagAccepted;
+    }
+
+    private bool SafeCompareTag(Component component, string tagName)
+    {
+        return component != null && SafeCompareTag(component.gameObject, tagName);
+    }
+
+    private bool SafeCompareTag(GameObject target, string tagName)
+    {
+        if (target == null || string.IsNullOrWhiteSpace(tagName))
+            return false;
+
+        try
+        {
+            return target.CompareTag(tagName);
+        }
+        catch (UnityException)
+        {
+            if (showDebugLog)
+                Debug.LogWarning($"[ItemPickup] 태그 '{tagName}'가 프로젝트에 없습니다. Project Settings > Tags and Layers를 확인하세요.", this);
+            return false;
+        }
+    }
+
+    private IEnumerator PickupAnimationRoutine(PlayerInventoryCollector collector)
+    {
+        float duration = Mathf.Max(0.01f, animationDuration);
+        float elapsed = 0f;
+        Vector3 startPosition = transform.position;
+        Vector3 targetPosition = startPosition;
+
+        Transform target = animationTargetOverride;
+        if (target == null && moveTowardCollector && collector != null)
+            target = collector.transform;
+
+        if (target != null)
+            targetPosition = target.position;
+
+        while (elapsed < duration)
+        {
+            elapsed += Time.deltaTime;
+            float t = Mathf.Clamp01(elapsed / duration);
+
+            if (target != null)
+                transform.position = Vector3.Lerp(startPosition, targetPosition, t);
+
+            float scale = scaleCurve != null ? scaleCurve.Evaluate(t) : Mathf.Lerp(1f, 0f, t);
+            transform.localScale = originalScale * Mathf.Max(0f, scale);
+
+            yield return null;
+        }
+
+        FinishPickup();
+    }
+
+    private void FinishPickup()
+    {
         if (destroyAfterPickup)
             Destroy(gameObject);
         else if (disableAfterPickup)
             gameObject.SetActive(false);
+        else
+        {
+            for (int i = 0; i < renderers.Length; i++)
+            {
+                if (renderers[i] != null)
+                    renderers[i].enabled = false;
+            }
+        }
+    }
+
+    private void PlayFeedback(InventoryManager manager, PlayerInventoryCollector collector)
+    {
+        AudioClip clip = pickupClipOverride != null ? pickupClipOverride : manager.GetAcquisitionClip(itemType);
+
+        if (clip != null)
+        {
+            // 아이템 오브젝트가 곧 Destroy/Disable될 경우, 오브젝트에 붙은 AudioSource는 소리가 끊길 수 있습니다.
+            if (destroyAfterPickup || disableAfterPickup)
+                AudioSource.PlayClipAtPoint(clip, transform.position);
+            else if (audioSource != null)
+                audioSource.PlayOneShot(clip);
+            else
+                AudioSource.PlayClipAtPoint(clip, transform.position);
+        }
+
+        if (playCollectorHaptic && collector != null)
+            collector.PlayHaptic(hapticAmplitude, hapticDuration);
+    }
+
+    private InventoryManager ResolveManager()
+    {
+        if (inventoryManager != null)
+            return inventoryManager;
+
+        if (InventoryManager.Instance != null)
+            inventoryManager = InventoryManager.Instance;
+        else if (autoFindManager)
+            inventoryManager = FindFirstObjectByType<InventoryManager>();
+
+        return inventoryManager;
+    }
+
+    private void ResolvePersistentKey()
+    {
+        if (!persistPickupState)
+            return;
+
+        if (string.IsNullOrWhiteSpace(persistentPickupKey))
+            persistentPickupKey = $"Pickup_{gameObject.scene.name}_{GetHierarchyPath(transform)}_{itemType}";
+    }
+
+    private string GetHierarchyPath(Transform target)
+    {
+        if (target == null)
+            return "Unknown";
+
+        string path = target.name;
+        Transform parent = target.parent;
+        while (parent != null)
+        {
+            path = parent.name + "/" + path;
+            parent = parent.parent;
+        }
+
+        return path;
     }
 
     public void ResetPickup()
     {
         pickedUp = false;
+
+        if (cachedCollider != null)
+            cachedCollider.enabled = true;
+
+        transform.localScale = originalScale;
+
+        for (int i = 0; i < renderers.Length; i++)
+        {
+            if (renderers[i] != null)
+                renderers[i].enabled = true;
+        }
     }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        amount = Mathf.Max(1, amount);
+        animationDuration = Mathf.Max(0.01f, animationDuration);
+        hapticDuration = Mathf.Max(0f, hapticDuration);
+
+        if (string.IsNullOrWhiteSpace(playerTag))
+            playerTag = "Player";
+
+        if (persistPickupState && string.IsNullOrWhiteSpace(persistentPickupKey))
+        {
+            string editorId = GlobalObjectId.GetGlobalObjectIdSlow(this).ToString();
+            persistentPickupKey = string.IsNullOrWhiteSpace(editorId)
+                ? $"Pickup_{gameObject.scene.name}_{GetHierarchyPath(transform)}_{itemType}"
+                : $"Pickup_{editorId}_{itemType}";
+        }
+    }
+#endif
 }
diff --git a/Assets/My project/Inventory/Scripts/ItemReward.cs b/Assets/My project/Inventory/Scripts/ItemReward.cs
index a3232ab8..eb5ada3e 100644
--- a/Assets/My project/Inventory/Scripts/ItemReward.cs	
+++ b/Assets/My project/Inventory/Scripts/ItemReward.cs	
@@ -1,76 +1,205 @@
 using UnityEngine;
 using UnityEngine.Events;
 
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
+
 /// <summary>
-/// 미니게임 성공, 퀘스트 완료, 버튼 이벤트 등에서 아이템을 지급할 때 사용합니다.
-/// 예: 낚시 성공 이벤트 -> ItemReward.GiveReward()
+/// 미니게임 성공, 퀘스트 완료, 버튼 이벤트, 아이템 사용 상호작용에 사용합니다.
+/// 기능: 보상 지급, 한 번만 지급, 저장, 필요 아이템 검사, 필요 아이템 소모, 부족 메시지.
+/// 예: 고양이 영입 = requireItemBeforeAction true + Fish 3개 소모 + giveRewardItem false + onActionCompleted에 고양이 합류 이벤트 연결.
+/// 예: 쓰레기 정화 = requireItemBeforeAction true + Trash 5개 소모 + onActionCompleted에 정화 이벤트 연결.
 /// </summary>
 [DisallowMultipleComponent]
 public class ItemReward : MonoBehaviour
 {
     [Header("Reference")]
     [SerializeField] private InventoryManager inventoryManager;
-
-    [Header("Reward")]
-    [SerializeField] private InventoryItemType rewardItemType = InventoryItemType.Fish;
-    [SerializeField] private int rewardAmount = 1;
-    [SerializeField] private bool giveOnlyOnce = false;
-
-    [Header("Auto Find")]
     [SerializeField] private bool autoFindManager = true;
 
+    [Header("Required Item / Interaction Cost")]
+    [Tooltip("true면 액션 전에 특정 아이템이 필요한지 검사합니다.")]
+    [SerializeField] private bool requireItemBeforeAction = false;
+    [SerializeField] private InventoryItemType requiredItemType = InventoryItemType.Fish;
+    [Min(1)] [SerializeField] private int requiredAmount = 1;
+    [SerializeField] private bool consumeRequiredItem = true;
+    [SerializeField] private string requirementFailMessage;
+    [SerializeField] private string requirementSuccessMessage;
+
+    [Header("Reward")]
+    [Tooltip("false면 보상 아이템을 지급하지 않고, 필요 아이템 소모와 이벤트만 실행합니다.")]
+    [SerializeField] private bool giveRewardItem = true;
+    [SerializeField] private InventoryItemType rewardItemType = InventoryItemType.Fish;
+    [Min(1)] [SerializeField] private int rewardAmount = 1;
+    [Tooltip("true이면 보상을 전부 받을 수 있을 때만 필요 아이템을 소모합니다. 보상 공간 부족으로 비용만 사라지는 상황을 방지합니다.")]
+    [SerializeField] private bool requireFullRewardCapacity = true;
+    [SerializeField] private bool giveOnlyOnce = false;
+
+    [Header("Persistent State")]
+    [Tooltip("true면 액션 완료 여부가 저장됩니다. 퀘스트/미니게임 보상 중복 방지에 사용하세요.")]
+    [SerializeField] private bool persistActionState = false;
+    [SerializeField] private string persistentActionKey;
+
+    [Header("Messages")]
+    [SerializeField] private bool showMessages = true;
+    [SerializeField] private string rewardGivenMessage;
+    [SerializeField] private string alreadyCompletedMessage = "이미 완료된 보상입니다.";
+
     [Header("Events")]
+    public UnityEvent onActionCompleted;
     public UnityEvent onRewardGiven;
-    public UnityEvent onRewardAlreadyGiven;
+    public UnityEvent onAlreadyCompleted;
+    public UnityEvent onRequirementMissing;
+    public UnityEvent onRequiredItemConsumed;
+    public UnityEvent onActionFailed;
 
     [Header("Debug")]
     [SerializeField] private bool showDebugLog = true;
 
-    private bool alreadyGiven;
+    private bool alreadyCompleted;
 
     private void Awake()
     {
-        if (inventoryManager == null && autoFindManager)
-            inventoryManager = FindFirstObjectByType<InventoryManager>();
+        ResolveManager();
+        ResolvePersistentKey();
+    }
+
+    private void Start()
+    {
+        if (persistActionState && ResolveManager() != null && inventoryManager.IsPersistentKeyConsumed(persistentActionKey))
+            alreadyCompleted = true;
     }
 
     public void GiveReward()
     {
-        if (giveOnlyOnce && alreadyGiven)
+        ExecuteAction();
+    }
+
+    public void ExecuteAction()
+    {
+        InventoryManager manager = ResolveManager();
+        if (manager == null)
         {
-            onRewardAlreadyGiven?.Invoke();
+            Debug.LogWarning("[ItemReward] InventoryManager가 연결되지 않았습니다.", this);
+            onActionFailed?.Invoke();
+            return;
+        }
+
+        if (giveOnlyOnce && alreadyCompleted)
+        {
+            if (showMessages)
+                manager.RequestMessage(alreadyCompletedMessage);
+
+            onAlreadyCompleted?.Invoke();
 
             if (showDebugLog)
-                Debug.Log("[ItemReward] 이미 지급된 아이템 보상입니다.");
+                Debug.Log("[ItemReward] 이미 완료된 액션입니다.", this);
 
             return;
         }
 
-        if (inventoryManager == null)
+        int requestedRewardAmount = Mathf.Max(1, rewardAmount);
+        if (giveRewardItem)
         {
-            Debug.LogWarning("[ItemReward] InventoryManager가 연결되지 않았습니다.");
-            return;
+            int addableAmount = manager.GetAddableAmount(rewardItemType, requestedRewardAmount);
+            bool rewardCapacityOk = requireFullRewardCapacity ? addableAmount >= requestedRewardAmount : addableAmount > 0;
+            if (!rewardCapacityOk)
+            {
+                if (showMessages)
+                    manager.RequestMessage($"{manager.GetDisplayName(rewardItemType)}은(는) 더 이상 받을 수 없습니다.");
+
+                onActionFailed?.Invoke();
+                return;
+            }
         }
 
-        int amount = Mathf.Max(1, rewardAmount);
-        inventoryManager.AddItem(rewardItemType, amount);
-        alreadyGiven = true;
+        if (requireItemBeforeAction)
+        {
+            if (!manager.HasItem(requiredItemType, requiredAmount))
+            {
+                string message = string.IsNullOrWhiteSpace(requirementFailMessage)
+                    ? manager.GetInsufficientMessage(requiredItemType, requiredAmount)
+                    : requirementFailMessage;
 
-        onRewardGiven?.Invoke();
+                if (showMessages)
+                    manager.RequestMessage(message);
+
+                onRequirementMissing?.Invoke();
+                onActionFailed?.Invoke();
+                return;
+            }
+
+            if (consumeRequiredItem)
+            {
+                bool consumed = manager.TryUseItem(requiredItemType, requiredAmount, true, false, true);
+                if (!consumed)
+                {
+                    onActionFailed?.Invoke();
+                    return;
+                }
+
+                onRequiredItemConsumed?.Invoke();
+            }
+
+            if (showMessages && !string.IsNullOrWhiteSpace(requirementSuccessMessage))
+                manager.RequestMessage(requirementSuccessMessage);
+        }
+
+        int actuallyGiven = 0;
+        if (giveRewardItem)
+        {
+            actuallyGiven = manager.AddItemAndGetAddedAmount(rewardItemType, requestedRewardAmount);
+            if (actuallyGiven <= 0)
+            {
+                onActionFailed?.Invoke();
+                return;
+            }
+
+            onRewardGiven?.Invoke();
+        }
+
+        alreadyCompleted = true;
+
+        if (persistActionState)
+            manager.MarkPersistentKeyConsumed(persistentActionKey);
+
+        if (showMessages)
+        {
+            if (!string.IsNullOrWhiteSpace(rewardGivenMessage))
+                manager.RequestMessage(rewardGivenMessage);
+            else if (!giveRewardItem)
+                manager.RequestMessage("완료되었습니다.");
+        }
+
+        onActionCompleted?.Invoke();
 
         if (showDebugLog)
-            Debug.Log($"[ItemReward] {rewardItemType} +{amount}");
+        {
+            if (giveRewardItem)
+                Debug.Log($"[ItemReward] {rewardItemType} +{actuallyGiven}", this);
+            else
+                Debug.Log("[ItemReward] 아이템 지급 없이 액션 완료", this);
+        }
     }
 
+    /// <summary>
+    /// 이번 호출에서만 amount를 바꿔 지급합니다. Inspector의 rewardAmount 값은 바꾸지 않습니다.
+    /// </summary>
     public void GiveRewardAmount(int amount)
     {
+        int previousAmount = rewardAmount;
         rewardAmount = Mathf.Max(1, amount);
-        GiveReward();
+        ExecuteAction();
+        rewardAmount = previousAmount;
     }
 
-    public void ResetRewardState()
+    public void ResetActionState()
     {
-        alreadyGiven = false;
+        alreadyCompleted = false;
+
+        if (persistActionState && ResolveManager() != null)
+            inventoryManager.ResetPersistentKey(persistentActionKey);
     }
 
     public void SetRewardItemType(InventoryItemType itemType)
@@ -78,8 +207,67 @@ public void SetRewardItemType(InventoryItemType itemType)
         rewardItemType = itemType;
     }
 
+    public void SetRequiredItemType(InventoryItemType itemType)
+    {
+        requiredItemType = itemType;
+    }
+
     public void SetInventoryManager(InventoryManager manager)
     {
         inventoryManager = manager;
     }
+
+    private InventoryManager ResolveManager()
+    {
+        if (inventoryManager != null)
+            return inventoryManager;
+
+        if (InventoryManager.Instance != null)
+            inventoryManager = InventoryManager.Instance;
+        else if (autoFindManager)
+            inventoryManager = FindFirstObjectByType<InventoryManager>();
+
+        return inventoryManager;
+    }
+
+    private void ResolvePersistentKey()
+    {
+        if (!persistActionState)
+            return;
+
+        if (string.IsNullOrWhiteSpace(persistentActionKey))
+            persistentActionKey = $"Reward_{gameObject.scene.name}_{GetHierarchyPath(transform)}";
+    }
+
+    private string GetHierarchyPath(Transform target)
+    {
+        if (target == null)
+            return "Unknown";
+
+        string path = target.name;
+        Transform parent = target.parent;
+        while (parent != null)
+        {
+            path = parent.name + "/" + path;
+            parent = parent.parent;
+        }
+
+        return path;
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        requiredAmount = Mathf.Max(1, requiredAmount);
+        rewardAmount = Mathf.Max(1, rewardAmount);
+
+        if (persistActionState && string.IsNullOrWhiteSpace(persistentActionKey))
+        {
+            string editorId = GlobalObjectId.GetGlobalObjectIdSlow(this).ToString();
+            persistentActionKey = string.IsNullOrWhiteSpace(editorId)
+                ? $"Reward_{gameObject.scene.name}_{GetHierarchyPath(transform)}"
+                : $"Reward_{editorId}";
+        }
+    }
+#endif
 }
diff --git a/Assets/My project/Inventory/Scripts/PlayerInventoryCollector.cs b/Assets/My project/Inventory/Scripts/PlayerInventoryCollector.cs
new file mode 100644
index 00000000..c99a4f9a
--- /dev/null
+++ b/Assets/My project/Inventory/Scripts/PlayerInventoryCollector.cs	
@@ -0,0 +1,199 @@
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.XR;
+
+/// <summary>
+/// VR 플레이어의 몸, 손, 컨트롤러 Collider에 붙여서
+/// "이 Collider는 인벤토리 아이템을 획득할 수 있다"고 표시하는 컴포넌트입니다.
+/// 기능: 획득 허용/차단, InventoryManager Override, 컨트롤러 햅틱, 빠른 아이템 사용 메서드.
+/// </summary>
+[DisallowMultipleComponent]
+public class PlayerInventoryCollector : MonoBehaviour
+{
+    [Header("Collection")]
+    [SerializeField] private bool canCollectItems = true;
+    [SerializeField] private InventoryManager inventoryManagerOverride;
+    [Tooltip("확인창이 필요한 아이템을 빠른 사용으로 눌렀을 때 InventoryUI의 확인창을 사용합니다.")]
+    [SerializeField] private bool respectInventoryUseConfirmation = true;
+    [SerializeField] private InventoryUI inventoryUIForConfirmedUses;
+
+    [Header("Haptic")]
+    [SerializeField] private bool enableHaptic = true;
+    [SerializeField] private XRNode hapticNode = XRNode.RightHand;
+    [Range(0f, 1f)] [SerializeField] private float defaultHapticAmplitude = 0.35f;
+    [SerializeField] private float defaultHapticDuration = 0.08f;
+
+    [Header("Quick Use - Compass")]
+    [SerializeField] private bool consumeCompassOnQuickUse = false;
+    [SerializeField] private string compassMissingMessage = "낡은 나침반이 필요합니다.";
+    [SerializeField] private string compassUsedMessage = "나침반이 방향을 가리킵니다.";
+    public UnityEvent onCompassUsed;
+    public UnityEvent onCompassMissing;
+
+    [Header("Quick Use - Fish")]
+    [SerializeField] private int fishUseAmount = 1;
+    [SerializeField] private string fishMissingMessage = "생선이 부족합니다.";
+    [SerializeField] private string fishUsedMessage = "생선을 사용했습니다.";
+    public UnityEvent onFishUsed;
+    public UnityEvent onFishMissing;
+
+    [Header("Quick Use - Trash")]
+    [SerializeField] private int trashUseAmount = 1;
+    [SerializeField] private string trashMissingMessage = "쓰레기가 부족합니다.";
+    [SerializeField] private string trashUsedMessage = "쓰레기를 사용했습니다.";
+    public UnityEvent onTrashUsed;
+    public UnityEvent onTrashMissing;
+
+    [Header("Quick Use - Bottle")]
+    [SerializeField] private bool consumeBottleOnQuickUse = false;
+    [SerializeField] private string bottleMissingMessage = "마법병이 필요합니다.";
+    [SerializeField] private string bottleUsedMessage = "마법병을 사용했습니다.";
+    public UnityEvent onBottleUsed;
+    public UnityEvent onBottleMissing;
+
+    [Header("Quick Use - Memory Piece")]
+    [SerializeField] private string memoryPieceMissingMessage = "기억의 조각이 없습니다.";
+    [SerializeField] private string memoryPieceUsedMessage = "기억의 조각을 확인했습니다.";
+    public UnityEvent onMemoryPieceUsed;
+    public UnityEvent onMemoryPieceMissing;
+
+    public bool CanCollectItems => canCollectItems;
+    public InventoryManager InventoryManagerOverride => inventoryManagerOverride;
+
+    public void SetCanCollectItems(bool canCollect)
+    {
+        canCollectItems = canCollect;
+    }
+
+    public void SetInventoryManagerOverride(InventoryManager manager)
+    {
+        inventoryManagerOverride = manager;
+    }
+
+    public void PlayDefaultHaptic()
+    {
+        PlayHaptic(defaultHapticAmplitude, defaultHapticDuration);
+    }
+
+    public void PlayHaptic(float amplitude, float duration)
+    {
+        if (!enableHaptic)
+            return;
+
+        InputDevice device = InputDevices.GetDeviceAtXRNode(hapticNode);
+        if (!device.isValid)
+            return;
+
+        HapticCapabilities capabilities;
+        if (device.TryGetHapticCapabilities(out capabilities) && capabilities.supportsImpulse)
+            device.SendHapticImpulse(0, Mathf.Clamp01(amplitude), Mathf.Max(0f, duration));
+    }
+
+    public void UseCompass()
+    {
+        InventoryManager manager = ResolveManager();
+        if (manager == null)
+            return;
+
+        bool result = manager.TryUseItem(InventoryItemType.OldCompass, 1, consumeCompassOnQuickUse, false, true);
+        if (result)
+        {
+            manager.RequestMessage(compassUsedMessage);
+            PlayDefaultHaptic();
+            onCompassUsed?.Invoke();
+        }
+        else
+        {
+            manager.RequestMessage(compassMissingMessage);
+            onCompassMissing?.Invoke();
+        }
+    }
+
+    public void UseFish()
+    {
+        TryUseQuickItem(InventoryItemType.Fish, fishUseAmount, true, fishUsedMessage, fishMissingMessage, onFishUsed, onFishMissing);
+    }
+
+    public void UseTrash()
+    {
+        TryUseQuickItem(InventoryItemType.Trash, trashUseAmount, true, trashUsedMessage, trashMissingMessage, onTrashUsed, onTrashMissing);
+    }
+
+    public void UseBottle()
+    {
+        TryUseQuickItem(InventoryItemType.Bottle, 1, consumeBottleOnQuickUse, bottleUsedMessage, bottleMissingMessage, onBottleUsed, onBottleMissing);
+    }
+
+    public void UseMemoryPiece()
+    {
+        TryUseQuickItem(InventoryItemType.MemoryPiece, 1, false, memoryPieceUsedMessage, memoryPieceMissingMessage, onMemoryPieceUsed, onMemoryPieceMissing);
+    }
+
+    public bool TryUseQuickItem(InventoryItemType itemType, int amount, bool consume, string successMessage, string missingMessage, UnityEvent onSuccess, UnityEvent onFail)
+    {
+        InventoryManager manager = ResolveManager();
+        if (manager == null)
+            return false;
+
+        amount = Mathf.Max(1, amount);
+
+        if (respectInventoryUseConfirmation && manager.RequiresUseConfirmation(itemType))
+        {
+            InventoryUI ui = ResolveInventoryUI();
+            if (ui != null)
+            {
+                ui.RequestUseItem(itemType, amount);
+                return true;
+            }
+        }
+
+        bool result = manager.TryUseItem(itemType, amount, consume, false, true);
+
+        if (result)
+        {
+            if (!string.IsNullOrWhiteSpace(successMessage))
+                manager.RequestMessage(successMessage);
+
+            PlayDefaultHaptic();
+            onSuccess?.Invoke();
+            return true;
+        }
+
+        if (!string.IsNullOrWhiteSpace(missingMessage))
+            manager.RequestMessage(missingMessage);
+        else
+            manager.RequestMessage(manager.GetInsufficientMessage(itemType, amount));
+
+        onFail?.Invoke();
+        return false;
+    }
+
+    private InventoryUI ResolveInventoryUI()
+    {
+        if (inventoryUIForConfirmedUses != null)
+            return inventoryUIForConfirmedUses;
+
+        inventoryUIForConfirmedUses = FindFirstObjectByType<InventoryUI>();
+        return inventoryUIForConfirmedUses;
+    }
+
+    private InventoryManager ResolveManager()
+    {
+        if (inventoryManagerOverride != null)
+            return inventoryManagerOverride;
+
+        if (InventoryManager.Instance != null)
+            return InventoryManager.Instance;
+
+        return FindFirstObjectByType<InventoryManager>();
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        fishUseAmount = Mathf.Max(1, fishUseAmount);
+        trashUseAmount = Mathf.Max(1, trashUseAmount);
+        defaultHapticDuration = Mathf.Max(0f, defaultHapticDuration);
+    }
+#endif
+}
diff --git a/Assets/My project/Inventory/Scripts/PlayerInventoryCollector.cs.meta b/Assets/My project/Inventory/Scripts/PlayerInventoryCollector.cs.meta
new file mode 100644
index 00000000..2e93c44d
--- /dev/null
+++ b/Assets/My project/Inventory/Scripts/PlayerInventoryCollector.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 163db194b41091d4a9869360cb8ae57d
\ No newline at end of file
diff --git a/Assets/My project/Memory Scripts/UI/MemoryPiecePickup.cs b/Assets/My project/Memory Scripts/UI/MemoryPiecePickup.cs
index 532e1117..4c3a46bc 100644
--- a/Assets/My project/Memory Scripts/UI/MemoryPiecePickup.cs	
+++ b/Assets/My project/Memory Scripts/UI/MemoryPiecePickup.cs	
@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 
+[DisallowMultipleComponent]
 public class MemoryPiecePickup : MonoBehaviour
 {
     [Header("Reference")]
@@ -8,12 +9,17 @@ public class MemoryPiecePickup : MonoBehaviour
 
     [Header("Settings")]
     [SerializeField] private int amount = 1;
-    [SerializeField] private bool destroyAfterPickup = true;
+    [SerializeField] private bool destroyAfterPickup = false;
+    [Tooltip("Destroy After Pickup이 꺼져 있을 때, 획득 후 오브젝트를 비활성화합니다.")]
+    [SerializeField] private bool disableAfterPickup = true;
     [SerializeField] private bool autoFindManager = true;
     [SerializeField] private string playerTag = "Player";
+    [Tooltip("Player Tag가 비어 있을 때 아무 Collider나 획득을 허용합니다. 테스트용이 아니면 끄는 것을 추천합니다.")]
+    [SerializeField] private bool allowPickupWhenPlayerTagEmpty = false;
 
     [Header("Events")]
-    public UnityEvent onPickedUp;
+    public UnityEvent onPickedUp = new UnityEvent();
+    public UnityEvent onPickupFailed = new UnityEvent();
 
     private bool pickedUp;
 
@@ -24,21 +30,50 @@ private void Awake()
     }
 
     public void PickUp()
+    {
+        TryPickUp();
+    }
+
+    public bool TryPickUp()
     {
         if (pickedUp)
-            return;
+            return false;
+
+        if (memoryProgressManager == null)
+        {
+            Debug.LogWarning("[MemoryPiecePickup] MemoryProgressManager가 연결되지 않았습니다.", this);
+            onPickupFailed?.Invoke();
+            return false;
+        }
+
+        int addedAmount = memoryProgressManager.AddMemoryPiece(amount);
+
+        if (addedAmount <= 0)
+        {
+            onPickupFailed?.Invoke();
+            return false;
+        }
 
         pickedUp = true;
-
-        if (memoryProgressManager != null)
-            memoryProgressManager.AddMemoryPiece(amount);
-        else
-            Debug.LogWarning("[MemoryPiecePickup] MemoryProgressManager가 연결되지 않았습니다.");
-
         onPickedUp?.Invoke();
 
         if (destroyAfterPickup)
             Destroy(gameObject);
+        else if (disableAfterPickup)
+            gameObject.SetActive(false);
+
+        return true;
+    }
+
+    public void ResetPickup()
+    {
+        pickedUp = false;
+        gameObject.SetActive(true);
+    }
+
+    public void SetMemoryProgressManager(MemoryProgressManager manager)
+    {
+        memoryProgressManager = manager;
     }
 
     private void OnTriggerEnter(Collider other)
@@ -46,7 +81,35 @@ private void OnTriggerEnter(Collider other)
         if (pickedUp)
             return;
 
-        if (other.CompareTag(playerTag))
-            PickUp();
+        if (IsPlayerCollider(other))
+            TryPickUp();
     }
+
+    private bool IsPlayerCollider(Collider other)
+    {
+        if (other == null)
+            return false;
+
+        if (string.IsNullOrWhiteSpace(playerTag))
+            return allowPickupWhenPlayerTagEmpty;
+
+        return other.CompareTag(playerTag);
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        amount = Mathf.Max(1, amount);
+
+        if (string.IsNullOrWhiteSpace(playerTag) && !allowPickupWhenPlayerTagEmpty)
+        {
+            Debug.LogWarning("MemoryPiecePickup: Player Tag가 비어 있고 Allow Pickup When Player Tag Empty가 꺼져 있습니다. 이 상태에서는 트리거 획득이 작동하지 않습니다.", this);
+        }
+
+        if (destroyAfterPickup && disableAfterPickup)
+        {
+            Debug.LogWarning("MemoryPiecePickup: Destroy After Pickup이 켜져 있으면 Disable After Pickup은 의미가 없습니다.", this);
+        }
+    }
+#endif
 }
diff --git a/Assets/My project/Memory Scripts/UI/MemoryPieceReward.cs b/Assets/My project/Memory Scripts/UI/MemoryPieceReward.cs
index 4fa67ce0..c3e0f840 100644
--- a/Assets/My project/Memory Scripts/UI/MemoryPieceReward.cs	
+++ b/Assets/My project/Memory Scripts/UI/MemoryPieceReward.cs	
@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 
+[DisallowMultipleComponent]
 public class MemoryPieceReward : MonoBehaviour
 {
     [Header("Reference")]
@@ -10,22 +11,36 @@ public class MemoryPieceReward : MonoBehaviour
     [SerializeField] private int rewardAmount = 1;
     [SerializeField] private bool giveOnlyOnce = true;
 
+    [Header("Persistent Reward ID")]
+    [Tooltip("체크하면 같은 Reward ID는 게임을 다시 켜도 한 번만 지급됩니다.")]
+    [SerializeField] private bool persistRewardGiven = true;
+    [Tooltip("보상마다 고유 ID를 넣으세요. 예: Maze_Clear_Reward_01, WhalePuzzle_Clear_Reward_01")]
+    [SerializeField] private string rewardId = "Maze_Clear_Reward_01";
+
     [Header("Auto Find")]
     [SerializeField] private bool autoFindManager = true;
 
     [Header("Events")]
-    public UnityEvent onRewardGiven;
-    public UnityEvent onRewardAlreadyGiven;
+    public UnityEvent onRewardGiven = new UnityEvent();
+    public UnityEvent onRewardAlreadyGiven = new UnityEvent();
+    public UnityEvent onRewardFailed = new UnityEvent();
+    [Tooltip("진행도가 이미 완료되어 추가 보상이 필요 없는 경우 호출됩니다.")]
+    public UnityEvent onRewardNoNeedAlreadyCompleted = new UnityEvent();
 
     [Header("Debug")]
     [SerializeField] private bool showDebugLog = true;
 
     private bool alreadyGiven;
 
+    private string RewardSaveKey => $"MemoryPieceReward_{rewardId}";
+
     private void Awake()
     {
         if (memoryProgressManager == null && autoFindManager)
             memoryProgressManager = FindFirstObjectByType<MemoryProgressManager>();
+
+        if (giveOnlyOnce && persistRewardGiven && !string.IsNullOrWhiteSpace(rewardId))
+            alreadyGiven = PlayerPrefs.GetInt(RewardSaveKey, 0) == 1;
     }
 
     public void GiveReward()
@@ -35,27 +50,104 @@ public void GiveReward()
             onRewardAlreadyGiven?.Invoke();
 
             if (showDebugLog)
-                Debug.Log("[MemoryPieceReward] 이미 지급된 기억의 조각입니다.");
+                Debug.Log($"[MemoryPieceReward] 이미 지급된 기억의 조각입니다. Reward ID={rewardId}", this);
 
             return;
         }
 
         if (memoryProgressManager == null)
         {
-            Debug.LogWarning("[MemoryPieceReward] MemoryProgressManager가 연결되지 않았습니다.");
+            Debug.LogWarning("[MemoryPieceReward] MemoryProgressManager가 연결되지 않았습니다.", this);
+            onRewardFailed?.Invoke();
+            return;
+        }
+
+        if (memoryProgressManager.IsCompleted)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryPieceReward] 기억의 조각 진행도가 이미 완료되어 추가 지급이 필요 없습니다.", this);
+
+            onRewardNoNeedAlreadyCompleted?.Invoke();
+            return;
+        }
+
+        int addedAmount = memoryProgressManager.AddMemoryPiece(rewardAmount);
+
+        if (addedAmount <= 0)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryPieceReward] 실제로 추가된 기억의 조각이 없습니다.", this);
+
+            onRewardFailed?.Invoke();
             return;
         }
 
-        memoryProgressManager.AddMemoryPiece(rewardAmount);
         alreadyGiven = true;
+        SaveRewardGivenIfNeeded();
         onRewardGiven?.Invoke();
 
         if (showDebugLog)
-            Debug.Log($"[MemoryPieceReward] 기억의 조각 +{rewardAmount}");
+            Debug.Log($"[MemoryPieceReward] 기억의 조각 +{addedAmount}, Reward ID={rewardId}", this);
     }
 
     public void ResetReward()
     {
         alreadyGiven = false;
+
+        if (persistRewardGiven && !string.IsNullOrWhiteSpace(rewardId))
+        {
+            PlayerPrefs.DeleteKey(RewardSaveKey);
+            PlayerPrefs.Save();
+        }
+
+        if (showDebugLog)
+            Debug.Log($"[MemoryPieceReward] 보상 지급 상태를 초기화했습니다. Reward ID={rewardId}", this);
     }
+
+    public void SetMemoryProgressManager(MemoryProgressManager manager)
+    {
+        memoryProgressManager = manager;
+    }
+
+    public void SetRewardId(string id)
+    {
+        rewardId = id;
+    }
+
+    public bool IsRewardGiven()
+    {
+        return alreadyGiven;
+    }
+
+    private void SaveRewardGivenIfNeeded()
+    {
+        if (!giveOnlyOnce || !persistRewardGiven)
+            return;
+
+        if (string.IsNullOrWhiteSpace(rewardId))
+        {
+            Debug.LogWarning("[MemoryPieceReward] Reward ID가 비어 있어 지급 상태를 저장하지 않았습니다.", this);
+            return;
+        }
+
+        PlayerPrefs.SetInt(RewardSaveKey, 1);
+        PlayerPrefs.Save();
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        rewardAmount = Mathf.Max(1, rewardAmount);
+
+        if (persistRewardGiven && string.IsNullOrWhiteSpace(rewardId))
+        {
+            Debug.LogWarning("MemoryPieceReward: Persist Reward Given이 켜져 있지만 Reward ID가 비어 있습니다.", this);
+        }
+
+        if (persistRewardGiven && rewardId == "MazeReward_01")
+        {
+            Debug.LogWarning("MemoryPieceReward: 기본 Reward ID를 그대로 쓰고 있습니다. 보상마다 고유 ID로 바꾸는 것을 추천합니다.", this);
+        }
+    }
+#endif
 }
diff --git a/Assets/My project/Memory Scripts/UI/MemoryProgressDebugResetter.cs b/Assets/My project/Memory Scripts/UI/MemoryProgressDebugResetter.cs
new file mode 100644
index 00000000..4b98ee48
--- /dev/null
+++ b/Assets/My project/Memory Scripts/UI/MemoryProgressDebugResetter.cs	
@@ -0,0 +1,65 @@
+using UnityEngine;
+
+[DisallowMultipleComponent]
+public class MemoryProgressDebugResetter : MonoBehaviour
+{
+    [Header("References")]
+    [SerializeField] private MemoryProgressManager memoryProgressManager;
+    [SerializeField] private MemoryPieceReward[] rewardsToReset;
+    [SerializeField] private MemoryPiecePickup[] pickupsToReset;
+
+    [Header("Options")]
+    [SerializeField] private bool autoFindIfEmpty = true;
+
+    [ContextMenu("Reset Memory Progress And Rewards")]
+    public void ResetMemoryProgressAndRewards()
+    {
+        ResolveReferencesIfNeeded();
+
+        if (memoryProgressManager != null)
+            memoryProgressManager.ResetProgress();
+
+        if (rewardsToReset != null)
+        {
+            for (int i = 0; i < rewardsToReset.Length; i++)
+            {
+                if (rewardsToReset[i] != null)
+                    rewardsToReset[i].ResetReward();
+            }
+        }
+
+        if (pickupsToReset != null)
+        {
+            for (int i = 0; i < pickupsToReset.Length; i++)
+            {
+                if (pickupsToReset[i] != null)
+                    pickupsToReset[i].ResetPickup();
+            }
+        }
+
+        Debug.Log("[MemoryProgressDebugResetter] 기억의 조각 진행도 / 보상 / 픽업 상태를 초기화했습니다.", this);
+    }
+
+    public void ClearSavedProgressOnly()
+    {
+        ResolveReferencesIfNeeded();
+
+        if (memoryProgressManager != null)
+            memoryProgressManager.ClearSavedProgress();
+    }
+
+    private void ResolveReferencesIfNeeded()
+    {
+        if (!autoFindIfEmpty)
+            return;
+
+        if (memoryProgressManager == null)
+            memoryProgressManager = FindFirstObjectByType<MemoryProgressManager>();
+
+        if (rewardsToReset == null || rewardsToReset.Length == 0)
+            rewardsToReset = FindObjectsByType<MemoryPieceReward>(FindObjectsSortMode.None);
+
+        if (pickupsToReset == null || pickupsToReset.Length == 0)
+            pickupsToReset = FindObjectsByType<MemoryPiecePickup>(FindObjectsSortMode.None);
+    }
+}
diff --git a/Assets/My project/Memory Scripts/UI/MemoryProgressDebugResetter.cs.meta b/Assets/My project/Memory Scripts/UI/MemoryProgressDebugResetter.cs.meta
new file mode 100644
index 00000000..97a81df2
--- /dev/null
+++ b/Assets/My project/Memory Scripts/UI/MemoryProgressDebugResetter.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d5217bde4816062498bb9f889957f2eb
\ No newline at end of file
diff --git a/Assets/My project/Memory Scripts/UI/MemoryProgressManager.cs b/Assets/My project/Memory Scripts/UI/MemoryProgressManager.cs
index 3d98725f..f26e0c3a 100644
--- a/Assets/My project/Memory Scripts/UI/MemoryProgressManager.cs	
+++ b/Assets/My project/Memory Scripts/UI/MemoryProgressManager.cs	
@@ -1,63 +1,128 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;
 
 [Serializable]
 public class MemoryProgressChangedEvent : UnityEvent<int, int> { }
 
+[Serializable]
+public class MemoryPieceAddedEvent : UnityEvent<int, int, int> { }
+
+[DisallowMultipleComponent]
 public class MemoryProgressManager : MonoBehaviour
 {
     [Header("References")]
-    [Tooltip("진행도 UI가 여러 곳에 있으면 모두 넣으세요. 예: HUD용, 방 선택용")]
+    [Tooltip("직접 연결 방식입니다. 자동 등록을 쓸 경우 비워둬도 됩니다.")]
     [SerializeField] private MemoryProgressUI[] memoryProgressUIs;
 
     [Header("Progress")]
     [SerializeField] private int requiredPieces = 5;
     [SerializeField] private int currentPieces = 0;
 
+    [Header("Save / Load")]
+    [Tooltip("체크하면 PlayerPrefs로 현재 기억의 조각 진행도를 저장합니다.")]
+    [SerializeField] private bool usePlayerPrefsSave = true;
+    [SerializeField] private string saveKey = "MemoryProgress_CurrentPieces";
+    [Tooltip("Awake에서 저장된 진행도를 불러옵니다.")]
+    [SerializeField] private bool loadSavedProgressOnAwake = true;
+    [Tooltip("진행도가 바뀔 때마다 자동 저장합니다.")]
+    [SerializeField] private bool saveWheneverChanged = true;
+    [Tooltip("ResetProgress() 호출 시 저장값도 0으로 갱신합니다. 테스트용 리셋이면 켜두는 것을 추천합니다.")]
+    [SerializeField] private bool saveResetValue = true;
+
+    [Header("Start Behaviour")]
+    [Tooltip("Start에서 onProgressChanged를 한 번 호출합니다. 시작 시 다른 시스템도 현재 진행도를 받아야 하면 켜세요.")]
+    [SerializeField] private bool notifyProgressChangedOnStart = false;
+    [Tooltip("저장된 값이 이미 완료 상태일 때 Start에서 onAllPiecesCollected를 다시 호출합니다. 저장된 완료 상태로 문/스토리 이벤트를 복구해야 할 때 켜세요.")]
+    [SerializeField] private bool invokeCompletionOnStartIfAlreadyCompleted = false;
+
     [Header("Events")]
-    public MemoryProgressChangedEvent onProgressChanged;
-    public UnityEvent onAllPiecesCollected;
+    [Tooltip("진행도 값이 바뀔 때 호출됩니다. UI 갱신용으로 쓰세요. Reset / Set에서도 호출될 수 있습니다.")]
+    public MemoryProgressChangedEvent onProgressChanged = new MemoryProgressChangedEvent();
+
+    [Tooltip("AddMemoryPiece로 실제 조각이 추가되었을 때만 호출됩니다. 획득 팝업은 이 이벤트에 연결하세요. 인자: addedAmount, current, required")]
+    public MemoryPieceAddedEvent onMemoryPieceAdded = new MemoryPieceAddedEvent();
+
+    [Tooltip("모든 기억의 조각을 모았을 때 한 번만 호출됩니다.")]
+    public UnityEvent onAllPiecesCollected = new UnityEvent();
 
     [Header("Debug")]
     [SerializeField] private bool showDebugLog = true;
 
+    private readonly List<MemoryProgressUI> registeredUIs = new List<MemoryProgressUI>();
     private bool completionEventInvoked;
 
     public int CurrentPieces => currentPieces;
     public int RequiredPieces => requiredPieces;
     public bool IsCompleted => currentPieces >= requiredPieces;
 
+    private void Awake()
+    {
+        ValidateProgressValues();
+
+        if (usePlayerPrefsSave && loadSavedProgressOnAwake)
+            LoadProgress();
+
+        ValidateProgressValues();
+
+        // 저장된 값이 이미 완료 상태일 때 완료 이벤트가 중복 호출되지 않도록 기본적으로 막습니다.
+        // 단, invokeCompletionOnStartIfAlreadyCompleted를 켜면 Start에서 한 번 호출합니다.
+        completionEventInvoked = IsCompleted && !invokeCompletionOnStartIfAlreadyCompleted;
+    }
+
     private void Start()
     {
-        requiredPieces = Mathf.Max(1, requiredPieces);
-        currentPieces = Mathf.Clamp(currentPieces, 0, requiredPieces);
         RefreshUI();
+
+        if (notifyProgressChangedOnStart)
+            onProgressChanged?.Invoke(currentPieces, requiredPieces);
+
+        if (invokeCompletionOnStartIfAlreadyCompleted && IsCompleted)
+            CheckCompletion();
     }
 
-    public void AddMemoryPiece()
+    public int AddMemoryPiece()
     {
-        AddMemoryPiece(1);
+        return AddMemoryPiece(1);
     }
 
-    public void AddMemoryPiece(int amount)
+    /// <summary>
+    /// 기억의 조각을 추가합니다.
+    /// 반환값은 실제로 추가된 개수입니다.
+    /// 이미 완료 상태이거나 amount가 0 이하이면 0을 반환합니다.
+    /// </summary>
+    public int AddMemoryPiece(int amount)
     {
         if (amount <= 0)
-            return;
+        {
+            if (showDebugLog)
+                Debug.LogWarning("[MemoryProgressManager] 추가할 기억의 조각 수가 0 이하입니다.", this);
+
+            return 0;
+        }
 
         if (IsCompleted)
         {
             if (showDebugLog)
-                Debug.Log("[MemoryProgressManager] 이미 모든 기억의 조각을 모았습니다.");
+                Debug.Log("[MemoryProgressManager] 이미 모든 기억의 조각을 모았습니다.", this);
 
-            return;
+            return 0;
         }
 
-        currentPieces += amount;
-        currentPieces = Mathf.Clamp(currentPieces, 0, requiredPieces);
+        int before = currentPieces;
+        currentPieces = Mathf.Clamp(currentPieces + amount, 0, requiredPieces);
+        int addedAmount = currentPieces - before;
+
+        if (addedAmount <= 0)
+            return 0;
 
         RefreshAndNotify();
+        onMemoryPieceAdded?.Invoke(addedAmount, currentPieces, requiredPieces);
+        SaveProgressIfNeeded();
         CheckCompletion();
+
+        return addedAmount;
     }
 
     public void SetMemoryPieces(int value)
@@ -68,6 +133,29 @@ public void SetMemoryPieces(int value)
             completionEventInvoked = false;
 
         RefreshAndNotify();
+        SaveProgressIfNeeded();
+        CheckCompletion();
+    }
+
+    public void SetRequiredPieces(int value)
+    {
+        SetRequiredPieces(value, true);
+    }
+
+    public void SetRequiredPieces(int value, bool keepCurrentProgress)
+    {
+        requiredPieces = Mathf.Max(1, value);
+
+        if (!keepCurrentProgress)
+            currentPieces = 0;
+
+        currentPieces = Mathf.Clamp(currentPieces, 0, requiredPieces);
+
+        if (!IsCompleted)
+            completionEventInvoked = false;
+
+        RefreshAndNotify();
+        SaveProgressIfNeeded();
         CheckCompletion();
     }
 
@@ -76,6 +164,57 @@ public void ResetProgress()
         currentPieces = 0;
         completionEventInvoked = false;
         RefreshAndNotify();
+
+        if (usePlayerPrefsSave && saveResetValue)
+            SaveProgress();
+    }
+
+    public void ClearSavedProgress()
+    {
+        if (string.IsNullOrWhiteSpace(saveKey))
+            return;
+
+        PlayerPrefs.DeleteKey(saveKey);
+        PlayerPrefs.Save();
+
+        if (showDebugLog)
+            Debug.Log($"[MemoryProgressManager] 저장된 진행도 삭제: {saveKey}", this);
+    }
+
+    public void SaveProgress()
+    {
+        if (!usePlayerPrefsSave)
+            return;
+
+        if (string.IsNullOrWhiteSpace(saveKey))
+        {
+            Debug.LogWarning("[MemoryProgressManager] Save Key가 비어 있어 저장하지 않았습니다.", this);
+            return;
+        }
+
+        PlayerPrefs.SetInt(saveKey, currentPieces);
+        PlayerPrefs.Save();
+
+        if (showDebugLog)
+            Debug.Log($"[MemoryProgressManager] 진행도 저장: {currentPieces}/{requiredPieces}", this);
+    }
+
+    public void LoadProgress()
+    {
+        if (!usePlayerPrefsSave)
+            return;
+
+        if (string.IsNullOrWhiteSpace(saveKey))
+        {
+            Debug.LogWarning("[MemoryProgressManager] Save Key가 비어 있어 불러오지 않았습니다.", this);
+            return;
+        }
+
+        currentPieces = PlayerPrefs.GetInt(saveKey, currentPieces);
+        currentPieces = Mathf.Clamp(currentPieces, 0, requiredPieces);
+
+        if (showDebugLog)
+            Debug.Log($"[MemoryProgressManager] 진행도 불러오기: {currentPieces}/{requiredPieces}", this);
     }
 
     public void RegisterUI(MemoryProgressUI ui)
@@ -83,28 +222,75 @@ public void RegisterUI(MemoryProgressUI ui)
         if (ui == null)
             return;
 
+        if (!registeredUIs.Contains(ui))
+            registeredUIs.Add(ui);
+
         ui.SetProgress(currentPieces, requiredPieces);
     }
 
+    public void UnregisterUI(MemoryProgressUI ui)
+    {
+        if (ui == null)
+            return;
+
+        registeredUIs.Remove(ui);
+    }
+
+    public void RefreshAllUIs()
+    {
+        RefreshUI();
+    }
+
     private void RefreshAndNotify()
     {
         RefreshUI();
         onProgressChanged?.Invoke(currentPieces, requiredPieces);
 
         if (showDebugLog)
-            Debug.Log($"[MemoryProgressManager] 기억의 조각 {currentPieces}/{requiredPieces}");
+            Debug.Log($"[MemoryProgressManager] 기억의 조각 {currentPieces}/{requiredPieces}", this);
     }
 
     private void RefreshUI()
     {
-        if (memoryProgressUIs == null)
-            return;
+        if (memoryProgressUIs != null)
+        {
+            for (int i = 0; i < memoryProgressUIs.Length; i++)
+            {
+                if (memoryProgressUIs[i] != null)
+                    memoryProgressUIs[i].SetProgress(currentPieces, requiredPieces);
+            }
+        }
+
+        for (int i = registeredUIs.Count - 1; i >= 0; i--)
+        {
+            MemoryProgressUI ui = registeredUIs[i];
+
+            if (ui == null)
+            {
+                registeredUIs.RemoveAt(i);
+                continue;
+            }
+
+            // 같은 UI가 직접 배열에도 들어 있고 자동 등록도 된 경우, 중복 갱신을 피합니다.
+            if (IsInSerializedUIArray(ui))
+                continue;
+
+            ui.SetProgress(currentPieces, requiredPieces);
+        }
+    }
+
+    private bool IsInSerializedUIArray(MemoryProgressUI ui)
+    {
+        if (memoryProgressUIs == null || ui == null)
+            return false;
 
         for (int i = 0; i < memoryProgressUIs.Length; i++)
         {
-            if (memoryProgressUIs[i] != null)
-                memoryProgressUIs[i].SetProgress(currentPieces, requiredPieces);
+            if (memoryProgressUIs[i] == ui)
+                return true;
         }
+
+        return false;
     }
 
     private void CheckCompletion()
@@ -119,6 +305,179 @@ private void CheckCompletion()
         onAllPiecesCollected?.Invoke();
 
         if (showDebugLog)
-            Debug.Log("[MemoryProgressManager] 기억의 조각을 모두 모았습니다.");
+            Debug.Log("[MemoryProgressManager] 기억의 조각을 모두 모았습니다.", this);
     }
+
+    private void SaveProgressIfNeeded()
+    {
+        if (usePlayerPrefsSave && saveWheneverChanged)
+            SaveProgress();
+    }
+
+    private void ValidateProgressValues()
+    {
+        requiredPieces = Mathf.Max(1, requiredPieces);
+        currentPieces = Mathf.Clamp(currentPieces, 0, requiredPieces);
+    }
+
+
+    // ------------------------------------------------------------
+    // Test / Debug Helpers
+    // Unity Button OnClick에서는 반환값이 int인 AddMemoryPiece(int)가 잘 안 보일 수 있습니다.
+    // 그래서 버튼에서 바로 연결할 수 있는 void 테스트 메서드를 제공합니다.
+    // 빌드에 포함되어도 동작은 하지만, 실제 배포용 버튼에는 연결하지 않는 것을 추천합니다.
+    // ------------------------------------------------------------
+
+    [Header("Test / Debug")]
+    [Tooltip("테스트용 메서드를 인스펙터 버튼 OnClick에 연결해서 진행도 UI를 빠르게 확인할 수 있습니다.")]
+    [SerializeField] private bool enableTestMethods = true;
+
+    public void TestAddOnePiece()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        AddMemoryPiece(1);
+    }
+
+    public void TestAddTwoPieces()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        AddMemoryPiece(2);
+    }
+
+    public void TestResetProgress()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        ResetProgress();
+    }
+
+    public void TestSetProgressZero()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        SetMemoryPieces(0);
+    }
+
+    public void TestSetProgressOne()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        SetMemoryPieces(1);
+    }
+
+    public void TestSetProgressFour()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        SetMemoryPieces(Mathf.Max(0, requiredPieces - 1));
+    }
+
+    public void TestCompleteProgress()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        SetMemoryPieces(requiredPieces);
+    }
+
+    public void TestClearSaveAndReset()
+    {
+        if (!enableTestMethods)
+        {
+            if (showDebugLog)
+                Debug.Log("[MemoryProgressManager] 테스트 메서드가 비활성화되어 있습니다.", this);
+            return;
+        }
+
+        ClearSavedProgress();
+        ResetProgress();
+    }
+
+    [ContextMenu("TEST/Add One Piece")]
+    private void ContextTestAddOnePiece()
+    {
+        TestAddOnePiece();
+    }
+
+    [ContextMenu("TEST/Reset Progress")]
+    private void ContextTestResetProgress()
+    {
+        TestResetProgress();
+    }
+
+    [ContextMenu("TEST/Complete Progress")]
+    private void ContextTestCompleteProgress()
+    {
+        TestCompleteProgress();
+    }
+
+    [ContextMenu("TEST/Clear Save And Reset")]
+    private void ContextTestClearSaveAndReset()
+    {
+        TestClearSaveAndReset();
+    }
+
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        ValidateProgressValues();
+
+        if (usePlayerPrefsSave && string.IsNullOrWhiteSpace(saveKey))
+        {
+            Debug.LogWarning("MemoryProgressManager: Save Key가 비어 있습니다. 저장 기능을 쓰려면 고유한 키를 입력하세요.", this);
+        }
+
+        if (memoryProgressUIs != null)
+        {
+            for (int i = 0; i < memoryProgressUIs.Length; i++)
+            {
+                for (int j = i + 1; j < memoryProgressUIs.Length; j++)
+                {
+                    if (memoryProgressUIs[i] != null && memoryProgressUIs[i] == memoryProgressUIs[j])
+                    {
+                        Debug.LogWarning("MemoryProgressManager: Memory Progress UIs 배열에 같은 UI가 중복 등록되어 있습니다.", this);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+#endif
 }
diff --git a/Assets/My project/Memory Scripts/UI/MemoryProgressPopupUI.cs b/Assets/My project/Memory Scripts/UI/MemoryProgressPopupUI.cs
index 7361663a..b313ab68 100644
--- a/Assets/My project/Memory Scripts/UI/MemoryProgressPopupUI.cs	
+++ b/Assets/My project/Memory Scripts/UI/MemoryProgressPopupUI.cs	
@@ -2,32 +2,77 @@
 using TMPro;
 using UnityEngine;
 
+[DisallowMultipleComponent]
 public class MemoryProgressPopupUI : MonoBehaviour
 {
     [Header("Panel")]
+    [Tooltip("실제로 켜고 끌 팝업 패널입니다. 가능하면 이 스크립트는 항상 켜진 MemoryPopupController에 붙이고, 이 필드에 MemoryPopupPanel을 연결하세요.")]
     [SerializeField] private GameObject popupPanel;
+    [SerializeField] private CanvasGroup popupCanvasGroup;
+    [Tooltip("체크하면 팝업이 끝난 뒤 Popup Panel을 비활성화합니다. 단, Popup Panel이 이 스크립트 오브젝트와 같으면 자동으로 비활성화하지 않습니다.")]
+    [SerializeField] private bool deactivatePanelAfterHide = true;
 
     [Header("Text")]
     [SerializeField] private TMP_Text titleText;
     [SerializeField] private TMP_Text countText;
+    [SerializeField] private TMP_Text addedAmountText;
 
-    [Header("Settings")]
-    [SerializeField] private string message = "기억의 조각을 얻었다!";
+    [Header("Popup Visual Objects")]
+    [Tooltip("팝업 안의 소켓 이미지입니다. 보통 항상 켜도 됩니다.")]
+    [SerializeField] private GameObject popupCrystalSocket;
+    [Tooltip("팝업 안의 파란 기억 조각 이미지입니다.")]
+    [SerializeField] private GameObject popupCrystalIcon;
+    [Tooltip("팝업 안의 정적 Glow 이미지입니다. 애니메이션 없이 ON/OFF만 합니다.")]
+    [SerializeField] private GameObject popupGlowIcon;
+    [Tooltip("팝업이 표시될 때 Glow를 켭니다.")]
+    [SerializeField] private bool showPopupGlow = true;
+    [Tooltip("체크하면 마지막 조각 획득으로 완료됐을 때만 Popup Glow를 켭니다.")]
+    [SerializeField] private bool showPopupGlowOnlyWhenCompleted = false;
+
+    [Header("Messages")]
+    [SerializeField] private string message = "기억의 조각 획득!";
+    [SerializeField] private string completedMessage = "모든 기억의 조각을 모았습니다!";
+    [SerializeField] private bool useCompletedMessage = true;
+
+    [Header("Added Amount")]
+    [SerializeField] private string addedAmountFormat = "+{0}";
+    [SerializeField] private bool showCompletedTextWhenCompleted = true;
+    [SerializeField] private string completedAddedAmountText = "완료";
+
+    [Header("Timing")]
+    [Tooltip("팝업이 표시되는 시간입니다. 페이드 애니메이션은 제거했고, 이 시간 후 즉시 숨깁니다.")]
     [SerializeField] private float showTime = 1.5f;
+    [SerializeField] private bool autoHide = true;
+    [SerializeField] private bool useUnscaledTime = false;
 
     private Coroutine popupRoutine;
 
     private void Awake()
     {
+        AutoFillReferencesIfNeeded();
         HidePopup();
     }
 
+    private void OnDisable()
+    {
+        if (popupRoutine != null)
+        {
+            StopCoroutine(popupRoutine);
+            popupRoutine = null;
+        }
+    }
+
     public void ShowPopup(int current, int max)
     {
-        if (popupRoutine != null)
-            StopCoroutine(popupRoutine);
+        ShowPopupInternal(0, current, max, false);
+    }
 
-        popupRoutine = StartCoroutine(PopupRoutine(current, max));
+    public void ShowPieceAdded(int addedAmount, int current, int max)
+    {
+        if (addedAmount <= 0)
+            return;
+
+        ShowPopupInternal(addedAmount, current, max, true);
     }
 
     public void HidePopup()
@@ -38,26 +83,157 @@ public void HidePopup()
             popupRoutine = null;
         }
 
-        if (popupPanel != null)
+        SetCanvasVisible(false);
+        ApplyPopupObjects(false, false);
+
+        if (ShouldDeactivatePanel() && popupPanel != null)
             popupPanel.SetActive(false);
     }
 
-    private IEnumerator PopupRoutine(int current, int max)
+    private void ShowPopupInternal(int addedAmount, int current, int max, bool showAddedAmount)
     {
+        AutoFillReferencesIfNeeded();
+
+        if (!gameObject.activeInHierarchy)
+        {
+            Debug.LogWarning("[MemoryProgressPopupUI] 스크립트 오브젝트가 비활성화되어 팝업을 표시할 수 없습니다. 항상 켜져 있는 MemoryPopupController 오브젝트에 붙이세요.", this);
+            return;
+        }
+
+        if (popupRoutine != null)
+            StopCoroutine(popupRoutine);
+
+        ShowPopupNow(addedAmount, current, max, showAddedAmount);
+
+        if (autoHide)
+            popupRoutine = StartCoroutine(AutoHideRoutine());
+    }
+
+    private void ShowPopupNow(int addedAmount, int current, int max, bool showAddedAmount)
+    {
+        bool completed = max > 0 && current >= max;
+
         if (popupPanel != null)
             popupPanel.SetActive(true);
 
+        ApplyPopupObjects(true, completed);
+        ApplyTexts(addedAmount, current, max, showAddedAmount, completed);
+        SetCanvasVisible(true);
+    }
+
+    private IEnumerator AutoHideRoutine()
+    {
+        yield return Wait(showTime);
+        HidePopup();
+    }
+
+    private void ApplyTexts(int addedAmount, int current, int max, bool showAddedAmount, bool completed)
+    {
         if (titleText != null)
-            titleText.text = message;
+        {
+            if (completed && useCompletedMessage)
+                titleText.text = completedMessage;
+            else
+                titleText.text = message;
+        }
 
         if (countText != null)
             countText.text = $"{current} / {max}";
 
-        yield return new WaitForSeconds(showTime);
+        if (addedAmountText != null)
+        {
+            bool showText = showAddedAmount || (completed && showCompletedTextWhenCompleted);
+            addedAmountText.gameObject.SetActive(showText);
 
-        if (popupPanel != null)
-            popupPanel.SetActive(false);
-
-        popupRoutine = null;
+            if (showText)
+            {
+                if (completed && showCompletedTextWhenCompleted)
+                    addedAmountText.text = completedAddedAmountText;
+                else
+                    addedAmountText.text = SafeFormatAddedAmount(addedAmount);
+            }
+        }
     }
+
+    private void ApplyPopupObjects(bool visible, bool completed)
+    {
+        if (popupCrystalSocket != null)
+            popupCrystalSocket.SetActive(visible);
+
+        if (popupCrystalIcon != null)
+            popupCrystalIcon.SetActive(visible);
+
+        if (popupGlowIcon != null)
+        {
+            bool glowVisible = visible && showPopupGlow && (!showPopupGlowOnlyWhenCompleted || completed);
+            popupGlowIcon.SetActive(glowVisible);
+        }
+    }
+
+    private string SafeFormatAddedAmount(int addedAmount)
+    {
+        try
+        {
+            return string.Format(addedAmountFormat, addedAmount);
+        }
+        catch
+        {
+            Debug.LogWarning("[MemoryProgressPopupUI] Added Amount Format이 잘못되어 기본 형식 '+{0}'을 사용합니다.", this);
+            return $"+{addedAmount}";
+        }
+    }
+
+    private void AutoFillReferencesIfNeeded()
+    {
+        if (popupPanel == null)
+            popupPanel = gameObject;
+
+        if (popupCanvasGroup == null)
+        {
+            if (popupPanel != null)
+                popupCanvasGroup = popupPanel.GetComponent<CanvasGroup>();
+
+            if (popupCanvasGroup == null)
+                popupCanvasGroup = GetComponent<CanvasGroup>();
+        }
+    }
+
+    private bool ShouldDeactivatePanel()
+    {
+        if (!deactivatePanelAfterHide)
+            return false;
+
+        if (popupPanel == null)
+            return false;
+
+        return popupPanel != gameObject;
+    }
+
+    private void SetCanvasVisible(bool visible)
+    {
+        if (popupCanvasGroup == null)
+            return;
+
+        popupCanvasGroup.alpha = visible ? 1f : 0f;
+        popupCanvasGroup.interactable = visible;
+        popupCanvasGroup.blocksRaycasts = visible;
+    }
+
+    private IEnumerator Wait(float duration)
+    {
+        if (duration <= 0f)
+            yield break;
+
+        if (useUnscaledTime)
+            yield return new WaitForSecondsRealtime(duration);
+        else
+            yield return new WaitForSeconds(duration);
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        showTime = Mathf.Max(0f, showTime);
+    }
+#endif
 }
diff --git a/Assets/My project/Memory Scripts/UI/MemoryProgressUI.cs b/Assets/My project/Memory Scripts/UI/MemoryProgressUI.cs
index 691e4d75..3ead8b0c 100644
--- a/Assets/My project/Memory Scripts/UI/MemoryProgressUI.cs	
+++ b/Assets/My project/Memory Scripts/UI/MemoryProgressUI.cs	
@@ -1,34 +1,95 @@
+using System.Collections;
 using TMPro;
 using UnityEngine;
 
+[DisallowMultipleComponent]
 public class MemoryProgressUI : MonoBehaviour
 {
+    [Header("Reference")]
+    [SerializeField] private MemoryProgressManager memoryProgressManager;
+    [SerializeField] private bool autoFindManager = true;
+    [SerializeField] private bool registerOnEnable = true;
+    [Tooltip("매니저를 찾지 못했을 때만 0/max로 초기 표시합니다.")]
+    [SerializeField] private bool initializeEmptyWhenNoManager = true;
+
     [Header("Text")]
     [SerializeField] private TMP_Text titleText;
     [SerializeField] private TMP_Text countText;
 
-    [Header("Piece Icons")]
-    [Tooltip("획득한 조각 아이콘입니다. PieceSlot_01~05 안의 FilledIcon을 순서대로 넣으세요.")]
+    [Header("Piece Icons - Detail Panel")]
+    [Tooltip("상세 패널용 획득 조각 아이콘입니다. PieceSlot_01~05 안의 FilledIcon을 순서대로 넣으세요.")]
     [SerializeField] private GameObject[] filledIcons;
 
-    [Tooltip("완성 또는 획득 연출용 Glow입니다. 없어도 됩니다.")]
+    [Tooltip("선택 사항입니다. 획득 후 계속 켜둘 정적 Glow 이미지입니다. 사용하지 않으려면 비워두세요.")]
     [SerializeField] private GameObject[] glowIcons;
 
+    [Header("Fill Flash - One Shot")]
+    [Tooltip("조각이 새로 채워지는 순간 잠깐 켰다가 자동으로 끄는 효과입니다. PieceSlot_01~05 안의 FillFlashIcon을 순서대로 넣으세요.")]
+    [SerializeField] private GameObject[] fillFlashIcons;
+
+    [Tooltip("조각이 새로 채워질 때 FillFlashIcon을 잠깐 표시합니다.")]
+    [SerializeField] private bool useFillFlash = true;
+
+    [Tooltip("FillFlashIcon이 켜져 있는 시간입니다. 애니메이션 없이 SetActive만 사용합니다.")]
+    [SerializeField] private float fillFlashShowTime = 0.5f;
+
+    [Tooltip("SetProgress가 처음 호출될 때는 기존 진행도를 복구하는 상황일 수 있으므로 Flash를 재생하지 않습니다.")]
+    [SerializeField] private bool skipFlashOnFirstUpdate = true;
+
+    [Header("Single Icon State - Mini Button")]
+    [Tooltip("미니 버튼처럼 아이콘 1개만 상태 제어할 때 켭니다. 상세 패널에서는 꺼두세요.")]
+    [SerializeField] private bool useSingleIconState = false;
+    [Tooltip("0개일 때 켤 아이콘입니다. 예: 어두운 기억 조각. 소켓을 항상 보이게 둘 거면 비워둬도 됩니다.")]
+    [SerializeField] private GameObject emptyStateIcon;
+    [Tooltip("1개 이상일 때 켤 아이콘입니다. 예: MiniCrystalIcon.")]
+    [SerializeField] private GameObject activeStateIcon;
+    [Tooltip("진행도 상태에 따라 켤 정적 Glow 이미지입니다. 예: MiniGlowIcon.")]
+    [SerializeField] private GameObject singleStateGlowIcon;
+    [Tooltip("체크하면 완료 시에만 미니 Glow가 켜집니다. 끄면 1개 이상 획득 시 켜집니다.")]
+    [SerializeField] private bool singleStateGlowOnlyWhenCompleted = true;
+
     [Header("Optional Objects")]
-    [Tooltip("5개를 모두 모았을 때 켤 전체 완성 이펙트입니다. 없어도 됩니다.")]
+    [Tooltip("모든 조각을 모았을 때 켤 정적 완료 표시 오브젝트입니다. 없어도 됩니다.")]
     [SerializeField] private GameObject completedEffect;
 
     [Header("Settings")]
     [SerializeField] private int maxPieces = 5;
     [SerializeField] private string title = "기억의 조각";
+    [SerializeField] private bool showCountText = true;
+    [Tooltip("상세 패널용 Glow Icons에만 적용됩니다.")]
     [SerializeField] private bool showGlowOnlyWhenCompleted = true;
 
+    private bool registered;
+    private bool hasProgressSnapshot;
+    private int lastCurrentPieces;
+    private Coroutine[] flashRoutines;
+
     private void Awake()
     {
-        if (titleText != null)
-            titleText.text = title;
+        SetTitle();
+        InitializeFlashIcons(false);
+    }
 
-        SetProgress(0, maxPieces);
+    private void OnEnable()
+    {
+        if (!registerOnEnable)
+        {
+            RefreshFromManager();
+            return;
+        }
+
+        TryRegisterToManager();
+    }
+
+    private void OnDisable()
+    {
+        if (registered && memoryProgressManager != null)
+            memoryProgressManager.UnregisterUI(this);
+
+        registered = false;
+
+        StopAllFlashRoutines();
+        InitializeFlashIcons(false);
     }
 
     public void SetProgress(int current, int max)
@@ -36,14 +97,85 @@ public void SetProgress(int current, int max)
         maxPieces = Mathf.Max(1, max);
         current = Mathf.Clamp(current, 0, maxPieces);
 
-        if (titleText != null)
-            titleText.text = title;
+        int previous = lastCurrentPieces;
+        bool shouldPlayFlash = useFillFlash
+                               && hasProgressSnapshot
+                               && current > previous
+                               && (!skipFlashOnFirstUpdate || hasProgressSnapshot);
+
+        SetTitle();
 
         if (countText != null)
+        {
+            countText.gameObject.SetActive(showCountText);
             countText.text = $"{current} / {maxPieces}";
+        }
 
         UpdatePieceIcons(current);
+        UpdateSingleStateIcons(current);
         UpdateCompletedEffect(current >= maxPieces);
+
+        if (shouldPlayFlash)
+            PlayFillFlash(previous, current);
+
+        lastCurrentPieces = current;
+        hasProgressSnapshot = true;
+    }
+
+    public void RefreshFromManager()
+    {
+        if (memoryProgressManager == null && autoFindManager)
+            memoryProgressManager = FindFirstObjectByType<MemoryProgressManager>();
+
+        if (memoryProgressManager != null)
+            SetProgress(memoryProgressManager.CurrentPieces, memoryProgressManager.RequiredPieces);
+        else if (initializeEmptyWhenNoManager)
+            SetProgress(0, maxPieces);
+    }
+
+    public void SetMemoryProgressManager(MemoryProgressManager manager)
+    {
+        if (registered && memoryProgressManager != null)
+            memoryProgressManager.UnregisterUI(this);
+
+        memoryProgressManager = manager;
+        registered = false;
+        hasProgressSnapshot = false;
+
+        if (isActiveAndEnabled && registerOnEnable)
+            TryRegisterToManager();
+        else
+            RefreshFromManager();
+    }
+
+    public void ResetProgressSnapshot()
+    {
+        hasProgressSnapshot = false;
+        lastCurrentPieces = 0;
+        StopAllFlashRoutines();
+        InitializeFlashIcons(false);
+    }
+
+    private void TryRegisterToManager()
+    {
+        if (memoryProgressManager == null && autoFindManager)
+            memoryProgressManager = FindFirstObjectByType<MemoryProgressManager>();
+
+        if (memoryProgressManager != null)
+        {
+            memoryProgressManager.RegisterUI(this);
+            registered = true;
+        }
+        else if (initializeEmptyWhenNoManager)
+        {
+            SetProgress(0, maxPieces);
+        }
+    }
+
+    private void SetTitle()
+    {
+        if (titleText != null)
+            titleText.text = title;
     }
 
     private void UpdatePieceIcons(int current)
@@ -74,9 +206,132 @@ private void UpdatePieceIcons(int current)
         }
     }
 
+    private void UpdateSingleStateIcons(int current)
+    {
+        if (!useSingleIconState)
+            return;
+
+        bool hasAnyPiece = current > 0;
+        bool completed = current >= maxPieces;
+
+        if (emptyStateIcon != null)
+            emptyStateIcon.SetActive(!hasAnyPiece);
+
+        if (activeStateIcon != null)
+            activeStateIcon.SetActive(hasAnyPiece);
+
+        if (singleStateGlowIcon != null)
+        {
+            bool showGlow = singleStateGlowOnlyWhenCompleted ? completed : hasAnyPiece;
+            singleStateGlowIcon.SetActive(showGlow);
+        }
+    }
+
     private void UpdateCompletedEffect(bool completed)
     {
         if (completedEffect != null)
             completedEffect.SetActive(completed);
     }
+
+    private void PlayFillFlash(int previousCurrent, int newCurrent)
+    {
+        if (fillFlashIcons == null || fillFlashIcons.Length == 0)
+            return;
+
+        EnsureFlashRoutineArray();
+
+        int start = Mathf.Clamp(previousCurrent, 0, fillFlashIcons.Length);
+        int end = Mathf.Clamp(newCurrent, 0, fillFlashIcons.Length);
+
+        for (int i = start; i < end; i++)
+        {
+            if (fillFlashIcons[i] == null)
+                continue;
+
+            if (flashRoutines[i] != null)
+                StopCoroutine(flashRoutines[i]);
+
+            flashRoutines[i] = StartCoroutine(FlashRoutine(i));
+        }
+    }
+
+    private IEnumerator FlashRoutine(int index)
+    {
+        GameObject target = fillFlashIcons[index];
+
+        if (target == null)
+            yield break;
+
+        target.SetActive(true);
+
+        if (fillFlashShowTime > 0f)
+            yield return new WaitForSeconds(fillFlashShowTime);
+
+        if (target != null)
+            target.SetActive(false);
+
+        if (flashRoutines != null && index >= 0 && index < flashRoutines.Length)
+            flashRoutines[index] = null;
+    }
+
+    private void EnsureFlashRoutineArray()
+    {
+        int length = fillFlashIcons == null ? 0 : fillFlashIcons.Length;
+
+        if (flashRoutines == null || flashRoutines.Length != length)
+            flashRoutines = new Coroutine[length];
+    }
+
+    private void StopAllFlashRoutines()
+    {
+        if (flashRoutines == null)
+            return;
+
+        for (int i = 0; i < flashRoutines.Length; i++)
+        {
+            if (flashRoutines[i] != null)
+            {
+                StopCoroutine(flashRoutines[i]);
+                flashRoutines[i] = null;
+            }
+        }
+    }
+
+    private void InitializeFlashIcons(bool active)
+    {
+        if (fillFlashIcons == null)
+            return;
+
+        for (int i = 0; i < fillFlashIcons.Length; i++)
+        {
+            if (fillFlashIcons[i] != null)
+                fillFlashIcons[i].SetActive(active);
+        }
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        maxPieces = Mathf.Max(1, maxPieces);
+        fillFlashShowTime = Mathf.Max(0f, fillFlashShowTime);
+
+        if (filledIcons != null && filledIcons.Length > 0 && filledIcons.Length != maxPieces)
+        {
+            Debug.LogWarning(
+                $"MemoryProgressUI: Filled Icons 개수({filledIcons.Length})와 Max Pieces({maxPieces})가 다릅니다. 미니 버튼 아이콘 1개 제어는 Filled Icons가 아니라 Single Icon State를 사용하세요.",
+                this
+            );
+        }
+
+        if (glowIcons != null && glowIcons.Length > 0 && filledIcons != null && filledIcons.Length > 0 && glowIcons.Length != filledIcons.Length)
+        {
+            Debug.LogWarning("MemoryProgressUI: Glow Icons 개수와 Filled Icons 개수가 다릅니다.", this);
+        }
+
+        if (fillFlashIcons != null && fillFlashIcons.Length > 0 && filledIcons != null && filledIcons.Length > 0 && fillFlashIcons.Length != filledIcons.Length)
+        {
+            Debug.LogWarning("MemoryProgressUI: Fill Flash Icons 개수와 Filled Icons 개수가 다릅니다.", this);
+        }
+    }
+#endif
 }
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (1)-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (1)-Photoroom.png
new file mode 100644
index 00000000..0860bf56
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (1)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4dd7c1dcdc523ca0c2ab150dbe071800e39b7460a433ef16ccff8bed2f49c205
+size 1989402
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (1)-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (1)-Photoroom.png.meta
new file mode 100644
index 00000000..99a53fb4
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (1)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 7f3c6e7e6728bb842a315422af9dca68
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (2)-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (2)-Photoroom.png
new file mode 100644
index 00000000..58fc9120
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (2)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b9eb021bc39921b0d6cef3b779394f966ba16107a3c51728805e470c397cd94
+size 2712698
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (2)-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (2)-Photoroom.png.meta
new file mode 100644
index 00000000..c717dc8c
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (2)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: b474bdde917dae6409fcef09072ad6d3
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (3)-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (3)-Photoroom.png
new file mode 100644
index 00000000..0381861e
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (3)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4525cd0a7a61af62a02634e076d2ebdf58dbe6e1b7ed88f2cbaf0b9e07fc0d1
+size 1365026
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (3)-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (3)-Photoroom.png.meta
new file mode 100644
index 00000000..a6b74110
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_35 (3)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 3451324d2ccfedf498637e8124285bbc
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (4)-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (4)-Photoroom.png
new file mode 100644
index 00000000..337cf5a5
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (4)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6786c4f13f09fcd2e64d1a1358870b516d6f090f327109bc4c81f1834b11302a
+size 754032
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (4)-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (4)-Photoroom.png.meta
new file mode 100644
index 00000000..f287377c
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (4)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: bb25dff618c798049998c04ea2c48b20
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (6)-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (6)-Photoroom.png
new file mode 100644
index 00000000..874f9951
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (6)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69fd1daf2f68c26b4664a4ef54cb080271714d36993b9d4749c53f1a187d3bed
+size 2071616
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (6)-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (6)-Photoroom.png.meta
new file mode 100644
index 00000000..e5c8d934
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_36 (6)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 496235692aa696f44a5ce88c04de266e
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_37 (7)-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_37 (7)-Photoroom.png
new file mode 100644
index 00000000..9b65e624
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_37 (7)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b1a67d19524330af7e4e6f276e797d1a718f10bbfb44badb093a7080db73bf4
+size 1023298
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_37 (7)-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_37 (7)-Photoroom.png.meta
new file mode 100644
index 00000000..3dca1386
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오전 11_53_37 (7)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: a805c219069a2fb40ac3d665c2ca8d8a
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오후 01_03_59-Photoroom.png b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오후 01_03_59-Photoroom.png
new file mode 100644
index 00000000..7b328310
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오후 01_03_59-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de35f566a52a233bc8916cee641744a18872758908071a4ae78d456d7826a8d8
+size 294260
diff --git a/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오후 01_03_59-Photoroom.png.meta b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오후 01_03_59-Photoroom.png.meta
new file mode 100644
index 00000000..ca32f3a4
--- /dev/null
+++ b/Assets/My project/Memory Scripts/lmage/ChatGPT Image 2026년 6월 23일 오후 01_03_59-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 2c996b5a2166f0045968150360faeb83
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/Memory Scripts/prefabs/MemoryProgressUI.prefab.meta b/Assets/My project/Memory Scripts/prefabs/MemoryProgressUI.prefab.meta
index da6e6f65..3f289d4b 100644
--- a/Assets/My project/Memory Scripts/prefabs/MemoryProgressUI.prefab.meta	
+++ b/Assets/My project/Memory Scripts/prefabs/MemoryProgressUI.prefab.meta	
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c0686413e99068e4fbce9da8e91e9c04
+guid: 944c5d3e05dae504b88b250288331453
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 17일 오후 01_28_13 (1)-Photoroom-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 17일 오후 01_28_13 (1)-Photoroom-Photoroom.png
new file mode 100644
index 00000000..b54e0da0
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 17일 오후 01_28_13 (1)-Photoroom-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c17f65da271adbbcda94c9b8ebe535777ab5ba78f402570e94cad6ada31c319e
+size 333704
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 17일 오후 01_28_13 (1)-Photoroom-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 17일 오후 01_28_13 (1)-Photoroom-Photoroom.png.meta
new file mode 100644
index 00000000..4dcb6fb2
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 17일 오후 01_28_13 (1)-Photoroom-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 2984d1f5ad790ef468a396359a453e66
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (1)-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (1)-Photoroom.png
new file mode 100644
index 00000000..946bb1c6
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (1)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e856c3cdf72e5b1f9c7eafd1ce47d20495d4a477f8a390bc0493e8170315ae88
+size 1197010
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (1)-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (1)-Photoroom.png.meta
new file mode 100644
index 00000000..8a4b11d2
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (1)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: f9587d604f434a045b0647be2c8953f4
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (2)-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (2)-Photoroom.png
new file mode 100644
index 00000000..5102e176
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (2)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:717d5e534ef6d35bdc377642e82de80a7f7508eb8e1dd65472777c8527971b48
+size 1139364
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (2)-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (2)-Photoroom.png.meta
new file mode 100644
index 00000000..9ad08f2f
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오전 10_08_26 (2)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 82d02db911e17b44f9c79e7b64636203
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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: 0
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 02_56_32-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 02_56_32-Photoroom.png
new file mode 100644
index 00000000..9562cb96
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 02_56_32-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c662808bcfb3df0436aa4705e170d4dfcd90a0356225a361172083a78a99c2bc
+size 3205068
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 02_56_32-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 02_56_32-Photoroom.png.meta
new file mode 100644
index 00000000..b9d36ff7
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 02_56_32-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: e77eb7ae6b1e9be4fb7e75aa9d2e46d4
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_38_40-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_38_40-Photoroom.png
new file mode 100644
index 00000000..0b69f593
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_38_40-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6be07406423092b3509e8a198a8aed5ce5f5d423b3438bbac557a1ba8ef328d0
+size 255396
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_38_40-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_38_40-Photoroom.png.meta
new file mode 100644
index 00000000..31970cdd
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_38_40-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: d2936b804a5db684bbdfbfa66c5ab119
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_49_28 (6)-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_49_28 (6)-Photoroom.png
new file mode 100644
index 00000000..b3acc30a
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_49_28 (6)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:897a4ef40dadd090fb6380853157892202afbc7500add40e2cf7eed97b67fb28
+size 842299
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_49_28 (6)-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_49_28 (6)-Photoroom.png.meta
new file mode 100644
index 00000000..01968202
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 03_49_28 (6)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 6d8dd3d85cd5343469e64ac4232c8516
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_21-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_21-Photoroom.png
new file mode 100644
index 00000000..700ca758
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_21-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59684433e4438c9550f926eb58d91a1095ae2d0d00b077a563947d929b519024
+size 944260
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_21-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_21-Photoroom.png.meta
new file mode 100644
index 00000000..1fa7161c
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_21-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: a20115b3e22a4014593fb6c5fe07219b
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_37-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_37-Photoroom.png
new file mode 100644
index 00000000..a376284a
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_37-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56ccfe09783cdc91db8efa8963efcb33a1e5305bdc2540e169489dc35e83a4f4
+size 1298445
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_37-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_37-Photoroom.png.meta
new file mode 100644
index 00000000..ed5278c7
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_06_37-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: a3ce8ddecf754a14bb7343449aa3c3f2
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_33_47-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_33_47-Photoroom.png
new file mode 100644
index 00000000..9d832a46
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_33_47-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a70434f1ddd91aebceb89852cfd3327ccc8e5aa0ffe180c87ff2f171d3aa5502
+size 1820875
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_33_47-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_33_47-Photoroom.png.meta
new file mode 100644
index 00000000..66fc697e
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 04_33_47-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 4c1fa95d3fc05d143b2e70362fdc1b70
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_49 (1)-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_49 (1)-Photoroom.png
new file mode 100644
index 00000000..6dd18a2b
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_49 (1)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cf54fe256e169724dfd604349273c6c8b5996aa5b91acee1422b33e40d0d546
+size 2094057
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_49 (1)-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_49 (1)-Photoroom.png.meta
new file mode 100644
index 00000000..a3e70580
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_49 (1)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 8b537254cc878364c90508c4d000f182
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (7)-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (7)-Photoroom.png
new file mode 100644
index 00000000..7c356c1f
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (7)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c675ead70ba1951c21f07a6a1b91d0be26617e060f98da4210d2dd09a46fc9e8
+size 1502193
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (7)-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (7)-Photoroom.png.meta
new file mode 100644
index 00000000..55c85ff6
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (7)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: d3f309f1fb12f51488d93a03feeacb29
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (8)-Photoroom.png b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (8)-Photoroom.png
new file mode 100644
index 00000000..69105ca8
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (8)-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:254e54dbc678b916b7febbcfa0c90bf951e84919dec6a820021225f642610c1c
+size 1325577
diff --git a/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (8)-Photoroom.png.meta b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (8)-Photoroom.png.meta
new file mode 100644
index 00000000..993297d3
--- /dev/null
+++ b/Assets/My project/maze Scripts/Image/ChatGPT Image 2026년 6월 22일 오후 05_27_52 (8)-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 0cefd0900b95c8f47b9f1fe794cafe93
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Materials/M_LeftFootprint.mat b/Assets/My project/maze Scripts/Materials/M_LeftFootprint.mat
index 8f44fc52..a60efa7c 100644
--- a/Assets/My project/maze Scripts/Materials/M_LeftFootprint.mat	
+++ b/Assets/My project/maze Scripts/Materials/M_LeftFootprint.mat	
@@ -26,10 +26,11 @@ Material:
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SURFACE_TYPE_TRANSPARENT
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_InvalidKeywords:
+  - _EMISSION
+  m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
+  m_DoubleSidedGI: 1
   m_CustomRenderQueue: 3000
   stringTagMap:
     RenderType: Transparent
@@ -42,7 +43,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: e0e619da4f226dc40975bb5a9772e3fb, type: 3}
+        m_Texture: {fileID: 2800000, guid: 82d02db911e17b44f9c79e7b64636203, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -62,11 +63,11 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _EmissionMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 82d02db911e17b44f9c79e7b64636203, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: e0e619da4f226dc40975bb5a9772e3fb, type: 3}
+        m_Texture: {fileID: 2800000, guid: 82d02db911e17b44f9c79e7b64636203, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -108,7 +109,7 @@ Material:
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
-    - _Cull: 2
+    - _Cull: 0
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
@@ -118,13 +119,13 @@ Material:
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
-    - _Metallic: 0
+    - _Metallic: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.005
     - _QueueOffset: 0
-    - _ReceiveShadows: 1
+    - _ReceiveShadows: 0
     - _SampleGI: 0
-    - _Smoothness: 0.5
+    - _Smoothness: 0
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 5
@@ -136,7 +137,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0.07423039, g: 1.0679439, b: 1.7207954, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
diff --git a/Assets/My project/maze Scripts/Materials/M_RightFootprint.mat b/Assets/My project/maze Scripts/Materials/M_RightFootprint.mat
index 3e217a56..80378669 100644
--- a/Assets/My project/maze Scripts/Materials/M_RightFootprint.mat	
+++ b/Assets/My project/maze Scripts/Materials/M_RightFootprint.mat	
@@ -29,7 +29,7 @@ Material:
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
+  m_DoubleSidedGI: 1
   m_CustomRenderQueue: 3000
   stringTagMap:
     RenderType: Transparent
@@ -42,7 +42,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: ade04a3aaded49041a1b3ab9690dc8b8, type: 3}
+        m_Texture: {fileID: 2800000, guid: f9587d604f434a045b0647be2c8953f4, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -66,7 +66,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: ade04a3aaded49041a1b3ab9690dc8b8, type: 3}
+        m_Texture: {fileID: 2800000, guid: f9587d604f434a045b0647be2c8953f4, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -108,7 +108,7 @@ Material:
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
-    - _Cull: 2
+    - _Cull: 0
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
diff --git a/Assets/My project/maze Scripts/Materials/Wall.mat b/Assets/My project/maze Scripts/Materials/Wall.mat
new file mode 100644
index 00000000..d5d283de
--- /dev/null
+++ b/Assets/My project/maze Scripts/Materials/Wall.mat	
@@ -0,0 +1,137 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-9026514080015927677
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
+  version: 10
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Wall
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses:
+  - MOTIONVECTORS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AddPrecomputedVelocity: 0
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Assets/My project/maze Scripts/Materials/Wall.mat.meta b/Assets/My project/maze Scripts/Materials/Wall.mat.meta
new file mode 100644
index 00000000..a762d786
--- /dev/null
+++ b/Assets/My project/maze Scripts/Materials/Wall.mat.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4fcae91f963deff48b4b756ac897ea45
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Prefab/Footprint Left.prefab b/Assets/My project/maze Scripts/Prefab/Footprint Left.prefab
index 38a9f10a..9a3b5b70 100644
--- a/Assets/My project/maze Scripts/Prefab/Footprint Left.prefab	
+++ b/Assets/My project/maze Scripts/Prefab/Footprint Left.prefab	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8cf909e32aebf6e3d00868c2d53971fa91e5b05baeae98b3495ac7cb42d42ae1
-size 3578
+oid sha256:5b85cc62301979761695786dff97dc23b32405fde53bdee33747dffe5599058e
+size 4306
diff --git a/Assets/My project/maze Scripts/Prefab/Footprint Right.prefab b/Assets/My project/maze Scripts/Prefab/Footprint Right.prefab
index 2a2d53d9..ec0d64c1 100644
--- a/Assets/My project/maze Scripts/Prefab/Footprint Right.prefab	
+++ b/Assets/My project/maze Scripts/Prefab/Footprint Right.prefab	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0338cef3ab690b55628a87cc6f329457c088514feac12c1ff51d0c1433720bff
-size 3584
+oid sha256:79e6e0fbb540f162100fdea9c7e1faf79831e97bec123fa2773fc8fdcc5fd2cf
+size 4303
diff --git a/Assets/My project/maze Scripts/Prefab/MazeUIRoot.prefab b/Assets/My project/maze Scripts/Prefab/MazeUIRoot.prefab
new file mode 100644
index 00000000..dfe1cb69
--- /dev/null
+++ b/Assets/My project/maze Scripts/Prefab/MazeUIRoot.prefab	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f78a95a12f3fc982a10fe195488dbe56f9618fa472a21355c8a16d58510ea5be
+size 115414
diff --git a/Assets/My project/maze Scripts/Prefab/MazeUIRoot.prefab.meta b/Assets/My project/maze Scripts/Prefab/MazeUIRoot.prefab.meta
new file mode 100644
index 00000000..9c0a70f2
--- /dev/null
+++ b/Assets/My project/maze Scripts/Prefab/MazeUIRoot.prefab.meta	
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0fde253198ce3c343ad08b6b86a32a91
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/maze Scripts/Ui/FootprintEffect.cs b/Assets/My project/maze Scripts/Ui/FootprintEffect.cs
new file mode 100644
index 00000000..d56264dd
--- /dev/null
+++ b/Assets/My project/maze Scripts/Ui/FootprintEffect.cs	
@@ -0,0 +1,247 @@
+using System.Collections;
+using UnityEngine;
+
+[DisallowMultipleComponent]
+public class FootprintEffect : MonoBehaviour
+{
+    [Header("Timing")]
+    [SerializeField] private float appearTime = 0.25f;
+    [SerializeField] private float lifeTime = 3f;
+    [SerializeField] private float fadeTime = 0.8f;
+
+    [Header("Scale Effect")]
+    [SerializeField] private bool useScaleEffect = true;
+    [SerializeField] private float startScaleMultiplier = 0.75f;
+    [SerializeField] private float popScaleMultiplier = 1.08f;
+    [SerializeField] private float endScaleMultiplier = 0.85f;
+
+    [Header("Unlit Brightness Effect")]
+    [Tooltip("URP Unlit 머티리얼에서 Emission 대신 색 밝기를 조절합니다.")]
+    [SerializeField] private bool useBrightnessEffect = true;
+    [SerializeField] private float appearBrightness = 1.4f;
+    [SerializeField] private float normalBrightness = 1.0f;
+    [SerializeField] private float fadeBrightness = 0.5f;
+
+    [Header("Destroy")]
+    [SerializeField] private bool destroyAfterFade = true;
+    [Tooltip("renderer.materials로 생성된 머티리얼 인스턴스를 OnDestroy에서 정리합니다.")]
+    [SerializeField] private bool cleanupMaterialInstances = true;
+
+    private Renderer[] renderers;
+    private Material[] materials;
+    private Color[] originalColors;
+    private Vector3 originalScale;
+    private Coroutine effectRoutine;
+
+    private void Awake()
+    {
+        originalScale = transform.localScale;
+        CacheMaterials();
+        ApplyVisual(0f, startScaleMultiplier, fadeBrightness);
+    }
+
+    private void OnEnable()
+    {
+        if (effectRoutine != null)
+            StopCoroutine(effectRoutine);
+
+        effectRoutine = StartCoroutine(EffectRoutine());
+    }
+
+    private void OnDisable()
+    {
+        if (effectRoutine != null)
+        {
+            StopCoroutine(effectRoutine);
+            effectRoutine = null;
+        }
+    }
+
+    private void OnDestroy()
+    {
+        if (!cleanupMaterialInstances || materials == null)
+            return;
+
+        for (int i = 0; i < materials.Length; i++)
+        {
+            if (materials[i] != null)
+                Destroy(materials[i]);
+        }
+    }
+
+    private void CacheMaterials()
+    {
+        renderers = GetComponentsInChildren<Renderer>(true);
+
+        int materialCount = 0;
+
+        for (int i = 0; i < renderers.Length; i++)
+            materialCount += renderers[i].materials.Length;
+
+        materials = new Material[materialCount];
+        originalColors = new Color[materialCount];
+
+        int index = 0;
+
+        for (int i = 0; i < renderers.Length; i++)
+        {
+            Material[] rendererMaterials = renderers[i].materials;
+
+            for (int j = 0; j < rendererMaterials.Length; j++)
+            {
+                materials[index] = rendererMaterials[j];
+                originalColors[index] = GetMaterialColor(materials[index]);
+                index++;
+            }
+        }
+    }
+
+    private IEnumerator EffectRoutine()
+    {
+        yield return AppearRoutine();
+
+        if (lifeTime > 0f)
+            yield return new WaitForSeconds(lifeTime);
+
+        yield return FadeRoutine();
+
+        effectRoutine = null;
+
+        if (destroyAfterFade)
+            Destroy(gameObject);
+    }
+
+    private IEnumerator AppearRoutine()
+    {
+        if (appearTime <= 0f)
+        {
+            ApplyVisual(1f, 1f, normalBrightness);
+            yield break;
+        }
+
+        float timer = 0f;
+
+        while (timer < appearTime)
+        {
+            timer += Time.deltaTime;
+            float t = Mathf.Clamp01(timer / appearTime);
+
+            float alpha = Mathf.Lerp(0f, 1f, t);
+            float brightness = useBrightnessEffect
+                ? Mathf.Lerp(fadeBrightness, appearBrightness, t)
+                : 1f;
+
+            float scaleMultiplier;
+
+            if (t < 0.75f)
+            {
+                float popT = t / 0.75f;
+                scaleMultiplier = Mathf.Lerp(startScaleMultiplier, popScaleMultiplier, popT);
+            }
+            else
+            {
+                float settleT = (t - 0.75f) / 0.25f;
+                scaleMultiplier = Mathf.Lerp(popScaleMultiplier, 1f, settleT);
+            }
+
+            ApplyVisual(alpha, scaleMultiplier, brightness);
+            yield return null;
+        }
+
+        ApplyVisual(1f, 1f, normalBrightness);
+    }
+
+    private IEnumerator FadeRoutine()
+    {
+        if (fadeTime <= 0f)
+        {
+            ApplyVisual(0f, endScaleMultiplier, fadeBrightness);
+            yield break;
+        }
+
+        float timer = 0f;
+
+        while (timer < fadeTime)
+        {
+            timer += Time.deltaTime;
+            float t = Mathf.Clamp01(timer / fadeTime);
+
+            float alpha = Mathf.Lerp(1f, 0f, t);
+            float brightness = useBrightnessEffect
+                ? Mathf.Lerp(normalBrightness, fadeBrightness, t)
+                : 1f;
+
+            float scaleMultiplier = Mathf.Lerp(1f, endScaleMultiplier, t);
+
+            ApplyVisual(alpha, scaleMultiplier, brightness);
+            yield return null;
+        }
+
+        ApplyVisual(0f, endScaleMultiplier, fadeBrightness);
+    }
+
+    private void ApplyVisual(float alpha, float scaleMultiplier, float brightness)
+    {
+        if (useScaleEffect)
+            transform.localScale = originalScale * scaleMultiplier;
+
+        if (materials == null)
+            return;
+
+        for (int i = 0; i < materials.Length; i++)
+        {
+            if (materials[i] == null)
+                continue;
+
+            Color color = originalColors[i];
+            color.r *= brightness;
+            color.g *= brightness;
+            color.b *= brightness;
+            color.a = alpha;
+
+            SetMaterialColor(materials[i], color);
+        }
+    }
+
+    private Color GetMaterialColor(Material material)
+    {
+        if (material == null)
+            return Color.white;
+
+        if (material.HasProperty("_BaseColor"))
+            return material.GetColor("_BaseColor");
+
+        if (material.HasProperty("_Color"))
+            return material.GetColor("_Color");
+
+        return Color.white;
+    }
+
+    private void SetMaterialColor(Material material, Color color)
+    {
+        if (material == null)
+            return;
+
+        if (material.HasProperty("_BaseColor"))
+            material.SetColor("_BaseColor", color);
+        else if (material.HasProperty("_Color"))
+            material.SetColor("_Color", color);
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        appearTime = Mathf.Max(0f, appearTime);
+        lifeTime = Mathf.Max(0f, lifeTime);
+        fadeTime = Mathf.Max(0f, fadeTime);
+
+        startScaleMultiplier = Mathf.Max(0.01f, startScaleMultiplier);
+        popScaleMultiplier = Mathf.Max(0.01f, popScaleMultiplier);
+        endScaleMultiplier = Mathf.Max(0.01f, endScaleMultiplier);
+
+        appearBrightness = Mathf.Max(0f, appearBrightness);
+        normalBrightness = Mathf.Max(0f, normalBrightness);
+        fadeBrightness = Mathf.Max(0f, fadeBrightness);
+    }
+#endif
+}
diff --git a/Assets/My project/maze Scripts/Ui/FootprintEffect.cs.meta b/Assets/My project/maze Scripts/Ui/FootprintEffect.cs.meta
new file mode 100644
index 00000000..3a05c13d
--- /dev/null
+++ b/Assets/My project/maze Scripts/Ui/FootprintEffect.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 584270a38112922408ab805f60a5c0c2
\ No newline at end of file
diff --git a/Assets/My project/maze Scripts/Ui/FootprintHintManager.cs b/Assets/My project/maze Scripts/Ui/FootprintHintManager.cs
index b2d29246..88eac700 100644
--- a/Assets/My project/maze Scripts/Ui/FootprintHintManager.cs	
+++ b/Assets/My project/maze Scripts/Ui/FootprintHintManager.cs	
@@ -2,10 +2,11 @@
 using System.Collections.Generic;
 using UnityEngine;
 
+[DisallowMultipleComponent]
 public class FootprintHintManager : MonoBehaviour
 {
     [Header("VR Player Reference")]
-    [Tooltip("XR Origin�� Main Camera Transform�� �ִ� ���� ��õ�մϴ�.")]
+    [Tooltip("XR Origin의 Main Camera Transform을 넣는 것을 추천합니다.")]
     [SerializeField] private Transform playerTarget;
 
     [Header("Footprint Prefabs")]
@@ -14,91 +15,246 @@ public class FootprintHintManager : MonoBehaviour
 
     [Header("Footprint Settings")]
     [SerializeField] private int footprintCount = 6;
-    [SerializeField] private float spacing = 0.45f;
+    [SerializeField] private float spacing = 0.5f;
     [SerializeField] private float sideOffset = 0.13f;
-    [SerializeField] private float showTime = 2f;
+    [SerializeField] private float showTime = 3f;
+    [SerializeField] private float revealInterval = 0.08f;
     [SerializeField] private bool startWithLeftFoot = true;
+    [SerializeField] private Transform footprintParent;
+
+    [Header("Effect Lifetime")]
+    [Tooltip("FootprintEffect처럼 발자국 프리팹이 스스로 페이드아웃 후 삭제되는 경우 체크하세요.")]
+    [SerializeField] private bool footprintsAutoDestroy = true;
+    [Tooltip("발자국이 스스로 삭제된 뒤 리스트에서 빈 참조를 정리하기 전까지 기다리는 시간입니다.")]
+    [SerializeField] private float autoDestroyCleanupDelay = 1.5f;
+    [Tooltip("Footprints Auto Destroy가 켜져 있는데 프리팹에 FootprintEffect가 없으면 안전하게 자동 삭제합니다.")]
+    [SerializeField] private bool destroyIfMissingFootprintEffect = true;
+    [Tooltip("FootprintEffect가 없는 프리팹을 강제 삭제할 때 추가로 기다릴 시간입니다.")]
+    [SerializeField] private float fallbackDestroyDelay = 1f;
+
+    [Header("Footprint Rotation Offset")]
+    [Tooltip("왼발 프리팹 방향이 살짝 어긋난 경우 여기서 보정합니다.")]
+    [SerializeField] private Vector3 leftFootRotationOffset = Vector3.zero;
+    [Tooltip("오른발 프리팹 방향이 살짝 어긋난 경우 여기서 보정합니다.")]
+    [SerializeField] private Vector3 rightFootRotationOffset = Vector3.zero;
 
     [Header("Ground Settings")]
     [SerializeField] private bool useGroundRaycast = true;
+    [Tooltip("가급적 Ground 레이어만 선택하세요. Everything이면 벽이나 다른 오브젝트를 바닥으로 착각할 수 있습니다.")]
     [SerializeField] private LayerMask groundMask = ~0;
     [SerializeField] private float raycastHeight = 2f;
     [SerializeField] private float raycastDistance = 5f;
     [SerializeField] private float groundOffset = 0.03f;
     [SerializeField] private float fallbackGroundY = 0f;
 
+    [Header("Obstacle Settings")]
+    [Tooltip("체크하면 발자국이 Wall 레이어를 뚫고 생성되지 않도록 벽 앞에서 멈춥니다.")]
+    [SerializeField] private bool stopAtObstacle = true;
+    [Tooltip("벽/장애물 레이어만 선택하세요. 예: Wall")]
+    [SerializeField] private LayerMask obstacleMask;
+    [Tooltip("바닥에서 어느 높이에서 벽을 검사할지 정합니다.")]
+    [SerializeField] private float obstacleCheckHeight = 0.45f;
+    [Tooltip("벽 감지 SphereCast 반지름입니다. 발자국 폭보다 작게 두는 것을 추천합니다.")]
+    [SerializeField] private float obstacleCheckRadius = 0.08f;
+    [Tooltip("벽에 너무 붙어서 발자국이 생성되지 않도록 여유 거리를 둡니다.")]
+    [SerializeField] private float obstaclePadding = 0.12f;
+
+    [Header("Debug")]
+    [SerializeField] private bool showDebugLogs = false;
+    [SerializeField] private bool drawDebugPath = true;
+    [SerializeField] private Color debugPathColor = Color.cyan;
+    [SerializeField] private Color debugBlockedColor = Color.red;
+
     private readonly List<GameObject> spawnedFootprints = new List<GameObject>();
     private Coroutine footprintRoutine;
+    private Coroutine cleanupRoutine;
+
+    private void OnDisable()
+    {
+        ClearFootprints();
+    }
+
+    public void SetPlayerTarget(Transform target)
+    {
+        playerTarget = target;
+    }
 
     public void ShowFootprints(MazeDirection direction)
     {
-        if (footprintRoutine != null)
-            StopCoroutine(footprintRoutine);
-
-        footprintRoutine = StartCoroutine(ShowFootprintRoutine(direction));
+        ShowFootprints(direction, -1, -1f);
     }
 
-    private IEnumerator ShowFootprintRoutine(MazeDirection direction)
+    public void ShowFootprints(MazeDirection direction, int countOverride, float showTimeOverride)
     {
-        ClearFootprints();
+        if (playerTarget == null)
+        {
+            Debug.LogWarning("FootprintHintManager: Player Target is missing.", this);
+            return;
+        }
+
+        Vector3 moveDirection = GetWorldDirection(direction);
+        ShowFootprintsAlongWorldDirection(moveDirection, countOverride, showTimeOverride);
+    }
+
+    public void ShowFootprintsToTarget(Transform target)
+    {
+        ShowFootprintsToTarget(target, -1, -1f);
+    }
+
+    public void ShowFootprintsToTarget(Transform target, int countOverride, float showTimeOverride)
+    {
+        if (target == null)
+        {
+            Debug.LogWarning("FootprintHintManager: Target is missing.", this);
+            return;
+        }
+
+        ShowFootprintsToPosition(target.position, countOverride, showTimeOverride);
+    }
+
+    public void ShowFootprintsToPosition(Vector3 targetPosition)
+    {
+        ShowFootprintsToPosition(targetPosition, -1, -1f);
+    }
+
+    public void ShowFootprintsToPosition(Vector3 targetPosition, int countOverride, float showTimeOverride)
+    {
+        if (playerTarget == null)
+        {
+            Debug.LogWarning("FootprintHintManager: Player Target is missing.", this);
+            return;
+        }
+
+        Vector3 moveDirection = targetPosition - playerTarget.position;
+        moveDirection.y = 0f;
+
+        ShowFootprintsAlongWorldDirection(moveDirection, countOverride, showTimeOverride);
+    }
+
+    public void ShowFootprintsAlongWorldDirection(Vector3 worldDirection)
+    {
+        ShowFootprintsAlongWorldDirection(worldDirection, -1, -1f);
+    }
+
+    public void ShowFootprintsAlongWorldDirection(Vector3 worldDirection, int countOverride, float showTimeOverride)
+    {
+        worldDirection.y = 0f;
+
+        if (worldDirection.sqrMagnitude < 0.001f)
+        {
+            if (showDebugLogs)
+                Debug.Log("FootprintHintManager: Direction is too small. Hint skipped.", this);
+
+            return;
+        }
+
+        worldDirection.Normalize();
+
+        StopRunningRoutines();
+        footprintRoutine = StartCoroutine(
+            ShowFootprintRoutine(worldDirection, countOverride, showTimeOverride)
+        );
+    }
+
+    private IEnumerator ShowFootprintRoutine(Vector3 moveDirection, int countOverride, float showTimeOverride)
+    {
+        ClearSpawnedFootprintsOnly();
 
         if (playerTarget == null)
         {
-            Debug.LogWarning("FootprintHintManager: Player Target is missing.");
+            Debug.LogWarning("FootprintHintManager: Player Target is missing.", this);
             footprintRoutine = null;
             yield break;
         }
 
         if (leftFootPrefab == null || rightFootPrefab == null)
         {
-            Debug.LogWarning("FootprintHintManager: Left Foot Prefab or Right Foot Prefab is missing.");
+            Debug.LogWarning("FootprintHintManager: Left Foot Prefab or Right Foot Prefab is missing.", this);
             footprintRoutine = null;
             yield break;
         }
 
-        Vector3 moveDirection = GetWorldDirection(direction);
-
-        if (moveDirection == Vector3.zero)
-        {
-            footprintRoutine = null;
-            yield break;
-        }
+        int countToUse = countOverride > 0 ? countOverride : footprintCount;
+        float showTimeToUse = showTimeOverride > 0f ? showTimeOverride : showTime;
 
+        Vector3 origin = playerTarget.position;
         Vector3 sideDirection = Vector3.Cross(Vector3.up, moveDirection).normalized;
+        Vector3 lastPathCenter = origin;
 
-        for (int i = 0; i < footprintCount; i++)
+        if (showDebugLogs)
+            Debug.Log($"FootprintHintManager: Show footprints. Count={countToUse}, Direction={moveDirection}", this);
+
+        for (int i = 0; i < countToUse; i++)
         {
             bool isLeftFoot = startWithLeftFoot ? i % 2 == 0 : i % 2 != 0;
-
             GameObject prefabToUse = isLeftFoot ? leftFootPrefab : rightFootPrefab;
 
             float forwardDistance = spacing * (i + 1);
             float leftRightOffset = isLeftFoot ? -sideOffset : sideOffset;
 
-            Vector3 spawnPosition =
-                playerTarget.position +
-                moveDirection * forwardDistance +
-                sideDirection * leftRightOffset;
+            Vector3 pathCenter = origin + moveDirection * forwardDistance;
 
+            bool blocked = stopAtObstacle && IsBlockedByObstacle(lastPathCenter, pathCenter);
+
+            if (drawDebugPath)
+                Debug.DrawLine(lastPathCenter + Vector3.up * 0.05f, pathCenter + Vector3.up * 0.05f, blocked ? debugBlockedColor : debugPathColor, 2f);
+
+            if (blocked)
+            {
+                if (showDebugLogs)
+                    Debug.Log($"FootprintHintManager: Footprints stopped by obstacle at index {i}.", this);
+
+                break;
+            }
+
+            Vector3 spawnPosition = pathCenter + sideDirection * leftRightOffset;
             Quaternion spawnRotation = Quaternion.LookRotation(moveDirection, Vector3.up);
 
             PlaceOnGround(ref spawnPosition, ref spawnRotation, moveDirection);
 
-            GameObject footprint = Instantiate(
-                prefabToUse,
-                spawnPosition,
-                spawnRotation
-            );
+            Vector3 rotationOffset = isLeftFoot ? leftFootRotationOffset : rightFootRotationOffset;
+            Quaternion finalRotation = spawnRotation * Quaternion.Euler(rotationOffset);
+
+            GameObject footprint = footprintParent != null
+                ? Instantiate(prefabToUse, spawnPosition, finalRotation, footprintParent)
+                : Instantiate(prefabToUse, spawnPosition, finalRotation);
 
             spawnedFootprints.Add(footprint);
+            ScheduleFallbackDestroyIfNeeded(footprint, showTimeToUse);
+            lastPathCenter = pathCenter;
+
+            if (revealInterval > 0f)
+                yield return new WaitForSeconds(revealInterval);
         }
 
-        yield return new WaitForSeconds(showTime);
+        if (showTimeToUse > 0f)
+            yield return new WaitForSeconds(showTimeToUse);
+
+        if (footprintsAutoDestroy)
+        {
+            cleanupRoutine = StartCoroutine(CleanupDestroyedFootprintsAfterDelay(autoDestroyCleanupDelay));
+        }
+        else
+        {
+            ClearSpawnedFootprintsOnly();
+        }
 
-        ClearFootprints();
         footprintRoutine = null;
     }
 
+    private void ScheduleFallbackDestroyIfNeeded(GameObject footprint, float showTimeToUse)
+    {
+        if (!footprintsAutoDestroy || !destroyIfMissingFootprintEffect || footprint == null)
+            return;
+
+        FootprintEffect effect = footprint.GetComponentInChildren<FootprintEffect>(true);
+
+        if (effect != null)
+            return;
+
+        Destroy(footprint, Mathf.Max(0f, showTimeToUse + fallbackDestroyDelay));
+    }
+
     private Vector3 GetWorldDirection(MazeDirection direction)
     {
         Vector3 forward = playerTarget.forward;
@@ -107,8 +263,11 @@ private Vector3 GetWorldDirection(MazeDirection direction)
         forward.y = 0f;
         right.y = 0f;
 
-        forward.Normalize();
-        right.Normalize();
+        if (forward.sqrMagnitude > 0.001f)
+            forward.Normalize();
+
+        if (right.sqrMagnitude > 0.001f)
+            right.Normalize();
 
         switch (direction)
         {
@@ -130,11 +289,7 @@ private Vector3 GetWorldDirection(MazeDirection direction)
         }
     }
 
-    private void PlaceOnGround(
-        ref Vector3 position,
-        ref Quaternion rotation,
-        Vector3 moveDirection
-    )
+    private void PlaceOnGround(ref Vector3 position, ref Quaternion rotation, Vector3 moveDirection)
     {
         if (!useGroundRaycast)
         {
@@ -144,12 +299,11 @@ Vector3 moveDirection
 
         Vector3 rayStart = position + Vector3.up * raycastHeight;
 
-        if (Physics.Raycast(rayStart, Vector3.down, out RaycastHit hit, raycastDistance, groundMask))
+        if (Physics.Raycast(rayStart, Vector3.down, out RaycastHit hit, raycastDistance, groundMask, QueryTriggerInteraction.Ignore))
         {
             position = hit.point + hit.normal * groundOffset;
 
-            Vector3 projectedForward =
-                Vector3.ProjectOnPlane(moveDirection, hit.normal).normalized;
+            Vector3 projectedForward = Vector3.ProjectOnPlane(moveDirection, hit.normal).normalized;
 
             if (projectedForward.sqrMagnitude > 0.001f)
                 rotation = Quaternion.LookRotation(projectedForward, hit.normal);
@@ -160,14 +314,125 @@ Vector3 moveDirection
         }
     }
 
-    public void ClearFootprints()
+    private bool IsBlockedByObstacle(Vector3 from, Vector3 to)
     {
-        foreach (GameObject footprint in spawnedFootprints)
+        if (!stopAtObstacle)
+            return false;
+
+        if (obstacleMask.value == 0)
+            return false;
+
+        Vector3 fromGround = GetGroundPointForObstacleCheck(from);
+        Vector3 toGround = GetGroundPointForObstacleCheck(to);
+
+        Vector3 start = fromGround + Vector3.up * obstacleCheckHeight;
+        Vector3 end = toGround + Vector3.up * obstacleCheckHeight;
+
+        Vector3 direction = end - start;
+        direction.y = 0f;
+
+        float distance = direction.magnitude;
+
+        if (distance <= 0.001f)
+            return false;
+
+        direction.Normalize();
+
+        float checkDistance = Mathf.Max(0f, distance + obstaclePadding);
+
+        return Physics.SphereCast(start, obstacleCheckRadius, direction, out RaycastHit hit, checkDistance, obstacleMask, QueryTriggerInteraction.Ignore);
+    }
+
+    private Vector3 GetGroundPointForObstacleCheck(Vector3 position)
+    {
+        if (!useGroundRaycast)
         {
-            if (footprint != null)
-                Destroy(footprint);
+            position.y = fallbackGroundY;
+            return position;
+        }
+
+        Vector3 rayStart = position + Vector3.up * raycastHeight;
+
+        if (Physics.Raycast(rayStart, Vector3.down, out RaycastHit hit, raycastDistance, groundMask, QueryTriggerInteraction.Ignore))
+            return hit.point;
+
+        position.y = fallbackGroundY;
+        return position;
+    }
+
+    private IEnumerator CleanupDestroyedFootprintsAfterDelay(float delay)
+    {
+        if (delay > 0f)
+            yield return new WaitForSeconds(delay);
+
+        spawnedFootprints.RemoveAll(footprint => footprint == null);
+        cleanupRoutine = null;
+    }
+
+    private void StopRunningRoutines()
+    {
+        if (footprintRoutine != null)
+        {
+            StopCoroutine(footprintRoutine);
+            footprintRoutine = null;
+        }
+
+        if (cleanupRoutine != null)
+        {
+            StopCoroutine(cleanupRoutine);
+            cleanupRoutine = null;
+        }
+    }
+
+    private void ClearSpawnedFootprintsOnly()
+    {
+        for (int i = 0; i < spawnedFootprints.Count; i++)
+        {
+            if (spawnedFootprints[i] != null)
+                Destroy(spawnedFootprints[i]);
         }
 
         spawnedFootprints.Clear();
     }
-}
\ No newline at end of file
+
+    public void ClearFootprints()
+    {
+        StopRunningRoutines();
+        ClearSpawnedFootprintsOnly();
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        footprintCount = Mathf.Max(1, footprintCount);
+        spacing = Mathf.Max(0.01f, spacing);
+        sideOffset = Mathf.Max(0f, sideOffset);
+        showTime = Mathf.Max(0f, showTime);
+        revealInterval = Mathf.Max(0f, revealInterval);
+        autoDestroyCleanupDelay = Mathf.Max(0f, autoDestroyCleanupDelay);
+        fallbackDestroyDelay = Mathf.Max(0f, fallbackDestroyDelay);
+        raycastHeight = Mathf.Max(0.01f, raycastHeight);
+        raycastDistance = Mathf.Max(0.01f, raycastDistance);
+        groundOffset = Mathf.Max(0f, groundOffset);
+        obstacleCheckHeight = Mathf.Max(0f, obstacleCheckHeight);
+        obstacleCheckRadius = Mathf.Max(0.001f, obstacleCheckRadius);
+        obstaclePadding = Mathf.Max(0f, obstaclePadding);
+
+        if (stopAtObstacle && obstacleMask.value == 0)
+        {
+            Debug.LogWarning(
+                "FootprintHintManager: Stop At Obstacle이 켜져 있지만 Obstacle Mask가 비어 있습니다. Wall 레이어를 지정하세요.",
+                this
+            );
+        }
+
+        if (useGroundRaycast && groundMask.value == ~0)
+        {
+            Debug.LogWarning(
+                "FootprintHintManager: Ground Mask가 Everything입니다. 가능하면 Ground 레이어만 지정하세요.",
+                this
+            );
+        }
+    }
+#endif
+}
diff --git a/Assets/My project/maze Scripts/Ui/MazeDirection.cs b/Assets/My project/maze Scripts/Ui/MazeDirection.cs
index b63e0a95..1fec08e3 100644
--- a/Assets/My project/maze Scripts/Ui/MazeDirection.cs	
+++ b/Assets/My project/maze Scripts/Ui/MazeDirection.cs	
@@ -5,4 +5,4 @@ public enum MazeDirection
     Backward,
     Left,
     Right
-}
\ No newline at end of file
+}
diff --git a/Assets/My project/maze Scripts/Ui/MazeGameManager.cs b/Assets/My project/maze Scripts/Ui/MazeGameManager.cs
index 3f938063..838c56c9 100644
--- a/Assets/My project/maze Scripts/Ui/MazeGameManager.cs	
+++ b/Assets/My project/maze Scripts/Ui/MazeGameManager.cs	
@@ -1,38 +1,115 @@
-using UnityEngine;
+using UnityEngine;
+using UnityEngine.Events;
 
+[DisallowMultipleComponent]
 public class MazeGameManager : MonoBehaviour
 {
+    private enum MazePhase
+    {
+        SearchingExit,
+        Completed,
+        Failed
+    }
+
     [Header("VR Player Reference")]
-    [Tooltip("XR Origin 또는 Main Camera Transform을 넣으세요.")]
+    [Tooltip("XR Origin 안의 Main Camera Transform을 넣는 것을 추천합니다.")]
     [SerializeField] private Transform playerTarget;
+    [SerializeField] private bool autoFindMainCameraIfMissing = true;
 
     [Header("Managers")]
     [SerializeField] private MazeUIManager mazeUI;
     [SerializeField] private FootprintHintManager footprintHint;
 
-    [Header("Goal")]
+    [Header("Goal / Exit")]
+    [Tooltip("미로 출구입니다. 출구에 도착하면 기억의 조각을 획득하고 성공 처리됩니다.")]
     [SerializeField] private Transform goal;
     [SerializeField] private float goalDistance = 1.5f;
 
+    [Header("Exit Reward")]
+    [Tooltip("체크하면 출구에 도착했을 때 기억의 조각을 획득한 것으로 처리합니다.")]
+    [SerializeField] private bool giveMemoryPieceAtExit = true;
+    [Tooltip("출구 도착 시 켜거나 보여줄 기억의 조각 연출 오브젝트입니다. 없어도 됩니다.")]
+    [SerializeField] private GameObject memoryPieceRewardObject;
+    [Tooltip("Reset 시 기억의 조각 연출 오브젝트를 꺼둘지 정합니다.")]
+    [SerializeField] private bool hideRewardObjectOnReset = true;
+
     [Header("Checkpoints")]
+    [Tooltip("출구까지 가는 길목입니다. 코너/갈림길마다 순서대로 배치하세요.")]
     [SerializeField] private Transform[] checkpoints;
     [SerializeField] private float checkpointDistance = 1.5f;
 
+    [Header("Checkpoint Rules")]
+    [Tooltip("체크하면 Checkpoint1 -> Checkpoint2 -> ... 순서대로만 인정됩니다.")]
+    [SerializeField] private bool enforceCheckpointOrder = true;
+    [Tooltip("체크하면 모든 체크포인트를 지난 뒤에만 Goal 성공이 됩니다.")]
+    [SerializeField] private bool requireAllCheckpointsBeforeGoal = true;
+    [Tooltip("체크포인트에 도착했을 때 다음 길목/출구 방향으로 발자국 힌트를 표시합니다.")]
+    [SerializeField] private bool showHintAtCheckpoint = true;
+    [Tooltip("체크하면 Direction enum보다 다음 체크포인트/출구 위치를 기준으로 발자국을 표시합니다.")]
+    [SerializeField] private bool useTargetBasedHint = true;
+
     [Header("Checkpoint Directions")]
-    [Tooltip("각 체크포인트에 도착했을 때 보여줄 발자국 방향입니다.")]
+    [Tooltip("useTargetBasedHint가 꺼져 있거나 다음 목표가 없을 때 사용하는 발자국 방향입니다.")]
     [SerializeField] private MazeDirection[] checkpointDirections;
 
+    [Header("Hint Settings")]
+    [SerializeField] private int checkpointHintFootprintCount = 6;
+    [SerializeField] private float checkpointHintShowTime = 3f;
+
+    [Header("Compass Hint")]
+    [Tooltip("나침반이 있으면 1회 출구 경로 힌트를 보여줍니다.")]
+    [SerializeField] private bool hasCompass = true;
+    [SerializeField] private int compassHintFootprintCount = 8;
+    [SerializeField] private float compassHintShowTime = 4f;
+
+    [Header("Start Guide")]
+    [SerializeField] private bool showStartGuideMessage = true;
+    [TextArea]
+    [SerializeField] private string startGuideMessage = "푸른빛 정원에 들어왔다.\n손목의 나침반을 사용하면 빛나는 발자국 힌트를 볼 수 있다.";
+
     [Header("VR Distance Option")]
     [Tooltip("VR에서는 머리 높이가 달라지므로 보통 Y축 높이는 무시하는 것이 좋습니다.")]
     [SerializeField] private bool ignoreHeight = true;
 
+    [Header("Result Buttons / Retry & Exit")]
+    [Tooltip("체크하면 MazeUIManager의 Compass / Retry / Exit 버튼 이벤트를 자동으로 연결합니다. 이 경우 Inspector의 OnClick에 같은 함수를 중복 연결하지 마세요.")]
+    [SerializeField] private bool wireUIButtonsAutomatically = true;
+
+    [Tooltip("다시하기 버튼을 눌렀을 때 플레이어를 시작 위치로 되돌릴지 정합니다.")]
+    [SerializeField] private bool movePlayerToRetrySpawn = false;
+    [Tooltip("이동시킬 플레이어 루트입니다. XR Origin 루트 오브젝트를 넣는 것을 추천합니다. 비워두면 Player Target을 이동합니다.")]
+    [SerializeField] private Transform playerRootToMoveOnRetry;
+    [Tooltip("다시하기 버튼을 눌렀을 때 이동할 시작 위치입니다.")]
+    [SerializeField] private Transform retrySpawnPoint;
+
+    [Tooltip("나가기/계속하기 버튼을 누르면 Result/HUD/Guide UI를 숨깁니다.")]
+    [SerializeField] private bool hideUIWhenExitButtonClicked = true;
+    [Tooltip("나가기/계속하기 버튼을 눌렀을 때 꺼둘 오브젝트입니다. 예: MazeRoot, MazeCanvas 등. 없어도 됩니다.")]
+    [SerializeField] private GameObject objectToDisableWhenExit;
+    [Tooltip("나가기/계속하기 버튼 클릭 후 호출할 추가 이벤트입니다. 다음 씬 이동, 다음 스토리 진행 등을 여기에 연결하세요.")]
+    [SerializeField] private UnityEvent onExitButtonClicked = new UnityEvent();
+
+    [Header("Moving Walls")]
+    [Tooltip("다시하기/초기화 때 시작 위치로 되돌릴 움직이는 벽들입니다. 비워두면 씬 안의 MovingMazeWall을 자동으로 찾을 수 있습니다.")]
+    [SerializeField] private MovingMazeWall[] movingWallsToReset;
+    [SerializeField] private bool autoFindMovingWallsIfEmpty = true;
+    [SerializeField] private bool resetMovingWallsOnMazeReset = true;
+
+    [Header("Debug")]
+    [SerializeField] private bool showDebugLogs = true;
+    [SerializeField] private bool drawDebugDistances = true;
+
+    private MazePhase phase;
     private bool[] reached;
-    private bool isCompleted;
-    private bool isFailed;
+    private bool hasMemoryPiece;
+    private bool compassUsed;
+    private int currentCheckpointIndex;
 
     private void Awake()
     {
+        ResolveReferences();
         InitializeCheckpoints();
+        ResolveMovingWalls();
     }
 
     private void Start()
@@ -40,9 +117,37 @@ private void Start()
         ResetMaze();
     }
 
+    private void OnEnable()
+    {
+        SetUIEventWiring(true);
+    }
+
+    private void OnDisable()
+    {
+        SetUIEventWiring(false);
+    }
+
+    private void SetUIEventWiring(bool addListeners)
+    {
+        if (!wireUIButtonsAutomatically || mazeUI == null)
+            return;
+
+        // 중복 연결 방지용으로 먼저 제거합니다.
+        mazeUI.OnCompassButtonClicked.RemoveListener(UseCompass);
+        mazeUI.OnRetryButtonClicked.RemoveListener(RetryMaze);
+        mazeUI.OnExitButtonClicked.RemoveListener(ExitMaze);
+
+        if (!addListeners)
+            return;
+
+        mazeUI.OnCompassButtonClicked.AddListener(UseCompass);
+        mazeUI.OnRetryButtonClicked.AddListener(RetryMaze);
+        mazeUI.OnExitButtonClicked.AddListener(ExitMaze);
+    }
+
     private void Update()
     {
-        if (isCompleted || isFailed)
+        if (phase == MazePhase.Completed || phase == MazePhase.Failed)
             return;
 
         if (playerTarget == null)
@@ -52,10 +157,37 @@ private void Update()
         CheckGoal();
     }
 
+    private void ResolveReferences()
+    {
+        if (autoFindMainCameraIfMissing && playerTarget == null && Camera.main != null)
+            playerTarget = Camera.main.transform;
+
+        if (footprintHint != null && playerTarget != null)
+            footprintHint.SetPlayerTarget(playerTarget);
+    }
+
+    private void ResolveMovingWalls()
+    {
+        if (!autoFindMovingWallsIfEmpty)
+            return;
+
+        if (movingWallsToReset != null && movingWallsToReset.Length > 0)
+            return;
+
+#if UNITY_2023_1_OR_NEWER
+        movingWallsToReset = FindObjectsByType<MovingMazeWall>(FindObjectsInactive.Include, FindObjectsSortMode.None);
+#else
+        movingWallsToReset = FindObjectsOfType<MovingMazeWall>(true);
+#endif
+    }
+
     private void InitializeCheckpoints()
     {
         int count = checkpoints != null ? checkpoints.Length : 0;
         reached = new bool[count];
+
+        for (int i = 0; i < count; i++)
+            reached[i] = checkpoints[i] == null;
     }
 
     private void CheckCheckpoints()
@@ -63,37 +195,475 @@ private void CheckCheckpoints()
         if (checkpoints == null || checkpoints.Length == 0)
             return;
 
+        if (enforceCheckpointOrder)
+            CheckCurrentCheckpointOnly();
+        else
+            CheckAllCheckpoints();
+    }
+
+    private void CheckCurrentCheckpointOnly()
+    {
+        SkipNullCheckpointsInOrder();
+
+        if (currentCheckpointIndex >= checkpoints.Length)
+            return;
+
+        Transform checkpoint = checkpoints[currentCheckpointIndex];
+
+        float distance = GetDistance(playerTarget.position, checkpoint.position);
+
+        if (drawDebugDistances)
+            Debug.DrawLine(playerTarget.position, checkpoint.position, Color.yellow);
+
+        if (distance <= checkpointDistance)
+        {
+            int reachedIndex = currentCheckpointIndex;
+
+            reached[reachedIndex] = true;
+            currentCheckpointIndex++;
+            UpdateCheckpointUI();
+
+            if (showDebugLogs)
+                Debug.Log($"MazeGameManager: Checkpoint {reachedIndex + 1} reached. NextIndex={currentCheckpointIndex}", this);
+
+            if (showHintAtCheckpoint)
+                ShowCheckpointHint(reachedIndex);
+        }
+    }
+
+    private void SkipNullCheckpointsInOrder()
+    {
+        while (checkpoints != null && currentCheckpointIndex < checkpoints.Length && checkpoints[currentCheckpointIndex] == null)
+        {
+            if (showDebugLogs)
+                Debug.Log($"MazeGameManager: Checkpoint {currentCheckpointIndex + 1} is null. It is skipped.", this);
+
+            reached[currentCheckpointIndex] = true;
+            currentCheckpointIndex++;
+            UpdateCheckpointUI();
+        }
+    }
+
+    private void CheckAllCheckpoints()
+    {
         for (int i = 0; i < checkpoints.Length; i++)
         {
             if (reached[i])
                 continue;
 
             if (checkpoints[i] == null)
+            {
+                reached[i] = true;
+                UpdateCheckpointUI();
                 continue;
+            }
 
             float distance = GetDistance(playerTarget.position, checkpoints[i].position);
 
+            if (drawDebugDistances)
+                Debug.DrawLine(playerTarget.position, checkpoints[i].position, Color.yellow);
+
             if (distance <= checkpointDistance)
             {
                 reached[i] = true;
+                UpdateCheckpointUI();
 
-                MazeDirection direction = GetCheckpointDirection(i);
+                if (showDebugLogs)
+                    Debug.Log($"MazeGameManager: Checkpoint {i + 1} reached.", this);
 
-                if (footprintHint != null)
-                    footprintHint.ShowFootprints(direction);
+                if (showHintAtCheckpoint)
+                    ShowCheckpointHint(i);
             }
         }
     }
 
+    private void ShowCheckpointHint(int checkpointIndex)
+    {
+        if (footprintHint == null)
+            return;
+
+        if (useTargetBasedHint)
+        {
+            Transform target = GetNextHintTarget();
+
+            if (target != null)
+            {
+                if (showDebugLogs)
+                    Debug.Log($"MazeGameManager: Show checkpoint hint to {target.name}.", this);
+
+                footprintHint.ShowFootprintsToTarget(target, checkpointHintFootprintCount, checkpointHintShowTime);
+                return;
+            }
+        }
+
+        MazeDirection direction = GetCheckpointDirection(checkpointIndex);
+        footprintHint.ShowFootprints(direction, checkpointHintFootprintCount, checkpointHintShowTime);
+    }
+
     private void CheckGoal()
     {
         if (goal == null)
             return;
 
+        if (drawDebugDistances)
+            Debug.DrawLine(playerTarget.position, goal.position, Color.green);
+
+        if (requireAllCheckpointsBeforeGoal && !AllCheckpointsReached())
+            return;
+
         float distance = GetDistance(playerTarget.position, goal.position);
 
         if (distance <= goalDistance)
-            Complete();
+            CompleteAtExit();
+    }
+
+    public void UseCompass()
+    {
+        if (phase == MazePhase.Completed || phase == MazePhase.Failed)
+            return;
+
+        if (!hasCompass)
+        {
+            if (mazeUI != null)
+                mazeUI.OnCompassMissing();
+
+            return;
+        }
+
+        if (compassUsed)
+        {
+            if (mazeUI != null)
+                mazeUI.OnCompassAlreadyUsed();
+
+            return;
+        }
+
+        compassUsed = true;
+
+        bool hintShown = ShowHintToNextTarget(compassHintFootprintCount, compassHintShowTime);
+
+        if (!hintShown && footprintHint != null)
+        {
+            MazeDirection fallbackDirection = GetCurrentFallbackDirection();
+            footprintHint.ShowFootprints(fallbackDirection, compassHintFootprintCount, compassHintShowTime);
+        }
+
+        if (showDebugLogs)
+            Debug.Log("MazeGameManager: Compass used.", this);
+
+        if (mazeUI != null)
+        {
+            mazeUI.SetCompassUsed();
+            mazeUI.ShowGuideMessage("나침반이 다음 길목을 가리킨다.\n빛나는 발자국을 따라가 보자.");
+        }
+    }
+
+    private bool ShowHintToNextTarget(int footprintCount, float showTime)
+    {
+        Transform target = GetNextHintTarget();
+
+        if (target == null || footprintHint == null)
+            return false;
+
+        if (showDebugLogs)
+            Debug.Log($"MazeGameManager: Show hint to target: {target.name}", this);
+
+        footprintHint.ShowFootprintsToTarget(target, footprintCount, showTime);
+        return true;
+    }
+
+    private Transform GetNextHintTarget()
+    {
+        if (enforceCheckpointOrder && checkpoints != null)
+        {
+            for (int i = currentCheckpointIndex; i < checkpoints.Length; i++)
+            {
+                if (checkpoints[i] != null && (reached == null || i >= reached.Length || !reached[i]))
+                    return checkpoints[i];
+            }
+        }
+
+        return goal;
+    }
+
+    private MazeDirection GetCurrentFallbackDirection()
+    {
+        int index = enforceCheckpointOrder ? currentCheckpointIndex : 0;
+        return GetCheckpointDirection(index);
+    }
+
+    private bool AllCheckpointsReached()
+    {
+        if (checkpoints == null || checkpoints.Length == 0)
+            return true;
+
+        if (reached == null || reached.Length != checkpoints.Length)
+            return false;
+
+        for (int i = 0; i < reached.Length; i++)
+        {
+            if (checkpoints[i] == null)
+                continue;
+
+            if (!reached[i])
+                return false;
+        }
+
+        return true;
+    }
+
+    private int GetCheckpointCount()
+    {
+        if (checkpoints == null)
+            return 0;
+
+        int count = 0;
+
+        for (int i = 0; i < checkpoints.Length; i++)
+        {
+            if (checkpoints[i] != null)
+                count++;
+        }
+
+        return count;
+    }
+
+    private int GetReachedCheckpointCount()
+    {
+        if (reached == null || checkpoints == null)
+            return 0;
+
+        int count = 0;
+
+        int length = Mathf.Min(reached.Length, checkpoints.Length);
+
+        for (int i = 0; i < length; i++)
+        {
+            if (checkpoints[i] != null && reached[i])
+                count++;
+        }
+
+        return count;
+    }
+
+    private void UpdateCheckpointUI()
+    {
+        if (mazeUI != null)
+            mazeUI.SetCheckpointProgress(GetReachedCheckpointCount(), GetCheckpointCount());
+    }
+
+    private MazeDirection GetCheckpointDirection(int index)
+    {
+        if (checkpointDirections != null && index >= 0 && index < checkpointDirections.Length)
+            return checkpointDirections[index];
+
+        return MazeDirection.Forward;
+    }
+
+    private void CompleteAtExit()
+    {
+        if (phase == MazePhase.Completed || phase == MazePhase.Failed)
+            return;
+
+        phase = MazePhase.Completed;
+
+        if (giveMemoryPieceAtExit)
+            hasMemoryPiece = true;
+
+        if (memoryPieceRewardObject != null)
+            memoryPieceRewardObject.SetActive(true);
+
+        if (footprintHint != null)
+            footprintHint.ClearFootprints();
+
+        UpdateCheckpointUI();
+
+        if (showDebugLogs)
+            Debug.Log("MazeGameManager: Maze completed at exit.", this);
+
+        if (mazeUI != null)
+        {
+            mazeUI.SetMemoryPieceState(hasMemoryPiece);
+
+            int reachedCheckpointCount = GetReachedCheckpointCount();
+            int totalCheckpointCount = GetCheckpointCount();
+
+            if (giveMemoryPieceAtExit)
+            {
+                mazeUI.ShowSuccessResult(
+                    "기억의 조각을 되찾았다!",
+                    "별빛 발자국을 따라 미로를 통과했습니다.",
+                    hasMemoryPiece,
+                    reachedCheckpointCount,
+                    totalCheckpointCount
+                );
+            }
+            else
+            {
+                mazeUI.ShowSuccessResult(
+                    "미로 탈출 성공!",
+                    "발자국 힌트를 따라 미로 출구에 도착했습니다.",
+                    false,
+                    reachedCheckpointCount,
+                    totalCheckpointCount
+                );
+            }
+        }
+    }
+
+    public void Fail()
+    {
+        Fail("길을 잃었다...");
+    }
+
+    public void Fail(string message)
+    {
+        if (phase == MazePhase.Completed || phase == MazePhase.Failed)
+            return;
+
+        phase = MazePhase.Failed;
+
+        if (footprintHint != null)
+            footprintHint.ClearFootprints();
+
+        if (showDebugLogs)
+            Debug.Log($"MazeGameManager: Maze failed. Message={message}", this);
+
+        if (mazeUI != null)
+            mazeUI.ShowFail(message);
+    }
+
+    public void RetryMaze()
+    {
+        ResolveReferences();
+        MovePlayerToRetrySpawnIfNeeded();
+        ResetMazeStateOnly();
+    }
+
+    public void ResetMaze()
+    {
+        ResolveReferences();
+        ResetMazeStateOnly();
+    }
+
+    private void ResetMazeStateOnly()
+    {
+        phase = MazePhase.SearchingExit;
+        hasMemoryPiece = false;
+        compassUsed = false;
+        currentCheckpointIndex = 0;
+
+        if (reached == null || reached.Length != (checkpoints != null ? checkpoints.Length : 0))
+            InitializeCheckpoints();
+        else
+        {
+            for (int i = 0; i < reached.Length; i++)
+                reached[i] = checkpoints != null && i < checkpoints.Length && checkpoints[i] == null;
+        }
+
+        if (memoryPieceRewardObject != null && hideRewardObjectOnReset)
+            memoryPieceRewardObject.SetActive(false);
+
+        if (footprintHint != null)
+            footprintHint.ClearFootprints();
+
+        ResetMovingWallsIfNeeded();
+
+        if (showDebugLogs)
+            Debug.Log("MazeGameManager: Maze reset.", this);
+
+        if (mazeUI != null)
+        {
+            mazeUI.ResetUI(hasCompass);
+            mazeUI.SetStartObjective();
+            mazeUI.SetCheckpointProgress(0, GetCheckpointCount());
+            mazeUI.SetMemoryPieceState(false);
+
+            if (showStartGuideMessage)
+                mazeUI.ShowGuideMessage(startGuideMessage);
+        }
+    }
+
+    private void ResetMovingWallsIfNeeded()
+    {
+        if (!resetMovingWallsOnMazeReset)
+            return;
+
+        ResolveMovingWalls();
+
+        if (movingWallsToReset == null)
+            return;
+
+        for (int i = 0; i < movingWallsToReset.Length; i++)
+        {
+            if (movingWallsToReset[i] != null)
+                movingWallsToReset[i].ResetToInitialState();
+        }
+    }
+
+    private void MovePlayerToRetrySpawnIfNeeded()
+    {
+        if (!movePlayerToRetrySpawn || retrySpawnPoint == null)
+            return;
+
+        Transform targetRoot = playerRootToMoveOnRetry;
+
+        if (targetRoot == null)
+            targetRoot = playerTarget;
+
+        if (targetRoot == null)
+            return;
+
+        targetRoot.SetPositionAndRotation(retrySpawnPoint.position, retrySpawnPoint.rotation);
+
+        if (showDebugLogs)
+            Debug.Log("MazeGameManager: Player moved to retry spawn point.", this);
+    }
+
+    public void ExitMaze()
+    {
+        if (footprintHint != null)
+            footprintHint.ClearFootprints();
+
+        if (mazeUI != null && hideUIWhenExitButtonClicked)
+        {
+            mazeUI.HideResult();
+            mazeUI.HideHUD();
+            mazeUI.HideGuideImmediately();
+        }
+
+        if (objectToDisableWhenExit != null)
+            objectToDisableWhenExit.SetActive(false);
+
+        onExitButtonClicked?.Invoke();
+
+        if (showDebugLogs)
+            Debug.Log("MazeGameManager: Exit / Continue button clicked.", this);
+    }
+
+    public void SetHasCompass(bool value)
+    {
+        hasCompass = value;
+
+        if (mazeUI != null)
+        {
+            if (compassUsed)
+                mazeUI.SetCompassUsed();
+            else if (hasCompass)
+                mazeUI.SetCompassAvailable();
+            else
+                mazeUI.SetCompassNone();
+        }
+    }
+
+    public bool HasMemoryPiece()
+    {
+        return hasMemoryPiece;
+    }
+
+    public bool IsCompassUsed()
+    {
+        return compassUsed;
     }
 
     private float GetDistance(Vector3 a, Vector3 b)
@@ -107,61 +677,38 @@ private float GetDistance(Vector3 a, Vector3 b)
         return Vector3.Distance(a, b);
     }
 
-    private MazeDirection GetCheckpointDirection(int index)
+#if UNITY_EDITOR
+    private void OnValidate()
     {
-        if (checkpointDirections != null &&
-            index >= 0 &&
-            index < checkpointDirections.Length)
+        goalDistance = Mathf.Max(0.01f, goalDistance);
+        checkpointDistance = Mathf.Max(0.01f, checkpointDistance);
+        checkpointHintFootprintCount = Mathf.Max(1, checkpointHintFootprintCount);
+        checkpointHintShowTime = Mathf.Max(0f, checkpointHintShowTime);
+        compassHintFootprintCount = Mathf.Max(1, compassHintFootprintCount);
+        compassHintShowTime = Mathf.Max(0f, compassHintShowTime);
+
+        if (playerTarget == null && !autoFindMainCameraIfMissing)
+            Debug.LogWarning("MazeGameManager: Player Target이 비어 있습니다. XR Origin 안의 Main Camera를 넣는 것을 추천합니다.", this);
+
+        if (goal == null)
+            Debug.LogWarning("MazeGameManager: Goal이 비어 있습니다. 출구 오브젝트를 연결하세요.", this);
+
+        if (mazeUI == null)
+            Debug.LogWarning("MazeGameManager: Maze UI가 비어 있습니다.", this);
+
+        if (footprintHint == null)
+            Debug.LogWarning("MazeGameManager: Footprint Hint가 비어 있습니다.", this);
+
+        if (requireAllCheckpointsBeforeGoal && (checkpoints == null || checkpoints.Length == 0))
+            Debug.LogWarning("MazeGameManager: Require All Checkpoints Before Goal이 켜져 있지만 Checkpoints가 비어 있습니다.", this);
+
+        if (checkpoints != null && checkpointDirections != null && checkpointDirections.Length > 0 && checkpoints.Length != checkpointDirections.Length)
         {
-            return checkpointDirections[index];
+            Debug.LogWarning(
+                "MazeGameManager: Checkpoints 배열과 Checkpoint Directions 배열의 길이가 다릅니다. 각 체크포인트와 방향은 같은 인덱스로 1:1 매칭하는 것을 추천합니다.",
+                this
+            );
         }
-
-        return MazeDirection.None;
     }
-
-    private void Complete()
-    {
-        if (isCompleted || isFailed)
-            return;
-
-        isCompleted = true;
-
-        if (footprintHint != null)
-            footprintHint.ClearFootprints();
-
-        if (mazeUI != null)
-            mazeUI.ShowSuccess();
-    }
-
-    public void Fail()
-    {
-        if (isCompleted || isFailed)
-            return;
-
-        isFailed = true;
-
-        if (footprintHint != null)
-            footprintHint.ClearFootprints();
-
-        if (mazeUI != null)
-            mazeUI.ShowFail();
-    }
-
-    public void ResetMaze()
-    {
-        isCompleted = false;
-        isFailed = false;
-
-        if (reached == null || reached.Length != (checkpoints != null ? checkpoints.Length : 0))
-            InitializeCheckpoints();
-
-        for (int i = 0; i < reached.Length; i++)
-            reached[i] = false;
-
-        if (footprintHint != null)
-            footprintHint.ClearFootprints();
-
-        if (mazeUI != null)
-            mazeUI.HideReward();
-    }
-}
\ No newline at end of file
+#endif
+}
diff --git a/Assets/My project/maze Scripts/Ui/MazeMixedUIPanelFollower.cs b/Assets/My project/maze Scripts/Ui/MazeMixedUIPanelFollower.cs
new file mode 100644
index 00000000..eb497640
--- /dev/null
+++ b/Assets/My project/maze Scripts/Ui/MazeMixedUIPanelFollower.cs	
@@ -0,0 +1,330 @@
+using UnityEngine;
+
+[DisallowMultipleComponent]
+public class MazeMixedUIPanelFollower : MonoBehaviour
+{
+    public enum PanelFollowMode
+    {
+        None,
+        Wrist,
+        CameraFront,
+        CameraFrontOnShow
+    }
+
+    [Header("Canvas")]
+    [Tooltip("비워두면 이 오브젝트 또는 부모에서 Canvas를 자동으로 찾습니다. Render Mode는 World Space여야 합니다.")]
+    [SerializeField] private Canvas targetCanvas;
+
+    [Header("Follow Targets")]
+    [Tooltip("손목 HUD가 따라갈 Transform입니다. 컨트롤러 자체보다 WristUIAnchor 빈 오브젝트를 넣는 것을 추천합니다.")]
+    [SerializeField] private Transform wristTarget;
+
+    [Tooltip("Guide/Result가 기준으로 삼을 카메라 Transform입니다. XR Origin 안의 Main Camera를 넣으세요.")]
+    [SerializeField] private Transform cameraTarget;
+
+    [Tooltip("Camera Target이 비어 있으면 Camera.main을 자동으로 찾습니다.")]
+    [SerializeField] private bool autoFindMainCameraIfMissing = true;
+
+    [Header("Panels In One Canvas")]
+    [SerializeField] private RectTransform hudPanel;
+    [SerializeField] private RectTransform guidePanel;
+    [SerializeField] private RectTransform resultPanel;
+
+    [Header("Panel Follow Mode")]
+    [SerializeField] private PanelFollowMode hudFollowMode = PanelFollowMode.Wrist;
+    [Tooltip("CameraFrontOnShow: 켜지는 순간 카메라 앞에 배치 후 고정됩니다.")]
+    [SerializeField] private PanelFollowMode guideFollowMode = PanelFollowMode.CameraFrontOnShow;
+    [Tooltip("CameraFrontOnShow: 켜지는 순간 카메라 앞에 배치 후 고정됩니다.")]
+    [SerializeField] private PanelFollowMode resultFollowMode = PanelFollowMode.CameraFrontOnShow;
+
+    [Header("HUD Wrist Placement")]
+    [Tooltip("손목 기준 위치 오프셋입니다. WristUIAnchor를 쓰면 0,0,0 권장")]
+    [SerializeField] private Vector3 hudWristPositionOffset = Vector3.zero;
+
+    [Tooltip("손목 기준 회전 오프셋입니다. WristUIAnchor를 쓰면 0,0,0 권장")]
+    [SerializeField] private Vector3 hudWristRotationOffset = Vector3.zero;
+
+    [Header("Guide Camera Placement")]
+    [SerializeField] private float guideDistance = 1.6f;
+    [SerializeField] private float guideHeightOffset = -0.12f;
+    [SerializeField] private Vector3 guideRotationOffset = Vector3.zero;
+
+    [Header("Result Camera Placement")]
+    [SerializeField] private float resultDistance = 1.7f;
+    [SerializeField] private float resultHeightOffset = -0.05f;
+    [SerializeField] private Vector3 resultRotationOffset = Vector3.zero;
+
+    [Header("Billboard")]
+    [Tooltip("Guide/Result가 표시될 때 카메라를 바라보게 합니다. UI가 뒤집혀 보이면 Rotation Offset Y=180을 시도하세요.")]
+    [SerializeField] private bool frontPanelsLookAtCamera = true;
+
+    [Header("Smooth Follow")]
+    [SerializeField] private bool useSmoothFollow = true;
+    [SerializeField] private float positionSmooth = 14f;
+    [SerializeField] private float rotationSmooth = 14f;
+
+    [Header("Scale Preset")]
+    [Tooltip("체크하면 시작 시 패널별 월드 스케일을 적용합니다. 이미 크기를 맞췄다면 끄세요.")]
+    [SerializeField] private bool applyScaleOnStart = false;
+    [SerializeField] private Vector3 hudWorldScale = new Vector3(0.0016f, 0.0016f, 0.0016f);
+    [SerializeField] private Vector3 guideWorldScale = new Vector3(0.0024f, 0.0024f, 0.0024f);
+    [SerializeField] private Vector3 resultWorldScale = new Vector3(0.0026f, 0.0026f, 0.0026f);
+
+    private bool hudWasActive;
+    private bool guideWasActive;
+    private bool resultWasActive;
+
+    private bool hudPlacedOnce;
+    private bool guidePlacedOnce;
+    private bool resultPlacedOnce;
+
+    private enum PanelKind
+    {
+        HUD,
+        Guide,
+        Result
+    }
+
+    private void Reset()
+    {
+        targetCanvas = GetComponent<Canvas>();
+
+        if (targetCanvas == null)
+            targetCanvas = GetComponentInParent<Canvas>();
+    }
+
+    private void Awake()
+    {
+        ResolveReferences();
+
+        if (targetCanvas != null && targetCanvas.renderMode != RenderMode.WorldSpace)
+        {
+            Debug.LogWarning(
+                "MazeMixedUIPanelFollower: Canvas Render Mode는 World Space여야 손목/카메라 앞 위치 제어가 자연스럽습니다.",
+                targetCanvas
+            );
+        }
+
+        if (applyScaleOnStart)
+            ApplyScalePreset();
+
+        CacheActiveStates();
+    }
+
+    private void ResolveReferences()
+    {
+        if (targetCanvas == null)
+            targetCanvas = GetComponent<Canvas>();
+
+        if (targetCanvas == null)
+            targetCanvas = GetComponentInParent<Canvas>();
+
+        if (autoFindMainCameraIfMissing && cameraTarget == null && Camera.main != null)
+            cameraTarget = Camera.main.transform;
+    }
+
+    private void LateUpdate()
+    {
+        ResolveReferences();
+
+        FollowPanel(hudPanel, hudFollowMode, PanelKind.HUD, ref hudWasActive, ref hudPlacedOnce);
+        FollowPanel(guidePanel, guideFollowMode, PanelKind.Guide, ref guideWasActive, ref guidePlacedOnce);
+        FollowPanel(resultPanel, resultFollowMode, PanelKind.Result, ref resultWasActive, ref resultPlacedOnce);
+    }
+
+    private void CacheActiveStates()
+    {
+        hudWasActive = hudPanel != null && hudPanel.gameObject.activeInHierarchy;
+        guideWasActive = guidePanel != null && guidePanel.gameObject.activeInHierarchy;
+        resultWasActive = resultPanel != null && resultPanel.gameObject.activeInHierarchy;
+    }
+
+    private void FollowPanel(RectTransform panel, PanelFollowMode mode, PanelKind kind, ref bool wasActive, ref bool placedOnce)
+    {
+        if (panel == null)
+            return;
+
+        bool isActive = panel.gameObject.activeInHierarchy;
+
+        if (!isActive)
+        {
+            wasActive = false;
+            placedOnce = false;
+            return;
+        }
+
+        if (mode == PanelFollowMode.None)
+        {
+            wasActive = isActive;
+            return;
+        }
+
+        bool justActivated = !wasActive && isActive;
+
+        Vector3 targetPosition;
+        Quaternion targetRotation;
+
+        if (mode == PanelFollowMode.Wrist)
+        {
+            if (wristTarget == null)
+                return;
+
+            GetWristPose(out targetPosition, out targetRotation);
+            ApplyTransform(panel, targetPosition, targetRotation, useSmoothFollow);
+        }
+        else
+        {
+            if (cameraTarget == null)
+                return;
+
+            GetCameraFrontPose(kind, out targetPosition, out targetRotation);
+
+            if (mode == PanelFollowMode.CameraFront)
+            {
+                ApplyTransform(panel, targetPosition, targetRotation, useSmoothFollow);
+            }
+            else if (mode == PanelFollowMode.CameraFrontOnShow)
+            {
+                if (justActivated || !placedOnce)
+                {
+                    panel.SetPositionAndRotation(targetPosition, targetRotation);
+                    placedOnce = true;
+                }
+            }
+        }
+
+        wasActive = isActive;
+    }
+
+    private void GetWristPose(out Vector3 targetPosition, out Quaternion targetRotation)
+    {
+        targetPosition =
+            wristTarget.position +
+            wristTarget.right * hudWristPositionOffset.x +
+            wristTarget.up * hudWristPositionOffset.y +
+            wristTarget.forward * hudWristPositionOffset.z;
+
+        targetRotation = wristTarget.rotation * Quaternion.Euler(hudWristRotationOffset);
+    }
+
+    private void GetCameraFrontPose(PanelKind kind, out Vector3 targetPosition, out Quaternion targetRotation)
+    {
+        float distance = kind == PanelKind.Result ? resultDistance : guideDistance;
+        float heightOffset = kind == PanelKind.Result ? resultHeightOffset : guideHeightOffset;
+        Vector3 rotationOffset = kind == PanelKind.Result ? resultRotationOffset : guideRotationOffset;
+
+        Vector3 forward = cameraTarget.forward;
+
+        if (forward.sqrMagnitude < 0.001f)
+            forward = Vector3.forward;
+
+        targetPosition = cameraTarget.position + forward.normalized * distance + Vector3.up * heightOffset;
+
+        if (frontPanelsLookAtCamera)
+        {
+            Vector3 lookDirection = targetPosition - cameraTarget.position;
+
+            if (lookDirection.sqrMagnitude < 0.001f)
+                lookDirection = cameraTarget.forward;
+
+            targetRotation = Quaternion.LookRotation(lookDirection.normalized, Vector3.up);
+        }
+        else
+        {
+            targetRotation = cameraTarget.rotation;
+        }
+
+        targetRotation *= Quaternion.Euler(rotationOffset);
+    }
+
+    private void ApplyTransform(RectTransform panel, Vector3 targetPosition, Quaternion targetRotation, bool smooth)
+    {
+        if (smooth)
+        {
+            panel.position = Vector3.Lerp(panel.position, targetPosition, Time.deltaTime * positionSmooth);
+            panel.rotation = Quaternion.Slerp(panel.rotation, targetRotation, Time.deltaTime * rotationSmooth);
+        }
+        else
+        {
+            panel.SetPositionAndRotation(targetPosition, targetRotation);
+        }
+    }
+
+    private void ApplyScalePreset()
+    {
+        if (hudPanel != null)
+            hudPanel.localScale = hudWorldScale;
+
+        if (guidePanel != null)
+            guidePanel.localScale = guideWorldScale;
+
+        if (resultPanel != null)
+            resultPanel.localScale = resultWorldScale;
+    }
+
+    public void SetWristTarget(Transform target)
+    {
+        wristTarget = target;
+    }
+
+    public void SetCameraTarget(Transform target)
+    {
+        cameraTarget = target;
+    }
+
+    public void SnapPanelsNow()
+    {
+        bool previousSmooth = useSmoothFollow;
+        useSmoothFollow = false;
+
+        FollowPanel(hudPanel, hudFollowMode, PanelKind.HUD, ref hudWasActive, ref hudPlacedOnce);
+        FollowPanel(guidePanel, guideFollowMode, PanelKind.Guide, ref guideWasActive, ref guidePlacedOnce);
+        FollowPanel(resultPanel, resultFollowMode, PanelKind.Result, ref resultWasActive, ref resultPlacedOnce);
+
+        useSmoothFollow = previousSmooth;
+    }
+
+    public void PlaceGuideInFrontNow()
+    {
+        ResolveReferences();
+
+        if (guidePanel == null || cameraTarget == null)
+            return;
+
+        GetCameraFrontPose(PanelKind.Guide, out Vector3 position, out Quaternion rotation);
+        guidePanel.SetPositionAndRotation(position, rotation);
+        guidePlacedOnce = true;
+    }
+
+    public void PlaceResultInFrontNow()
+    {
+        ResolveReferences();
+
+        if (resultPanel == null || cameraTarget == null)
+            return;
+
+        GetCameraFrontPose(PanelKind.Result, out Vector3 position, out Quaternion rotation);
+        resultPanel.SetPositionAndRotation(position, rotation);
+        resultPlacedOnce = true;
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        guideDistance = Mathf.Max(0.1f, guideDistance);
+        resultDistance = Mathf.Max(0.1f, resultDistance);
+        positionSmooth = Mathf.Max(0.01f, positionSmooth);
+        rotationSmooth = Mathf.Max(0.01f, rotationSmooth);
+
+        if (hudFollowMode == PanelFollowMode.Wrist && wristTarget == null)
+            Debug.LogWarning("MazeMixedUIPanelFollower: HUD가 Wrist 모드인데 Wrist Target이 비어 있습니다. WristUIAnchor를 연결하세요.", this);
+
+        if ((guideFollowMode == PanelFollowMode.CameraFront || guideFollowMode == PanelFollowMode.CameraFrontOnShow ||
+             resultFollowMode == PanelFollowMode.CameraFront || resultFollowMode == PanelFollowMode.CameraFrontOnShow) &&
+            cameraTarget == null && !autoFindMainCameraIfMissing)
+        {
+            Debug.LogWarning("MazeMixedUIPanelFollower: CameraFront 계열 모드를 쓰려면 Camera Target을 연결하세요.", this);
+        }
+    }
+#endif
+}
diff --git a/Assets/My project/maze Scripts/Ui/MazeMixedUIPanelFollower.cs.meta b/Assets/My project/maze Scripts/Ui/MazeMixedUIPanelFollower.cs.meta
new file mode 100644
index 00000000..955ff649
--- /dev/null
+++ b/Assets/My project/maze Scripts/Ui/MazeMixedUIPanelFollower.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5a822665d8e7f7d4996f9ed84f19e1de
\ No newline at end of file
diff --git a/Assets/My project/maze Scripts/Ui/MazeUIManager.cs b/Assets/My project/maze Scripts/Ui/MazeUIManager.cs
index a368e5a3..5b257e42 100644
--- a/Assets/My project/maze Scripts/Ui/MazeUIManager.cs	
+++ b/Assets/My project/maze Scripts/Ui/MazeUIManager.cs	
@@ -1,42 +1,617 @@
+using System.Collections;
 using TMPro;
 using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.UI;
 
+[DisallowMultipleComponent]
 public class MazeUIManager : MonoBehaviour
 {
+    public enum CompassUIState
+    {
+        None,
+        Available,
+        Used
+    }
+
+    [Header("HUD")]
+    [SerializeField] private GameObject hudPanel;
+    [SerializeField] private TextMeshProUGUI objectiveText;
+    [SerializeField] private TextMeshProUGUI memoryPieceText;
+    [SerializeField] private TextMeshProUGUI compassStateText;
+
+    [Header("Compass UI")]
+    [SerializeField] private Button compassButton;
+    [SerializeField] private TextMeshProUGUI compassButtonText;
+
+    [Header("Icon HUD / Socket Overlay")]
+    [Tooltip("기억의 조각 홈 안에 들어가는 파란 수정 아이콘입니다. 홈 이미지는 연결하지 않아도 됩니다.")]
+    [SerializeField] private Image memoryCrystalIcon;
+    [Tooltip("나침반 버튼 안의 나침반 이미지입니다. 사용 가능/완료 색상만 바꿉니다.")]
+    [SerializeField] private Image compassIcon;
+    [Tooltip("나침반 사용 가능 상태를 알려주는 작은 느낌표 아이콘입니다.")]
+    [SerializeField] private GameObject hintAlertIcon;
+    [Tooltip("체크포인트 홈 위에 얹는 별 아이콘들입니다. 1번 체크포인트부터 순서대로 넣으세요.")]
+    [SerializeField] private Image[] checkpointStarIcons;
+    [Tooltip("체크하면 미도달 별을 끄고, 소켓 홈만 보이게 합니다.")]
+    [SerializeField] private bool hideInactiveCheckpointStars = true;
+    [Tooltip("체크하면 기억의 조각 미획득 시 수정 아이콘을 끄고, 빈 홈만 보이게 합니다.")]
+    [SerializeField] private bool hideMemoryCrystalWhenMissing = true;
+    [Tooltip("나침반 사용 가능 상태에서 느낌표 아이콘을 켭니다.")]
+    [SerializeField] private bool showHintAlertWhenCompassAvailable = true;
+
+    [Header("Guide Message UI")]
+    [SerializeField] private GameObject guidePanel;
+    [SerializeField] private CanvasGroup guideCanvasGroup;
+    [SerializeField] private TextMeshProUGUI guideText;
+    [SerializeField] private float guideShowTime = 2.5f;
+    [SerializeField] private float fadeTime = 0.25f;
+
     [Header("Result UI")]
-    [SerializeField] private GameObject rewardPanel;
-    [SerializeField] private TextMeshProUGUI rewardText;
+    [SerializeField] private GameObject resultPanel;
+    [SerializeField] private TextMeshProUGUI resultTitleText;
+    [SerializeField] private TextMeshProUGUI resultBodyText;
+    [SerializeField] private Button retryButton;
+    [SerializeField] private Button exitButton;
+    [SerializeField] private TextMeshProUGUI retryButtonText;
+    [SerializeField] private TextMeshProUGUI exitButtonText;
+
+    [Header("Result Placement")]
+    [Tooltip("연결하면 결과창을 켜는 순간 카메라 앞에 즉시 배치합니다.")]
+    [SerializeField] private MazeMixedUIPanelFollower panelFollower;
+    [SerializeField] private bool placeResultInFrontWhenShown = true;
+
+    [Header("Result Button Text")]
+    [SerializeField] private string retryButtonLabel = "다시하기";
+    [SerializeField] private string exitButtonLabel = "계속하기";
+
+    [Header("Result Reward UI")]
+    [Tooltip("기억의 조각 뒤에 깔리는 푸른 빛 효과 오브젝트입니다. 없어도 됩니다.")]
+    [SerializeField] private GameObject resultRewardGlow;
+    [Tooltip("결과창 중앙 보상 홈 안에 들어가는 기억의 조각 아이콘입니다. 결과창용 소켓 이미지는 연결하지 않아도 됩니다.")]
+    [SerializeField] private Image resultMemoryCrystalIcon;
+    [Tooltip("결과창 체크포인트 홈 위에 얹는 별 아이콘들입니다. 1번부터 순서대로 넣으세요.")]
+    [SerializeField] private Image[] resultCheckpointStarIcons;
+    [Tooltip("체크하면 결과창의 미도달 별은 끄고, 결과창 체크포인트 홈만 보이게 합니다.")]
+    [SerializeField] private bool hideInactiveResultCheckpointStars = true;
+    [Tooltip("체크하면 결과창에서 기억의 조각을 획득하지 못한 상태일 때 수정 아이콘을 끕니다.")]
+    [SerializeField] private bool hideResultMemoryCrystalWhenMissing = true;
+
+    [Header("Current Maze Text")]
+    [SerializeField] private string startObjectiveMessage = "목표: 나침반의 발자국 힌트를 따라 미로 출구를 찾아라";
+    [SerializeField] private string memoryMissingMessage = "기억의 조각: 미획득";
+    [SerializeField] private string memoryCollectedMessage = "기억의 조각: 획득";
+
+    [Header("Result Text")]
+    [SerializeField] private string successResultTitleMessage = "기억의 조각을 되찾았다!";
+    [SerializeField] private string successResultBodyMessage = "별빛 발자국을 따라 미로를 통과했습니다.";
+    [SerializeField] private string failResultTitleMessage = "미로 탐험 실패";
+    [SerializeField] private string failResultBodyMessage = "다시 도전해 보세요.";
+
+    [Header("UI Colors")]
+    [SerializeField] private Color normalColor = Color.white;
+    [SerializeField] private Color successColor = Color.green;
+    [SerializeField] private Color failColor = Color.red;
+    [SerializeField] private Color disabledColor = Color.gray;
+
+    [Header("Icon Colors")]
+    [SerializeField] private Color iconActiveColor = Color.white;
+    [SerializeField] private Color iconInactiveColor = new Color(1f, 1f, 1f, 0.25f);
+
+    [Header("Result Colors")]
+    [SerializeField] private Color resultSuccessTitleColor = new Color(1f, 0.78f, 0.36f, 1f);
+    [SerializeField] private Color resultFailTitleColor = new Color(1f, 0.35f, 0.35f, 1f);
+
+    [Header("Button Events")]
+    public UnityEvent OnCompassButtonClicked = new UnityEvent();
+    public UnityEvent OnRetryButtonClicked = new UnityEvent();
+    public UnityEvent OnExitButtonClicked = new UnityEvent();
+
+    private Coroutine guideRoutine;
 
     private void Awake()
     {
-        HideReward();
+        EnsureEvents();
+
+        if (compassButton != null)
+            compassButton.onClick.AddListener(HandleCompassButtonClicked);
+
+        if (retryButton != null)
+            retryButton.onClick.AddListener(HandleRetryButtonClicked);
+
+        if (exitButton != null)
+            exitButton.onClick.AddListener(HandleExitButtonClicked);
+
+        HideResult();
+        HideGuideImmediately();
+    }
+
+    private void EnsureEvents()
+    {
+        if (OnCompassButtonClicked == null)
+            OnCompassButtonClicked = new UnityEvent();
+
+        if (OnRetryButtonClicked == null)
+            OnRetryButtonClicked = new UnityEvent();
+
+        if (OnExitButtonClicked == null)
+            OnExitButtonClicked = new UnityEvent();
+    }
+
+    private void OnDestroy()
+    {
+        if (compassButton != null)
+            compassButton.onClick.RemoveListener(HandleCompassButtonClicked);
+
+        if (retryButton != null)
+            retryButton.onClick.RemoveListener(HandleRetryButtonClicked);
+
+        if (exitButton != null)
+            exitButton.onClick.RemoveListener(HandleExitButtonClicked);
+    }
+
+    public void HandleCompassButtonClicked()
+    {
+        OnCompassButtonClicked?.Invoke();
+    }
+
+    public void HandleRetryButtonClicked()
+    {
+        OnRetryButtonClicked?.Invoke();
+    }
+
+    public void HandleExitButtonClicked()
+    {
+        OnExitButtonClicked?.Invoke();
+    }
+
+    public void ShowHUD()
+    {
+        if (hudPanel != null)
+            hudPanel.SetActive(true);
+    }
+
+    public void HideHUD()
+    {
+        if (hudPanel != null)
+            hudPanel.SetActive(false);
+    }
+
+    public void SetObjectiveSearchingMemory()
+    {
+        SetObjective(startObjectiveMessage);
+    }
+
+    public void SetObjectiveReturningToExit()
+    {
+        SetObjective("목표: 출구로 이동해 기억의 조각을 획득하라");
+    }
+
+    public void SetStartObjective()
+    {
+        SetObjective(startObjectiveMessage);
+    }
+
+    public void SetObjective(string message)
+    {
+        if (objectiveText != null)
+            objectiveText.text = message;
+    }
+
+    public void SetMemoryPieceState(bool hasMemoryPiece)
+    {
+        if (memoryPieceText != null)
+        {
+            if (hasMemoryPiece)
+            {
+                memoryPieceText.text = memoryCollectedMessage;
+                memoryPieceText.color = successColor;
+            }
+            else
+            {
+                memoryPieceText.text = memoryMissingMessage;
+                memoryPieceText.color = normalColor;
+            }
+        }
+
+        if (memoryCrystalIcon != null)
+        {
+            if (hideMemoryCrystalWhenMissing)
+                memoryCrystalIcon.gameObject.SetActive(hasMemoryPiece);
+            else
+            {
+                memoryCrystalIcon.gameObject.SetActive(true);
+                memoryCrystalIcon.color = hasMemoryPiece ? iconActiveColor : iconInactiveColor;
+            }
+        }
+    }
+
+    public void SetCheckpointProgress(int reachedCount, int totalCount)
+    {
+        SetStarProgress(checkpointStarIcons, reachedCount, totalCount, hideInactiveCheckpointStars);
+    }
+
+    public void SetHintAlertVisible(bool visible)
+    {
+        if (hintAlertIcon != null)
+            hintAlertIcon.SetActive(visible);
+    }
+
+    public void SetCompassState(CompassUIState state)
+    {
+        switch (state)
+        {
+            case CompassUIState.None:
+                SetCompassNone();
+                break;
+
+            case CompassUIState.Available:
+                SetCompassAvailable();
+                break;
+
+            case CompassUIState.Used:
+                SetCompassUsed();
+                break;
+        }
+    }
+
+    public void SetCompassNone()
+    {
+        if (compassStateText != null)
+        {
+            compassStateText.text = "나침반: 없음";
+            compassStateText.color = disabledColor;
+        }
+
+        if (compassButtonText != null)
+            compassButtonText.text = "나침반 없음";
+
+        if (compassButton != null)
+            compassButton.interactable = false;
+
+        if (compassIcon != null)
+            compassIcon.color = iconInactiveColor;
+
+        SetHintAlertVisible(false);
+    }
+
+    public void SetCompassAvailable()
+    {
+        if (compassStateText != null)
+        {
+            compassStateText.text = "나침반: 사용 가능";
+            compassStateText.color = normalColor;
+        }
+
+        if (compassButtonText != null)
+            compassButtonText.text = "나침반 사용";
+
+        if (compassButton != null)
+            compassButton.interactable = true;
+
+        if (compassIcon != null)
+            compassIcon.color = iconActiveColor;
+
+        SetHintAlertVisible(showHintAlertWhenCompassAvailable);
+    }
+
+    public void SetCompassUsed()
+    {
+        if (compassStateText != null)
+        {
+            compassStateText.text = "나침반: 사용 완료";
+            compassStateText.color = disabledColor;
+        }
+
+        if (compassButtonText != null)
+            compassButtonText.text = "사용 완료";
+
+        if (compassButton != null)
+            compassButton.interactable = false;
+
+        if (compassIcon != null)
+            compassIcon.color = iconInactiveColor;
+
+        SetHintAlertVisible(false);
+    }
+
+    public void ShowMessage(string message)
+    {
+        ShowGuideMessage(message);
+    }
+
+    public void ShowGuideMessage(string message)
+    {
+        if (guideRoutine != null)
+            StopCoroutine(guideRoutine);
+
+        guideRoutine = StartCoroutine(GuideMessageRoutine(message));
+    }
+
+    private IEnumerator GuideMessageRoutine(string message)
+    {
+        if (guidePanel != null)
+            guidePanel.SetActive(true);
+
+        if (guideText != null)
+        {
+            guideText.text = message;
+            guideText.color = normalColor;
+        }
+
+        if (guideCanvasGroup != null)
+        {
+            yield return FadeCanvasGroup(guideCanvasGroup, 0f, 1f, fadeTime);
+            yield return new WaitForSeconds(guideShowTime);
+            yield return FadeCanvasGroup(guideCanvasGroup, 1f, 0f, fadeTime);
+        }
+        else
+        {
+            yield return new WaitForSeconds(guideShowTime);
+        }
+
+        if (guidePanel != null)
+            guidePanel.SetActive(false);
+
+        guideRoutine = null;
+    }
+
+    private IEnumerator FadeCanvasGroup(CanvasGroup canvasGroup, float from, float to, float duration)
+    {
+        if (canvasGroup == null)
+            yield break;
+
+        if (duration <= 0f)
+        {
+            canvasGroup.alpha = to;
+            yield break;
+        }
+
+        float timer = 0f;
+
+        while (timer < duration)
+        {
+            timer += Time.deltaTime;
+            float t = Mathf.Clamp01(timer / duration);
+            canvasGroup.alpha = Mathf.Lerp(from, to, t);
+            yield return null;
+        }
+
+        canvasGroup.alpha = to;
+    }
+
+    public void ShowSuccessResult(int reachedCheckpointCount, int totalCheckpointCount)
+    {
+        ShowSuccessResult(successResultTitleMessage, successResultBodyMessage, true, reachedCheckpointCount, totalCheckpointCount);
+    }
+
+    public void ShowSuccessResult(string titleMessage, string bodyMessage, bool showMemoryPieceReward, int reachedCheckpointCount, int totalCheckpointCount)
+    {
+        ShowResult(titleMessage, bodyMessage, resultSuccessTitleColor, showMemoryPieceReward, reachedCheckpointCount, totalCheckpointCount);
+    }
+
+    public void SetResultMemoryPieceState(bool hasMemoryPiece)
+    {
+        if (resultRewardGlow != null)
+            resultRewardGlow.SetActive(hasMemoryPiece);
+
+        if (resultMemoryCrystalIcon != null)
+        {
+            if (hideResultMemoryCrystalWhenMissing)
+                resultMemoryCrystalIcon.gameObject.SetActive(hasMemoryPiece);
+            else
+            {
+                resultMemoryCrystalIcon.gameObject.SetActive(true);
+                resultMemoryCrystalIcon.color = hasMemoryPiece ? iconActiveColor : iconInactiveColor;
+            }
+        }
+    }
+
+    public void SetResultCheckpointProgress(int reachedCount, int totalCount)
+    {
+        SetStarProgress(resultCheckpointStarIcons, reachedCount, totalCount, hideInactiveResultCheckpointStars);
     }
 
     public void ShowSuccess()
     {
-        ShowResult("SUCCESS!", Color.green);
+        ShowSuccess(successResultTitleMessage, successResultBodyMessage);
+    }
+
+    public void ShowSuccess(string bodyMessage)
+    {
+        ShowSuccess(successResultTitleMessage, bodyMessage);
+    }
+
+    public void ShowSuccess(string titleMessage, string bodyMessage)
+    {
+        ShowResult(titleMessage, bodyMessage, resultSuccessTitleColor, true, -1, -1);
     }
 
     public void ShowFail()
     {
-        ShowResult("FAIL!", Color.red);
+        ShowFail(failResultBodyMessage);
     }
 
-    private void ShowResult(string message, Color color)
+    public void ShowFail(string bodyMessage)
     {
-        if (rewardPanel != null)
-            rewardPanel.SetActive(true);
+        ShowResult(failResultTitleMessage, bodyMessage, resultFailTitleColor, false, 0, GetResultStarIconCount());
+    }
 
-        if (rewardText != null)
+    private void ShowResult(string titleMessage, string bodyMessage, Color titleColor, bool showMemoryPieceReward, int reachedCheckpointCount, int totalCheckpointCount)
+    {
+        HideHUD();
+        HideGuideImmediately();
+        SetResultButtonLabels();
+
+        if (resultPanel != null)
+            resultPanel.SetActive(true);
+
+        if (placeResultInFrontWhenShown && panelFollower != null)
+            panelFollower.PlaceResultInFrontNow();
+
+        if (resultTitleText != null)
         {
-            rewardText.text = message;
-            rewardText.color = color;
+            resultTitleText.text = titleMessage;
+            resultTitleText.color = titleColor;
         }
+
+        if (resultBodyText != null)
+            resultBodyText.text = bodyMessage;
+
+        SetResultMemoryPieceState(showMemoryPieceReward);
+
+        if (reachedCheckpointCount >= 0 && totalCheckpointCount >= 0)
+            SetResultCheckpointProgress(reachedCheckpointCount, totalCheckpointCount);
+    }
+
+    public void SetResultButtonLabels()
+    {
+        if (retryButtonText != null)
+            retryButtonText.text = retryButtonLabel;
+
+        if (exitButtonText != null)
+            exitButtonText.text = exitButtonLabel;
+    }
+
+    public void HideResult()
+    {
+        if (resultPanel != null)
+            resultPanel.SetActive(false);
+
+        SetResultMemoryPieceState(false);
+        SetResultCheckpointProgress(0, GetResultStarIconCount());
     }
 
     public void HideReward()
     {
-        if (rewardPanel != null)
-            rewardPanel.SetActive(false);
+        HideResult();
     }
-}
\ No newline at end of file
+
+    public void HideGuideImmediately()
+    {
+        if (guideRoutine != null)
+        {
+            StopCoroutine(guideRoutine);
+            guideRoutine = null;
+        }
+
+        if (guideCanvasGroup != null)
+            guideCanvasGroup.alpha = 0f;
+
+        if (guidePanel != null)
+            guidePanel.SetActive(false);
+    }
+
+    public void ResetUI(bool hasCompass)
+    {
+        ShowHUD();
+        HideResult();
+        HideGuideImmediately();
+
+        SetStartObjective();
+        SetMemoryPieceState(false);
+
+        int checkpointIconCount = checkpointStarIcons != null ? checkpointStarIcons.Length : 0;
+        SetCheckpointProgress(0, checkpointIconCount);
+
+        if (hasCompass)
+            SetCompassAvailable();
+        else
+            SetCompassNone();
+    }
+
+    public void OnMemoryPieceCollected()
+    {
+        SetMemoryPieceState(true);
+        SetObjectiveReturningToExit();
+        ShowGuideMessage("기억의 조각을 찾았다!\n이제 출구로 돌아가자.");
+    }
+
+    public void OnCompassUsedToMemory()
+    {
+        SetCompassUsed();
+        ShowGuideMessage("나침반이 기억의 조각 방향을 가리킨다.\n빛나는 발자국을 따라가 보자.");
+    }
+
+    public void OnCompassUsedToExit()
+    {
+        SetCompassUsed();
+        ShowGuideMessage("나침반이 출구 방향을 가리킨다.\n발자국을 따라 출구로 돌아가자.");
+    }
+
+    public void OnCompassUsedToNextPath()
+    {
+        SetCompassUsed();
+        ShowGuideMessage("나침반이 다음 길을 가리킨다.\n빛나는 발자국을 따라가 보자.");
+    }
+
+    public void OnCompassMissing()
+    {
+        ShowGuideMessage("낡은 나침반이 없다.");
+    }
+
+    public void OnCompassAlreadyUsed()
+    {
+        ShowGuideMessage("나침반은 이미 사용했다.");
+    }
+
+    private void SetStarProgress(Image[] starIcons, int reachedCount, int totalCount, bool hideInactiveStars)
+    {
+        if (starIcons == null)
+            return;
+
+        int safeTotal = Mathf.Clamp(totalCount, 0, starIcons.Length);
+        int safeReached = Mathf.Clamp(reachedCount, 0, safeTotal);
+
+        for (int i = 0; i < starIcons.Length; i++)
+        {
+            Image starIcon = starIcons[i];
+
+            if (starIcon == null)
+                continue;
+
+            bool slotUsed = i < safeTotal;
+            bool reached = i < safeReached;
+
+            if (!slotUsed)
+            {
+                starIcon.gameObject.SetActive(false);
+                continue;
+            }
+
+            if (hideInactiveStars)
+            {
+                starIcon.gameObject.SetActive(reached);
+                if (reached)
+                    starIcon.color = iconActiveColor;
+            }
+            else
+            {
+                starIcon.gameObject.SetActive(true);
+                starIcon.color = reached ? iconActiveColor : iconInactiveColor;
+            }
+        }
+    }
+
+    private int GetResultStarIconCount()
+    {
+        return resultCheckpointStarIcons != null ? resultCheckpointStarIcons.Length : 0;
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        guideShowTime = Mathf.Max(0f, guideShowTime);
+        fadeTime = Mathf.Max(0f, fadeTime);
+
+        if (checkpointStarIcons != null && checkpointStarIcons.Length == 0)
+            Debug.LogWarning("MazeUIManager: HUD Checkpoint Star Icons 배열이 비어 있습니다. HUD 체크포인트 별 아이콘을 연결하세요.", this);
+
+        if (resultCheckpointStarIcons != null && resultCheckpointStarIcons.Length == 0)
+            Debug.LogWarning("MazeUIManager: Result Checkpoint Star Icons 배열이 비어 있습니다. 결과창 체크포인트 별 아이콘을 연결하세요.", this);
+
+        if (placeResultInFrontWhenShown && panelFollower == null)
+            Debug.LogWarning("MazeUIManager: Place Result In Front When Shown이 켜져 있지만 Panel Follower가 비어 있습니다. 결과창 위치가 한 프레임 늦게 잡힐 수 있습니다.", this);
+    }
+#endif
+}
diff --git a/Assets/My project/maze Scripts/Ui/MovingMazeWall.cs b/Assets/My project/maze Scripts/Ui/MovingMazeWall.cs
new file mode 100644
index 00000000..a7c08104
--- /dev/null
+++ b/Assets/My project/maze Scripts/Ui/MovingMazeWall.cs	
@@ -0,0 +1,104 @@
+using UnityEngine;
+
+[DisallowMultipleComponent]
+public class MovingMazeWall : MonoBehaviour
+{
+    [Header("Movement")]
+    [Tooltip("로컬 좌표 기준 이동 거리입니다.")]
+    [SerializeField] private Vector3 localMoveOffset = new Vector3(0f, 0f, 2f);
+
+    [SerializeField] private float speed = 1f;
+
+    [Header("Timing")]
+    [Tooltip("움직이기 전 대기 시간입니다.")]
+    [SerializeField] private float startDelay = 0f;
+
+    [Tooltip("여러 벽이 같은 타이밍으로 움직이지 않게 하는 시간 오프셋입니다.")]
+    [SerializeField] private float phaseOffset = 0f;
+
+    [Header("Options")]
+    [SerializeField] private bool moveOnStart = true;
+    [SerializeField] private bool useUnscaledTime = false;
+
+    private Vector3 startLocalPosition;
+    private bool isMoving;
+    private float moveStartTime;
+
+    private void Awake()
+    {
+        startLocalPosition = transform.localPosition;
+        isMoving = moveOnStart;
+        moveStartTime = GetCurrentTime();
+    }
+
+    private void Update()
+    {
+        if (!isMoving)
+            return;
+
+        float time = GetCurrentTime() - moveStartTime + phaseOffset - startDelay;
+
+        if (time < 0f)
+            return;
+
+        float t = Mathf.PingPong(time * speed, 1f);
+
+        transform.localPosition = Vector3.Lerp(
+            startLocalPosition,
+            startLocalPosition + localMoveOffset,
+            t
+        );
+    }
+
+    private float GetCurrentTime()
+    {
+        return useUnscaledTime ? Time.unscaledTime : Time.time;
+    }
+
+    public void StartMove()
+    {
+        isMoving = true;
+        moveStartTime = GetCurrentTime();
+    }
+
+    public void StopMove()
+    {
+        isMoving = false;
+    }
+
+    public void ResetWallPosition()
+    {
+        transform.localPosition = startLocalPosition;
+        moveStartTime = GetCurrentTime();
+    }
+
+    public void ResetWallPosition(bool keepMoving)
+    {
+        transform.localPosition = startLocalPosition;
+        isMoving = keepMoving;
+        moveStartTime = GetCurrentTime();
+    }
+
+    public void ResetAndStop()
+    {
+        ResetWallPosition(false);
+    }
+
+    public void ResetAndStart()
+    {
+        ResetWallPosition(true);
+    }
+
+    public void ResetToInitialState()
+    {
+        ResetWallPosition(moveOnStart);
+    }
+
+#if UNITY_EDITOR
+    private void OnValidate()
+    {
+        speed = Mathf.Max(0f, speed);
+        startDelay = Mathf.Max(0f, startDelay);
+    }
+#endif
+}
diff --git a/Assets/My project/maze Scripts/Ui/MovingMazeWall.cs.meta b/Assets/My project/maze Scripts/Ui/MovingMazeWall.cs.meta
new file mode 100644
index 00000000..6a7dad0c
--- /dev/null
+++ b/Assets/My project/maze Scripts/Ui/MovingMazeWall.cs.meta	
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 647badbd7deb2204cb358b4e44c944a7
\ No newline at end of file
diff --git a/Assets/My project/shell Scripts/lmage/ChatGPT Image 2026년 6월 22일 오후 03_41_52-Photoroom.png b/Assets/My project/shell Scripts/lmage/ChatGPT Image 2026년 6월 22일 오후 03_41_52-Photoroom.png
new file mode 100644
index 00000000..3dbe3734
--- /dev/null
+++ b/Assets/My project/shell Scripts/lmage/ChatGPT Image 2026년 6월 22일 오후 03_41_52-Photoroom.png	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d4a8bcbf4c325ee067346e58e0bb5fd4aab1e499980990c669c8e4fd5e1ec41
+size 1000676
diff --git a/Assets/My project/shell Scripts/lmage/ChatGPT Image 2026년 6월 22일 오후 03_41_52-Photoroom.png.meta b/Assets/My project/shell Scripts/lmage/ChatGPT Image 2026년 6월 22일 오후 03_41_52-Photoroom.png.meta
new file mode 100644
index 00000000..b224ec7b
--- /dev/null
+++ b/Assets/My project/shell Scripts/lmage/ChatGPT Image 2026년 6월 22일 오후 03_41_52-Photoroom.png.meta	
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: 63492377015e7e641bbb79f0437191cb
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/My project/test scene.unity b/Assets/My project/test scene.unity
index f0c2bd9e..c5641e03 100644
--- a/Assets/My project/test scene.unity	
+++ b/Assets/My project/test scene.unity	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87798e659e0d6b6bb7f42d343763858bb7edaff24fa57586b6047c8574f27ba9
-size 470225
+oid sha256:e180e9fc87320565b36dd0b0721179d397d595807a61378ef49196f4f0a46054
+size 290
diff --git a/Assets/RapidIcon.meta b/Assets/RapidIcon.meta
new file mode 100644
index 00000000..25085dba
--- /dev/null
+++ b/Assets/RapidIcon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b71243c2180ba7547aa602494f149597
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor.meta b/Assets/RapidIcon/Editor.meta
new file mode 100644
index 00000000..d6824d19
--- /dev/null
+++ b/Assets/RapidIcon/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 762505d68621d5b45956c2a6afefbdfe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts.meta b/Assets/RapidIcon/Editor/Scripts.meta
new file mode 100644
index 00000000..ec62881a
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b79448a699ad4024dab3128ac29dced0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts/AssetSelection.meta b/Assets/RapidIcon/Editor/Scripts/AssetSelection.meta
new file mode 100644
index 00000000..b1fcc1e7
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/AssetSelection.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ad86275e12197b24ebecfe38f46e3fb1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs
new file mode 100644
index 00000000..4c6a92dc
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs
@@ -0,0 +1,824 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	//---ObjectPathPair Definition---//
+	public struct ObjectPathPair
+	{
+		public ObjectPathPair(UnityEngine.Object obj, string pth)
+		{
+			UnityEngine_object = obj;
+			path = pth;
+		}
+
+		public UnityEngine.Object UnityEngine_object;
+		public string path;
+	};
+
+	[Serializable]
+	public class AssetGrid
+	{
+		//---PUBLIC---//
+		//Icons
+		public Dictionary<UnityEngine.Object, IconSet> objectIconSets;
+		public Dictionary<string, IconSet> sortedIconSetsByPath;
+		public List<IconSet> visibleIconSets;
+		public List<IconSet> selectedIconSets;
+
+		//Textures
+		public Texture2D[] assetSelectionTextures;
+
+		//Other
+		public string rapidIconRootFolder;
+		public bool assetGridFocused;
+		public int previewSize;
+
+		//---INTERNAL---//
+		//GUI
+		Vector2 scrollPosition;
+		GUIStyle gridStyle, gridLabelStyle;
+
+		//Selection
+		int lastSelectedIconIndex;
+		int selectionMinIndex;
+		int selectionMaxIndex;
+		string lastSelectedIndividualFolder;
+		List<ObjectPathPair> objectsLoadedFromSelectedFolders;
+
+		//RapidIcon Window Elements
+		RapidIconWindow window;
+		AssetList assetList;
+
+		//Filter
+		int filterIdx;
+		string[] filters = new string[] { "t:model t:prefab", "t:prefab", "t:model" };
+		string[] filterNames = new string[] { "Prefabs & Models", "Prefabs Only", "Models Only" };
+
+		//Other
+		Rect rect;
+		bool iconsRefreshed;
+
+		public AssetGrid(AssetList assets)
+		{
+			//---Initialise AssetGrid---//
+			//Asset List
+			assetList = assets;
+
+			//Selection
+			objectsLoadedFromSelectedFolders = new List<ObjectPathPair>();
+			lastSelectedIconIndex = -1;
+			selectionMinIndex = int.MaxValue;
+			selectionMaxIndex = -1;
+
+			//Icons
+			objectIconSets = new Dictionary<UnityEngine.Object, IconSet>();
+			sortedIconSetsByPath = new Dictionary<string, IconSet>();
+			selectedIconSets = new List<IconSet>();
+
+			//Styles
+			previewSize = 128;
+			gridStyle = new GUIStyle();
+			gridStyle.fixedHeight = previewSize;
+			gridStyle.fixedWidth = previewSize;
+			gridStyle.margin.bottom = 16 + (int)EditorGUIUtility.singleLineHeight + 2;
+			gridStyle.margin.left = 16;
+			gridStyle.alignment = TextAnchor.MiddleCenter;
+			gridLabelStyle = new GUIStyle(gridStyle);
+			gridLabelStyle.margin.bottom = 16 + previewSize + 2;
+			gridLabelStyle.fixedHeight = EditorGUIUtility.singleLineHeight;
+			gridLabelStyle.alignment = TextAnchor.MiddleCenter;
+			if (EditorGUIUtility.isProSkin)
+				gridLabelStyle.normal.textColor = new Color32(192, 192, 192, 255);
+			else
+				gridLabelStyle.normal.textColor = Color.black;
+
+			//Filter
+			filterIdx = 0;
+
+			//Textures
+			assetSelectionTextures = new Texture2D[5];
+
+			string[] split = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets("RapidIconWindow")[0]).Split('/');
+			rapidIconRootFolder = "";
+			for (int i = 0; i < split.Length - 4; i++)
+				rapidIconRootFolder += split[i] + "/";
+
+			assetSelectionTextures[0] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/deselectedAsset.png");
+			assetSelectionTextures[1] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/selectedAssetActiveDark.png");
+			assetSelectionTextures[2] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/selectedAssetInactiveDark.png");
+			assetSelectionTextures[3] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/selectedAssetActiveLight.png");
+			assetSelectionTextures[4] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/selectedAssetInactiveLight.png");
+			assetSelectionTextures[0].hideFlags = HideFlags.DontSave;
+			assetSelectionTextures[1].hideFlags = HideFlags.DontSave;
+			assetSelectionTextures[2].hideFlags = HideFlags.DontSave;
+			assetList.lastNumberOfSelected = -1;
+
+			//Other
+			iconsRefreshed = true;
+		}
+
+		public void Draw(float width, RapidIconWindow w)
+		{
+			//---Check variables are set---//
+			CheckAndSetWindow(w);
+
+			//---Refresh icons after startup---//
+			if (!iconsRefreshed && EditorApplication.timeSinceStartup > 15)
+			{
+				RefreshAllIcons();
+				iconsRefreshed = true;
+			}
+
+			GUILayout.BeginVertical(GUILayout.Width(width));
+			GUILayout.Space(4);
+
+			//---Filter---//
+			GUILayout.BeginHorizontal();
+			GUILayout.Space(8);
+			if (GUILayout.Button("Refresh"))
+				ReloadObjects();
+			if (GUILayout.Button("Filter: " + filterNames[filterIdx]))
+			{
+				filterIdx++;
+				if (filterIdx == 3)
+					filterIdx = 0;
+
+				ReloadObjects();
+			}
+			GUILayout.FlexibleSpace();
+			GUILayout.EndHorizontal();
+
+			//---Scroll view----//
+			scrollPosition = GUILayout.BeginScrollView(scrollPosition, false, false, GUIStyle.none, GUI.skin.verticalScrollbar);
+
+			//---Draw icons---//
+			DrawIcons(width);
+
+			//---End GUI elements---//
+			GUILayout.EndScrollView();
+			GUILayout.EndVertical();
+
+			//---Get last rect and check focus---//
+			if (Event.current.type == EventType.Repaint)
+				rect = new Rect(GUILayoutUtility.GetLastRect());
+			CheckFocus(rect);
+		}
+
+		public void SaveData()
+		{
+			//---Save selected assets---//
+			string selectedAssetsString = "";
+			foreach (KeyValuePair<UnityEngine.Object, IconSet> iconSet in objectIconSets)
+			{
+				selectedAssetsString += "|-A-|" + iconSet.Value.assetPath + "|-S-|" + iconSet.Value.selected;
+			}
+			EditorPrefs.SetString(PlayerSettings.productName + "RapidIconSelectedAssets", selectedAssetsString);
+
+			//---Save other variables---//
+			EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconAssetGridScroll", scrollPosition.y);
+			EditorPrefs.SetBool(PlayerSettings.productName + "RapidIconIconsRefreshed", iconsRefreshed);
+			EditorPrefs.SetInt(PlayerSettings.productName + "RapidIconFilterIdx", filterIdx);
+		}
+
+		public void LoadData()
+		{
+			//---Close RapidIcon window if left open when Unity starts---//
+			if (!SessionState.GetBool("rapidicon_loaded", false))
+			{
+				SessionState.SetBool("rapidicon_forceclose", true);
+				SessionState.SetBool("rapidicon_loaded", true);
+				return;
+			}
+
+			//---Load objects in selected folders---//
+			objectsLoadedFromSelectedFolders = LoadObjectsInSelectedFolders();
+			CreateIconSets();
+
+			//---Load selected assets---//
+			string selectedAssetsString = EditorPrefs.GetString(PlayerSettings.productName + "RapidIconSelectedAssets");
+			string[] splitAssets = selectedAssetsString.Split(new string[] { "|-A-|" }, StringSplitOptions.RemoveEmptyEntries);
+			foreach (string s in splitAssets)
+			{
+				string[] splitS = s.Split(new string[] { "|-S-|" }, StringSplitOptions.RemoveEmptyEntries);
+				string assetPath = splitS[0];
+				if (splitS[1] == "True")
+				{
+					IconSet iconSet = GetIconSetFromPath(assetPath);
+					if (iconSet != null)
+					{
+						iconSet.selected = true;
+						selectedIconSets.Add(GetIconSetFromPath(assetPath));
+					}
+				}
+			}
+
+			//---Load other variables---//
+			iconsRefreshed = EditorPrefs.GetBool(PlayerSettings.productName + "RapidIconIconsRefreshed");
+			scrollPosition = new Vector2(0, EditorPrefs.GetFloat(PlayerSettings.productName + "RapidIconAssetGridScroll"));
+			filterIdx = EditorPrefs.GetInt(PlayerSettings.productName + "RapidIconFilterIdx", 0);
+		}
+
+		void ReloadObjects()
+		{
+			//---Unload objects
+			EditorUtility.UnloadUnusedAssetsImmediate();
+
+			//---Reload the objects from selected folders---//
+			objectsLoadedFromSelectedFolders = LoadObjectsInSelectedFolders();
+			CreateIconSets();
+
+			//---Add loaded icons to list---///
+			sortedIconSetsByPath.Clear();
+			foreach (ObjectPathPair loadedObject in objectsLoadedFromSelectedFolders)
+			{
+				IconSet iconSet = objectIconSets[loadedObject.UnityEngine_object];
+				sortedIconSetsByPath.Add(iconSet.assetPath, iconSet);
+			}
+
+			//---Sort the list by path---//
+			sortedIconSetsByPath = SortIconSetsByFolder(sortedIconSetsByPath);
+
+			//---Update variables---//
+			assetList.lastNumberOfSelected = assetList.selectedFolders.Count;
+			lastSelectedIndividualFolder = assetList.selectedFolders[0];
+		}
+
+		public void RefreshAllIcons()
+		{
+			//---Loop through all icons---//
+			int index = 1;
+			foreach (IconSet iconSet in objectIconSets.Values)
+			{
+				//---Show a progress bar---//
+				EditorUtility.DisplayProgressBar("Updating Icons (" + index++ + "/" + objectIconSets.Count + ")", iconSet.assetPath, (float)(index) / (float)(objectIconSets.Count));
+
+				//---Update the icon renders---//
+				Vector2Int renderResolution = Utils.MutiplyVector2IntByFloat(iconSet.GetCurrentIcon().iconSettings.exportResolution, window.iconEditor.resMultiplyers[window.iconEditor.resMultiplyerIndex]);
+				iconSet.GetCurrentIcon().UpdateIcon(renderResolution, new Vector2Int(128, (int)(((float)renderResolution.y / (float)renderResolution.x) * 128)));
+			}
+
+			//---Clear the progress bar when done---//
+			EditorUtility.ClearProgressBar();
+		}
+
+		void CheckAndSetWindow(RapidIconWindow w)
+		{
+			if (!window)
+				window = w;
+		}
+
+		List<ObjectPathPair> LoadObjectsInSelectedFolders()
+		{
+			//---Get asset paths of all assets in selected folders---//
+			string[] assetGUIDs = AssetDatabase.FindAssets(filters[filterIdx], assetList.selectedFolders.ToArray());
+			string[] assetPaths = new string[assetGUIDs.Length];
+			for (int i = 0; i < assetGUIDs.Length; i++)
+				assetPaths[i] = AssetDatabase.GUIDToAssetPath(assetGUIDs[i]);
+
+			List<ObjectPathPair> loadedObjectPathPairs = new List<ObjectPathPair>();
+			foreach (string assetPath in assetPaths)
+			{
+				//---Get folder path from each of the asset paths---//
+				string[] split = assetPath.Split('/');
+				string folderPath = "";
+				for (int i = 0; i < split.Length - 1; i++)
+					folderPath += split[i] + (i < split.Length - 2 ? "/" : "");
+
+				//---Load the asset if the path is in the selected folders list---//
+				if (assetList.selectedFolders.Contains(folderPath))
+				{
+					ObjectPathPair objectPathPair = new ObjectPathPair();
+
+					UnityEngine.Object o = AssetDatabase.LoadMainAssetAtPath(assetPath);
+					objectPathPair.UnityEngine_object = o;
+					objectPathPair.path = assetPath;
+					loadedObjectPathPairs.Add(objectPathPair);
+				}
+			}
+			return loadedObjectPathPairs;
+		}
+
+		void CreateIconSets()
+		{
+			int index = 1;
+			foreach (ObjectPathPair loadedObject in objectsLoadedFromSelectedFolders)
+			{
+				if (!objectIconSets.ContainsKey(loadedObject.UnityEngine_object))
+				{
+					//---Create icon if doesn't already exist---//
+					EditorUtility.DisplayProgressBar("Generating Icon Previews (" + index + " / " + (objectsLoadedFromSelectedFolders.Count) + ")", loadedObject.path, (float)(index++) / (float)objectsLoadedFromSelectedFolders.Count);
+					objectIconSets.Add(loadedObject.UnityEngine_object, CreateIconSet(loadedObject));
+				}
+				else if (objectIconSets[loadedObject.UnityEngine_object].deleted)
+				{
+					objectIconSets[loadedObject.UnityEngine_object].deleted = false;
+				}
+				else
+				{
+					//---Update asset path if changed---//
+					IconSet iconSet = objectIconSets[loadedObject.UnityEngine_object];
+
+					string currentPath = AssetDatabase.GetAssetPath(loadedObject.UnityEngine_object);
+					string savedPath = iconSet.assetPath;
+					if (savedPath != currentPath)
+					{
+						Debug.LogWarning("Path updated for " + iconSet.assetName + " from " + savedPath + " to " + currentPath);
+						iconSet.assetPath = currentPath;
+
+						string[] split;
+						split = iconSet.assetPath.Split('/');
+						iconSet.assetName = split[split.Length - 1];
+						if (iconSet.assetName.Length > 19)
+							iconSet.assetShortenedName = iconSet.assetName.Substring(0, 16) + "...";
+						else
+							iconSet.assetShortenedName = iconSet.assetName;
+
+						split = iconSet.assetPath.Split('/');
+						iconSet.folderPath = "";
+						for (int i = 0; i < split.Length - 1; i++)
+							iconSet.folderPath += split[i] + (i < split.Length - 2 ? "/" : "");
+					}
+				}
+			}
+			EditorUtility.ClearProgressBar();
+		}
+
+		public IconSet CreateIconSet(ObjectPathPair objectPathPair)
+		{
+			//---Create a new icon set and icon objects---//
+			IconSet iconSet = new IconSet(this, objectPathPair);
+			return iconSet;
+		}
+
+		void DrawIcons(float gridWidth)
+		{
+			//---Draw margin---//
+			GUILayout.Space(14);
+			GUILayout.BeginHorizontal();
+			GUILayout.Space(16);
+
+			//---Create lists---//
+			List<Texture2D> visibleIconRenders = new List<Texture2D>();
+			List<Texture2D> visibleIconSelectionTextures = new List<Texture2D>();
+			List<string> visibleIconLabels = new List<string>();
+			visibleIconSets = new List<IconSet>();
+
+			//---Reload objects if needed---//
+			if (sortedIconSetsByPath.Count != objectsLoadedFromSelectedFolders.Count || assetList.selectedFolders.Count != assetList.lastNumberOfSelected || assetList.selectedFolders[0] != lastSelectedIndividualFolder)
+			{
+				ReloadObjects();
+			}
+
+			//---Deselect icons if no longer in selected folders / search (i.e. if not visible in the grid)---//
+			foreach (IconSet iconSet in objectIconSets.Values)
+			{
+				if (!assetList.selectedFolders.Contains(iconSet.folderPath) || (assetList.doSearch && !assetList.searchFolders.Contains(iconSet.folderPath + "/" + iconSet.assetName)))
+				{
+					iconSet.selected = false;
+					if (selectedIconSets.Contains(iconSet))
+						selectedIconSets.Remove(iconSet);
+				}
+			}
+
+			int index = 0;
+			foreach (KeyValuePair<string, IconSet> iconSet in sortedIconSetsByPath)
+			{
+				//---Skip this icon if it's flagged as deleted---//
+				if (iconSet.Value.deleted)
+					continue;
+
+				//---Flag  the icon as deleted if asset object is null---//
+				else if (iconSet.Value.assetObject == null)
+				{
+					iconSet.Value.deleted = true;
+					iconSet.Value.assetObject = null;
+					selectedIconSets.Remove(iconSet.Value);
+					continue;
+				}
+
+				//---Render the icon preview if it is missing---//
+				if (iconSet.Value.GetCurrentIcon().previewRender == null)
+				{
+					EditorUtility.DisplayProgressBar("Generating Icon Previews (" + index + "/" + (sortedIconSetsByPath.Count) + ")", iconSet.Value.assetPath, ((float)index++ / sortedIconSetsByPath.Count));
+					iconSet.Value.GetCurrentIcon().previewRender = Utils.RenderIcon_Safe(iconSet.Value.GetCurrentIcon(), previewSize, (int)(((float)iconSet.Value.GetCurrentIcon().iconSettings.exportResolution.y / (float)iconSet.Value.GetCurrentIcon().iconSettings.exportResolution.x) * previewSize));
+				}
+
+				//---Set the selection texture---//
+				if (EditorGUIUtility.isProSkin)
+					iconSet.Value.selectionTexture = iconSet.Value.selected ? (assetGridFocused ? assetSelectionTextures[1] : assetSelectionTextures[2]) : assetSelectionTextures[0];
+				else
+					iconSet.Value.selectionTexture = iconSet.Value.selected ? (assetGridFocused ? assetSelectionTextures[3] : assetSelectionTextures[4]) : assetSelectionTextures[0];
+
+				//---Add the icon to visibleIcons if it's within the selected folders, or the search---//
+				if (assetList.selectedFolders.Contains(iconSet.Value.folderPath) && (!assetList.doSearch || assetList.searchFolders.Contains(iconSet.Value.folderPath + "/" + iconSet.Value.assetName)))
+				{
+					visibleIconSets.Add(iconSet.Value);
+
+					//Use warning image if animations enabled
+					visibleIconRenders.Add(iconSet.Value.GetCurrentIcon().previewRender);
+
+					visibleIconSelectionTextures.Add(iconSet.Value.selectionTexture);
+					visibleIconLabels.Add(iconSet.Value.assetShortenedName);
+				}
+			}
+			EditorUtility.ClearProgressBar();
+
+			//---Draw the grid of icons---///
+			int count = Mathf.FloorToInt((gridWidth - 16) / (previewSize + 16));
+			count = Mathf.Min(count, visibleIconSets.Count);
+			int clicked = GUILayout.SelectionGrid(-1, visibleIconRenders.ToArray(), count, gridStyle, GUILayout.Width(32 + count * (previewSize + 16)));
+			Rect r = GUILayoutUtility.GetLastRect();
+			r.y += previewSize + 2;
+
+			//---Draw the label background textures on the grid---//
+			int labelClicked = GUI.SelectionGrid(r, -1, visibleIconSelectionTextures.ToArray(), count, gridLabelStyle);
+
+			//---Draw the label texts on the grid---//
+			clicked = GUI.SelectionGrid(r, clicked, visibleIconLabels.ToArray(), count, gridLabelStyle);
+			if (clicked == -1 && labelClicked != -1)
+				clicked = labelClicked;
+
+			//---Draw margin and end GUI elements---//
+			GUILayout.Space(16);
+			GUILayout.FlexibleSpace();
+			GUILayout.EndHorizontal();
+
+			//---Check mouse clicks and arrow key presses for grid selection---//
+			CheckMouseClicks(clicked, visibleIconSets);
+			CheckArrowKeys(visibleIconSets, count);
+		}
+
+		void CheckMouseClicks(int clicked, List<IconSet> visibleIconSets)
+		{
+			if (clicked >= 0)
+			{
+				if (!Event.current.control && !Event.current.shift)
+				{
+					//---Regular click, no ctrl/shift - select the icon---//
+					foreach (KeyValuePair<UnityEngine.Object, IconSet> iconSet in objectIconSets)
+						iconSet.Value.selected = false;
+
+					visibleIconSets[clicked].selected = true;
+					visibleIconSets[clicked].assetGridIconIndex = clicked;
+					selectedIconSets.Clear();
+					selectionMinIndex = clicked;
+					selectionMaxIndex = clicked;
+				}
+				else if (Event.current.control)
+				{
+					//---Ctrl click - add icon to existing selection---//
+					visibleIconSets[clicked].selected = !visibleIconSets[clicked].selected;
+					visibleIconSets[clicked].assetGridIconIndex = clicked;
+				}
+				else if (Event.current.shift)
+				{
+					//---Shift click - add all icons between clicks---//
+					if (selectionMinIndex != -1 && selectionMaxIndex != -1 && clicked >= selectionMinIndex && clicked <= selectionMaxIndex)
+					{
+						for (int i = selectionMinIndex; i <= selectionMaxIndex; i++)
+						{
+							visibleIconSets[i].selected = false;
+							if (selectedIconSets.Contains(visibleIconSets[i]))
+								selectedIconSets.Remove(visibleIconSets[i]);
+						}
+
+						selectionMinIndex = Mathf.Min(lastSelectedIconIndex, clicked);
+						selectionMaxIndex = Math.Max(lastSelectedIconIndex, clicked);
+					}
+					int minI = Mathf.Min(lastSelectedIconIndex, clicked);
+					int maxI = Math.Max(lastSelectedIconIndex, clicked);
+					if (minI < 0) minI = 0;
+					if (maxI < 0) maxI = 0;
+
+					for (int i = minI; i <= maxI; i++)
+					{
+						visibleIconSets[i].selected = true;
+						visibleIconSets[i].assetGridIconIndex = i;
+						if (!selectedIconSets.Contains(visibleIconSets[i]))
+							selectedIconSets.Add(visibleIconSets[i]);
+					}
+
+				}
+
+				//---If not shift click then toggle the icon from the selection---//
+				if (!Event.current.shift)
+				{
+					if (visibleIconSets[clicked].selected && !selectedIconSets.Contains(visibleIconSets[clicked]))
+						selectedIconSets.Add(visibleIconSets[clicked]);
+					else if (selectedIconSets.Contains(visibleIconSets[clicked]))
+						selectedIconSets.Remove(visibleIconSets[clicked]);
+				}
+
+				//---Sort the selected icons by grid index---//
+				if (selectedIconSets.Count > 1)
+					selectedIconSets = selectedIconSets.OrderBy(a => a.assetGridIconIndex).ToList();
+
+				//---Update variables---//
+				selectionMinIndex = Mathf.Min(selectionMinIndex, clicked);
+				selectionMaxIndex = Mathf.Max(selectionMaxIndex, clicked);
+				lastSelectedIconIndex = clicked;
+				assetGridFocused = true;
+				window.Repaint();
+			}
+			else if (Event.current.rawType == EventType.MouseDown && !window.leftSeparator.mouseOver && !window.rightSeparator.mouseOver)
+			{
+				//---Clear selection if mouse clicked in empty space in asset grid region---//
+				Vector2 correctMousePos = Event.current.mousePosition + rect.position;
+				if (rect.Contains(correctMousePos))
+				{
+					selectedIconSets.Clear();
+					foreach (IconSet iconSet in visibleIconSets)
+						iconSet.selected = false;
+				}
+			}
+		}
+
+		void CheckArrowKeys(List<IconSet> iconSets, int gridXIcons)
+		{
+			//---Check if a key is pressed---//
+			if (assetGridFocused && Event.current.isKey && Event.current.type != EventType.KeyUp)
+			{
+				//---Right arrow key pressed---//
+				if (Event.current.keyCode == KeyCode.RightArrow && lastSelectedIconIndex < iconSets.Count - 1)
+				{
+					if (!Event.current.shift && !Event.current.control)
+					{
+						//---Select only this icon if no shift/ctrl pressed---//
+						foreach (IconSet iconSet in iconSets)
+							iconSet.selected = false;
+						selectedIconSets.Clear();
+
+						iconSets[lastSelectedIconIndex + 1].selected = true;
+						selectedIconSets.Add(iconSets[lastSelectedIconIndex + 1]);
+					}
+					else
+					{
+						//---Add to current selection if shift/ctrl pressed---///
+						if (!iconSets[lastSelectedIconIndex + 1].selected)
+						{
+							iconSets[lastSelectedIconIndex + 1].selected = true;
+							selectedIconSets.Add(iconSets[lastSelectedIconIndex + 1]);
+						}
+						else
+						{
+							iconSets[lastSelectedIconIndex].selected = false;
+							selectedIconSets.Remove(iconSets[lastSelectedIconIndex]);
+						}
+
+					}
+					lastSelectedIconIndex++;
+				}
+				//---Left arrow key pressed---//
+				else if (Event.current.keyCode == KeyCode.LeftArrow && lastSelectedIconIndex > 0)
+				{
+					if (!Event.current.shift && !Event.current.control)
+					{
+						//---Select only this icon if no shift/ctrl pressed---//
+						foreach (IconSet iconSet in iconSets)
+							iconSet.selected = false;
+						selectedIconSets.Clear();
+
+						iconSets[lastSelectedIconIndex - 1].selected = true;
+						selectedIconSets.Add(iconSets[lastSelectedIconIndex - 1]);
+					}
+					else
+					{
+						//---Add to current selection if shift/ctrl pressed---///
+						if (!iconSets[lastSelectedIconIndex - 1].selected)
+						{
+							iconSets[lastSelectedIconIndex - 1].selected = true;
+							selectedIconSets.Add(iconSets[lastSelectedIconIndex - 1]);
+						}
+						else
+						{
+							iconSets[lastSelectedIconIndex].selected = false;
+							selectedIconSets.Remove(iconSets[lastSelectedIconIndex]);
+						}
+					}
+					lastSelectedIconIndex--;
+				}
+				//---Down arrow key pressed---//
+				else if (Event.current.keyCode == KeyCode.DownArrow)
+				{
+					if (lastSelectedIconIndex < iconSets.Count - gridXIcons)
+					{
+						if (!Event.current.shift && !Event.current.control)
+						{
+							//---Select only this icon if no shift/ctrl pressed---//
+							foreach (IconSet iconSet in iconSets)
+								iconSet.selected = false;
+							selectedIconSets.Clear();
+
+							iconSets[lastSelectedIconIndex + gridXIcons].selected = true;
+							selectedIconSets.Add(iconSets[lastSelectedIconIndex + gridXIcons]);
+						}
+						else
+						{
+							//---Add to current selection if shift/ctrl pressed---///
+							if (!iconSets[lastSelectedIconIndex + gridXIcons].selected)
+							{
+								iconSets[lastSelectedIconIndex + gridXIcons].selected = true;
+								selectedIconSets.Add(iconSets[lastSelectedIconIndex + gridXIcons]);
+								for (int i = lastSelectedIconIndex; i < lastSelectedIconIndex + gridXIcons; i++)
+								{
+									iconSets[i].selected = true;
+									selectedIconSets.Add(iconSets[i]);
+								}
+							}
+							else
+							{
+								iconSets[lastSelectedIconIndex].selected = false;
+								selectedIconSets.Remove(iconSets[lastSelectedIconIndex]);
+								for (int i = lastSelectedIconIndex; i < lastSelectedIconIndex + gridXIcons; i++)
+								{
+									iconSets[i].selected = false;
+									selectedIconSets.Remove(iconSets[i]);
+								}
+							}
+
+						}
+						lastSelectedIconIndex += gridXIcons;
+					}
+					else if (lastSelectedIconIndex < Mathf.Floor((float)iconSets.Count / gridXIcons) * gridXIcons)
+					{
+						if (!Event.current.shift && !Event.current.control)
+						{
+							//---Select only this icon if no shift/ctrl pressed---//
+							foreach (IconSet iconSet in iconSets)
+								iconSet.selected = false;
+							selectedIconSets.Clear();
+
+							iconSets[iconSets.Count - 1].selected = true;
+							selectedIconSets.Add(iconSets[iconSets.Count - 1]);
+						}
+						else
+						{
+							//---Add to current selection if shift/ctrl pressed---///
+							if (!iconSets[iconSets.Count - 1].selected)
+							{
+								iconSets[iconSets.Count - 1].selected = true;
+								selectedIconSets.Add(iconSets[iconSets.Count - 1]);
+								for (int i = lastSelectedIconIndex; i < iconSets.Count; i++)
+								{
+									iconSets[i].selected = true;
+									selectedIconSets.Add(iconSets[i]);
+								}
+							}
+							else
+							{
+								iconSets[lastSelectedIconIndex].selected = false;
+								selectedIconSets.Remove(iconSets[lastSelectedIconIndex]);
+								for (int i = lastSelectedIconIndex; i < iconSets.Count - 1; i++)
+								{
+									iconSets[i].selected = false;
+									selectedIconSets.Remove(iconSets[i]);
+								}
+							}
+
+						}
+						lastSelectedIconIndex = iconSets.Count - 1;
+					}
+				}
+				//---Up arrow key pressed---//
+				else if (Event.current.keyCode == KeyCode.UpArrow && lastSelectedIconIndex >= gridXIcons)
+				{
+					if (!Event.current.shift && !Event.current.control)
+					{
+						//---Select only this icon if no shift/ctrl pressed---//
+						foreach (IconSet iconSet in iconSets)
+							iconSet.selected = false;
+						selectedIconSets.Clear();
+
+						iconSets[lastSelectedIconIndex - gridXIcons].selected = true;
+						selectedIconSets.Add(iconSets[lastSelectedIconIndex - gridXIcons]);
+					}
+					else
+					{
+						//---Add to current selection if shift/ctrl pressed---///
+						if (!iconSets[lastSelectedIconIndex - gridXIcons].selected)
+						{
+							iconSets[lastSelectedIconIndex - gridXIcons].selected = true;
+							selectedIconSets.Add(iconSets[lastSelectedIconIndex - gridXIcons]);
+							for (int i = lastSelectedIconIndex; i > lastSelectedIconIndex - gridXIcons; i--)
+							{
+								iconSets[i].selected = true;
+								selectedIconSets.Add(iconSets[i]);
+							}
+						}
+						else
+						{
+							iconSets[lastSelectedIconIndex].selected = false;
+							selectedIconSets.Remove(iconSets[lastSelectedIconIndex]);
+							for (int i = lastSelectedIconIndex; i > lastSelectedIconIndex - gridXIcons; i--)
+							{
+								iconSets[i].selected = false;
+								selectedIconSets.Remove(iconSets[i]);
+							}
+						}
+
+					}
+					lastSelectedIconIndex -= gridXIcons;
+				}
+				else if (Event.current.keyCode == KeyCode.A && Event.current.modifiers == EventModifiers.Control)
+				{
+					//---Select all if ctrl-A pressed---//
+					selectedIconSets.Clear();
+					foreach (KeyValuePair<string, IconSet> iconSet in sortedIconSetsByPath)
+					{
+						if (assetList.selectedFolders.Contains(iconSet.Value.folderPath))
+						{
+							iconSet.Value.selected = true;
+							selectedIconSets.Add(iconSet.Value);
+						}
+					}
+				}
+			}
+		}
+
+		Dictionary<string, IconSet> SortIconSetsByFolder(Dictionary<string, IconSet> data)
+		{
+			//---Get a string array of asset paths---//
+			string[] assetPaths = new string[data.Keys.Count];
+			data.Keys.CopyTo(assetPaths, 0);
+
+			//---Create a dictionary that will hold folder paths as keys, and a list of asset paths in the values (assets within the folder)---//
+			Dictionary<string, List<string>> folders = new Dictionary<string, List<string>>();
+
+			//---Create a list for just the folder names---//
+			List<string> folderNames = new List<string>();
+
+			foreach (string assetPath in assetPaths)
+			{
+				//---Get folder path from asset path---//
+				string[] split = assetPath.Split('/');
+				string folderPath = "";
+				for (int i = 0; i < split.Length - 1; i++)
+					folderPath += split[i] + (i < split.Length - 2 ? "/" : "");
+
+				//---Add folder to folders dictionary if not already in there---//
+				if (!folders.ContainsKey(folderPath))
+				{
+					folders.Add(folderPath, new List<string>());
+					folderNames.Add(folderPath);
+				}
+
+				//---Add asset path in the list at the [folderPath] index of the folders dictionary---//
+				folders[folderPath].Add(assetPath);
+			}
+
+			//---Sort the folder names---//
+			folderNames.Sort();
+
+			//---For each of the sorted folders, sort the assets within that folder---//
+			string[] sortedAssetPaths = new string[assetPaths.Length];
+			int index = 0;
+			foreach (string folder in folderNames)
+			{
+				folders[folder].Sort();
+				foreach (string assetPath in folders[folder])
+				{
+					//---Add the asset paths to the new list in sorted order---//
+					sortedAssetPaths[index++] = assetPath;
+				}
+			}
+
+			//---Use the sorted list of asset paths to create a dictionary of sorted icons---//
+			Dictionary<string, IconSet> sortedData = new Dictionary<string, IconSet>();
+			foreach (string assetPath in sortedAssetPaths)
+			{
+				sortedData.Add(assetPath, data[assetPath]);
+			}
+
+			return sortedData;
+		}
+
+		void CheckFocus(Rect checkRect)
+		{
+			//---Check if last mouse click was in the asset grid rect---//
+			if (Event.current.rawType == EventType.MouseDown)
+			{
+				assetGridFocused = checkRect.Contains(Event.current.mousePosition);
+			}
+
+			//---Check the RapidIcon window is in focus---//
+			if (EditorWindow.focusedWindow != null && EditorWindow.focusedWindow.GetType() != typeof(RapidIconWindow))
+				assetGridFocused = false;
+		}
+
+		IconSet GetIconSetFromPath(string path)
+		{
+			//---Loop through icons and check if the path matches---//
+			foreach (IconSet iconSet in objectIconSets.Values)
+			{
+				if (iconSet.assetPath == path)
+					return iconSet;
+			}
+
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs.meta b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs.meta
new file mode 100644
index 00000000..905d66e2
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2c67b68295a3db64db12b09928f40b1f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetGrid.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs
new file mode 100644
index 00000000..56e54a05
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs
@@ -0,0 +1,582 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	[Serializable]
+	public class AssetList
+	{
+		//---PUBLIC---///
+		//Selected folders
+		public List<string> selectedFolders;
+		public int lastNumberOfSelected;
+
+		//Search
+		public bool doSearch;
+		public List<string> searchFolders;
+
+		//---INTERNAL---//
+		//Foldouts
+		bool foldoutColoursSet;
+		GUIStyle foldoutStyle, foldoutStyleSelected;
+		Dictionary<string, bool> foldoutStates;
+		bool foldoutsUpdated;
+		List<string> visibleFolders;
+
+		//Selection
+		string selectionMinFolder, selectionMaxFolder, firstSelectedFolder, lastSelectedFolder, selectFolder;
+		int arrowSelectedFolder;
+
+		//Textures
+		Texture2D[] selectionTextures;
+		Texture2D[] folderIcons;
+
+		//Search
+		string searchString;
+
+		//Other
+		RapidIconWindow window;
+		bool assetListFocused, initialised;
+		string rootFolder;
+		Vector2 scrollPosition;
+
+		public AssetList(string appDataPath)
+		{
+			//---Initialise AssetList---//
+			//Foldouts
+			foldoutColoursSet = false;
+			foldoutStyle = foldoutStyleSelected = new GUIStyle();
+			foldoutStates = new Dictionary<string, bool>();
+			visibleFolders = new List<string>();
+			foldoutsUpdated = false;
+
+			//Search
+			searchFolders = new List<string>();
+			searchString = "";
+			doSearch = false;
+
+			//Selection
+			selectionTextures = new Texture2D[2];
+			if (EditorGUIUtility.isProSkin)
+			{
+				selectionTextures[0] = Utils.CreateColourTexture(2, 2, new Color32(44, 93, 135, 255));
+				selectionTextures[1] = Utils.CreateColourTexture(2, 2, new Color32(77, 77, 77, 255));
+			}
+			else
+			{
+				selectionTextures[0] = Utils.CreateColourTexture(2, 2, new Color32(58, 114, 176, 255));
+				selectionTextures[1] = Utils.CreateColourTexture(2, 2, new Color32(174, 174, 174, 255));
+			}
+			selectionTextures[0].hideFlags = HideFlags.DontSave;
+			selectionTextures[1].hideFlags = HideFlags.DontSave;
+			arrowSelectedFolder = 0;
+			selectedFolders = new List<string>();
+			firstSelectedFolder = "";
+			lastSelectedFolder = "";
+			selectionMinFolder = "";
+			selectionMaxFolder = "";
+			selectFolder = "";
+
+			//Root Paths
+			string[] rootFolderSplit = appDataPath.Split('/');
+			rootFolder = rootFolderSplit[rootFolderSplit.Length - 1];
+
+			string[] split = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets("RapidIcon")[0]).Split('/');
+			string rapidIconRootFolder = "";
+			for (int i = 0; i < split.Length; i++)
+				rapidIconRootFolder += split[i] + "/";
+
+			//Folder Icons
+			folderIcons = new Texture2D[4];
+			folderIcons[0] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/folderIconClosedDark.png");
+			folderIcons[1] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/folderIconOpenDark.png");
+			folderIcons[2] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/folderIconClosedLight.png");
+			folderIcons[3] = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/folderIconOpenLight.png");
+
+			//Other
+			assetListFocused = true;
+		}
+
+		public void Draw(float width, RapidIconWindow w)
+		{
+			//---Check variables are set---//
+			CheckAndSetWindow(w);
+			CheckAndSetFoldoutColours();
+			CheckArrowKeys();
+
+			//---Search Bar---//
+			GUILayout.BeginVertical(GUILayout.Width(width));
+			EditorGUI.BeginChangeCheck();
+			searchString = GUILayout.TextField(searchString);
+			if (searchString == "")
+			{
+				Rect r = GUILayoutUtility.GetLastRect();
+				GUI.Label(r, "Search Models and Prefabs");
+				searchFolders.Clear();
+				doSearch = false;
+			}
+			else if (EditorGUI.EndChangeCheck())
+			{
+				doSearch = true;
+				searchFolders.Clear();
+				string[] results = AssetDatabase.FindAssets(searchString);
+				if (results.Length > 0)
+				{
+					foreach (string guid in results)
+					{
+						string path = AssetDatabase.GUIDToAssetPath(guid);
+						if (AssetDatabase.GetMainAssetTypeAtPath(path) == typeof(GameObject))
+						{
+							searchFolders.Add(path);
+						}
+					}
+				}
+			}
+
+			//---Draw asset list folders---//
+			visibleFolders.Clear();
+			scrollPosition = GUILayout.BeginScrollView(scrollPosition, false, false, GUIStyle.none, GUI.skin.verticalScrollbar, GUILayout.Width(width));
+
+			if (!foldoutsUpdated)
+			{
+				UpdateFoldoutStates(rootFolder, true);
+				foldoutsUpdated = true;
+			}
+
+			DrawAllSubFolders(rootFolder, 0, width);
+			if (selectFolder != "")
+			{
+				SelectFolder(selectFolder, 0);
+				selectFolder = "";
+			}
+			GUILayout.EndScrollView();
+			GUILayout.EndVertical();
+
+			//---Check if asset list is focused---//
+			CheckFocus(GUILayoutUtility.GetLastRect());
+		}
+
+		public void SaveData()
+		{
+			//---Save all opened folders---//
+			string openedFoldersString = "";
+			foreach (KeyValuePair<string, bool> foldoutState in foldoutStates)
+			{
+				if (foldoutState.Value)
+					openedFoldersString += "|-F-|" + foldoutState.Key;
+			}
+			EditorPrefs.SetString(PlayerSettings.productName + "RapidIconOpenedFolders", openedFoldersString);
+
+			//---Save all selected folders---//
+			string selectedFoldersString = "";
+			foreach (string folder in selectedFolders)
+			{
+				selectedFoldersString += "|-F-|" + folder;
+			}
+			EditorPrefs.SetString(PlayerSettings.productName + "RapidIconSelectedFolders", selectedFoldersString);
+		}
+
+		public void LoadData()
+		{
+			//---Load all opened folders---//
+			string openedFoldersString = EditorPrefs.GetString(PlayerSettings.productName + "RapidIconOpenedFolders");
+			string[] openedFoldersSplit = openedFoldersString.Split(new string[] { "|-F-|" }, StringSplitOptions.RemoveEmptyEntries);
+			foreach (string folder in openedFoldersSplit)
+				foldoutStates.Add(folder, true);
+
+			//---Load all selected folders---//
+			string selectedFoldersString = EditorPrefs.GetString(PlayerSettings.productName + "RapidIconSelectedFolders");
+			string[] selectedFoldersSplit = selectedFoldersString.Split(new string[] { "|-F-|" }, StringSplitOptions.RemoveEmptyEntries);
+			foreach (string folder in selectedFoldersSplit)
+				selectedFolders.Add(folder);
+			if (selectedFolders.Count == 0)
+				selectedFolders.Add(rootFolder);
+			selectedFolders.Sort();
+		}
+
+		void CheckAndSetWindow(RapidIconWindow w)
+		{
+			if (!window)
+				window = w;
+		}
+
+		void CheckAndSetFoldoutColours()
+		{
+			if (!foldoutColoursSet)
+			{
+				foldoutStyle = new GUIStyle(EditorStyles.foldout);
+				foldoutStyleSelected = new GUIStyle(EditorStyles.foldout);
+				Color txtCol = new Color32(192, 192, 192, 255);
+
+				if (EditorGUIUtility.isProSkin)
+				{
+					//---Set unselected foldout style---//
+					foldoutStyle.normal.textColor = txtCol;
+					foldoutStyle.onNormal.textColor = txtCol;
+					foldoutStyle.hover.textColor = txtCol;
+					foldoutStyle.onHover.textColor = txtCol;
+					foldoutStyle.focused.textColor = txtCol;
+					foldoutStyle.onFocused.textColor = txtCol;
+					foldoutStyle.active.textColor = txtCol;
+					foldoutStyle.onActive.textColor = txtCol;
+
+					//---Set selected foldout style---//
+					foldoutStyleSelected.normal.textColor = txtCol;
+					foldoutStyleSelected.onNormal.textColor = txtCol;
+					foldoutStyleSelected.hover.textColor = txtCol;
+					foldoutStyleSelected.onHover.textColor = txtCol;
+					foldoutStyleSelected.focused.textColor = txtCol;
+					foldoutStyleSelected.onFocused.textColor = txtCol;
+					foldoutStyleSelected.active.textColor = txtCol;
+					foldoutStyleSelected.onActive.textColor = txtCol;
+				}
+				else
+				{
+					//---Set unselected foldout style---//
+					foldoutStyle.normal.textColor = Color.black;
+					foldoutStyle.onNormal.textColor = Color.black;
+					foldoutStyle.hover.textColor = Color.black;
+					foldoutStyle.onHover.textColor = Color.black;
+					foldoutStyle.focused.textColor = Color.black;
+					foldoutStyle.onFocused.textColor = Color.black;
+					foldoutStyle.active.textColor = Color.black;
+					foldoutStyle.onActive.textColor = Color.black;
+
+					//---Set selected foldout style---//
+					foldoutStyleSelected.normal.textColor = Color.white;
+					foldoutStyleSelected.onNormal.textColor = Color.white;
+					foldoutStyleSelected.hover.textColor = Color.white;
+					foldoutStyleSelected.onHover.textColor = Color.white;
+					foldoutStyleSelected.focused.textColor = Color.white;
+					foldoutStyleSelected.onFocused.textColor = Color.white;
+					foldoutStyleSelected.active.textColor = Color.white;
+					foldoutStyleSelected.onActive.textColor = Color.white;
+				}
+
+				foldoutColoursSet = true;
+			}
+		}
+
+		void CheckArrowKeys()
+		{
+			//---Check if a key is pressed---//
+			if (assetListFocused && Event.current.isKey && Event.current.type != EventType.KeyUp)
+			{
+				//---Fold out folders if right arrow key pressed---//
+				if (Event.current.keyCode == KeyCode.RightArrow)
+				{
+					foreach (string f in selectedFolders)
+					{
+						//Fold out subfolders as well if alt pressed
+						if (Event.current.alt)
+							SetAllFoldoutChildren(f, true);
+						else
+							foldoutStates[f] = true;
+					}
+					GUIUtility.ExitGUI();
+				}
+				//---Collapse folders if left arrow key pressed---//
+				else if (Event.current.keyCode == KeyCode.LeftArrow)
+				{
+					foreach (string f in selectedFolders)
+					{
+						//Fold in subfolders as well if alt pressed
+						if (Event.current.alt)
+							SetAllFoldoutChildren(f, false);
+						else
+							foldoutStates[f] = false;
+					}
+					GUIUtility.ExitGUI();
+				}
+				//---Select folder below if down arrow key pressed---//
+				else if (Event.current.keyCode == KeyCode.DownArrow && arrowSelectedFolder < visibleFolders.Count - 1)
+				{
+					SelectFolder(visibleFolders[++arrowSelectedFolder], -1);
+					GUIUtility.ExitGUI();
+				}
+				//---Select folder above if up arrow key pressed---//
+				else if (Event.current.keyCode == KeyCode.UpArrow && arrowSelectedFolder > 0)
+				{
+					SelectFolder(visibleFolders[--arrowSelectedFolder], 1);
+					GUIUtility.ExitGUI();
+				}
+			}
+		}
+
+		void CheckFocus(Rect rect)
+		{
+			//---Check if last mouse click was in the asset list rect---//
+			if (Event.current.rawType == EventType.MouseDown)
+				assetListFocused = rect.Contains(Event.current.mousePosition);
+
+			if (assetListFocused)
+				window.assetGrid.assetGridFocused = false;
+
+			//---Check the RapidIcon window is in focus---//
+			if (EditorWindow.focusedWindow != null && EditorWindow.focusedWindow.GetType() != typeof(RapidIconWindow))
+				assetListFocused = false;
+		}
+
+		void SetAllFoldoutChildren(string folder, bool foldout)
+		{
+			//---Set foldout state of folder---//
+			if (!foldoutStates.ContainsKey(folder))
+				foldoutStates.Add(folder, foldout);
+			else
+				foldoutStates[folder] = foldout;
+
+			//---Set foldout state of sub folders---//
+			string[] subfolders = AssetDatabase.GetSubFolders(folder);
+			foreach (string subfolder in subfolders)
+				SetAllFoldoutChildren(subfolder, foldout);
+		}
+
+		void SelectFolder(string folder, int keyAdjust)
+		{
+			assetListFocused = true;
+			arrowSelectedFolder = visibleFolders.IndexOf(folder);
+
+			//---Select this folder only---//
+			if (!Event.current.control && !Event.current.shift)
+			{
+				selectedFolders.Clear();
+				selectedFolders.Add(folder);
+				firstSelectedFolder = folder;
+				lastSelectedFolder = folder;
+				selectionMinFolder = folder;
+				selectionMaxFolder = folder;
+			}
+			//---Control select, add folder to selection---//
+			else if (!Event.current.shift)
+			{
+				if (!selectedFolders.Contains(folder))
+				{
+					if (selectionMinFolder == "")
+						selectionMinFolder = folder;
+
+					if (selectionMaxFolder == "")
+						selectionMaxFolder = folder;
+
+					selectedFolders.Add(folder);
+					lastSelectedFolder = folder;
+
+					int lastSelectedFolderIndex = visibleFolders.IndexOf(lastSelectedFolder);
+
+					int selectionMinIndex = visibleFolders.IndexOf(selectionMinFolder);
+					if (selectionMinIndex == -1)
+						selectionMinIndex = lastSelectedFolderIndex;
+
+					int selectionMaxIndex = visibleFolders.IndexOf(selectionMaxFolder);
+					if (selectionMaxIndex == -1)
+						selectionMinIndex = lastSelectedFolderIndex;
+
+					selectionMinFolder = visibleFolders[Mathf.Min(lastSelectedFolderIndex, selectionMinIndex)];
+					selectionMaxFolder = visibleFolders[Mathf.Max(lastSelectedFolderIndex, selectionMaxIndex)];
+				}
+				else if (selectedFolders.Count > 1)
+					selectedFolders.Remove(visibleFolders[visibleFolders.IndexOf(folder) + keyAdjust]);
+			}
+			//---Shift select, select folder and folders inbetween---//
+			else
+			{
+				if (selectionMinFolder == "")
+					selectionMinFolder = folder;
+
+				if (selectionMaxFolder == "")
+					selectionMaxFolder = folder;
+
+				if (lastSelectedFolder == "")
+					lastSelectedFolder = folder;
+
+				if (firstSelectedFolder == "")
+					firstSelectedFolder = folder;
+
+				int thisFolderIndex = visibleFolders.IndexOf(folder);
+				int lastSelectedFolderIndex = visibleFolders.IndexOf(lastSelectedFolder);
+				int firstSelectedFolderIndex = visibleFolders.IndexOf(firstSelectedFolder);
+				int selectionMinIndex = visibleFolders.IndexOf(selectionMinFolder);
+				int selectionMaxIndex = visibleFolders.IndexOf(selectionMaxFolder);
+				if (selectionMinIndex == -1)
+					selectionMinIndex = int.MaxValue;
+
+				int minI = 0, maxI = -1;
+
+				if (thisFolderIndex >= selectionMinIndex && thisFolderIndex <= selectionMaxIndex)
+				{
+					selectedFolders.Clear();
+					minI = Mathf.Min(firstSelectedFolderIndex, thisFolderIndex);
+					maxI = Math.Max(firstSelectedFolderIndex, thisFolderIndex);
+
+					selectionMinFolder = visibleFolders[minI];
+					selectionMaxFolder = visibleFolders[maxI];
+				}
+				else
+				{
+					minI = Mathf.Min(lastSelectedFolderIndex, thisFolderIndex, selectionMinIndex);
+					maxI = Mathf.Max(lastSelectedFolderIndex, thisFolderIndex, selectionMaxIndex);
+
+					selectionMinFolder = visibleFolders[Mathf.Min(minI, selectionMinIndex)];
+					selectionMaxFolder = visibleFolders[Mathf.Max(maxI, selectionMaxIndex)];
+				}
+
+				lastSelectedFolder = visibleFolders[thisFolderIndex];
+				for (int i = minI; i <= maxI; i++)
+				{
+					if (!selectedFolders.Contains(visibleFolders[i]))
+						selectedFolders.Add(visibleFolders[i]);
+				}
+			}
+
+		}
+
+		void UpdateFoldoutStates(string folder, bool foldout)
+		{
+			//---Add this folder to the foldoutStates if it's not already added---//
+			if (!foldoutStates.ContainsKey(folder))
+				foldoutStates.Add(folder, foldout);
+
+			//---Get the subfolders and update those too---
+			string[] subfolders = AssetDatabase.GetSubFolders(folder);
+			foreach (string subfolder in subfolders)
+			{
+				UpdateFoldoutStates(subfolder, false);
+			}
+		}
+
+		void DrawAllSubFolders(string folder, int depth, float width)
+		{
+			//---If searching, check this folder is in the search results---//
+			bool inSearch = false;
+			foreach (string f in searchFolders)
+			{
+				if (f.Contains(folder))
+				{
+					inSearch = true;
+					break;
+				}
+			}
+			if (!inSearch && doSearch && depth > 0)
+				return;
+
+			visibleFolders.Add(folder);
+
+			//---Get display name and folder icon---//
+			string[] split = folder.Split('/');
+			string displayName = split[split.Length - 1];
+			displayName = " " + displayName;
+			GUIContent folderGuiContent;
+
+			if (!foldoutStates.ContainsKey(folder))
+				UpdateFoldoutStates(folder, false);
+
+			if (EditorGUIUtility.isProSkin || (selectedFolders.Contains(folder) && assetListFocused))
+				folderGuiContent = new GUIContent(displayName, foldoutStates[folder] ? folderIcons[1] : folderIcons[0]);
+			else
+				folderGuiContent = new GUIContent(displayName, foldoutStates[folder] ? folderIcons[3] : folderIcons[2]);
+
+			//---Use bold font for root "Assets" folder---//
+			if (depth == 0)
+			{
+				foldoutStyle.fontStyle = FontStyle.Bold;
+				foldoutStyleSelected.fontStyle = FontStyle.Bold;
+			}
+			else
+			{
+				foldoutStyle.fontStyle = FontStyle.Normal;
+				foldoutStyleSelected.fontStyle = FontStyle.Normal;
+			}
+
+			//---Get rect for this folder---//
+			Rect r = GUILayoutUtility.GetRect(folderGuiContent, GUI.skin.label);
+			r.position += new Vector2(15 * depth, 0);
+			r.yMin -= 1; r.yMax += 1;
+
+			//---Draw selection texture if folder is selected---//
+			if (selectedFolders.Contains(folder))
+			{
+				Rect selectRect = new Rect(r);
+				selectRect.position = new Vector2(0, r.position.y);
+				selectRect.width = width;
+
+				GUI.DrawTexture(selectRect, assetListFocused ? selectionTextures[0] : selectionTextures[1]);
+				if (window)
+					window.Repaint();
+			}
+
+			//---Get subfolders---//
+			string[] subfolders = AssetDatabase.GetSubFolders(folder);
+			if (subfolders.Length > 0)
+			{
+				//---Create clickArea rects---//
+				//There are two click areas, to the left and right of the foldout arrow button
+				Rect clickArea = new Rect(r);
+				Rect clickAreaLeft = new Rect(r);
+				clickArea.position += new Vector2(15, 0);
+				clickArea.width -= 15;
+				clickAreaLeft.width = 15 * depth;
+				clickAreaLeft.position = new Vector2(0, clickAreaLeft.position.y);
+				r.width = 15;
+
+				//---Check if either clickArea is clicked---//
+				if (GUI.Button(clickArea, "", GUIStyle.none) || GUI.Button(clickAreaLeft, "", GUIStyle.none))
+				{
+					selectFolder = folder;
+					window.assetGrid.assetGridFocused = false;
+				}
+
+				//---Draw the foldouts---//
+				//Store the original states before drawing so a change check can be done
+				bool chk = foldoutStates[folder];
+				foldoutStates[folder] = EditorGUI.Foldout(r, foldoutStates[folder], folderGuiContent, (selectedFolders.Contains(folder) && assetListFocused) ? foldoutStyleSelected : foldoutStyle);
+
+				//---If foldoutStates have changed---//
+				if (foldoutStates[folder] != chk)
+				{
+					//---Set focus true---//
+					assetListFocused = true;
+					GUI.FocusControl(null);
+
+					//---If alt key pressed, set all child folder states to match parent---//
+					if (Event.current.alt)
+						SetAllFoldoutChildren(folder, foldoutStates[folder]);
+				}
+
+				//---If foldout state is open---//
+				if (foldoutStates[folder])
+				{
+					//---Draw the sub folders (recursive)---
+					foreach (string subfolder in subfolders)
+					{
+						DrawAllSubFolders(subfolder, depth + 1, width);
+					}
+				}
+			}
+			else
+			{
+				//---If no subfolders, then draw a button (no style, i.e. clickable label) instead of a foldout---//
+				r.position += new Vector2(12, 0);
+				GUIStyle l = new GUIStyle(GUI.skin.label);
+
+				if (EditorGUIUtility.isProSkin)
+					l.normal.textColor = new Color32(192, 192, 192, 255);
+				else
+					l.normal.textColor = (selectedFolders.Contains(folder) && assetListFocused) ? Color.white : Color.black;
+
+				l.hover.textColor = l.normal.textColor;
+				l.active.textColor = l.normal.textColor;
+
+				Rect clickAreaLeft = new Rect(r);
+				clickAreaLeft.width = 15 * (depth + 1) + 4;
+				clickAreaLeft.position = new Vector2(0, clickAreaLeft.position.y);
+
+				if (GUI.Button(r, folderGuiContent, l) || GUI.Button(clickAreaLeft, "", GUIStyle.none))
+				{
+					selectFolder = folder;
+					window.assetGrid.assetGridFocused = false;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs.meta b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs.meta
new file mode 100644
index 00000000..87d4ef93
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 24f69c03ee5a76f4e8aae24472f18a45
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/AssetSelection/AssetList.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor.meta b/Assets/RapidIcon/Editor/Scripts/IconEditor.meta
new file mode 100644
index 00000000..332cf512
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b6b314e68def01e4db28f252a736e048
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs b/Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs
new file mode 100644
index 00000000..87c7fead
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs
@@ -0,0 +1,721 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEditorInternal;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	[Serializable]
+	public class IconEditor
+	{
+		//---PUBLIC---//
+		//Textures
+		public Texture2D previewBackgroundImage;
+		public Texture2D scrollAreaBackgroundImage;
+		public Texture2D scaleLinkOnImage;
+		public Texture2D scaleLinkOffImage;
+		public Texture2D separatorTex;
+
+		//Icon resolution
+		public Vector2Int renderResolution;
+		public Vector2Int renderSize;
+		public int resMultiplyerIndex;
+		public float[] resMultiplyers = new float[] { 0.25f, 0.5f, 1f };
+
+		//Icons
+		public Icon currentIcon;
+		public IconSet currentIconSet;
+		public bool updateFlag;
+
+		//Tabs
+		public bool linkScale;
+		public MaterialEditor materialEditor;
+		public Material mat;
+		public ReorderableList reorderableList;
+		public string lastPresetPath;
+		public string[] tabNames = new string[] { "Object", "Hierarchy", "Camera", "Lighting", "Animation", "Post-Processing", "Export" };
+
+		//RapidIcon Window Elements/Settings
+		public RapidIconWindow window;
+		public AssetGrid assetGrid;
+		public ReorderableListCallbacks reorderableListCallbacks;
+		public bool fullscreen;
+		public float fullWidth;
+		public float sepWidth;
+		public float oldMinWidth;
+
+		//Other
+		public bool replaceAll;
+
+		//---INTERNAL---//
+		//Preview zoom/resolution
+		int zoomScaleIndex;
+		float[] zoomScales = new float[] { 0.25f, 0.5f, 0.75f, 1f, 1.25f, 1.5f, 2f, 3f, 1f };
+		string[] zoomScalesStrings = new string[] { "25%", "50%", "75%", "100%", "125%", "150%", "200%", "300%", "Scale to Fit (num %)" };
+		string[] resMultiplyersStrings = new string[] { "Quarter", "Half", "Full" };
+		int zoomFitByWidthHeight; //0: height, 1: width
+
+		//Preview GUI
+		Vector2 previewScrollPos;
+		GUIStyle renderStyle;
+		GUIStyle scrollStyle;
+		Vector2 previewAreaSize;
+		Rect previewRect;
+		DraggableSeparator previewDraggableSeparator;
+
+		//Tabs
+		Vector2 controlsScrollPos;
+		public int tab;
+
+		//Icons
+		int currentIconIndex;
+		bool updateAllFlag;
+
+		//Other
+		bool undoHold;
+		bool sceneChangeUpdate = false;
+
+		public IconEditor(AssetGrid grid, RapidIconWindow w)
+		{
+			//---Initialise IconEditor---//
+			//Set RapidIcon elements
+			CheckAndSetWindow(w);
+			assetGrid = grid;
+
+			//Render resolution/style
+			renderResolution = new Vector2Int(256, 256);
+			renderSize = new Vector2Int(256, 256);
+			renderStyle = new GUIStyle();
+			renderStyle.stretchWidth = true;
+			renderStyle.stretchHeight = true;
+			renderStyle.stretchHeight = true;
+			renderStyle.stretchWidth = true;
+
+			//Set preview zoom/resolution setting
+			zoomScaleIndex = 8;
+			resMultiplyerIndex = 2;
+
+			//Create colour textures
+			scrollAreaBackgroundImage = Utils.CreateColourTexture(4, 4, new Color32(50, 50, 50, 255));
+			if (EditorGUIUtility.isProSkin)
+				separatorTex = Utils.CreateColourTexture(2, 2, new Color32(31, 31, 31, 255));
+			else
+				separatorTex = Utils.CreateColourTexture(2, 2, new Color32(153, 153, 153, 255));
+
+			//Load textures
+			previewBackgroundImage = (Texture2D)AssetDatabase.LoadMainAssetAtPath(assetGrid.rapidIconRootFolder + "Editor/UI/previewGrid.png");
+			scaleLinkOnImage = (Texture2D)AssetDatabase.LoadMainAssetAtPath(assetGrid.rapidIconRootFolder + "Editor/UI/linkOn.png");
+			scaleLinkOffImage = (Texture2D)AssetDatabase.LoadMainAssetAtPath(assetGrid.rapidIconRootFolder + "Editor/UI/linkOff.png");
+
+			//Create horizontal separator
+			previewDraggableSeparator = new DraggableSeparator(SeparatorTypes.Horizontal);
+
+			//Set bools
+			linkScale = true;
+			replaceAll = false;
+
+			//Create material editor
+			mat = new Material(Shader.Find("RapidIcon/ImgShader"));
+			materialEditor = (MaterialEditor)Editor.CreateEditor(mat);
+
+			//Create reorderable list for post-processing shaders
+			List<Material> blankList = new List<Material>();
+			reorderableList = new ReorderableList(blankList, typeof(Material), true, true, true, true);
+			reorderableListCallbacks = new ReorderableListCallbacks(this);
+			reorderableList.drawElementCallback = reorderableListCallbacks.DrawListItems;
+			reorderableList.drawHeaderCallback = reorderableListCallbacks.DrawHeader;
+			reorderableList.onSelectCallback = reorderableListCallbacks.SelectShader;
+			reorderableList.onAddCallback = reorderableListCallbacks.AddShader;
+			reorderableList.onRemoveCallback = reorderableListCallbacks.RemoveShader;
+			reorderableList.onReorderCallback = reorderableListCallbacks.ShadersReorded;
+
+			//Configure undo
+			undoHold = false;
+			Undo.undoRedoPerformed += OnUndo;
+		}
+
+		public void Draw(float width, RapidIconWindow w)
+		{
+			//---Check variables are set---//
+			CheckAndSetWindow(w);
+
+			//---On first update of new scene---//
+			if (!sceneChangeUpdate)
+			{
+				foreach (IconSet iconSet in assetGrid.objectIconSets.Values)
+				{
+					foreach (Icon icon in iconSet.icons)
+					{
+						if (icon.iconSettings.postProcessingMaterials.Count > 0 && icon.iconSettings.postProcessingMaterials[0] == null)
+						{
+							if (iconSet.saveData)
+							{
+								//---Load the MatInfo if icon has been saved---//
+								icon.LoadMatInfo();
+							}
+							else
+							{
+								//---Reset the icon if not saved---//
+								ObjectPathPair obj = new ObjectPathPair(iconSet.assetObject, iconSet.assetPath);
+								IconSet newIconSet = assetGrid.CreateIconSet(obj);
+								//----------TODO----------//
+								//Utils.CopyIconSettings(newIcon, currentIcon, -1);
+								//Utils.UpdateIcon(currentIcon, this);
+							}
+
+							//---Update all icons---//
+							updateAllFlag = true;
+							sceneChangeUpdate = true;
+						}
+					}
+				}
+			}
+
+			//---If icon(s) selected---//
+			if (assetGrid.selectedIconSets.Count > 0)
+			{
+				//---Get the currently selected icon---//
+				currentIconIndex = Mathf.Clamp(currentIconIndex, 0, assetGrid.selectedIconSets.Count - 1);
+				currentIconSet = assetGrid.selectedIconSets[currentIconIndex];
+				currentIcon = currentIconSet.GetCurrentIcon();
+
+				//---Check if the object asscoiated with the icon has been deleted---//
+				if (currentIconSet.assetObject == null)
+				{
+					//---Flag as deleted and remove from selection---//
+					currentIconSet.deleted = true;
+					assetGrid.selectedIconSets.Remove(currentIconSet);
+
+					//---If other icon(s) still selected, update currentIcon - otherwise return---//
+					if (assetGrid.selectedIconSets.Count > 0)
+					{
+						if (currentIconIndex > assetGrid.selectedIconSets.Count - 1)
+							currentIconIndex = assetGrid.selectedIconSets.Count - 1;
+
+						currentIconSet = assetGrid.selectedIconSets[currentIconIndex];
+						currentIcon = currentIconSet.GetCurrentIcon();
+					}
+					else
+						return;
+				}
+
+				//---Create a GUI area, prevents buggy behaviour when moving left separator---//
+				Rect r = new Rect(window.rightSeparator.rect);
+				if (fullscreen)
+				{
+					r.x = 0;
+					r.width = window.position.width;
+				}
+				else
+				{
+					r.width = width;
+				}
+				GUILayout.BeginArea(r);
+				GUILayout.BeginVertical();
+
+				//---Update icons if flag set---//
+				if (updateFlag)
+				{
+					Utils.UpdateIcon(currentIcon, this);
+					updateFlag = false;
+				}
+				if (updateAllFlag)
+				{
+					assetGrid.RefreshAllIcons();
+					updateAllFlag = false;
+				}
+
+				//---Check current icon has a full render---//
+				Utils.CheckCurrentIconRender(this);
+
+				//---Draw the icon preview---//
+				DrawPreview();
+				GUILayout.Space(2);
+
+				//---Draw the preview zoom/resolution controls---//
+				DrawPreviewResAndZoom();
+
+				//---Draw the draggable separator---//
+				previewDraggableSeparator.Draw(100, window.position.height - 100, window);
+				GUILayout.Space(8);
+
+				//---Draw the icon selector---//
+				DrawIconSelecter();
+
+				//---Draw the tab selector---//
+				tab = GUILayout.Toolbar(tab, tabNames);
+				sepWidth = width - 50;
+
+				//---Draw the tabs---//
+				DrawTabs(width);
+
+				//---Check mouse inputs to rotate/zoom the preview---//
+				CheckMouseMovement();
+
+				//---End GUI elements---//
+				GUILayout.EndVertical();
+				GUILayout.EndArea();
+			}
+			else if (Event.current.type == EventType.Layout || Event.current.type == EventType.Repaint)
+			{
+				GUILayout.BeginVertical();
+				GUILayout.FlexibleSpace();
+				GUILayout.BeginHorizontal();
+				GUILayout.FlexibleSpace();
+				GUILayout.Label("No Icons Selected");
+				GUILayout.FlexibleSpace();
+				GUILayout.EndHorizontal();
+				GUILayout.FlexibleSpace();
+				GUILayout.EndVertical();
+			}
+		}
+
+		public void SaveData()
+		{
+			//---Save the separator---//
+			previewDraggableSeparator.SaveData("RapidIconSepPosPreview");
+
+			//---Add the icons to be saved to list---//
+			IconSetData iconSetData = new IconSetData();
+			foreach (KeyValuePair<UnityEngine.Object, IconSet> iconSet in assetGrid.objectIconSets)
+			{
+				if (iconSet.Value.saveData)
+					iconSetData.iconSets.Add(iconSet.Value);
+			}
+
+			//---Save the icon data---//
+			Utils.SaveIconSetData(iconSetData);
+
+			//---Save the preview zoom/resolution settings and current tab---//
+			EditorPrefs.SetInt(PlayerSettings.productName + "RapidIconPreviewResIdx", resMultiplyerIndex);
+			EditorPrefs.SetInt(PlayerSettings.productName + "RapidIconPreviewZoomIdx", zoomScaleIndex);
+			EditorPrefs.SetInt(PlayerSettings.productName + "RapidIconEditorTab", tab);
+
+			//---Save the window position and width if fullscreen mode set---//
+			if (fullscreen)
+			{
+				EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconWindowPosX", window.position.xMax - (fullWidth + window.position.width));
+				EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconWindowPosY", window.position.y);
+				EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconWindowWidth", fullWidth + window.position.width);
+			}
+			else
+			{
+				EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconWindowPosX", -1);
+				EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconWindowPosY", -1);
+				EditorPrefs.SetFloat(PlayerSettings.productName + "RapidIconWindowWidth", -1);
+			}
+		}
+
+		public void LoadData()
+		{
+			//---Load icon data---//
+			IconSetData iconData = new IconSetData();
+			iconData = Utils.LoadIconSetData();
+
+			assetGrid.objectIconSets = new Dictionary<UnityEngine.Object, IconSet>();
+			if (iconData != null)
+			{
+				foreach (IconSet iconSet in iconData.iconSets)
+				{
+					if (iconSet.assetObject != null)
+						assetGrid.objectIconSets.Add(iconSet.assetObject, iconSet);
+				}
+			}
+
+			//---Load the draggable separator data---//
+			previewDraggableSeparator.LoadData("RapidIconSepPosPreview", 650);
+
+			//---Load the preview zoom/resolution settings---//
+			resMultiplyerIndex = EditorPrefs.GetInt(PlayerSettings.productName + "RapidIconPreviewResIdx", -1);
+			zoomScaleIndex = EditorPrefs.GetInt(PlayerSettings.productName + "RapidIconPreviewZoomIdx", -1);
+
+			if (resMultiplyerIndex == -1)
+				resMultiplyerIndex = 2;
+
+			if (zoomScaleIndex == -1)
+				zoomScaleIndex = 8;
+
+			//---Load the current tab---//
+			tab = EditorPrefs.GetInt(PlayerSettings.productName + "RapidIconEditorTab", 0);
+		}
+
+		void OnUndo()
+		{
+			//---Need to update icon after undo---//
+			updateFlag = true;
+
+			//---Create new material editor---//
+			if (materialEditor == null)
+			{
+				reorderableList.index = reorderableList.count - 1;
+				materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)reorderableList.list[reorderableList.index]);
+			}
+
+			//---Load materials---//
+			if (assetGrid.visibleIconSets != null)
+			{
+				foreach (IconSet iconSet in assetGrid.visibleIconSets)
+				{
+					foreach (Icon icon in iconSet.icons)
+					{
+						if (icon.iconSettings.matInfo != null && icon.iconSettings.matInfo.Count > 0)
+							icon.LoadMatInfo();
+					}
+				}
+			}
+		}
+
+		void CheckAndSetWindow(RapidIconWindow w)
+		{
+			if (!window)
+				window = w;
+		}
+
+		void DrawIconSelecter()
+		{
+			GUILayout.BeginHorizontal();
+
+			//---Draw previous icon select button---//
+			if (GUILayout.Button("←", GUILayout.Width(50)) && currentIconIndex > 0)
+				currentIconIndex--;
+
+			//---Draw dropdown list of selected assets---//
+			int idx = 0;
+			string[] iconNames = new string[assetGrid.selectedIconSets.Count];
+			foreach (IconSet iconSet in assetGrid.selectedIconSets)
+			{
+				string name = iconSet.assetName;
+				for (int i = 1; i <= 128; i++)
+				{
+					if (!iconNames.Contains(name))
+						break;
+
+					name = iconSet.assetName + " (" + i + ")";
+				}
+				iconNames[idx++] = (name);
+			}
+			currentIconIndex = EditorGUILayout.Popup(currentIconIndex, iconNames);
+
+			//---Draw next icon select button---//
+			if (GUILayout.Button("→", GUILayout.Width(50)) && currentIconIndex < assetGrid.selectedIconSets.Count - 1)
+				currentIconIndex++;
+
+			GUILayout.EndHorizontal();
+
+			//---Sub icon selector---//
+			GUILayout.BeginHorizontal();
+
+			idx = 0;
+			string[] subIconNames = new string[currentIconSet.icons.Count];
+			foreach (Icon icon in currentIconSet.icons)
+			{
+				string name = icon.iconSettings.exportName;
+				for (int i = 1; i <= 128; i++)
+				{
+					if (!subIconNames.Contains(name))
+						break;
+
+					name = icon.iconSettings.exportName + " (" + i + ")";
+				}
+				subIconNames[idx++] = (name);
+			}
+
+			float tmp = EditorGUIUtility.labelWidth;
+			EditorGUIUtility.labelWidth = 75;
+			currentIconSet.iconIndex = EditorGUILayout.Popup("Icon Variant", currentIconSet.iconIndex, subIconNames);
+			EditorGUIUtility.labelWidth = tmp;
+
+			if (GUILayout.Button("+", GUILayout.Width(20)))
+			{
+				Icon newIcon = currentIconSet.AddDefaultIcon(assetGrid, new ObjectPathPair { path = currentIconSet.assetPath, UnityEngine_object = currentIconSet.assetObject });
+				currentIconSet.iconIndex = currentIconSet.icons.Count - 1;
+				newIcon.iconSettings.exportName += " (" + currentIconSet.iconIndex + ")";
+
+				currentIconSet.saveData = true;
+				updateFlag = true;
+			}
+
+			GUI.enabled = currentIconSet.icons.Count > 1;
+			if (GUILayout.Button("-", GUILayout.Width(20)))
+			{
+				currentIconSet.icons.Remove(currentIcon);
+				currentIconSet.iconIndex = currentIconSet.icons.Count - 1;
+
+				currentIconSet.saveData = true;
+				updateFlag = true;
+			}
+			GUI.enabled = true;
+
+			GUILayout.EndHorizontal();
+		}
+
+		void CheckMouseMovement()
+		{
+			//---Detect right mouse button down---//
+			if (Event.current.button == 1 && Event.current.type == EventType.Layout)
+			{
+				//---Check if the mouse is over the preview render---//
+				if (previewRect.Contains(Event.current.mousePosition))
+				{
+					//---Record the object for undo, but only once until hold released---//
+					if (!undoHold)
+					{
+						Undo.RecordObject(currentIcon, "Camera Rotation");
+						undoHold = true;
+					}
+
+					//---Get rotation from mouse x movement---//
+					Quaternion camTurnAngle = Quaternion.AngleAxis(Event.current.delta.x * 0.2f, Vector3.up);
+
+					//---Combine with rotation from mouse y movement---//
+					Vector3 axis = Quaternion.LookRotation(currentIcon.iconSettings.cameraTarget - currentIcon.iconSettings.cameraPosition) * Vector3.right;
+					camTurnAngle *= Quaternion.AngleAxis(Event.current.delta.y * 0.2f, axis);
+
+					//---Rotate the camera by moving it---//
+					currentIcon.iconSettings.cameraPosition = camTurnAngle * currentIcon.iconSettings.cameraPosition;
+
+					//---Flag the icon to be saved and updated---//
+					currentIconSet.saveData = true;
+					updateFlag = true;
+					window.Repaint();
+				}
+			}
+			//---Detect scroll wheel movement---//
+			else if (Event.current.type == EventType.ScrollWheel)
+			{
+				//---Check if the mouse is over the preview render---//
+				if (previewRect.Contains(Event.current.mousePosition))
+				{
+					//---Record the object for undo, but only once until hold released---//
+					if (!undoHold)
+					{
+						Undo.RecordObject(currentIcon, "Camera Zoom");
+						undoHold = true;
+					}
+
+					//---Zoom the camra---//
+					if (Mathf.Sign(Event.current.delta.y) == 1)
+						currentIcon.iconSettings.camerasScaleFactor /= 1.1f;
+					else
+						currentIcon.iconSettings.camerasScaleFactor *= 1.1f;
+
+					//---Flag the icon to be saved and updated---//
+					currentIconSet.saveData = true;
+					updateFlag = true;
+					window.Repaint();
+				}
+			}
+			//--If no mouse inputs then release undo hold---//
+			else if (undoHold)
+				undoHold = false;
+		}
+
+		void DrawPreview()
+		{
+			//---Setup scroll style if null---//
+			if (scrollStyle == null)
+			{
+				scrollStyle = new GUIStyle(GUI.skin.scrollView);
+				scrollStyle.margin.left = 1;
+				scrollStyle.normal.background = scrollAreaBackgroundImage;
+			}
+
+			//---Begin GUI elements---//
+			previewScrollPos = GUILayout.BeginScrollView(previewScrollPos, scrollStyle, GUILayout.Height(previewDraggableSeparator.value));
+			GUILayout.FlexibleSpace();
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+
+			//---Get the render rect---//
+			Rect renderRect = GUILayoutUtility.GetRect(renderSize.x, renderSize.y);
+			renderRect.size -= new Vector2(12, 12);
+			renderRect.center += new Vector2(6, 6);
+
+			//---Draw the background checkerboard texture---//
+			GUI.DrawTextureWithTexCoords(renderRect, previewBackgroundImage, new Rect(0, 0, renderRect.width / 32, renderRect.height / 32));
+
+			//---Draw the icon render---//
+			GUI.DrawTexture(renderRect, currentIcon.fullRender);
+
+			//---End GUI elements---//
+			GUILayout.FlexibleSpace();
+			GUILayout.EndHorizontal();
+			GUILayout.FlexibleSpace();
+			GUILayout.EndScrollView();
+
+
+			if (Event.current.type == EventType.Repaint)
+			{
+				//---Get difference in pixels between export resolution and preview window resolution---//
+				previewRect = GUILayoutUtility.GetLastRect();
+				previewAreaSize = previewRect.size;
+				Vector2 delta = currentIcon.iconSettings.exportResolution - previewRect.size;
+
+				//---Normalise the delta to the export resolution---//
+				delta.x /= currentIcon.iconSettings.exportResolution.x;
+				delta.y /= currentIcon.iconSettings.exportResolution.y;
+
+				//---If export resolution is bigger than preview window (x and y)---//
+				if (delta.x > 0 && delta.y > 0)
+				{
+					//---If normalised delta is larger in y---//
+					if (Mathf.Abs(delta.x) < Mathf.Abs(delta.y))
+						zoomFitByWidthHeight = 0; //fit by height
+					else
+						zoomFitByWidthHeight = 1; //fit by width
+				}
+				//---If export resolution is smaller than preview window (x and y)---//
+				else if (delta.x <= 0 && delta.y <= 0)
+				{
+					//---If normalised delta is larger in x---//
+					if (Mathf.Abs(delta.x) < Mathf.Abs(delta.y))
+						zoomFitByWidthHeight = 1; //fit by width
+					else
+						zoomFitByWidthHeight = 0; //fit by height
+				}
+				//---If export resolution is bigger than preview window (y only)---//
+				else if (delta.y > 0)
+					zoomFitByWidthHeight = 0; //fit by height
+											  //---If export resolution is bigger than preview window (x only)---//
+				else if (delta.x > 0)
+					zoomFitByWidthHeight = 1; //fit by width
+			}
+		}
+
+		void DrawPreviewResAndZoom()
+		{
+			//---Begin GUI elements---//
+			EditorGUI.BeginChangeCheck();
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+
+			//---Calculate zoom scale for 'Zoom to Fit'---//
+			switch (zoomFitByWidthHeight)
+			{
+				case 0: //fit by height
+					zoomScales[8] = previewAreaSize.y / (float)(currentIcon.iconSettings.exportResolution.y);
+					break;
+				case 1: //fit by width
+					zoomScales[8] = previewAreaSize.x / (float)(currentIcon.iconSettings.exportResolution.x);
+					break;
+			}
+
+			//---Set this zoom scale to 1 if not icons selected---//
+			if (assetGrid.selectedIconSets.Count == 0)
+				zoomScales[8] = 1;
+
+			//---Set the string for the zoom option---//
+			string s = "Scale to Fit (" + (100f * (float)zoomScales[8]).ToString("f1") + "%)";
+			zoomScalesStrings[8] = s;
+
+			//---Draw preview resolution selection dropdown---//
+			GUILayout.Label("Preview Resolution", GUILayout.Width(115));
+			resMultiplyerIndex = EditorGUILayout.Popup(resMultiplyerIndex, resMultiplyersStrings, GUILayout.Width(70));
+			renderResolution = Utils.MutiplyVector2IntByFloat(currentIcon.iconSettings.exportResolution, resMultiplyers[resMultiplyerIndex]);
+
+			//---If preview resolution changed then update the icon---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				currentIconSet = assetGrid.selectedIconSets[currentIconIndex];
+				currentIcon = currentIconSet.GetCurrentIcon();
+				if (currentIcon != null)
+				{
+					updateFlag = true;
+				}
+			}
+
+			//---Draw the preview zoom selection dropdown---//
+			GUILayout.Space(32);
+			GUILayout.Label("Zoom", GUILayout.Width(40));
+			zoomScaleIndex = EditorGUILayout.Popup(zoomScaleIndex, zoomScalesStrings, GUILayout.Width(150));
+			renderSize = Utils.MutiplyVector2IntByFloat(currentIcon.iconSettings.exportResolution, zoomScales[zoomScaleIndex]);
+
+			//---End GUI elements---//
+			GUILayout.EndHorizontal();
+		}
+
+		void DrawTabs(float width)
+		{
+			//---Begin scroll view---//
+			controlsScrollPos = GUILayout.BeginScrollView(controlsScrollPos, GUILayout.Height(window.position.height - previewDraggableSeparator.value - 98));
+
+			//---Draw the controls for the selected tab---//
+			switch (tab)
+			{
+				case 0:
+					Tabs.DrawObjectControls(this);
+					break;
+				case 1:
+					Tabs.DrawHierarchyControls(this);
+					break;
+				case 2:
+					Tabs.DrawCameraControls(this);
+					break;
+				case 3:
+					Tabs.DrawLightingControls(this);
+					break;
+				case 4:
+					Tabs.DrawAnimationControls(this);
+					break;
+				case 5:
+					Tabs.DrawPostProcessingControls(this);
+					break;
+				case 6:
+					Tabs.DrawExportControls(this);
+					break;
+			}
+
+			//---If any tab other than export/hierarchy tab---//
+			if (tab != 1 && tab != 6)
+			{
+				//---Draw button to apply settings to all selected icons---//
+				GUILayout.Space(12);
+				GUILayout.BeginHorizontal();
+				GUILayout.FlexibleSpace();
+				if (GUILayout.Button("Copy to Other Icons", GUILayout.Width(200)))
+				{
+					CopyWindow.Init(this);
+				}
+				GUILayout.FlexibleSpace();
+				GUILayout.EndHorizontal();
+			}
+
+			//---Draw button to reset this icon's settings---//
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+			if (GUILayout.Button("Reset Icon(s)", GUILayout.Width(200)))
+			{
+				ResetWindow.Init(this);
+			}
+			GUILayout.FlexibleSpace();
+			GUILayout.EndHorizontal();
+
+			//---End scroll view---//
+			GUILayout.EndScrollView();
+
+			//---Draw fullscreen toggle button---//
+			if (GUILayout.Button(fullscreen ? "<" : ">", GUILayout.Width(20)))
+			{
+				//---Toggle fullscreen---//
+				fullscreen = !fullscreen;
+
+				//---Set window position and size---//
+				if (fullscreen)
+				{
+					fullWidth = window.position.width - width;
+					oldMinWidth = window.minSize.x;
+					window.minSize = new Vector2(400, window.minSize.y);
+					window.position = new Rect(window.position.xMax - width, window.position.y, width, window.position.height);
+				}
+				else
+				{
+					window.position = new Rect(window.position.xMax - (fullWidth + window.position.width), window.position.y, fullWidth + window.position.width, window.position.height);
+					window.minSize = new Vector2(oldMinWidth, window.minSize.y);
+				}
+			}
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs.meta b/Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs.meta
new file mode 100644
index 00000000..f63399a9
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 18af1c8019c04c147852c58dd6f9894a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/IconEditor/IconEditor.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs b/Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs
new file mode 100644
index 00000000..70823cd7
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs
@@ -0,0 +1,209 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEditorInternal;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	public class ReorderableListCallbacks
+	{
+		private IconEditor iconEditor;
+
+		public ReorderableListCallbacks(IconEditor iconEditor)
+		{
+			this.iconEditor = iconEditor;
+		}
+
+		private ReorderableListCallbacks()
+		{ }
+
+		public void DrawHeader(Rect rect)
+		{
+			//---Title label---//
+			EditorGUI.LabelField(rect, "Shaders");
+
+			//---Fullscreen check---//
+			float sw2 = iconEditor.sepWidth;
+			if (iconEditor.fullscreen)
+				sw2 += iconEditor.fullWidth;
+			rect.width = 100;
+			rect.x = sw2 - 154;
+
+			//---Draw Save preset button---//
+			if (GUI.Button(rect, "Save Preset"))
+			{
+				//---Get save path---//
+				string savePath = EditorUtility.SaveFilePanel("Save Preset", iconEditor.lastPresetPath == "" ? Application.dataPath : iconEditor.lastPresetPath, "PostProcessingPreset", "rippp");
+
+				//---If savepath is not empty then save preset---//
+				if (savePath != "")
+				{
+					//---Convert data to JSON string---//
+					iconEditor.currentIcon.SaveMatInfo();
+					string data = JsonUtility.ToJson(iconEditor.currentIcon);
+					//int pos = data.IndexOf("\"matInfo\":");
+					//data = "{\"iconSettings\":{" + data.Substring(pos);
+
+					//---Save bytes---//
+					File.WriteAllBytes(savePath, System.Text.Encoding.ASCII.GetBytes(data));
+
+					//---Store path as last preset path---//
+					iconEditor.lastPresetPath = savePath;
+				}
+			}
+
+			//---Draw Load Preset button---//
+			rect.x += 102;
+			if (GUI.Button(rect, "Load Preset"))
+			{
+				//---Get open path---//
+				string openPath = EditorUtility.OpenFilePanel("Open Preset", iconEditor.lastPresetPath == "" ? Application.dataPath : iconEditor.lastPresetPath, "rippp");
+
+				//---If open path is not empty then load the preset---//
+				if (openPath != "")
+				{
+					//---Read bytes and get JSON string---//
+					Byte[] bytes = File.ReadAllBytes(openPath);
+					iconEditor.lastPresetPath = openPath;
+					string data = System.Text.Encoding.ASCII.GetString(bytes);
+
+					//---Convert to icon from JSON---//
+					Icon tmp = JsonUtility.FromJson<Icon>(data);
+
+					//---Load mat info---//
+					iconEditor.currentIconSet.saveData = true;
+					iconEditor.currentIcon.iconSettings.matInfo = new List<Icon.MaterialInfo>(tmp.iconSettings.matInfo);
+					iconEditor.currentIcon.LoadMatInfo();
+
+					//---Update icon---//
+					Utils.UpdateIcon(iconEditor.currentIcon, iconEditor);
+
+					//---Update reorderable list---//
+					iconEditor.reorderableList.list = iconEditor.currentIcon.iconSettings.postProcessingMaterials;
+					iconEditor.reorderableList.index = 0;
+
+					//---Create new material editor---//
+					Editor.DestroyImmediate(iconEditor.materialEditor);
+					iconEditor.materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index]);
+				}
+			}
+		}
+
+		public void DrawListItems(Rect rect, int index, bool isActive, bool isFocused)
+		{
+			//---If index within bounds of the list---//
+			if (index >= 0 && index < iconEditor.reorderableList.list.Count)
+			{
+				//---Check and fix editor---//
+				if (iconEditor.materialEditor == null)
+				{
+					Editor.DestroyImmediate(iconEditor.materialEditor);
+					iconEditor.materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index]);
+				}
+
+				//---Check and fix materials---//
+				if (iconEditor.currentIcon.iconSettings.postProcessingMaterials[index] == null)
+				{
+					iconEditor.currentIcon.LoadMatInfo();
+				}
+
+				//---Check for fullscreen---//
+				float sw2 = iconEditor.sepWidth;
+				if (iconEditor.fullscreen)
+					sw2 += iconEditor.fullWidth;
+
+				//---Get widths of elements in list item - layer toggle, layer name, layer shader---//
+				float[] widths = new float[] { 16, (sw2 - 150) / 2, (sw2 + 100) / 2 };
+
+				//---Prevent error, close window if material toggles is null - reopening window should fix---//
+				if (iconEditor.currentIcon.iconSettings.materialToggles == null)
+				{
+					iconEditor.window.Close();
+					return;
+				}
+
+				//---Draw text field for layer name, this is draw first before the change check as changing the layer name doesn't need to update the icon---//
+				GUI.enabled = iconEditor.currentIcon.iconSettings.materialToggles[iconEditor.currentIcon.iconSettings.postProcessingMaterials[index]];
+				iconEditor.currentIcon.iconSettings.materialDisplayNames[iconEditor.currentIcon.iconSettings.postProcessingMaterials[index]] = EditorGUI.TextField(new Rect(rect.x + widths[0] + 4, rect.y + 3, widths[1], EditorGUIUtility.singleLineHeight), iconEditor.currentIcon.iconSettings.materialDisplayNames[iconEditor.currentIcon.iconSettings.postProcessingMaterials[index]]);
+
+				//---Draw the layer toggle---//
+				GUI.enabled = true;
+				EditorGUI.BeginChangeCheck();
+				iconEditor.currentIcon.iconSettings.materialToggles[iconEditor.currentIcon.iconSettings.postProcessingMaterials[index]] = EditorGUI.Toggle(new Rect(rect.x, rect.y + 3, widths[0], EditorGUIUtility.singleLineHeight), iconEditor.currentIcon.iconSettings.materialToggles[iconEditor.currentIcon.iconSettings.postProcessingMaterials[index]]);
+
+				//---Draw the shader selection field---//
+				GUI.enabled = iconEditor.currentIcon.iconSettings.materialToggles[iconEditor.currentIcon.iconSettings.postProcessingMaterials[index]];
+				iconEditor.currentIcon.iconSettings.postProcessingMaterials[index].shader = (Shader)EditorGUI.ObjectField(new Rect(rect.x + widths[0] + widths[1] + 8, rect.y + 3, widths[2], EditorGUIUtility.singleLineHeight), iconEditor.currentIcon.iconSettings.postProcessingMaterials[index].shader, typeof(Shader), true);
+				GUI.enabled = true;
+
+				//---If layer toggles/shaders changed then update the icon---//
+				if (EditorGUI.EndChangeCheck())
+				{
+					iconEditor.updateFlag = true;
+					Editor.DestroyImmediate(iconEditor.materialEditor);
+					iconEditor.materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index]);
+				}
+			}
+		}
+
+		public void SelectShader(ReorderableList l)
+		{
+			//---If selected shader changes, create a new material editor---//
+			Editor.DestroyImmediate(iconEditor.materialEditor);
+			iconEditor.materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index]);
+		}
+
+		public void AddShader(ReorderableList l)
+		{
+			//---Record object for undo---//
+			Undo.RecordObject(iconEditor.currentIcon, "Add New Shader");
+
+			//---Create new material with default shader---//
+			Material m = new Material(Shader.Find("RapidIcon/ObjectRender"));
+
+			//---Add the new material to the list and select it---//
+			l.list.Add(m);
+			l.index = l.list.Count - 1;
+
+			//---Add the material display name and toggle to the current icon---//
+			iconEditor.currentIcon.iconSettings.materialDisplayNames.Add(m, "Shader " + l.list.Count);
+			iconEditor.currentIcon.iconSettings.materialToggles.Add(m, true);
+
+			//---Create a new material editor---//
+			Editor.DestroyImmediate(iconEditor.materialEditor);
+			iconEditor.materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index]);
+
+			//---Update and save the current icon---//
+			iconEditor.currentIconSet.saveData = true;
+			iconEditor.updateFlag = true;
+		}
+
+		public void RemoveShader(ReorderableList l)
+		{
+			//---Record object for undo---//
+			Undo.RecordObject(iconEditor.currentIcon, "Remove Shader");
+
+			//---Remove the material from the list---//
+			l.list.Remove(l.list[l.index]);
+			l.index = (int)Mathf.Clamp(l.index, 0, l.list.Count - 1);
+
+			//---Create a new material editor, if any materials left in the list---//
+			Editor.DestroyImmediate(iconEditor.materialEditor);
+			if (l.list.Count > 0)
+				iconEditor.materialEditor = (MaterialEditor)Editor.CreateEditor((UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index]);
+
+			//---Update and save the current icon---//
+			iconEditor.currentIconSet.saveData = true;
+			iconEditor.updateFlag = true;
+		}
+
+		public void ShadersReorded(ReorderableList l)
+		{
+			//---Update and save the current icon if the list is reordered---//
+			iconEditor.currentIconSet.saveData = true;
+			iconEditor.updateFlag = true;
+		}
+	}
+}
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs.meta b/Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs.meta
new file mode 100644
index 00000000..1e7bab3c
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1395b5f87121a87409bf19e220e7d467
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/IconEditor/ReorderableListCallbacks.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs b/Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs
new file mode 100644
index 00000000..d6c4ce12
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs
@@ -0,0 +1,672 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	public static class Tabs
+	{
+		public static void DrawObjectControls(IconEditor iconEditor)
+		{
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw position field---//
+			GUI.enabled = !iconEditor.currentIcon.iconSettings.autoPosition;
+			Vector3 tmpObjPos = EditorGUILayout.Vector3Field("Position", iconEditor.currentIcon.iconSettings.objectPosition);
+			Rect posR = GUILayoutUtility.GetLastRect();
+			posR.x += 50;
+			posR.height = 18;
+			posR.width = 50;
+			GUI.enabled = true;
+
+			//---Draw auto button for position---//
+			bool tmpAutoPos = GUI.Toggle(posR, iconEditor.currentIcon.iconSettings.autoPosition, "Auto", GUI.skin.button);
+
+			//---Draw object rotation and scale fields---//
+			Vector3 tmpObjRot = EditorGUILayout.Vector3Field("Rotation", iconEditor.currentIcon.iconSettings.objectRotation);
+			Vector3 tmpObjScale = EditorGUILayout.Vector3Field("Scale", iconEditor.currentIcon.iconSettings.objectScale);
+
+			//---Draw link scale toggle---//
+			Rect r = GUILayoutUtility.GetLastRect();
+			r.position += new Vector2(40, 0);
+			if (GUI.Button(r, iconEditor.linkScale ? iconEditor.scaleLinkOnImage : iconEditor.scaleLinkOffImage, GUIStyle.none))
+			{
+				iconEditor.linkScale = !iconEditor.linkScale;
+			}
+
+			//---If any fields changed---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+				Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Object");
+
+				//---Apply position and rotation---//
+				iconEditor.currentIcon.iconSettings.objectPosition = tmpObjPos;
+				iconEditor.currentIcon.iconSettings.objectRotation = tmpObjRot;
+
+				if (tmpAutoPos && !iconEditor.currentIcon.iconSettings.autoPosition)
+				{
+					iconEditor.currentIcon.iconSettings.objectPosition = Utils.GetObjectAutoOffset(iconEditor.currentIcon, Utils.GetObjectBounds(iconEditor.currentIconSet));
+				}
+				iconEditor.currentIcon.iconSettings.autoPosition = tmpAutoPos;
+
+				//---If link scale disabled, apply scale---//
+				if (!iconEditor.linkScale)
+				{
+					iconEditor.currentIcon.iconSettings.objectScale = tmpObjScale;
+				}
+				else
+				{
+					//---If link scale enabled, detect which axis changed and apply to all axes---//
+					if (tmpObjScale.x != iconEditor.currentIcon.iconSettings.objectScale.x)
+					{
+						iconEditor.currentIcon.iconSettings.objectScale = tmpObjScale.x * Vector3.one;
+					}
+					else if (tmpObjScale.y != iconEditor.currentIcon.iconSettings.objectScale.y)
+					{
+						iconEditor.currentIcon.iconSettings.objectScale = tmpObjScale.y * Vector3.one;
+					}
+					else if (tmpObjScale.z != iconEditor.currentIcon.iconSettings.objectScale.z)
+					{
+						iconEditor.currentIcon.iconSettings.objectScale = tmpObjScale.z * Vector3.one;
+					}
+				}
+
+				//---Save and update icon---//
+				iconEditor.currentIconSet.saveData = true;
+				iconEditor.updateFlag = true;
+			}
+		}
+
+		public static void DrawHierarchyControls(IconEditor iconEditor)
+		{
+			GUILayout.BeginHorizontal();
+			GUILayout.Label("Object Hierarchy");
+
+			if (GUILayout.Button("Enable All"))
+			{
+				List<string> keys = iconEditor.currentIcon.iconSettings.subObjectEnables.Keys.ToList();
+
+				foreach (string s in keys)
+					iconEditor.currentIcon.iconSettings.subObjectEnables[s] = true;
+
+				iconEditor.updateFlag = true;
+				iconEditor.currentIconSet.saveData = true;
+			}
+
+			if (GUILayout.Button("Disable All"))
+			{
+				List<string> keys = iconEditor.currentIcon.iconSettings.subObjectEnables.Keys.ToList();
+
+				foreach (string s in keys)
+					iconEditor.currentIcon.iconSettings.subObjectEnables[s] = false;
+
+				iconEditor.updateFlag = true;
+				iconEditor.currentIconSet.saveData = true;
+			}
+
+			GUILayout.FlexibleSpace();
+			GUILayout.EndHorizontal();
+
+			GameObject obj = (GameObject)iconEditor.currentIconSet.assetObject;
+
+			Rect r = GUILayoutUtility.GetRect(new GUIContent(obj.name), GUI.skin.label);
+			bool active = iconEditor.currentIcon.iconSettings.subObjectEnables["/0"];
+
+			EditorGUI.BeginChangeCheck();
+			bool tmpToggle = GUI.Toggle(r, active, obj.name);
+
+			if (EditorGUI.EndChangeCheck())
+			{
+				iconEditor.currentIcon.iconSettings.subObjectEnables["/0"] = tmpToggle;
+
+				iconEditor.updateFlag = true;
+				iconEditor.currentIconSet.saveData = true;
+			}
+
+			DrawChildObjects(iconEditor, obj, 0, 0, "/0", !tmpToggle);
+		}
+
+		private static void DrawChildObjects(IconEditor iconEditor, GameObject obj, int depth, int childIdx, string path, bool parentDisabled)
+		{
+			for (int i = 0; i < obj.transform.childCount; i++)
+			{
+				GameObject child = obj.transform.GetChild(i).gameObject;
+				Rect r = GUILayoutUtility.GetRect(new GUIContent(child.name), GUI.skin.label);
+				r.x += (depth + 1) * 16;
+
+				string newPath = path + "/" + i;
+				if (!iconEditor.currentIcon.iconSettings.subObjectEnables.ContainsKey(newPath))
+				{
+					iconEditor.currentIcon.iconSettings.subObjectEnables.Add(newPath, true);
+				}
+				bool active = iconEditor.currentIcon.iconSettings.subObjectEnables[newPath];
+
+				if (parentDisabled)
+				{
+					active = false;
+					GUI.enabled = false;
+				}
+
+				EditorGUI.BeginChangeCheck();
+				bool tmpToggle = GUI.Toggle(r, active, child.name);
+
+				if (EditorGUI.EndChangeCheck())
+				{
+					iconEditor.currentIcon.iconSettings.subObjectEnables[newPath] = tmpToggle;
+
+					iconEditor.updateFlag = true;
+					iconEditor.currentIconSet.saveData = true;
+				}
+
+				GUI.enabled = true;
+				DrawChildObjects(iconEditor, child, depth + 1, i, newPath, !tmpToggle);
+			}
+		}
+
+		public static void DrawCameraControls(IconEditor iconEditor)
+		{
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw camera position field---//
+			Vector3 tmpCamPos = EditorGUILayout.Vector3Field("Position", iconEditor.currentIcon.iconSettings.cameraPosition);
+
+			//---Draw camera point of focus field---//
+			GUILayout.Space(8);
+			float tmpWdith = EditorGUIUtility.labelWidth;
+			EditorGUIUtility.labelWidth = 80;
+			Vector3 tmpCamTgt = iconEditor.currentIcon.iconSettings.cameraTarget;
+			tmpCamTgt = EditorGUILayout.Vector3Field("Point of Focus", iconEditor.currentIcon.iconSettings.cameraTarget);
+
+			//---Draw camera projection mode field---//
+			GUILayout.Space(8);
+			string[] listOptions = { "Perspective", "Orthographic" };
+			EditorGUIUtility.labelWidth = 80;
+			int tmpOrtho = EditorGUILayout.Popup("Projection", iconEditor.currentIcon.iconSettings.cameraOrtho ? 1 : 0, listOptions);
+
+			//---Temporary variables for undo---//
+			float tmpCamSize = iconEditor.currentIcon.iconSettings.cameraSize;
+			float tmpScaleFactor = iconEditor.currentIcon.iconSettings.camerasScaleFactor;
+			float tmpCamFov = iconEditor.currentIcon.iconSettings.cameraFov;
+			bool tmpCamAuto = iconEditor.currentIcon.iconSettings.autoScale;
+
+			//---If projection mode is ortho---//
+			if (tmpOrtho == 1)
+			{
+				GUILayout.BeginHorizontal();
+
+				GUI.enabled = !iconEditor.currentIcon.iconSettings.autoScale;
+
+				//---Draw camera size field---//
+				tmpCamSize = EditorGUILayout.FloatField("Size", iconEditor.currentIcon.iconSettings.cameraSize);
+
+				GUI.enabled = true;
+				//---Draw auto button---//
+				GUIStyle s = new GUIStyle(GUI.skin.button);
+				s.fixedWidth = 50;
+				tmpCamAuto = GUILayout.Toggle(iconEditor.currentIcon.iconSettings.autoScale, "Auto", s);
+
+				GUILayout.EndHorizontal();
+			}
+			else
+			{
+				//---Draw FOV field---//
+				tmpCamFov = EditorGUILayout.FloatField("Field of View", iconEditor.currentIcon.iconSettings.cameraFov);
+			}
+
+			//---Draw scale factor field---//
+			tmpScaleFactor = EditorGUILayout.FloatField("Scale Factor", iconEditor.currentIcon.iconSettings.camerasScaleFactor);
+
+			//---If perspective projection mode---//
+
+
+			EditorGUIUtility.labelWidth = tmpWdith;
+			//---If any field changed---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+				Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Camera");
+
+				//---Apply camera position, point of focus, and projection mode---//
+				iconEditor.currentIcon.iconSettings.cameraPosition = tmpCamPos;
+				iconEditor.currentIcon.iconSettings.cameraTarget = tmpCamTgt;
+				iconEditor.currentIcon.iconSettings.cameraOrtho = tmpOrtho == 1 ? true : false;
+
+				//---Apply size, fov, and scale factor---//
+				iconEditor.currentIcon.iconSettings.cameraSize = tmpCamSize;
+				iconEditor.currentIcon.iconSettings.cameraFov = tmpCamFov;
+				iconEditor.currentIcon.iconSettings.camerasScaleFactor = tmpScaleFactor;
+
+				//---Auto scale---//
+				if (tmpCamAuto && !iconEditor.currentIcon.iconSettings.autoScale)
+				{
+					iconEditor.currentIcon.iconSettings.cameraSize = Utils.GetCameraAuto(iconEditor.currentIcon, Utils.GetObjectBounds(iconEditor.currentIconSet));
+				}
+				iconEditor.currentIcon.iconSettings.autoScale = tmpCamAuto;
+
+				//---Save and update icon---//
+				iconEditor.currentIconSet.saveData = true;
+				iconEditor.updateFlag = true;
+			}
+		}
+
+		private static void ApplyScaleFactor(Icon icon, IconEditor iconEditor)
+		{
+			//---If not current icon then apply the scale factor---//
+			if (icon != iconEditor.currentIcon)
+			{
+				icon.iconSettings.camerasScaleFactor = iconEditor.currentIcon.iconSettings.camerasScaleFactor;
+				icon.iconSettings.perspLastScale = iconEditor.currentIcon.iconSettings.perspLastScale;
+				icon.parentIconSet.saveData = true;
+				Utils.UpdateIcon(icon, iconEditor);
+			}
+		}
+
+		public static void DrawLightingControls(IconEditor iconEditor)
+		{
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw ambient light field---///
+			Color tmpAmbLight = EditorGUILayout.ColorField("Ambient Light Colour", iconEditor.currentIcon.iconSettings.ambientLightColour);
+
+			//---Draw diretional light fields---//
+			EditorGUILayout.Space(4);
+			EditorGUILayout.LabelField("Directional Light");
+			Color tmpLightColour = EditorGUILayout.ColorField("Colour", iconEditor.currentIcon.iconSettings.lightColour);
+			Vector3 tmpLightDir = EditorGUILayout.Vector3Field("Rotation", iconEditor.currentIcon.iconSettings.lightDir);
+			float tmpLightIntensity = EditorGUILayout.FloatField("Intensity", iconEditor.currentIcon.iconSettings.lightIntensity);
+
+			//---If any fields have changed---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+				Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Lighting");
+
+				//---Apply settings---//
+				iconEditor.currentIcon.iconSettings.ambientLightColour = tmpAmbLight;
+				iconEditor.currentIcon.iconSettings.lightColour = tmpLightColour;
+				iconEditor.currentIcon.iconSettings.lightDir = tmpLightDir;
+				iconEditor.currentIcon.iconSettings.lightIntensity = tmpLightIntensity;
+
+				//---Update and save icon---//
+				iconEditor.currentIconSet.saveData = true;
+				iconEditor.updateFlag = true;
+			}
+		}
+
+		public static void DrawAnimationControls(IconEditor iconEditor)
+		{
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw animation clip field---//
+			AnimationClip c = (AnimationClip)EditorGUILayout.ObjectField("Animation Clip", iconEditor.currentIcon.iconSettings.animationClip, typeof(AnimationClip), false);
+
+			//---Draw animation offset field---//
+			Rect r = EditorGUILayout.GetControlRect(false, EditorGUIUtility.singleLineHeight);
+			float offset = EditorGUI.Slider(r, "Animation Offset", iconEditor.currentIcon.iconSettings.animationOffset, 0, 1);
+
+			//---If any fields have changed---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+				Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Animations");
+
+				//---Apply settings---//
+				iconEditor.currentIcon.iconSettings.animationClip = c;
+				iconEditor.currentIcon.iconSettings.animationOffset = offset;
+
+				//---Update and save icon---//
+				iconEditor.updateFlag = true;
+				iconEditor.currentIconSet.saveData = true;
+			}
+		}
+
+		public static void DrawPostProcessingControls(IconEditor iconEditor)
+		{
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw filter mode field---//
+			FilterMode tmpFilterMode = (FilterMode)EditorGUILayout.EnumPopup("Filter Mode", iconEditor.currentIcon.iconSettings.filterMode);
+
+			//---If filter mode changed---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+
+				//---Apply sttings, update icon---//
+				Undo.RecordObject(iconEditor.currentIcon, "Change Filter Mode");
+				iconEditor.currentIcon.iconSettings.filterMode = tmpFilterMode;
+				iconEditor.updateFlag = true;
+			}
+
+			//---Draw reorderable list---//
+			iconEditor.reorderableList.list = iconEditor.currentIcon.iconSettings.postProcessingMaterials;
+			iconEditor.reorderableList.index = (int)Mathf.Clamp(iconEditor.reorderableList.index, 0, iconEditor.reorderableList.list.Count - 1);
+			GUILayout.Space(2);
+			iconEditor.reorderableList.DoLayoutList();
+
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+			if (iconEditor.reorderableList.list.Count > 0)
+			{
+				//---Draw shader settings label---//
+				string shaderName = iconEditor.currentIcon.iconSettings.postProcessingMaterials[iconEditor.reorderableList.index].shader.name;
+				GUILayout.Label("Shader Settings (" + shaderName + ")");
+				GUILayout.BeginVertical(GUI.skin.box);
+
+				//---If not the default render shader---//
+				if (shaderName != "RapidIcon/ObjectRender")
+				{
+					//---Get the material properties---//
+					UnityEngine.Object[] obj = new UnityEngine.Object[1];
+					obj[0] = (UnityEngine.Object)iconEditor.reorderableList.list[iconEditor.reorderableList.index];
+					MaterialProperty[] props = MaterialEditor.GetMaterialProperties(obj);
+
+					//---If the shader doesn't have a custom GUI---//
+					if (iconEditor.materialEditor.customShaderGUI == null)
+					{
+						//---Draw the properties fields---//
+						foreach (MaterialProperty prop in props)
+						{
+							if (iconEditor.materialEditor == null)
+							{
+								Debug.LogWarning("null editor!!!");
+								continue;
+							}
+
+#if UNITY_6000_2_OR_NEWER
+							if (prop.name != "_MainTex" && prop.propertyFlags != UnityEngine.Rendering.ShaderPropertyFlags.HideInInspector)
+							{
+								iconEditor.materialEditor.ShaderProperty(prop, prop.displayName);
+							}
+#else
+							if (prop.name != "_MainTex" && prop.flags != MaterialProperty.PropFlags.HideInInspector)
+							{
+								iconEditor.materialEditor.ShaderProperty(prop, prop.displayName);
+							}
+#endif
+
+						}
+					}
+					else
+					//---If the shader does have a custom GUI---//
+					{
+
+						//---Get list of all properties---//
+						List<MaterialProperty> list = new List<MaterialProperty>(props);
+
+						//---Remove the property from list if it is _MainTex---//
+						foreach (MaterialProperty prop in list)
+						{
+							if (prop.name == "_MainTex")
+							{
+								list.Remove(prop);
+								break;
+							}
+						}
+
+						//---Draw the custom GUI---//
+						props = list.ToArray();
+						iconEditor.materialEditor.customShaderGUI.OnGUI(iconEditor.materialEditor, props);
+					}
+
+				}
+				//---If the default render shader---//
+				else
+				{
+					//---Begine change check---//
+					EditorGUI.BeginChangeCheck();
+
+					//---Draw fix alpha edges toggle---//
+					IconSettings.FixEdgesModes tmpFixEdges = (IconSettings.FixEdgesModes)EditorGUILayout.EnumPopup("Edge Fix Mode", iconEditor.currentIcon.iconSettings.fixEdgesMode);
+
+					//---If toggle changed---//
+					if (EditorGUI.EndChangeCheck())
+					{
+						//---Record object for undo and apply---//
+						Undo.RecordObject(iconEditor.currentIcon, "Toggle Icon Premultiplied Alpha");
+						iconEditor.currentIcon.iconSettings.fixEdgesMode = tmpFixEdges;
+
+						//---Update and save icon---//
+						iconEditor.currentIconSet.saveData = true;
+						iconEditor.updateFlag = true;
+					}
+				}
+				GUILayout.EndVertical();
+			}
+
+			//---If any fields changed---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Save material info and update icon---//
+				iconEditor.currentIcon.SaveMatInfo();
+				iconEditor.updateFlag = true;
+			}
+		}
+
+		public static void DrawExportControls(IconEditor iconEditor)
+		{
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw export resolution field, limit to 8x8 - 2048x2048---//
+			Vector2Int tmpExportRes = EditorGUILayout.Vector2IntField("Export Resolution", iconEditor.currentIcon.iconSettings.exportResolution);
+			tmpExportRes.x = (int)Mathf.Clamp(tmpExportRes.x, 8, 2048);
+			tmpExportRes.y = (int)Mathf.Clamp(tmpExportRes.y, 8, 2048);
+
+			//---If resolution fields change---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+				Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Export Resolution");
+
+				//---Apply settings---//
+				iconEditor.currentIcon.iconSettings.exportResolution.x = (int)Mathf.Clamp(tmpExportRes.x, 8, 2048);
+				iconEditor.currentIcon.iconSettings.exportResolution.y = (int)Mathf.Clamp(tmpExportRes.y, 8, 2048);
+
+				//---Save and update icon---//
+				iconEditor.currentIconSet.saveData = true;
+				iconEditor.updateFlag = true;
+			}
+
+			//---Begin new change check---//
+			EditorGUI.BeginChangeCheck();
+
+			GUILayout.Space(2);
+			GUILayout.BeginHorizontal();
+			//---Add forward slash to end of export path if missing---//
+			if (iconEditor.currentIcon.iconSettings.exportFolderPath[iconEditor.currentIcon.iconSettings.exportFolderPath.Length - 1] != '/')
+				iconEditor.currentIcon.iconSettings.exportFolderPath += "/";
+
+			//---Draw export folder field---//
+			float tmpWdith = EditorGUIUtility.labelWidth;
+			EditorGUIUtility.labelWidth = 80;
+			iconEditor.currentIcon.iconSettings.exportFolderPath = EditorGUILayout.TextField("Export Folder", iconEditor.currentIcon.iconSettings.exportFolderPath);
+
+			//---If export path is blank, change it to default Export folder---//
+			string tmpFolder = iconEditor.currentIcon.iconSettings.exportFolderPath;
+			if (tmpFolder == "")
+			{
+				string[] split = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets("RapidIconWindow")[0]).Split('/');
+				string rapidIconRootFolder = "";
+				for (int i = 0; i < split.Length - 3; i++)
+					rapidIconRootFolder += split[i] + "/";
+
+				iconEditor.currentIcon.iconSettings.exportFolderPath = rapidIconRootFolder + "Exports/";
+			}
+
+			//---Draw button to open file explorer to select export folder---//
+			EditorGUIUtility.labelWidth = tmpWdith;
+			if (GUILayout.Button("Browse", GUILayout.Width(100)))
+			{
+				string folder = EditorUtility.OpenFolderPanel("Export Folder", iconEditor.currentIcon.iconSettings.exportFolderPath, "");
+				if (folder != "")
+				{
+					string dataPath = Application.dataPath;
+					dataPath = dataPath.Substring(0, dataPath.LastIndexOf('/') + 1);
+					folder = folder.Replace(dataPath, "");
+					iconEditor.currentIcon.iconSettings.exportFolderPath = folder;
+				}
+			}
+			GUILayout.EndHorizontal();
+
+			//---Draw export path prefix/suffix fields---//
+			tmpWdith = EditorGUIUtility.labelWidth;
+			EditorGUIUtility.labelWidth = 80;
+			string exportPrefix = EditorGUILayout.TextField("Export Prefix", iconEditor.currentIcon.iconSettings.exportPrefix);
+			string exportSuffix = EditorGUILayout.TextField("Export Suffix", iconEditor.currentIcon.iconSettings.exportSuffix);
+
+			//---If any fields changes---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				//---Record object for undo---//
+				Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Export Path");
+
+				//---Apply settings---//
+				iconEditor.currentIcon.iconSettings.exportResolution = tmpExportRes;
+				iconEditor.currentIcon.iconSettings.exportPrefix = exportPrefix;
+				iconEditor.currentIcon.iconSettings.exportSuffix = exportSuffix;
+				iconEditor.currentIconSet.saveData = true;
+			}
+
+			//---Add button apply to all selected icons---//
+			if (GUILayout.Button("Copy to Other Icons"))
+				CopyWindow.Init(iconEditor);
+
+			//---Draw a separator---//
+			GUILayout.Space(12);
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+			Rect r = GUILayoutUtility.GetRect(iconEditor.sepWidth, 1);
+			if (iconEditor.separatorTex == null)
+			{
+				if (EditorGUIUtility.isProSkin)
+					iconEditor.separatorTex = Utils.CreateColourTexture(2, 2, new Color32(31, 31, 31, 255));
+				else
+					iconEditor.separatorTex = Utils.CreateColourTexture(2, 2, new Color32(153, 153, 153, 255));
+			}
+			GUI.DrawTexture(r, iconEditor.separatorTex);
+			GUILayout.FlexibleSpace();
+			GUILayout.EndHorizontal();
+			GUILayout.Space(12);
+
+			//---Begin change check---//
+			EditorGUI.BeginChangeCheck();
+
+			//---Draw export name field---//
+			string exportName = EditorGUILayout.TextField("Export Name", iconEditor.currentIcon.iconSettings.exportName);
+
+			//---Draw label showing full name with prefix/suffix---//
+			EditorGUIUtility.labelWidth = tmpWdith;
+			GUILayout.Label("Full Export Name: " + iconEditor.currentIcon.iconSettings.exportPrefix + iconEditor.currentIcon.iconSettings.exportName + iconEditor.currentIcon.iconSettings.exportSuffix + ".png");
+
+			//---If fields changesd, and export name is valid---//
+			if (EditorGUI.EndChangeCheck())
+			{
+				if (exportName.Length > 0)
+				{
+					//---Record object for undo---//
+					Undo.RecordObject(iconEditor.currentIcon, "Edit Icon Export Name");
+
+					//---Apply and save---//
+					iconEditor.currentIcon.iconSettings.exportName = exportName;
+					iconEditor.currentIconSet.saveData = true;
+				}
+			}
+
+			//---Draw button to export icon---//
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+			if (GUILayout.Button("Export Icon", GUILayout.Width(160)))
+			{
+				int result = EditorUtility.DisplayDialogComplex("Export Icon", "Export All Variants?", "All Variants", "Cancel", "Currently Selected Variant");
+
+				//---Export icon---//
+				if (result != 1)
+				{
+					if (result == 2)
+					{
+						Utils.ExportIcon(iconEditor.currentIcon, false, iconEditor);
+						Utils.FinishExportIcon(iconEditor.currentIcon);
+					}
+					else
+					{
+						//---Start asset editing---//
+						AssetDatabase.StartAssetEditing();
+
+						foreach (Icon icon in iconEditor.currentIconSet.icons)
+						{
+							Utils.ExportIcon(icon, iconEditor.currentIconSet.icons.Count > 1 ? true : false, iconEditor);
+						}
+
+						AssetDatabase.StopAssetEditing();
+						Utils.FinishExportIconSet(iconEditor.currentIconSet);
+					}
+
+					//---Reset replaceAll---//
+					iconEditor.replaceAll = false;
+				}
+			}
+
+			//---Draw button to export all selected icons---//
+			if (GUILayout.Button("Export Selected Icons", GUILayout.Width(160)))
+			{
+				int result = EditorUtility.DisplayDialogComplex("Export Icon", "Export All Variants?", "All Variants", "Cancel", "Currently Selected Variant");
+
+				if (result != 1)
+				{
+					//---Loop through all selected icons---//
+					int index = 1;
+					List<string> exportPaths = new List<string>();
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						if (result == 2)
+						{
+							Icon icon = iconSet.GetCurrentIcon();
+
+							//--Show progress bar---//
+							EditorUtility.DisplayProgressBar("Exporting Icons (" + index + "/" + iconEditor.assetGrid.selectedIconSets.Count + ")", iconSet.assetPath, ((float)index++ / iconEditor.assetGrid.selectedIconSets.Count));
+
+							//---Export icon---//
+							Utils.ExportIcon(icon, iconEditor.assetGrid.selectedIconSets.Count > 1 ? true : false, iconEditor);
+
+							//---Stop asset editing and finish export---//
+							Utils.FinishExportIcon(icon);
+						}
+						else
+						{
+							//--Show progress bar---//
+							EditorUtility.DisplayProgressBar("Exporting Icons (" + index + "/" + iconEditor.assetGrid.selectedIconSets.Count + ")", iconSet.assetPath, ((float)index++ / iconEditor.assetGrid.selectedIconSets.Count));
+
+							//---Start asset editing---//
+							AssetDatabase.StartAssetEditing();
+
+							foreach (Icon icon in iconSet.icons)
+							{
+								//---Export icon---//
+								Utils.ExportIcon(icon, iconEditor.assetGrid.selectedIconSets.Count > 1 || iconSet.icons.Count > 1 ? true : false, iconEditor);
+							}
+
+							//---Stop asset editing and finish export---//
+							AssetDatabase.StopAssetEditing();
+							Utils.FinishExportIconSet(iconSet);
+						}
+					}
+
+					//---Clear progress bar---//
+					EditorUtility.ClearProgressBar();
+
+					//---Reset replaceAll---//
+					iconEditor.replaceAll = false;
+				}
+			}
+			GUILayout.EndHorizontal();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs.meta b/Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs.meta
new file mode 100644
index 00000000..f889c3e5
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 43277a6de4118d145a17df3c98e17ffd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/IconEditor/Tabs.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons.meta b/Assets/RapidIcon/Editor/Scripts/Icons.meta
new file mode 100644
index 00000000..cb104c9e
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b1f03a313234425499c9d0575ea0d1f8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs b/Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs
new file mode 100644
index 00000000..df0cb665
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs
@@ -0,0 +1,287 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	[Serializable]
+	public class Icon : ScriptableObject
+	{
+		//---MatProperty Definition---//
+		[Serializable]
+		public struct MatProperty<T>
+		{
+			public string name;
+			public T value;
+
+			public MatProperty(string n, T v)
+			{
+				name = n;
+				value = v;
+			}
+		}
+
+		//---MaterialInfo Definition---//
+		[Serializable]
+		public struct MaterialInfo
+		{
+			public string shaderName;
+			public string displayName;
+			public bool toggle;
+			public List<MatProperty<int>> intProperties;
+			public List<MatProperty<float>> floatProperties;
+			public List<MatProperty<float>> rangeProperties;
+			public List<MatProperty<Color>> colourProperties;
+			public List<MatProperty<Vector4>> vectorProperties;
+			public List<MatProperty<string>> textureProperties;
+
+			//---Constructor---//
+			public MaterialInfo(string n)
+			{
+				shaderName = n;
+				displayName = n;
+				toggle = true;
+				intProperties = new List<MatProperty<int>>();
+				floatProperties = new List<MatProperty<float>>();
+				rangeProperties = new List<MatProperty<float>>();
+				colourProperties = new List<MatProperty<Color>>();
+				vectorProperties = new List<MatProperty<Vector4>>();
+				textureProperties = new List<MatProperty<string>>();
+			}
+		}
+
+		//---Variable Definitions---//
+		//Icon Set
+		[NonSerialized] public IconSet parentIconSet;
+
+		//Icon Settings
+		public IconSettings iconSettings;
+
+		//Renders
+		public Texture2D previewRender;
+		public Texture2D fullRender;
+
+		public void Init(Shader objRenderShader, string rapidIconRootFolder, GameObject rootObject)
+		{
+			iconSettings = new IconSettings(objRenderShader, rapidIconRootFolder, rootObject);
+		}
+
+		public void UpdateIcon(Vector2Int fullRenderSize)
+		{
+			fullRender = Utils.RenderIcon_Safe(this, fullRenderSize.x, fullRenderSize.y);
+		}
+
+		public void UpdateIcon(Vector2Int fullRenderSize, Vector2Int previewSize)
+		{
+			previewRender = Utils.RenderIcon_Safe(this, previewSize.x, previewSize.y);
+			fullRender = Utils.RenderIcon_Safe(this, fullRenderSize.x, fullRenderSize.y);
+		}
+
+		public void CompleteLoadData(IconSet iconSet, bool loadFixEdgesMode)
+		{
+			//---Set parent icon set---//
+			parentIconSet = iconSet;
+
+			//---Load animation from path---//
+			if (iconSettings.animationPath != string.Empty)
+			{
+				iconSettings.animationClip = (AnimationClip)AssetDatabase.LoadAssetAtPath(iconSettings.animationPath, typeof(AnimationClip));
+			}
+
+			//---Load the post-processing material info---//
+			LoadMatInfo(loadFixEdgesMode);
+
+			//---Load the sub object enables dictionary---//
+			iconSettings.subObjectEnables = new Dictionary<string, bool>();
+			int idx = 0;
+			foreach (string s in iconSettings.soeStrings)
+			{
+				iconSettings.subObjectEnables.Add(s, iconSettings.soeBools[idx++]);
+			}
+		}
+
+		public void PrepareForSaveData()
+		{
+			//---Get path of animation---//
+			iconSettings.animationPath = AssetDatabase.GetAssetPath(iconSettings.animationClip);
+
+			//---Clear the renders and assset object---//
+			previewRender = fullRender = null;
+
+			//---Save the post-processing material info---//
+			SaveMatInfo();
+
+			//---Clear the post-processing list/dictionaries---//
+			iconSettings.postProcessingMaterials.Clear();
+			iconSettings.materialDisplayNames.Clear();
+			iconSettings.materialToggles.Clear();
+
+			//---Save the sub object enables dictionary---//
+			iconSettings.soeStrings = iconSettings.subObjectEnables.Keys.ToList();
+			iconSettings.soeBools = iconSettings.subObjectEnables.Values.ToList();
+		}
+
+		public void LoadMatInfo(bool loadFixEdgesMode = true)
+		{
+			//---Initialise post-processing list/dictionaries---//
+			iconSettings.postProcessingMaterials = new List<Material>();
+			iconSettings.materialDisplayNames = new Dictionary<Material, string>();
+			iconSettings.materialToggles = new Dictionary<Material, bool>();
+
+			if (iconSettings.matInfo != null && iconSettings.matInfo.Count > 0)
+			{
+				//---For each material, load it's properties---//
+				foreach (MaterialInfo mi in iconSettings.matInfo)
+				{
+					//Create new material with the correct shader
+					Material m = new Material(Shader.Find(mi.shaderName));
+
+					//Set int properties (2021.1 or newer)
+					bool reg = false;
+					bool depthTex = false;
+					foreach (MatProperty<int> property in mi.intProperties)
+					{
+						//Custom property for default render shader
+						if (mi.shaderName == "RapidIcon/ObjectRender")
+						{
+							if (property.name == "custom_PreMulAlpha")
+							{
+								reg = (property.value == 1 ? true : false);
+							}
+
+
+							if (property.name == "custom_UseDepthTexture")
+							{
+								depthTex = (property.value == 1 ? true : false);
+							}
+						}
+
+#if UNITY_2021_1_OR_NEWER //Not implemented in older versions of Unity
+						m.SetInt(property.name, property.value);
+#endif
+					}
+
+					//---Handle default render shader---//
+					if (loadFixEdgesMode && mi.shaderName == "RapidIcon/ObjectRender")
+					{
+						if (reg && depthTex)
+							iconSettings.fixEdgesMode = IconSettings.FixEdgesModes.WithDepthTexture;
+						else if (reg)
+							iconSettings.fixEdgesMode = IconSettings.FixEdgesModes.Regular;
+						else
+							iconSettings.fixEdgesMode = IconSettings.FixEdgesModes.None;
+					}
+
+					//Set float properties
+					foreach (MatProperty<float> property in mi.floatProperties)
+						m.SetFloat(property.name, property.value);
+
+					//Set range properties
+					foreach (MatProperty<float> property in mi.rangeProperties)
+						m.SetFloat(property.name, property.value);
+
+					//Set colour properties
+					foreach (MatProperty<Color> property in mi.colourProperties)
+						m.SetColor(property.name, property.value);
+
+					//Set vector properties
+					foreach (MatProperty<Vector4> property in mi.vectorProperties)
+						m.SetVector(property.name, property.value);
+
+					//Set texture properties
+					foreach (MatProperty<string> property in mi.textureProperties)
+					{
+						//Load the texture from GUID, if not null
+						if (property.name != "null")
+						{
+							m.SetTexture(property.name, (Texture2D)AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(property.value)));
+						}
+					}
+
+					//Add the material to the post-processing stack
+					iconSettings.postProcessingMaterials.Add(m);
+					iconSettings.materialDisplayNames.Add(m, mi.displayName);
+					iconSettings.materialToggles.Add(m, mi.toggle);
+				}
+			}
+		}
+
+		public void SaveMatInfo()
+		{
+			//---Clear the matInfo and then store the info for each material in the post-processing stack---//
+			iconSettings.matInfo.Clear();
+			foreach (Material mat in iconSettings.postProcessingMaterials)
+			{
+				if (mat == null)
+					continue;
+
+				//---Create the new material info---//
+				MaterialInfo mi = new MaterialInfo(mat.shader.name);
+
+				//---Store all of the material's properties---//
+				int propCount = mat.shader.GetPropertyCount();
+				for (int i = 0; i < propCount; i++)
+				{
+					//---Get properties name and type---//
+					string propName = mat.shader.GetPropertyName(i);
+					UnityEngine.Rendering.ShaderPropertyType propType = mat.shader.GetPropertyType(i);
+
+					switch (propType)
+					{
+						//---Store int properties (2021.1 or newer)---///
+#if UNITY_2021_1_OR_NEWER //Not implemented in older versions of Unity
+						case UnityEngine.Rendering.ShaderPropertyType.Int:
+							mi.intProperties.Add(new MatProperty<int>(propName, mat.GetInt(propName)));
+							break;
+#endif
+						//---Store float properties---//
+						case UnityEngine.Rendering.ShaderPropertyType.Float:
+							mi.floatProperties.Add(new MatProperty<float>(propName, mat.GetFloat(propName)));
+							break;
+
+						//---Store range properties---//
+						case UnityEngine.Rendering.ShaderPropertyType.Range:
+							mi.rangeProperties.Add(new MatProperty<float>(propName, mat.GetFloat(propName)));
+							break;
+
+						//---Store colour properties---//
+						case UnityEngine.Rendering.ShaderPropertyType.Color:
+							mi.colourProperties.Add(new MatProperty<Color>(propName, mat.GetColor(propName)));
+							break;
+
+						//---Store vector properties---//
+						case UnityEngine.Rendering.ShaderPropertyType.Vector:
+							mi.vectorProperties.Add(new MatProperty<Vector4>(propName, mat.GetVector(propName)));
+							break;
+
+						//---Store texture properties---//
+						case UnityEngine.Rendering.ShaderPropertyType.Texture:
+							Texture t = mat.GetTexture(propName);
+							if (t != null)
+								//Store GUID of texture
+								mi.textureProperties.Add(new MatProperty<string>(propName, AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(t))));
+							else
+								mi.textureProperties.Add(new MatProperty<string>(propName, "null"));
+							break;
+					}
+
+				}
+
+				//---Add custom property for default render shader---//
+				if (mat.shader.name == "RapidIcon/ObjectRender")
+				{
+					bool enable = (iconSettings.fixEdgesMode == IconSettings.FixEdgesModes.Regular) || (iconSettings.fixEdgesMode == IconSettings.FixEdgesModes.WithDepthTexture);
+					mi.intProperties.Add(new MatProperty<int>("custom_PreMulAlpha", enable ? 1 : 0));
+					mi.intProperties.Add(new MatProperty<int>("custom_UseDepthTexture", (iconSettings.fixEdgesMode == IconSettings.FixEdgesModes.WithDepthTexture) ? 1 : 0));
+				}
+
+				//---Store the name and toggle state, then add the matInfo to the list of all matInfos to be save---//
+				mi.displayName = iconSettings.materialDisplayNames[mat];
+				mi.toggle = iconSettings.materialToggles[mat];
+				iconSettings.matInfo.Add(mi);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs.meta b/Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs.meta
new file mode 100644
index 00000000..88b002bb
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ba86e62c257f1bb4685f4f8aac8e5f37
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Icons/Icon.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs b/Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs
new file mode 100644
index 00000000..b507d9e2
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs
@@ -0,0 +1,194 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEditor.Animations;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	[Serializable]
+	public class IconSet
+	{
+		public List<Icon> icons;
+		[SerializeField] List<string> serialisedIconSettings;
+		public int iconIndex;
+
+		//Asset
+		public string assetPath;
+		public string assetName;
+		public string assetShortenedName;
+		public string folderPath;
+		public UnityEngine.Object assetObject;
+		public string assetGUID;
+		public string[] GUIDs; //No longer used, but kept for backwards compatibility of old save data
+
+		//Misc
+		public Texture2D selectionTexture;
+		public bool selected;
+		public bool saveData;
+		public bool deleted;
+		public int assetGridIconIndex;
+
+		public IconSet(AssetGrid assetGrid, ObjectPathPair objectPathPair)
+		{
+			icons = new List<Icon>();
+			iconIndex = 0;
+
+			AddDefaultIcon(assetGrid, objectPathPair);
+		}
+
+		public Icon GetCurrentIcon()
+		{
+			return icons[iconIndex];
+		}
+
+		public Icon AddUninitialisedIcon()
+		{
+			Icon icon = ScriptableObject.CreateInstance<Icon>();
+			icon.iconSettings = new IconSettings();
+
+			icon.parentIconSet = this;
+			icons.Add(icon);
+
+			return icon;
+		}
+
+		public Icon AddDefaultIcon(AssetGrid assetGrid, ObjectPathPair objectPathPair)
+		{
+			Icon icon = ScriptableObject.CreateInstance<Icon>();
+			icon.Init(Shader.Find("RapidIcon/ObjectRender"), assetGrid.rapidIconRootFolder, (GameObject)objectPathPair.UnityEngine_object);
+
+			//---Add the new icon to the icon set---//
+			icon.parentIconSet = this;
+			icons.Add(icon);
+
+			//---Set the asset object and path of the icon---//
+			assetObject = objectPathPair.UnityEngine_object;
+			assetPath = objectPathPair.path;
+
+			//---Get the asset as a GameObject, zero the postion if it's very small in magnitude---//
+			GameObject go = (GameObject)assetObject;
+			if (icon.iconSettings.objectPosition.magnitude < 0.0001f)
+				icon.iconSettings.objectPosition = Vector3.zero;
+
+			//---Zero the GameObject euler angles if they're very small in magnitude---//
+			icon.iconSettings.objectRotation = go.transform.eulerAngles;
+			if (icon.iconSettings.objectRotation.magnitude < 0.0001f)
+				icon.iconSettings.objectRotation = Vector3.zero;
+
+			//---Set the object scale variable---//
+			icon.iconSettings.objectScale = go.transform.localScale;
+
+			//---Get default object position to centre it in the icon---//
+			Bounds bounds = Utils.GetObjectBounds(this);
+			icon.iconSettings.objectPosition = Utils.GetObjectAutoOffset(icon, bounds);
+
+			//---Get default camera settings to fit the object in the icon render---//
+			float camAuto = Utils.GetCameraAuto(icon, bounds);
+			icon.iconSettings.cameraSize = camAuto;
+			icon.iconSettings.cameraPosition = Vector3.one * camAuto;
+
+			//---Render the preview---//
+			icon.previewRender = Utils.RenderIcon_Safe(icon, assetGrid.previewSize, (int)(((float)icon.iconSettings.exportResolution.y / (float)icon.iconSettings.exportResolution.x) * assetGrid.previewSize));
+			icon.previewRender.hideFlags = HideFlags.DontSave;
+
+			//---Set asset name and shortened asset name---//
+			string[] split;
+			split = assetPath.Split('/');
+			assetName = split[split.Length - 1];
+			if (assetName.Length > 19)
+				assetShortenedName = assetName.Substring(0, 16) + "...";
+			else
+				assetShortenedName = assetName;
+
+			//---Set folder path---//
+			split = assetPath.Split('/');
+			folderPath = "";
+			for (int i = 0; i < split.Length - 1; i++)
+				folderPath += split[i] + (i < split.Length - 2 ? "/" : "");
+
+			//---Set export name---//
+			icon.iconSettings.exportName = assetName;
+			int extensionPos = icon.iconSettings.exportName.LastIndexOf('.');
+			icon.iconSettings.exportName = icon.iconSettings.exportName.Substring(0, extensionPos);
+
+			//---Set selection texture---//
+			selectionTexture = assetGrid.assetSelectionTextures[1];
+
+			//---Load animations---//
+			LoadDefaultAnimationClip(icon);
+
+			return icon;
+		}
+
+		public void LoadDefaultAnimationClip(Icon icon)
+		{
+			//---Load the animation included in the imported assset (if there is one)---//
+			AnimationClip clip = (AnimationClip)AssetDatabase.LoadAssetAtPath(assetPath, typeof(AnimationClip));
+			icon.iconSettings.animationClip = clip;
+
+			//---If no clip loaded, then try and get one from the Animator component (if there is one)---//
+			if (icon.iconSettings.animationClip == null)
+			{
+				//---Try to get animator component from prefab---//
+				GameObject gameObject = null;
+				Animator animator = null;
+				try
+				{
+					gameObject = PrefabUtility.LoadPrefabContents(assetPath);
+					animator = gameObject.GetComponent<Animator>();
+				}
+				catch
+				{ /*Not a prefab - don't need to do anything just catch the error*/ }
+
+				//---If prefab has Animator component, then try to get first animation clip---//
+				if (animator != null)
+				{
+					AnimatorController animatorController = animator.runtimeAnimatorController as AnimatorController;
+					if (animatorController != null && animatorController.animationClips != null && animatorController.animationClips.Length > 0)
+						icon.iconSettings.animationClip = animatorController.animationClips[0];
+				}
+
+				//---Unload the prefab---//
+				if (gameObject != null)
+					PrefabUtility.UnloadPrefabContents(gameObject);
+			}
+		}
+
+		public void CompleteLoadData(bool loadFixEdgesModeFromSave)
+		{
+			//---Load asset from GUID---//
+			if (assetGUID != string.Empty)
+			{
+				assetObject = AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(assetGUID));
+			}
+
+			icons = new List<Icon>();
+
+			//---Complete load data of icons---//
+			foreach (string iconSettings in serialisedIconSettings)
+			{
+				Icon icon = AddUninitialisedIcon();
+				JsonUtility.FromJsonOverwrite(iconSettings, icon.iconSettings);
+
+				icon.CompleteLoadData(this, loadFixEdgesModeFromSave);
+				icon.LoadMatInfo();
+			}
+		}
+
+		public void PrepareForSaveData()
+		{
+			//---Get GUID of asset---//
+			assetGUID = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(assetObject));
+			assetObject = null;
+
+			//---Prepare icons for save data---//
+			serialisedIconSettings = new List<string>();
+			foreach (Icon icon in icons)
+			{
+				icon.PrepareForSaveData();
+				serialisedIconSettings.Add(JsonUtility.ToJson(icon.iconSettings));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs.meta b/Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs.meta
new file mode 100644
index 00000000..025ecc3c
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 7b4bd34b0d48a0e45a62ee32f5ee0805
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Icons/IconSet.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs b/Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs
new file mode 100644
index 00000000..665ca4e4
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+
+namespace RapidIcon_1_7_4
+{
+	[Serializable]
+	public class IconSetData
+	{
+		public List<IconSet> iconSets;
+
+		public IconSetData()
+		{
+			iconSets = new List<IconSet>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs.meta b/Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs.meta
new file mode 100644
index 00000000..97d8aa14
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 386ec4ab5b06b0e4fa8b220121084976
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Icons/IconSetData.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs b/Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs
new file mode 100644
index 00000000..d6180b40
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	[Serializable]
+	public class IconSettings
+	{
+		//Object Settings
+		public Vector3 objectPosition;
+		public Vector3 objectRotation;
+		public Vector3 objectScale;
+
+		//Hierarchy Settings
+		[NonSerialized] public Dictionary<string, bool> subObjectEnables;
+		public List<string> soeStrings;
+		public List<bool> soeBools;
+
+		//Camera Settings
+		public Vector3 cameraPosition;
+		public Vector3 cameraTarget;
+		public bool autoPosition;
+		public bool autoScale;
+		public bool cameraOrtho;
+		public float cameraFov;
+		public float cameraSize;
+		public float camerasScaleFactor;
+		public float perspLastScale;
+
+		//Lighting Settings
+		public Color lightColour;
+		public Vector3 lightDir;
+		public float lightIntensity;
+		public Color ambientLightColour;
+
+		//Animation Settings
+		public AnimationClip animationClip;
+		public float animationOffset;
+		public string animationPath;
+
+		//Post-Processing Settings
+		public List<Material> postProcessingMaterials;
+		public Dictionary<Material, String> materialDisplayNames;
+		public Dictionary<Material, bool> materialToggles;
+		public List<Icon.MaterialInfo> matInfo;
+		public enum FixEdgesModes { None, Regular, WithDepthTexture };
+		public FixEdgesModes fixEdgesMode;
+		public FilterMode filterMode;
+
+		//Export Settings
+		public string exportFolderPath;
+		public string exportName;
+		public string exportPrefix;
+		public string exportSuffix;
+		public Vector2Int exportResolution;
+
+		public IconSettings()
+		{
+			//Do nothing
+		}
+
+		public IconSettings(Shader objRenderShader, string rapidIconRootFolder, GameObject rootObject)
+		{
+			//---Initialise Icon---//
+			//Object Settings
+			objectPosition = Vector3.zero;
+			objectRotation = Vector3.zero;
+			objectScale = Vector3.one;
+			autoPosition = true;
+
+			//Hierarchy Settings
+			subObjectEnables = new Dictionary<string, bool>();
+			SetSubObjectEnables(rootObject, 0, "");
+
+			//Camera Settings
+			cameraPosition = new Vector3(1, Mathf.Sqrt(2), 1);
+			perspLastScale = 1;
+			cameraOrtho = true;
+			cameraFov = 60;
+			cameraSize = 5;
+			camerasScaleFactor = 1;
+			cameraTarget = Vector3.zero;
+			autoScale = true;
+
+			//Lighting Settings
+			ambientLightColour = Color.gray;
+			lightColour = Color.white;
+			lightDir = new Vector3(50, -30, 0);
+			lightIntensity = 1;
+
+			//Post-Processing Settings
+			postProcessingMaterials = new List<Material>();
+			matInfo = new List<Icon.MaterialInfo>();
+			materialDisplayNames = new Dictionary<Material, string>();
+			materialToggles = new Dictionary<Material, bool>();
+			filterMode = FilterMode.Point;
+			fixEdgesMode = FixEdgesModes.Regular;
+			Material defaultRender = new Material(objRenderShader);
+			postProcessingMaterials.Add(defaultRender);
+			materialDisplayNames.Add(defaultRender, "Object Render");
+			materialToggles.Add(defaultRender, true);
+
+			//Export Settings
+			exportResolution = new Vector2Int(256, 256);
+			exportFolderPath = rapidIconRootFolder;
+			exportFolderPath += "Exports/";
+		}
+
+		void SetSubObjectEnables(GameObject obj, int childIdx, string lastPath)
+		{
+			string path = lastPath + "/" + childIdx;
+			subObjectEnables.Add(path, true);
+
+			for (int i = 0; i < obj.transform.childCount; i++)
+			{
+				SetSubObjectEnables(obj.transform.GetChild(i).gameObject, i, path);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs.meta b/Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs.meta
new file mode 100644
index 00000000..870d6d15
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: d03cd17ccaa51bc4b8894e36f7f888ac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Icons/IconSettings.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs b/Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs
new file mode 100644
index 00000000..d09704a9
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal; //URP only
+using UnityEngine.SceneManagement;
+
+namespace RapidIcon_1_7_4
+{
+	public class RapidIconStage : PreviewSceneStage
+	{
+		//---INTERNAL---//
+		Camera cam;
+		Color ambientLightColour;
+		AmbientMode ambientMode;
+		bool fogEnabled;
+
+		public void SetScene(UnityEngine.SceneManagement.Scene scene_in)
+		{
+			this.scene = scene_in;
+		}
+
+		public void SetupScene(Icon icon)
+		{
+			icon.LoadMatInfo();
+
+			//---Create scene objects---//
+			GameObject obj = GameObject.Instantiate((GameObject)icon.parentIconSet.assetObject);
+			GameObject camGO = new GameObject("camera");
+			GameObject lightGO = new GameObject("light");
+
+			//---Place the objects in the scene---//
+			StageUtility.PlaceGameObjectInCurrentStage(camGO);
+			StageUtility.PlaceGameObjectInCurrentStage(lightGO);
+			StageUtility.PlaceGameObjectInCurrentStage(obj);
+
+			SceneManager.MoveGameObjectToScene(camGO, scene);
+			SceneManager.MoveGameObjectToScene(lightGO, scene);
+			SceneManager.MoveGameObjectToScene(obj, scene);
+
+			//---Apply the object settings---//
+			obj.transform.position = icon.iconSettings.objectPosition;
+			obj.transform.localScale = icon.iconSettings.objectScale;
+			obj.transform.eulerAngles = icon.iconSettings.objectRotation;
+
+			//---Apply hierarchy settings---//
+			List<string> keys = icon.iconSettings.subObjectEnables.Keys.ToList();
+			List<string> deleteKeys = new List<string>();
+			foreach (string key in keys)
+			{
+				var indicies = key.Split('/');
+				GameObject subObj = obj;
+				for (int i = 2; i < indicies.Length; i++)
+				{
+					int idx = int.Parse(indicies[i]);
+					try
+					{
+						subObj = subObj.transform.GetChild(idx).gameObject;
+					}
+					catch (Exception)
+					{
+						deleteKeys.Add(key);
+					}
+				}
+				subObj.SetActive(icon.iconSettings.subObjectEnables[key]);
+			}
+
+			foreach (string key in deleteKeys)
+			{
+				icon.iconSettings.subObjectEnables.Remove(key);
+				icon.parentIconSet.saveData = true;
+			}
+
+			//---Add the camera component and apply camera settings---//
+			cam = camGO.AddComponent<Camera>();
+			cam.scene = this.scene;
+			cam.clearFlags = CameraClearFlags.Nothing;
+			cam.transform.position = icon.iconSettings.cameraPosition;
+			cam.transform.LookAt(icon.iconSettings.cameraTarget);
+			cam.orthographic = icon.iconSettings.cameraOrtho;
+			cam.orthographicSize = icon.iconSettings.cameraSize;
+			cam.orthographicSize /= icon.iconSettings.camerasScaleFactor;
+
+			cam.fieldOfView = icon.iconSettings.cameraFov;
+			float fov = 2 * Mathf.Rad2Deg * Mathf.Atan2(
+				Mathf.Tan(cam.fieldOfView * Mathf.Deg2Rad / 2), icon.iconSettings.camerasScaleFactor
+				);
+			if (fov < 0)
+				fov += 180;
+			cam.fieldOfView = fov;
+
+			cam.nearClipPlane = 0.001f;
+			cam.farClipPlane = 10000;
+			cam.depthTextureMode = DepthTextureMode.Depth;
+			cam.clearFlags = CameraClearFlags.Color;
+			cam.GetUniversalAdditionalCameraData().renderPostProcessing = false; //URP only
+
+			//---Add light componenet and apply lighting settings---//
+			Light dirLight = lightGO.AddComponent<Light>();
+			dirLight.type = LightType.Directional;
+			dirLight.color = icon.iconSettings.lightColour;
+			dirLight.transform.eulerAngles = icon.iconSettings.lightDir;
+			dirLight.intensity = icon.iconSettings.lightIntensity;
+
+			//---Store current environment settings---//
+			ambientLightColour = RenderSettings.ambientLight;
+			ambientMode = RenderSettings.ambientMode;
+			fogEnabled = RenderSettings.fog;
+
+			//---Apply environment settings---//
+			RenderSettings.ambientLight = icon.iconSettings.ambientLightColour;
+			RenderSettings.ambientMode = UnityEngine.Rendering.AmbientMode.Flat;
+			RenderSettings.fog = false;
+
+			//---Apply animation settings---//
+			if (icon.iconSettings.animationClip != null)
+			{
+				float t = icon.iconSettings.animationClip.length * icon.iconSettings.animationOffset;
+				icon.iconSettings.animationClip.SampleAnimation(obj, t);
+			}
+		}
+
+		public Texture2D RenderIcon(int width, int height)
+		{
+			//---Setup render texture---//
+			// Built-in only
+			//var rtd = new RenderTextureDescriptor(width, height) { depthBufferBits = 24, msaaSamples = 4, useMipMap = false, sRGB = true };
+			//var rt = new RenderTexture(rtd);
+			//rt.Create();
+
+			// URP only
+			var urpAsset = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset;
+			int settingsMsaaSamples = urpAsset ? urpAsset.msaaSampleCount : 4;
+			var rtd = new RenderTextureDescriptor(width, height) { depthBufferBits = 24, msaaSamples = settingsMsaaSamples, useMipMap = false, sRGB = true };
+			var rt = new RenderTexture(rtd);
+			rt.Create();
+
+			//---Render camera to render texture---//
+			cam.targetTexture = rt;
+			cam.aspect = (float)width / (float)height;
+			cam.Render();
+			cam.targetTexture = null;
+			cam.ResetAspect();
+
+			//---Convert render texture to Texture2D---//
+			Texture2D render = new Texture2D(width, height, TextureFormat.RGBA32, false, false);
+			var oldActive = RenderTexture.active;
+			RenderTexture.active = rt;
+			render.ReadPixels(new Rect(0, 0, width, height), 0, 0);
+			render.Apply();
+
+			//---Cleanup render texture---//
+			RenderTexture.active = oldActive;
+			rt.Release();
+
+			//---Restore environment settings---//
+			RenderSettings.ambientLight = ambientLightColour;
+			RenderSettings.ambientMode = ambientMode;
+			RenderSettings.fog = fogEnabled;
+
+			return render;
+		}
+
+		protected override GUIContent CreateHeaderContent()
+		{
+			GUIContent headerContent = new GUIContent();
+			headerContent.text = "RapidIcon";
+			return headerContent;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs.meta b/Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs.meta
new file mode 100644
index 00000000..19e3001a
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fec9f379a6fe6654597cf7e06aacdb97
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/RapidIconScene.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils.meta b/Assets/RapidIcon/Editor/Scripts/Utils.meta
new file mode 100644
index 00000000..d182a78a
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d298ccf3892278244b9c8337bb5b7153
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs b/Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs
new file mode 100644
index 00000000..2e1523fd
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs
@@ -0,0 +1,163 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	public enum SeparatorTypes { Vertical, Horizontal };
+
+	[Serializable]
+	public class DraggableSeparator
+	{
+		//---PUBLIC---//
+		public float value;
+		public Rect rect;
+		public bool mouseOver;
+
+		//---INTERNAL---//
+		SeparatorTypes separatorType;
+		bool dragging;
+		Texture2D separatorTex;
+		RapidIconWindow window;
+
+		public DraggableSeparator(SeparatorTypes sepType)
+		{
+			//---Initialise DraggableSeparator---//
+			//Set type (horizontal/vertical)
+			separatorType = sepType;
+
+			//Create texture, use correct colour for light/dark mode
+			if (EditorGUIUtility.isProSkin)
+				separatorTex = Utils.CreateColourTexture(2, 2, new Color32(31, 31, 31, 255));
+			else
+				separatorTex = Utils.CreateColourTexture(2, 2, new Color32(153, 153, 153, 255));
+
+			separatorTex.hideFlags = HideFlags.DontSave;
+		}
+
+		public void Draw(float minValue, float maxValue, RapidIconWindow w)
+		{
+			//---Check variables are set---//
+			CheckAndSetWindow(w);
+			CheckPosition(minValue, maxValue);
+
+			//---Set seperator length---//
+			if (separatorType == SeparatorTypes.Vertical)
+				SetLength(window.position.height);
+			else
+				SetLength(window.position.width - window.leftSeparator.value);
+
+			//---Draw the separator---//
+			float currentSepPos = value;
+			Rect drawRect = new Rect(rect);
+			if (separatorType == SeparatorTypes.Vertical)
+				drawRect.width = 1;
+			else if (separatorType == SeparatorTypes.Horizontal)
+				drawRect.height = 1;
+			GUI.DrawTexture(drawRect, separatorTex);
+
+			//---Create mouse area rect, slightly larger than the draw rect---//
+			Rect mouseArea = new Rect(rect);
+			if (separatorType == SeparatorTypes.Vertical)
+				mouseArea.position -= new Vector2(3, 0);
+			else if (separatorType == SeparatorTypes.Horizontal)
+				mouseArea.position -= new Vector2(0, 4);
+
+			//---Set cursor if mouse over mouse area---//
+			if (separatorType == SeparatorTypes.Vertical)
+				EditorGUIUtility.AddCursorRect(mouseArea, MouseCursor.ResizeHorizontal);
+			else if (separatorType == SeparatorTypes.Horizontal)
+				EditorGUIUtility.AddCursorRect(mouseArea, MouseCursor.ResizeVertical);
+
+			//---Detect dragging of separator---//
+			if (mouseArea.Contains(Event.current.mousePosition))
+			{
+				mouseOver = true;
+				if (Event.current.rawType == EventType.MouseDown)
+					dragging = true;
+			}
+			else
+				mouseOver = false;
+
+			//---Move the separator with mouse if dragging---//
+			if (dragging)
+			{
+				if (separatorType == SeparatorTypes.Vertical)
+				{
+					currentSepPos = Mathf.Clamp(Event.current.mousePosition.x, minValue, maxValue);
+					rect.Set(currentSepPos, rect.y, rect.width, rect.height);
+				}
+				else if (separatorType == SeparatorTypes.Horizontal)
+				{
+					currentSepPos = Mathf.Clamp(Event.current.mousePosition.y, minValue, maxValue);
+					rect.Set(rect.x, currentSepPos, rect.width, rect.height);
+				}
+
+				value = currentSepPos;
+				window.Repaint();
+			}
+
+			//---Detect dragging of seperator stopped---//
+			if (Event.current.rawType == EventType.MouseUp)
+				dragging = false;
+		}
+
+		public void SaveData(string name)
+		{
+			//---Save separator position value---//
+			EditorPrefs.SetFloat(PlayerSettings.productName + name, value);
+		}
+
+		public void LoadData(string name, int defaultValue)
+		{
+			//---Load separator position value---//
+			if (separatorType == SeparatorTypes.Vertical)
+			{
+				rect = new Rect(EditorPrefs.GetFloat(PlayerSettings.productName + name, defaultValue), 0, 8f, 600);
+				value = rect.position.x;
+			}
+			else if (separatorType == SeparatorTypes.Horizontal)
+			{
+				rect = new Rect(0, EditorPrefs.GetFloat(PlayerSettings.productName + name, defaultValue), 400, 6f);
+				value = rect.position.y;
+			}
+		}
+
+		void CheckAndSetWindow(RapidIconWindow w)
+		{
+			if (!window)
+				window = w;
+		}
+
+		void SetLength(float length)
+		{
+			if (window)
+			{
+				if (separatorType == SeparatorTypes.Vertical)
+					rect.height = length;
+				else if (separatorType == SeparatorTypes.Horizontal)
+					rect.width = length;
+			}
+		}
+
+		void CheckPosition(float min, float max)
+		{
+			//---Apply min/max limits to separator position---//
+			float chk = value;
+			if (separatorType == SeparatorTypes.Vertical)
+			{
+				rect.position = new Vector2(Mathf.Clamp(rect.position.x, min, max), rect.position.y);
+				value = rect.position.x;
+			}
+			else if (separatorType == SeparatorTypes.Horizontal)
+			{
+				rect.position = new Vector2(rect.position.x, Mathf.Clamp(rect.position.y, min, max));
+				value = rect.position.y;
+			}
+
+			//---Repaint if separator has been moved---//
+			if (window && value != chk)
+				window.Repaint();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs.meta b/Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs.meta
new file mode 100644
index 00000000..bc384dc0
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1deafeb94c3e19347ab775f66a3564d2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Utils/DraggableSeparator.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs b/Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs
new file mode 100644
index 00000000..af6b1b80
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs
@@ -0,0 +1,563 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace RapidIcon_1_7_4
+{
+	static class Utils
+	{
+		private static Texture2D errorTexture;
+		private static void LoadErrorTexture()
+		{
+			string[] split = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets("RapidIcon")[0]).Split('/');
+			string rapidIconRootFolder = "";
+			for (int i = 0; i < split.Length; i++)
+				rapidIconRootFolder += split[i] + "/";
+
+			//Folder Icons
+			errorTexture = (Texture2D)AssetDatabase.LoadMainAssetAtPath(rapidIconRootFolder + "Editor/UI/error.png");
+		}
+
+		public static Bounds GetObjectBounds(IconSet iconSet)
+		{
+			//---Get object---//
+			GameObject go = (GameObject)iconSet.assetObject;
+
+			//---Store the prefabs position before zero-ing it---//
+			Vector3 prefabPos = go.transform.position;
+			go.transform.position = Vector3.zero;
+
+			//---Create a bounds object and encapsulate the bounds of the object mesh---//
+			MeshRenderer mr = go.GetComponent<MeshRenderer>();
+			Bounds bounds = new Bounds(Vector3.zero, 0.000001f * Vector3.one);
+			if (mr != null)
+				bounds.Encapsulate(mr.bounds);
+			else
+			{
+				SkinnedMeshRenderer smr = go.GetComponent<SkinnedMeshRenderer>();
+				if (smr != null)
+					bounds.Encapsulate(smr.bounds);
+			}
+
+			//---Encapsulate the bounds of the object's children objects as well---//
+			Utils.EncapsulateChildBounds(go.transform, ref bounds);
+
+			//---Reset the prefab postion to the stored value---//
+			go.transform.position = prefabPos;
+
+			return bounds;
+		}
+
+		public static Vector3 GetObjectAutoOffset(Icon icon, Bounds bounds)
+		{
+			//Apply the offset to the icon object position
+			return -bounds.center;
+		}
+
+		public static float GetCameraAuto(Icon icon, Bounds bounds)
+		{
+			//---Scale camera size and position so that the object fits in the render---//
+			Matrix4x4 trs = Matrix4x4.TRS(Vector3.zero, Quaternion.Euler(0, 45, 0), 1.05f * Vector3.one);
+			Vector3 corner = new Vector3(bounds.extents.x, bounds.extents.y, bounds.extents.z);
+			corner = trs * corner;
+
+			Vector2 refB2 = new Vector2(0.74f, 0.53f);
+			Vector2 b2 = refB2 * corner.magnitude;
+
+			return b2.magnitude;
+		}
+
+		public static void ExportIcon(Icon icon, bool inBatchExport, IconEditor iconEditor)
+		{
+			//---Create export folder if it doesn't already exist---//
+			if (!Directory.Exists(icon.iconSettings.exportFolderPath))
+				Directory.CreateDirectory(icon.iconSettings.exportFolderPath);
+
+			//---Get the full export file name---//
+			string fileName = icon.iconSettings.exportFolderPath + icon.iconSettings.exportPrefix + icon.iconSettings.exportName + icon.iconSettings.exportSuffix + ".png";
+
+			//---If it exists already, check if user want's to replace it---//
+			if (System.IO.File.Exists(fileName) && !iconEditor.replaceAll)
+			{
+				int result = 1;
+
+				if (inBatchExport)
+					result = EditorUtility.DisplayDialogComplex("Replace File?", fileName + " already exists, do you want to replace it?", "Replace", "Skip", "Replace All");
+				else
+					result = EditorUtility.DisplayDialog("Replace File?", fileName + " already exists, do you want to replace it?", "Replace", "Cancel") ? 0 : 1;
+
+				if (result == 1)
+					return;
+				else if (result == 2)
+				{
+					iconEditor.replaceAll = true;
+				}
+			}
+
+			//---Delete any existing file---//
+			if (AssetDatabase.IsValidFolder(icon.iconSettings.exportFolderPath))
+				AssetDatabase.DeleteAsset(fileName);
+
+			//---Render the icon---//
+			Texture2D exportRender = Utils.RenderIcon_Safe(icon, icon.iconSettings.exportResolution.x, icon.iconSettings.exportResolution.y);
+
+			//---Encode to png and save file---//
+			byte[] bytes = exportRender.EncodeToPNG();
+			File.WriteAllBytes(fileName, bytes);
+		}
+
+		public static void FinishExportIconSet(List<IconSet> iconSets)
+		{
+			//---Loop through all icons in list and finish export---//
+			foreach (IconSet iconSet in iconSets)
+				FinishExportIconSet(iconSet);
+		}
+
+		public static void FinishExportIcon(Icon icon)
+		{
+			//---Refresh asset database and get full filename---//
+			AssetDatabase.Refresh();
+			string fileName = icon.iconSettings.exportFolderPath + icon.iconSettings.exportPrefix + icon.iconSettings.exportName + icon.iconSettings.exportSuffix + ".png";
+
+			if (AssetDatabase.IsValidFolder(icon.iconSettings.exportFolderPath.Substring(0, icon.iconSettings.exportFolderPath.Length - 1)))
+			{
+				//---Set the importer settings---//
+				TextureImporter textureImporter = (TextureImporter)AssetImporter.GetAtPath(fileName);
+				textureImporter.alphaIsTransparency = true;
+				textureImporter.npotScale = TextureImporterNPOTScale.None;
+				textureImporter.textureCompression = TextureImporterCompression.Uncompressed;
+				textureImporter.SaveAndReimport();
+				textureImporter.filterMode = icon.iconSettings.filterMode;
+			}
+
+			//---Refresh asset database---//
+			AssetDatabase.Refresh();
+		}
+
+		public static void FinishExportIconSet(IconSet iconSet)
+		{
+			foreach (Icon icon in iconSet.icons)
+			{
+				//---Refresh asset database and get full filename---//
+				AssetDatabase.Refresh();
+				string fileName = icon.iconSettings.exportFolderPath + icon.iconSettings.exportPrefix + icon.iconSettings.exportName + icon.iconSettings.exportSuffix + ".png";
+
+				if (AssetDatabase.IsValidFolder(icon.iconSettings.exportFolderPath.Substring(0, icon.iconSettings.exportFolderPath.Length - 1)))
+				{
+					//---Set the importer settings---//
+					TextureImporter textureImporter = (TextureImporter)AssetImporter.GetAtPath(fileName);
+					textureImporter.alphaIsTransparency = true;
+					textureImporter.npotScale = TextureImporterNPOTScale.None;
+					textureImporter.textureCompression = TextureImporterCompression.Uncompressed;
+					textureImporter.SaveAndReimport();
+					textureImporter.filterMode = icon.iconSettings.filterMode;
+				}
+			}
+			//---Refresh asset database---//
+			AssetDatabase.Refresh();
+		}
+
+		public static void UpdateIcon(Icon icon, IconEditor iconEditor)
+		{
+			//---Get the render resolution---//
+			iconEditor.renderResolution = Utils.MutiplyVector2IntByFloat(iconEditor.currentIcon.iconSettings.exportResolution, iconEditor.resMultiplyers[iconEditor.resMultiplyerIndex]);
+
+			//---Update the icon render---//
+			icon.UpdateIcon(iconEditor.renderResolution, new Vector2Int(128, (int)(((float)iconEditor.renderResolution.y / (float)iconEditor.renderResolution.x) * 128)));
+		}
+
+		public static void ApplyToAllSelectedIcons(int tab, IconEditor iconEditor)
+		{
+			//---Display confirmation window---//
+			int result = EditorUtility.DisplayDialogComplex("Apply to All Selected Icons", "Would you like to apply only " + iconEditor.tabNames[tab] + " settings, or all settings?", iconEditor.tabNames[tab] + " Settings Only", "Cancel", "All Settings");
+
+			if (result == 1) //cancel
+				return;
+			else
+			{
+				//---Record object for undo---//
+				foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+				{
+					iconSet.GetCurrentIcon().SaveMatInfo();
+					Undo.RegisterCompleteObjectUndo(iconSet.GetCurrentIcon(), "Apply to all icons");
+				}
+
+				//---Loop through selected icons---//
+				int index = 1;
+				foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+				{
+					//---If not the current icon---//
+					if (iconSet.GetCurrentIcon() != iconEditor.currentIcon)
+					{
+						//---Display progress bar---//
+						EditorUtility.DisplayProgressBar("Updating Icons (" + index + "/" + (iconEditor.assetGrid.selectedIconSets.Count - 1) + ")", iconSet.assetPath, ((float)index++ / (iconEditor.assetGrid.selectedIconSets.Count - 1)));
+
+						Vector2Int oldExportRes = iconSet.GetCurrentIcon().iconSettings.exportResolution;
+						//---Copy icon settings from current icon to this icon---//
+						CopyIconSettings(iconEditor.currentIcon, iconSet.GetCurrentIcon(), result == 2 ? -1 : tab);
+
+						//--Save the icon---//
+						iconSet.GetCurrentIcon().SaveMatInfo();
+						iconSet.saveData = true;
+
+						//---Update icon if all settings copied, or if any tab other than hierarchy/export copied (or export resolution changed)---//
+						if (result == 2
+							|| (tab != 1 && tab != 6)
+							|| (tab == 6 && iconSet.GetCurrentIcon().iconSettings.exportResolution != oldExportRes))
+						{
+							Utils.UpdateIcon(iconSet.GetCurrentIcon(), iconEditor);
+						}
+					}
+				}
+
+				//---Clear the progress bar---//
+				EditorUtility.ClearProgressBar();
+			}
+		}
+
+		public static void CopyIconSettings(Icon from, Icon to, int tab)
+		{
+			if (from == to)
+				return;
+
+			//---Copy object settings---//
+			if (tab == 0 || tab == -1)
+			{
+				to.iconSettings.objectPosition = from.iconSettings.objectPosition;
+				to.iconSettings.objectRotation = from.iconSettings.objectRotation;
+				to.iconSettings.objectScale = from.iconSettings.objectScale;
+				if (from.iconSettings.autoPosition)
+				{
+					to.iconSettings.objectPosition = Utils.GetObjectAutoOffset(to, Utils.GetObjectBounds(to.parentIconSet));
+				}
+				to.iconSettings.autoPosition = from.iconSettings.autoPosition;
+			}
+
+			//---Copy camera settings---//
+			if (tab == 2 || tab == -1)
+			{
+				to.iconSettings.cameraPosition = from.iconSettings.cameraPosition;
+				to.iconSettings.cameraOrtho = from.iconSettings.cameraOrtho;
+				to.iconSettings.cameraFov = from.iconSettings.cameraFov;
+				to.iconSettings.cameraSize = from.iconSettings.cameraSize;
+				to.iconSettings.camerasScaleFactor = from.iconSettings.camerasScaleFactor;
+				to.iconSettings.perspLastScale = from.iconSettings.perspLastScale;
+				to.iconSettings.cameraTarget = from.iconSettings.cameraTarget;
+				if (from.iconSettings.autoScale)
+				{
+					to.iconSettings.cameraSize = Utils.GetCameraAuto(to, Utils.GetObjectBounds(to.parentIconSet));
+				}
+				to.iconSettings.autoScale = from.iconSettings.autoScale;
+			}
+
+			//--Copy lighting settings---//
+			if (tab == 3 || tab == -1)
+			{
+				to.iconSettings.ambientLightColour = from.iconSettings.ambientLightColour;
+				to.iconSettings.lightColour = from.iconSettings.lightColour;
+				to.iconSettings.lightDir = from.iconSettings.lightDir;
+				to.iconSettings.lightIntensity = from.iconSettings.lightIntensity;
+			}
+
+			//---Copy animation settings---//
+			if (tab == 4 || tab == -1)
+			{
+				to.iconSettings.animationClip = from.iconSettings.animationClip;
+				to.iconSettings.animationOffset = from.iconSettings.animationOffset;
+			}
+
+			//---Copy post-processing settings---//
+			if (tab == 5 || tab == -1)
+			{
+				foreach (Material mat in to.iconSettings.postProcessingMaterials)
+					Editor.DestroyImmediate(mat);
+
+				to.iconSettings.postProcessingMaterials.Clear();
+
+				foreach (Material mat in from.iconSettings.postProcessingMaterials)
+				{
+					Material newMat = new Material(mat);
+					to.iconSettings.postProcessingMaterials.Add(newMat);
+					to.iconSettings.materialDisplayNames.Add(newMat, from.iconSettings.materialDisplayNames[mat]);
+					to.iconSettings.materialToggles.Add(newMat, from.iconSettings.materialToggles[mat]);
+				}
+
+				to.iconSettings.fixEdgesMode = from.iconSettings.fixEdgesMode;
+				to.iconSettings.filterMode = from.iconSettings.filterMode;
+			}
+
+			//---Copy export settings---//
+			if (tab == 6 || tab == -1)
+			{
+				to.iconSettings.exportResolution = from.iconSettings.exportResolution;
+				to.iconSettings.exportFolderPath = from.iconSettings.exportFolderPath;
+				to.iconSettings.exportPrefix = from.iconSettings.exportPrefix;
+				to.iconSettings.exportSuffix = from.iconSettings.exportSuffix;
+			}
+
+			//---Save the icon---//
+			to.parentIconSet.saveData = true;
+		}
+
+		public static Texture2D CreateColourTexture(int width, int height, Color c)
+		{
+			//---Create new texture---//
+			Texture2D tex = new Texture2D(width, height);
+
+			//---Set pixel colours---//
+			Color[] pixels = Enumerable.Repeat(c, width * height).ToArray();
+			tex.SetPixels(pixels);
+
+			//---Apply changes and set filter mode---//
+			tex.Apply();
+			tex.filterMode = FilterMode.Point;
+
+			return tex;
+		}
+
+		public static Texture2D RenderIcon_Safe(Icon icon, int width = 128, int height = 128)
+		{
+			try
+			{
+				return RenderIcon(icon, width, height);
+			}
+			catch (Exception e)
+			{
+				Debug.LogError(e.Message + '\n' + e.StackTrace);
+
+				if (previewScene != null)
+					EditorSceneManager.ClosePreviewScene(previewScene);
+
+				if (errorTexture == null)
+					LoadErrorTexture();
+
+				return errorTexture;// Utils.CreateColourTexture(width, height, Color.magenta);
+			}
+		}
+
+		private static Scene previewScene;
+		private static Texture2D RenderIcon(Icon icon, int width, int height)
+		{
+			icon.SaveMatInfo();
+
+			//---Create stage and scene---//
+			previewScene = EditorSceneManager.NewPreviewScene();
+			if (EditorSceneManager.GetSceneCullingMask(previewScene) == 0)
+			{
+				throw new OutOfMemoryException("Too many preview scenes were not closed correctly. Restart unity to fix");
+			}
+
+			var stage = ScriptableObject.CreateInstance<RapidIconStage>();
+			if (stage == null)
+			{
+				throw new Exception("Unable to create RapidIcon stage");
+			}
+
+			stage.SetScene(previewScene);
+
+			//---Setup scene---//
+			stage.SetupScene(icon);
+
+			//and render icon---//
+			Texture2D render = stage.RenderIcon(width, height);
+
+			//---Fix alpha edges---//
+			if (icon.iconSettings.fixEdgesMode == IconSettings.FixEdgesModes.Regular || icon.iconSettings.fixEdgesMode == IconSettings.FixEdgesModes.WithDepthTexture)
+				render = FixAlphaEdges(render, icon.iconSettings.fixEdgesMode == IconSettings.FixEdgesModes.WithDepthTexture);
+
+			//---Known bug---//
+			if (icon.iconSettings.materialToggles == null)
+			{
+				icon.LoadMatInfo();
+				Debug.LogError("[RapidIcon] Undo Error: This is a known bug, if you \"Apply to All Selected Icons\" and then try to undo after changing your icon selection, the tool will not be able to undo the changes.");
+			}
+
+			//---Apply post-processing shaders---//
+			Texture2D img = CreateColourTexture(width, height, Color.clear);
+
+			foreach (Material m in icon.iconSettings.postProcessingMaterials)
+			{
+				if (icon.iconSettings.materialToggles != null)
+				{
+					if (icon.iconSettings.materialToggles[m])
+					{
+						var rtd = new RenderTextureDescriptor(img.width, img.height) { depthBufferBits = 24, msaaSamples = 8, useMipMap = false, sRGB = true };
+						var rt = new RenderTexture(rtd);
+
+						if (m == null)
+							continue;
+
+						if (m.shader.name == "RapidIcon/ObjectRender")
+							m.SetTexture("_Render", render);
+
+						Graphics.Blit(img, rt, m);
+
+						RenderTexture.active = rt;
+						img = new Texture2D(img.width, img.height);
+						img.ReadPixels(new Rect(0, 0, img.width, img.height), 0, 0);
+						img.Apply();
+						RenderTexture.active = null;
+						rt.Release();
+					}
+				}
+			}
+
+			//---Apply filter mode---//
+			img.filterMode = icon.iconSettings.filterMode;
+
+			EditorSceneManager.ClosePreviewScene(previewScene);
+			ScriptableObject.DestroyImmediate(stage);
+
+			icon.LoadMatInfo();
+			return img;
+		}
+
+		public static void CheckCurrentIconRender(IconEditor iconEditor)
+		{
+			//---If the current icon doesn't have a full render, then render one---//
+			if (!iconEditor.currentIcon.fullRender)
+			{
+				iconEditor.renderResolution = Utils.MutiplyVector2IntByFloat(iconEditor.currentIcon.iconSettings.exportResolution, iconEditor.resMultiplyers[iconEditor.resMultiplyerIndex]);
+				iconEditor.currentIcon.fullRender = Utils.RenderIcon_Safe(iconEditor.currentIcon, iconEditor.renderResolution.x, iconEditor.renderResolution.y);
+				iconEditor.currentIcon.fullRender.hideFlags = HideFlags.DontSave;
+			}
+		}
+
+		public static Texture2D FixAlphaEdges(Texture2D tex, bool useDepthTex)
+		{
+			//---Create render texture---//
+			var rtd = new RenderTextureDescriptor(tex.width, tex.height) { depthBufferBits = 24, msaaSamples = 8, useMipMap = false, sRGB = true };
+			var rt = new RenderTexture(rtd);
+
+			//---Blit texture to render texture using ImgShader---//
+			Material mat = new Material(Shader.Find("RapidIcon/ImgShader"));
+			mat.SetInt("_UseDepthTexture", useDepthTex ? 1 : 0);
+			Graphics.Blit(tex, rt, mat);
+
+			//---Copy the render texture to Texture2D---//
+			RenderTexture.active = rt;
+			Texture2D baked = new Texture2D(tex.width, tex.height);
+			baked.ReadPixels(new Rect(0, 0, tex.width, tex.height), 0, 0);
+			baked.Apply();
+
+			//---Cleanup---//
+			RenderTexture.active = null;
+			rt.Release();
+
+			return baked;
+		}
+
+		public static void SaveIconSetData(IconSetData iconSetData)
+		{
+			//---Perpare each icon for saving---//
+			foreach (IconSet iconSet in iconSetData.iconSets)
+			{
+				iconSet.PrepareForSaveData();
+			}
+
+			//---Save the data---//
+			string data = JsonUtility.ToJson(iconSetData);
+			EditorPrefs.SetString(PlayerSettings.productName + "RapidIconData", data);
+		}
+
+		public static IconSetData LoadIconSetData()
+		{
+			//---Load the icon data---//
+			string data = EditorPrefs.GetString(PlayerSettings.productName + "RapidIconData");
+			IconSetData iconData = JsonUtility.FromJson<IconSetData>(data);
+
+			//---Complete the load data for each icon---//
+			if (iconData != null)
+			{
+				//---Handle version control---//
+				VersionControl.CheckUpdate(iconData.iconSets);
+				bool loadFixEdgesModeFromSave = !(VersionControl.GetStoredVersion() < new VersionControl.Version("1.6.2")); //Keep at 1.6.2, do not update to latest version
+
+				foreach (IconSet iconSet in iconData.iconSets)
+				{
+					iconSet.CompleteLoadData(loadFixEdgesModeFromSave);
+				}
+			}
+
+			//---Update current stored version---//
+			VersionControl.UpdateStoredVersion();
+
+			return iconData;
+		}
+
+		//---Extension method to convert Vector2 to Vector2Int---//
+		public static Vector2Int ToVector2Int(this Vector2 v)
+		{
+			return new Vector2Int((int)v.x, (int)v.y);
+		}
+
+		public static void EncapsulateChildBounds(Transform t, ref Bounds bounds)
+		{
+			//---For each child object, encapsulate its bounds---//
+			MeshRenderer mr;
+			for (int i = 0; i < t.childCount; i++)
+			{
+				mr = t.GetChild(i).GetComponent<MeshRenderer>();
+				if (mr != null)
+					bounds.Encapsulate(mr.bounds);
+				else
+				{
+					SkinnedMeshRenderer smr = t.GetChild(i).GetComponent<SkinnedMeshRenderer>();
+					if (smr != null)
+						bounds.Encapsulate(smr.bounds);
+				}
+
+				EncapsulateChildBounds(t.GetChild(i), ref bounds);
+			}
+		}
+
+		[MenuItem("Tools/RapidIcon Utilities/Delete All Saved Data")]
+		static void DeleteEditorPrefs()
+		{
+			if (EditorUtility.DisplayDialog("Confirm", "Are you sure you want to delete all RapidIcon data? This will delete all of your icon settings and cannot be undone", "Delete", "Cancel"))
+			{
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconOpenedFolders");
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSelectedFolders");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSepPosLeft");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSelectedAssets");
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconAssetGridScroll");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSepPosRight");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSepPosPreview");
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconPreviewResIdx");
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconPreviewZoomIdx");
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconEditorTab");
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconData");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconIconsRefreshed");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconFilterIdx");
+
+				EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconVersion");
+			}
+		}
+
+		[MenuItem("Tools/RapidIcon Utilities/Don't Save On Close")]
+		static void DontSaveOnExit()
+		{
+			RapidIconWindow.dontSaveOnExit = true;
+		}
+
+		public static Vector2Int MutiplyVector2IntByFloat(Vector2Int vec, float f)
+		{
+			Vector2Int res = vec;
+			res.x = (int)(res.x * f);
+			res.y = (int)(res.y * f);
+
+			return res;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs.meta b/Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs.meta
new file mode 100644
index 00000000..68497c9c
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2e094dfc2ea2b6d42862e768ba911ca1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Utils/Utils.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs b/Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs
new file mode 100644
index 00000000..66b65c27
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs
@@ -0,0 +1,170 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	public static class VersionControl
+	{
+		static Version thisVersion = new Version("1.7.4");
+
+		public struct Version
+		{
+			public int major;
+			public int minor;
+			public int patch;
+
+			public Version(int major, int minor, int patch)
+			{
+				this.major = major;
+				this.minor = minor;
+				this.patch = patch;
+			}
+
+			public Version(string version)
+			{
+				this = ConvertFromString(version);
+			}
+
+			public static Version ConvertFromString(string s)
+			{
+				Version version = new Version(0, 0, 0);
+
+				string[] split = s.Split(".");
+				if (split != null)
+				{
+					if (split.Length >= 1)
+						int.TryParse(split[0], out version.major);
+
+					if (split.Length >= 2)
+						int.TryParse(split[1], out version.minor);
+
+					if (split.Length >= 3)
+						int.TryParse(split[2], out version.patch);
+				}
+
+				return version;
+			}
+
+			public static bool operator >(Version v1, Version v2)
+			{
+				if (v1.major > v2.major)
+					return true;  //major is newer
+				else if (v1.major < v2.major)
+					return false; //major is older
+
+				//major is equal
+
+				if (v1.minor > v2.minor)
+					return true;  //minor is newer
+				else if (v1.minor < v2.minor)
+					return false; //minor is older
+
+				//minor is equal
+
+				if (v1.patch > v2.patch)
+					return true;  //patch is newer
+				else if (v1.patch < v2.patch)
+					return false; //patch is older
+
+				//patch is equal, versions are equal
+				return false;
+			}
+
+			public static bool operator <(Version v1, Version v2)
+			{
+				if (v1.major < v2.major)
+					return true;  //major is older
+				else if (v1.major > v2.major)
+					return false; //major is newer
+
+				//major is equal
+
+				if (v1.minor < v2.minor)
+					return true;  //minor is older
+				else if (v1.minor > v2.minor)
+					return false; //minor is newer
+
+				//minor is equal
+
+				if (v1.patch < v2.patch)
+					return true;  //patch is older
+				else if (v1.patch > v2.patch)
+					return false; //patch is newer
+
+				//patch is equal, versions are equal
+				return false;
+			}
+		}
+
+		public static string ConvertToString(this Version version)
+		{
+			return version.major + "." + version.minor + "." + version.patch;
+		}
+
+		public static Version GetStoredVersion()
+		{
+			string s = EditorPrefs.GetString(PlayerSettings.productName + "RapidIconVersion", thisVersion.ConvertToString());
+			return Version.ConvertFromString(s);
+		}
+
+		public static void UpdateStoredVersion()
+		{
+			EditorPrefs.SetString(PlayerSettings.productName + "RapidIconVersion", thisVersion.ConvertToString());
+		}
+
+		public static bool IsStoredVersionOld()
+		{
+			Version version = GetStoredVersion();
+
+			if (thisVersion > version)
+				return true;
+
+			return false;
+		}
+
+		public static void CheckUpdate(List<IconSet> iconSets)
+		{
+			Version lastVersion = GetStoredVersion();
+
+			//---Pre 1.7.0 Updates---//
+			//Versions before 1.7.0 are no longer supported
+			if (lastVersion < new Version("1.7.0"))
+			{
+				Debug.LogWarning("RapidIcon versions prior to 1.7.0 are no longer supported");
+				return;
+			}
+		}
+
+		public static bool PreLoadCheck()
+		{
+			Version lastVersion = GetStoredVersion();
+
+			//---1.7.0 Updates---//
+			if (lastVersion < new Version("1.7.0"))
+			{
+				if (EditorUtility.DisplayDialog("Confirm", "Version 1.7.0 is not compatible with data from older version (" + lastVersion.ConvertToString() + "). Old data will be deleted, do you want to continue?", "Continue", "Cancel"))
+				{
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconOpenedFolders");
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSelectedFolders");
+
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconSelectedAssets");
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconAssetGridScroll");
+
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconEditorTab");
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconData");
+
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconIconsRefreshed");
+
+					EditorPrefs.DeleteKey(PlayerSettings.productName + "RapidIconFilterIdx");
+
+					UpdateStoredVersion();
+				}
+				else
+					return false;
+			}
+
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs.meta b/Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs.meta
new file mode 100644
index 00000000..d418aa81
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: e8b6b50a5e61d7b47bdaed3b7a92e673
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Utils/VersionControl.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows.meta b/Assets/RapidIcon/Editor/Scripts/Windows.meta
new file mode 100644
index 00000000..bc2ccd2c
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38c856e1df48832439f69da012f05ca0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs b/Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs
new file mode 100644
index 00000000..d4e576c3
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs
@@ -0,0 +1,142 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	public class CopyWindow : EditorWindow
+	{
+		public static CopyWindow window;
+		private static int option;
+		private static int subOption;
+		private static int selectedVariantIdx;
+		private static IconEditor iconEditor;
+
+		public static void Init(IconEditor editor)
+		{
+			window = (CopyWindow)GetWindow(typeof(CopyWindow), true, "Copy to other icons");
+			window.position = new Rect(Screen.currentResolution.width / 2 - 230, Screen.currentResolution.height / 2 - 64, 460, 128);
+
+			iconEditor = editor;
+			selectedVariantIdx = iconEditor.currentIconSet.icons.IndexOf(iconEditor.currentIcon);
+
+			window.Show();
+		}
+
+		void OnGUI()
+		{
+			GUILayout.Space(4);
+			GUILayout.Label("Copy to");
+
+			//---Draw dropdown list of selected assets---//
+
+			string[] options = new string[] { "All variants of this icon", "Currently selected variant of selected icons", "All variants of selected icons", "Specific variant of selected icons" };
+			option = EditorGUILayout.Popup(option, options);
+
+			string[] subOptions = new string[] { "Current tab only", "All tabs" };
+			subOption = EditorGUILayout.Popup(subOption, subOptions);
+
+			if (option == 3)
+			{
+				selectedVariantIdx = EditorGUILayout.IntField("Variant Index", selectedVariantIdx);
+				if (selectedVariantIdx < 0)
+					selectedVariantIdx = 0;
+
+				bool showWarning = false;
+				foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+				{
+					if (selectedVariantIdx >= iconSet.icons.Count)
+					{
+						showWarning = true;
+						break;
+					}
+				}
+
+				if (showWarning)
+				{
+					GUIStyle s = new GUIStyle(GUI.skin.label);
+					s.normal.textColor = new Color(1.0f, 0.5f, 0.0f, 1.0f);
+					GUILayout.Label("Not all selected icons have a variant at index " + selectedVariantIdx + ", a new variant will be created", s);
+				}
+			}
+
+			GUILayout.FlexibleSpace();
+
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+			if (GUILayout.Button("Copy"))
+			{
+				DoCopy();
+				window.Close();
+			}
+			GUILayout.EndHorizontal();
+		}
+
+		private void DoCopy()
+		{
+			switch (option)
+			{
+				case 0:
+					int idx = 0;
+					int count = iconEditor.currentIconSet.icons.Count;
+					foreach (Icon icon in iconEditor.currentIconSet.icons)
+					{
+						EditorUtility.DisplayProgressBar("Copy to Other Icons", "Copying to icon (" + idx + "/" + count + ")", (float)(idx++)/count);
+						Utils.CopyIconSettings(iconEditor.currentIcon, icon, subOption == 0 ? iconEditor.tab : -1);
+						Utils.UpdateIcon(icon, iconEditor);
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+
+				case 1:
+					idx = 0;
+					count = iconEditor.assetGrid.selectedIconSets.Count;
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						EditorUtility.DisplayProgressBar("Copy to Other Icons", "Copying to icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						Icon icon = iconSet.GetCurrentIcon();
+						Utils.CopyIconSettings(iconEditor.currentIcon, icon, subOption == 0 ? iconEditor.tab : -1);
+						Utils.UpdateIcon(icon, iconEditor);
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+
+				case 2:
+					idx = 0;
+					count = iconEditor.assetGrid.selectedIconSets.Count;
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						EditorUtility.DisplayProgressBar("Copy to Other Icons", "Copying to icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						foreach (Icon icon in iconSet.icons)
+						{
+							Utils.CopyIconSettings(iconEditor.currentIcon, icon, subOption == 0 ? iconEditor.tab : -1);
+							Utils.UpdateIcon(icon, iconEditor);
+						}
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+
+				case 3:
+					idx = 0;
+					count = iconEditor.assetGrid.selectedIconSets.Count;
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						EditorUtility.DisplayProgressBar("Copy to Other Icons", "Copying to icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						Icon icon;
+						if (iconSet.icons.Count > selectedVariantIdx)
+							icon = iconSet.icons[selectedVariantIdx];
+						else
+						{
+							icon = iconSet.AddDefaultIcon(iconEditor.assetGrid, new ObjectPathPair { path = iconSet.assetPath, UnityEngine_object = iconSet.assetObject });
+							iconSet.iconIndex = iconSet.icons.Count - 1;
+							icon.iconSettings.exportName += " (" + iconSet.iconIndex + ")";
+						}
+
+						Utils.CopyIconSettings(iconEditor.currentIcon, icon, subOption == 0 ? iconEditor.tab : -1);
+						Utils.UpdateIcon(icon, iconEditor);
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs.meta b/Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs.meta
new file mode 100644
index 00000000..c60da451
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 2be791c4489377a4ca53adc5e9e2b9ee
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Windows/CopyWindow.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs b/Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs
new file mode 100644
index 00000000..2b2648e2
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs
@@ -0,0 +1,147 @@
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace RapidIcon_1_7_4
+{
+	public class RapidIconWindow : EditorWindow
+	{
+		public static RapidIconWindow window;
+
+		public AssetList assetList;
+		public DraggableSeparator leftSeparator, rightSeparator;
+		public AssetGrid assetGrid;
+		public IconEditor iconEditor;
+		public static bool dontSaveOnExit;
+		public bool forceCloseDontSave;
+
+		[MenuItem("Tools/RapidIcon")]
+		public static void Init()
+		{
+			SessionState.SetBool("rapidicon_forceclose", false);
+			SessionState.SetBool("rapidicon_loaded", true);
+
+			if (!VersionControl.PreLoadCheck())
+				return;
+
+			/*--------------------------------------------------------------------------------
+			 * Display RapidIcon window
+			 *--------------------------------------------------------------------------------*/
+			dontSaveOnExit = false;
+
+			window = (RapidIconWindow)GetWindow(typeof(RapidIconWindow), false, "RapidIcon");
+			window.minSize = new Vector2(870, 600);
+			window.forceCloseDontSave = false;
+			window.Show();
+
+			float x = EditorPrefs.GetFloat(PlayerSettings.productName + "RapidIconWindowPosX", -1);
+			float y = EditorPrefs.GetFloat(PlayerSettings.productName + "RapidIconWindowPosY", -1);
+			float width = EditorPrefs.GetFloat(PlayerSettings.productName + "RapidIconWindowWidth", -1);
+
+			if (x != -1 && y != -1 && width != -1)
+				window.position = new Rect(x, y, width, window.position.height);
+
+			EditorSceneManager.sceneClosing += window.SceneClosing;
+			EditorSceneManager.sceneOpened += window.OpenScene;
+			EditorSceneManager.newSceneCreated += window.NewScene;
+		}
+
+		private void OnEnable()
+		{
+			/*--------------------------------------------------------------------------------
+			 * Instantiate and initialise window elements
+			 * Load data
+			 *--------------------------------------------------------------------------------*/
+			assetList = new AssetList(Application.dataPath);
+			assetList.LoadData();
+
+			leftSeparator = new DraggableSeparator(SeparatorTypes.Vertical);
+			leftSeparator.LoadData("RapidIconSepPosLeft", 300);
+
+			rightSeparator = new DraggableSeparator(SeparatorTypes.Vertical);
+			rightSeparator.LoadData("RapidIconSepPosRight", 900);
+
+			assetGrid = new AssetGrid(assetList);
+
+			iconEditor = new IconEditor(assetGrid, window);
+			iconEditor.LoadData();
+
+			assetGrid.LoadData();
+		}
+
+		void SceneClosing(Scene s, bool removingScene)
+		{
+			foreach (IconSet iconSet in assetGrid.objectIconSets.Values)
+			{
+				foreach (Icon icon in iconSet.icons)
+					icon.SaveMatInfo();
+			}
+		}
+
+		void NewScene(Scene s, NewSceneSetup newSceneSetup, NewSceneMode newSceneMode)
+		{
+			window.Close();
+		}
+
+		void OpenScene(Scene s, OpenSceneMode openSceneMode)
+		{
+			window.Close();
+		}
+
+		private void OnDisable()
+		{
+			if (forceCloseDontSave)
+				return;
+
+			/*--------------------------------------------------------------------------------
+			 * Save data
+			 *--------------------------------------------------------------------------------*/
+			assetList.SaveData();
+			leftSeparator.SaveData("RapidIconSepPosLeft");
+			rightSeparator.SaveData("RapidIconSepPosRight");
+			assetGrid.SaveData();
+
+			if (dontSaveOnExit)
+			{
+				bool res = EditorUtility.DisplayDialog("Exit Without Save?", "You have selected to exit without saving, are you sure?", "Don't Save", "Save");
+				if (res)
+					return;
+			}
+
+			iconEditor.SaveData();
+		}
+
+		void OnGUI()
+		{
+			if (!window)
+			{
+				RapidIconWindow window = EditorWindow.GetWindow<RapidIconWindow>();
+				window.forceCloseDontSave = true;
+				window.Close();
+				return;
+			}
+
+			if (SessionState.GetBool("rapidicon_forceclose", false))
+			{
+				forceCloseDontSave = true;
+				SessionState.SetBool("rapidicon_forceclose", false);
+				window.Close();
+			}
+
+			/*--------------------------------------------------------------------------------
+			 * Draw window elements
+			 *--------------------------------------------------------------------------------*/
+			GUILayout.BeginHorizontal();
+			if (!iconEditor.fullscreen)
+			{
+				assetList.Draw(leftSeparator.value, window);
+				leftSeparator.Draw(150, rightSeparator.value - 320, window);
+				assetGrid.Draw(rightSeparator.value - leftSeparator.value, window);
+				rightSeparator.Draw(leftSeparator.value + 320, window.position.width - 400, window);
+			}
+			iconEditor.Draw(window.position.width - rightSeparator.value, window);
+			GUILayout.EndHorizontal();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs.meta b/Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs.meta
new file mode 100644
index 00000000..96e5ddbb
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 1aaff905f87cc4c4bb8d3d29cdc687e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Windows/RapidIconWindow.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs b/Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs
new file mode 100644
index 00000000..2c6f40b3
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs
@@ -0,0 +1,144 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace RapidIcon_1_7_4
+{
+	public class ResetWindow : EditorWindow
+	{
+		public static ResetWindow window;
+		private static int option;
+		private static int subOption;
+		private static IconEditor iconEditor;
+
+		public static void Init(IconEditor editor)
+		{
+			window = (ResetWindow)GetWindow(typeof(ResetWindow), true, "Reset");
+			window.position = new Rect(Screen.currentResolution.width / 2 - 200, Screen.currentResolution.height / 2 - 50, 400, 100);
+
+			iconEditor = editor;
+
+			window.Show();
+		}
+
+		void OnGUI()
+		{
+			GUILayout.Space(4);
+			GUILayout.Label("Reset");
+
+			//---Draw dropdown list of selected assets---//
+
+			string[] options = new string[] { "Currently selected variant only", "All variants of currently selected icon", "Currently selected variant of all selected icons", "All variants of all selected icons", "Reset and delete all variants (this icon only)", "Reset and delete all variants (all selected icons)" };
+			option = EditorGUILayout.Popup(option, options);
+
+			if (option <= 3)
+			{
+				string[] subOptions = new string[] { "Current tab only", "All tabs" };
+				subOption = EditorGUILayout.Popup(subOption, subOptions);
+			}
+
+			GUILayout.FlexibleSpace();
+
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+			if (GUILayout.Button("Reset"))
+			{
+				DoReset();
+				window.Close();
+			}
+			GUILayout.EndHorizontal();
+		}
+
+		private void DoReset()
+		{
+			switch (option)
+			{
+				case 0:
+					ResetIcon(iconEditor.currentIcon);
+					break;
+
+				case 1:
+					int idx = 0;
+					int count = iconEditor.currentIconSet.icons.Count;
+					foreach (Icon icon in iconEditor.currentIconSet.icons)
+					{
+						EditorUtility.DisplayProgressBar("Reset Icons", "Resetting icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						ResetIcon(icon);
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+
+				case 2:
+					idx = 0;
+					count = iconEditor.assetGrid.selectedIconSets.Count;
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						EditorUtility.DisplayProgressBar("Reset Icons", "Resetting icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						Icon icon = iconSet.GetCurrentIcon();
+						ResetIcon(icon);
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+
+				case 3:
+					idx = 0;
+					count = iconEditor.assetGrid.selectedIconSets.Count;
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						EditorUtility.DisplayProgressBar("Reset Icons", "Resetting icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						foreach (Icon icon in iconSet.icons)
+						{
+							ResetIcon(icon);
+						}
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+				case 4:
+					iconEditor.currentIconSet.icons.Clear();
+
+					ObjectPathPair currrntSetObj = new ObjectPathPair(iconEditor.currentIconSet.assetObject, iconEditor.currentIconSet.assetPath);
+					iconEditor.currentIconSet.AddDefaultIcon(iconEditor.assetGrid, currrntSetObj);
+
+					iconEditor.currentIconSet.iconIndex = 0;
+					break;
+
+				case 5:
+					idx = 0;
+					count = iconEditor.assetGrid.selectedIconSets.Count;
+					foreach (IconSet iconSet in iconEditor.assetGrid.selectedIconSets)
+					{
+						EditorUtility.DisplayProgressBar("Reset Icons", "Resetting icon (" + idx + "/" + count + ")", (float)(idx++) / count);
+						iconSet.icons.Clear();
+
+						ObjectPathPair setObj = new ObjectPathPair(iconSet.assetObject, iconSet.assetPath);
+						iconSet.AddDefaultIcon(iconEditor.assetGrid, setObj);
+
+						iconSet.iconIndex = 0;
+					}
+					EditorUtility.ClearProgressBar();
+					break;
+			}
+
+		}
+
+		private void ResetIcon(Icon icon)
+		{
+			//---Create a reset icon---//
+			ObjectPathPair obj = new ObjectPathPair(icon.parentIconSet.assetObject, icon.parentIconSet.assetPath);
+			IconSet newIconSet = iconEditor.assetGrid.CreateIconSet(obj);
+
+			Utils.CopyIconSettings(newIconSet.GetCurrentIcon(), icon, subOption == 0 ? iconEditor.tab : -1);
+			ResetHierarchy(icon);
+
+			Utils.UpdateIcon(icon, iconEditor);
+		}
+
+		private void ResetHierarchy(Icon icon)
+		{
+			List<string> keys = icon.iconSettings.subObjectEnables.Keys.ToList();
+			foreach (string s in keys)
+				icon.iconSettings.subObjectEnables[s] = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs.meta b/Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs.meta
new file mode 100644
index 00000000..473f8974
--- /dev/null
+++ b/Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 8d4beb9accfc98843b04511a1978a612
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/Scripts/Windows/ResetWindow.cs
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI.meta b/Assets/RapidIcon/Editor/UI.meta
new file mode 100644
index 00000000..73b9165f
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 954762a6a3282594aa92cadacac0ed67
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Editor/UI/deselectedAsset.png b/Assets/RapidIcon/Editor/UI/deselectedAsset.png
new file mode 100644
index 00000000..d537d8dc
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/deselectedAsset.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:afa5188ef6ca85bb6fcf2bc2cfa41845f0147b8865b24c6701571ab0c595f817
+size 1645
diff --git a/Assets/RapidIcon/Editor/UI/deselectedAsset.png.meta b/Assets/RapidIcon/Editor/UI/deselectedAsset.png.meta
new file mode 100644
index 00000000..710b20a0
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/deselectedAsset.png.meta
@@ -0,0 +1,113 @@
+fileFormatVersion: 2
+guid: 2c228a5b0451ee94286cb772ffdbd13b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  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
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/deselectedAsset.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/error.png b/Assets/RapidIcon/Editor/UI/error.png
new file mode 100644
index 00000000..450dde71
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/error.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb513ff6b32c278bcb2dc1a076f75e1e44814297859a8621134a69a53c1ac709
+size 1144
diff --git a/Assets/RapidIcon/Editor/UI/error.png.meta b/Assets/RapidIcon/Editor/UI/error.png.meta
new file mode 100644
index 00000000..fdd5aa6a
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/error.png.meta
@@ -0,0 +1,124 @@
+fileFormatVersion: 2
+guid: 5a9a54266295a834e8574206d05e5599
+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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/error.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/folderIconClosedDark.png b/Assets/RapidIcon/Editor/UI/folderIconClosedDark.png
new file mode 100644
index 00000000..7c51f536
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconClosedDark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:993674a2e830dc5a8d673c4f26ffa0e5cd32263c2da8ba084815d98295bc6b7a
+size 1593
diff --git a/Assets/RapidIcon/Editor/UI/folderIconClosedDark.png.meta b/Assets/RapidIcon/Editor/UI/folderIconClosedDark.png.meta
new file mode 100644
index 00000000..207ad42f
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconClosedDark.png.meta
@@ -0,0 +1,117 @@
+fileFormatVersion: 2
+guid: ac814a384ed02864586bb115e2d633b3
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/folderIconClosedDark.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/folderIconClosedLight.png b/Assets/RapidIcon/Editor/UI/folderIconClosedLight.png
new file mode 100644
index 00000000..beff52a3
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconClosedLight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42be952f6e3ed69d20d31812be8cec907e20cd51df7bd6520dc9a10795d5c225
+size 1601
diff --git a/Assets/RapidIcon/Editor/UI/folderIconClosedLight.png.meta b/Assets/RapidIcon/Editor/UI/folderIconClosedLight.png.meta
new file mode 100644
index 00000000..3b616d0d
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconClosedLight.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: a5e714f8a69c9e045ba052949185e1cf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/folderIconClosedLight.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/folderIconOpenDark.png b/Assets/RapidIcon/Editor/UI/folderIconOpenDark.png
new file mode 100644
index 00000000..5f937363
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconOpenDark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e917d7443b4346c496946c6b9e0f6f80d38f0df492af0091f2d449eababc6a8
+size 1682
diff --git a/Assets/RapidIcon/Editor/UI/folderIconOpenDark.png.meta b/Assets/RapidIcon/Editor/UI/folderIconOpenDark.png.meta
new file mode 100644
index 00000000..f702f83b
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconOpenDark.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 13aa37db26a94d1469f83d1a77fd963d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/folderIconOpenDark.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/folderIconOpenLight.png b/Assets/RapidIcon/Editor/UI/folderIconOpenLight.png
new file mode 100644
index 00000000..ae2ec4a7
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconOpenLight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e23a20e52a6798dbb0d711fc7568577d31a4a40b89dc1329ad8598e915c3b91d
+size 1678
diff --git a/Assets/RapidIcon/Editor/UI/folderIconOpenLight.png.meta b/Assets/RapidIcon/Editor/UI/folderIconOpenLight.png.meta
new file mode 100644
index 00000000..0b1cab70
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/folderIconOpenLight.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 09f1769391151b34f8a5d7b3c04e97b2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/folderIconOpenLight.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/linkOff.png b/Assets/RapidIcon/Editor/UI/linkOff.png
new file mode 100644
index 00000000..f78dc88a
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/linkOff.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba0edd859aacddd5310a5eec8694990e15bfcd2a305c8a12211c3a74deea54ab
+size 1958
diff --git a/Assets/RapidIcon/Editor/UI/linkOff.png.meta b/Assets/RapidIcon/Editor/UI/linkOff.png.meta
new file mode 100644
index 00000000..ff36c09b
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/linkOff.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: a114500a04d1ce64f937c28005a810f5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/linkOff.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/linkOn.png b/Assets/RapidIcon/Editor/UI/linkOn.png
new file mode 100644
index 00000000..208cf89d
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/linkOn.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df197e6dda82ac478d3e302a745fe091f92c62e0620f34714686cf84bf7cf7e7
+size 1965
diff --git a/Assets/RapidIcon/Editor/UI/linkOn.png.meta b/Assets/RapidIcon/Editor/UI/linkOn.png.meta
new file mode 100644
index 00000000..a9d1a654
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/linkOn.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 64bde91062bb95f45a9f4bcb01f23f72
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/linkOn.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/previewBorder.png b/Assets/RapidIcon/Editor/UI/previewBorder.png
new file mode 100644
index 00000000..64f54c24
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/previewBorder.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9c6246563d4eee72990d04c0cedb8a349e8d645911b034cf0b88cdbd976d48f
+size 1846
diff --git a/Assets/RapidIcon/Editor/UI/previewBorder.png.meta b/Assets/RapidIcon/Editor/UI/previewBorder.png.meta
new file mode 100644
index 00000000..b1820974
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/previewBorder.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 835127944badb174aa949d535c1684cd
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/previewBorder.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/previewGrid.png b/Assets/RapidIcon/Editor/UI/previewGrid.png
new file mode 100644
index 00000000..33374fb9
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/previewGrid.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:083330b4fa9a6c8d32d3579b146a597e6d057ca686b248d47d65a373eec5d3a7
+size 1616
diff --git a/Assets/RapidIcon/Editor/UI/previewGrid.png.meta b/Assets/RapidIcon/Editor/UI/previewGrid.png.meta
new file mode 100644
index 00000000..adc72f45
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/previewGrid.png.meta
@@ -0,0 +1,113 @@
+fileFormatVersion: 2
+guid: 68ba632e4aeca6f4599e2f67d921c7d0
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  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
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: 1
+    mipBias: -1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/previewGrid.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png b/Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png
new file mode 100644
index 00000000..a736fa4d
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:680441f0fdc40dba1e111482c01840f3e05682ec3305b8b7e885cae9a42cc22f
+size 1923
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png.meta b/Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png.meta
new file mode 100644
index 00000000..1e961024
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 7d97d81b00f4874488e8f1ed90493168
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/selectedAssetActiveDark.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png b/Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png
new file mode 100644
index 00000000..f771e6e4
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d82b06f3b7f3b034a496bf7995ef533112404ac2f6b868e4b2e4f5739580be5
+size 1923
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png.meta b/Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png.meta
new file mode 100644
index 00000000..9f1a70a8
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 0dedd4889dcc6d44a8db00515bb6e94a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/selectedAssetActiveLight.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png
new file mode 100644
index 00000000..d21665f5
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6888431160de042bf81a9076c277378db7963cf60c5fc495f6253e1f2ca7198e
+size 1930
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png.meta b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png.meta
new file mode 100644
index 00000000..f3a7dd36
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 5f9f2f73f4839ca4198d5f51757e745a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/selectedAssetInactiveDark.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png
new file mode 100644
index 00000000..8f0dbfa1
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:420341ba73f9226ab195c380e18b4fd90bc3767e2039b6a314ad612a637ad151
+size 1929
diff --git a/Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png.meta b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png.meta
new file mode 100644
index 00000000..6b83a299
--- /dev/null
+++ b/Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png.meta
@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: ae4a2439dff069e479b4e4a39779500b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Editor/UI/selectedAssetInactiveLight.png
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Exports.meta b/Assets/RapidIcon/Exports.meta
new file mode 100644
index 00000000..3e7ef571
--- /dev/null
+++ b/Assets/RapidIcon/Exports.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: be786e1a6a2c47747a7dbccdcc2583bc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/RapidIcon_Documentation.pdf b/Assets/RapidIcon/RapidIcon_Documentation.pdf
new file mode 100644
index 00000000..a4879cb0
--- /dev/null
+++ b/Assets/RapidIcon/RapidIcon_Documentation.pdf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:064ed5b9b89733d0443218bfa306fb1535da0c38d58cef116a8a4cf4f65c9e73
+size 271848
diff --git a/Assets/RapidIcon/RapidIcon_Documentation.pdf.meta b/Assets/RapidIcon/RapidIcon_Documentation.pdf.meta
new file mode 100644
index 00000000..52591f32
--- /dev/null
+++ b/Assets/RapidIcon/RapidIcon_Documentation.pdf.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: 37ad0900422b207448885f6968382857
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/RapidIcon_Documentation.pdf
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders.meta b/Assets/RapidIcon/Shaders.meta
new file mode 100644
index 00000000..83237eec
--- /dev/null
+++ b/Assets/RapidIcon/Shaders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9194eea3f3d5e6e4b8dcfe274045ebaf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Shaders/ImgShader.shader b/Assets/RapidIcon/Shaders/ImgShader.shader
new file mode 100644
index 00000000..03eafce3
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/ImgShader.shader
@@ -0,0 +1,77 @@
+Shader "RapidIcon/ImgShader" 
+{
+	Properties
+	{
+		_MainTex("Tex", 2D) = "white" {}
+		_UseDepthTexture("UseDepthTexture", int) = 0
+	}
+		SubShader
+	{
+		Tags { "Queue" = "Transparent" "PreviewType" = "Plane" }
+
+		//LOD 100
+
+		ZWrite Off
+		Blend One OneMinusSrcAlpha
+
+		Pass
+		{
+			CGPROGRAM
+			#pragma vertex vert
+			#pragma fragment frag
+
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float4 pos : SV_POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			sampler2D _MainTex;
+			sampler2D _LastCameraDepthTexture;
+			int _UseDepthTexture;
+
+			v2f vert(appdata v)
+			{
+				v2f o;
+				o.pos = UnityObjectToClipPos(v.vertex);
+				o.uv = v.uv;
+				return o;
+			}
+
+			half4 frag(v2f i) : SV_Target
+			{
+				half4 col = tex2D(_MainTex, i.uv);
+
+				if (col.a > 0 && col.a < 1)
+				{
+					col.r /= col.a;
+					col.g /= col.a;
+					col.b /= col.a;
+				}
+
+				float depth = tex2D(_LastCameraDepthTexture, i.uv).r;
+				depth = Linear01Depth(depth);
+				depth = 1-depth;
+				if(depth > 0.01)
+					depth = 1;
+				
+				if(_UseDepthTexture == 1)
+				{
+					col.a*=depth;
+				}
+
+				return col;
+			}
+			ENDCG
+		}
+	}
+}
+
diff --git a/Assets/RapidIcon/Shaders/ImgShader.shader.meta b/Assets/RapidIcon/Shaders/ImgShader.shader.meta
new file mode 100644
index 00000000..d1b3f253
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/ImgShader.shader.meta
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: c8660893a3c43aa4fb36057a3973f713
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/ImgShader.shader
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders/ObjectRender.shader b/Assets/RapidIcon/Shaders/ObjectRender.shader
new file mode 100644
index 00000000..fde277a6
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/ObjectRender.shader
@@ -0,0 +1,59 @@
+Shader "RapidIcon/ObjectRender"
+{
+	Properties
+	{
+		[NoScaleOffset]
+		_MainTex("Tex", 2D) = "black" {}
+
+		[NoScaleOffset]
+		_Render("Object Render", 2D) = "black" {}
+	}
+	SubShader
+	{
+		Blend One OneMinusSrcAlpha
+
+		Pass
+		{
+			CGPROGRAM
+			#pragma vertex vert
+			#pragma fragment frag
+
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float2 uv : TEXCOORD0;
+				float4 vertex : SV_POSITION;
+			};
+
+			v2f vert(appdata v)
+			{
+				v2f o;
+				o.vertex = UnityObjectToClipPos(v.vertex);
+				o.uv = v.uv;
+				return o;
+			}
+
+			sampler2D _MainTex;
+			sampler2D _Render;
+
+			fixed4 frag(v2f i) : SV_Target
+			{
+				fixed4 col = tex2D(_MainTex, i.uv);
+				fixed4 render = tex2D(_Render, i.uv);
+
+				fixed4 output;
+				output.rgb = lerp(col.rgb, render.rgb, render.a);
+				output.a = 1 - ((1 - col.a)*(1 - render.a));
+				return output;
+			}
+			ENDCG
+		}
+	}
+}
diff --git a/Assets/RapidIcon/Shaders/ObjectRender.shader.meta b/Assets/RapidIcon/Shaders/ObjectRender.shader.meta
new file mode 100644
index 00000000..7b1698c4
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/ObjectRender.shader.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: e533984b6c5c18a4087237c04964e9f0
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/ObjectRender.shader
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders/PostProcessing.meta b/Assets/RapidIcon/Shaders/PostProcessing.meta
new file mode 100644
index 00000000..e560520e
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3462a04ea39fe2242896806769cbb73f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/HSV.shader b/Assets/RapidIcon/Shaders/PostProcessing/HSV.shader
new file mode 100644
index 00000000..3240f654
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/HSV.shader
@@ -0,0 +1,85 @@
+Shader "RapidIcon/PostProcessing/HSV"
+{
+	Properties
+	{
+		_MainTex("Texture", 2D) = "white" {}
+		_Hue("Hue", range(0,1)) = 0
+		_Saturation("Saturation", range(0,1)) = 1
+		_Value("Value", range(0,1)) = 1
+	}
+	
+	SubShader
+	{
+		// No culling or depth
+		Cull Off ZWrite Off ZTest Always
+
+		Pass
+		{
+			CGPROGRAM
+			#pragma vertex vert
+			#pragma fragment frag
+
+			#include "UnityCG.cginc"
+
+			struct appdata
+			{
+				float4 vertex : POSITION;
+				float2 uv : TEXCOORD0;
+			};
+
+			struct v2f
+			{
+				float2 uv : TEXCOORD0;
+				float4 vertex : SV_POSITION;
+			};
+
+			v2f vert(appdata v)
+			{
+				v2f o;
+				o.vertex = UnityObjectToClipPos(v.vertex);
+				o.uv = v.uv;
+				return o;
+			}
+
+			sampler2D _MainTex;
+			float _Hue;
+			float _Saturation;
+			float _Value;
+
+			fixed4 frag(v2f i) : SV_Target
+			{
+				fixed4 col = tex2D(_MainTex, i.uv);
+
+				float pi = 3.14159265359;
+				float U = cos(2*_Hue*pi);
+				float W = sin(2*_Hue*pi);
+
+				float4 newCol;
+				newCol.r = (.299 + .701*U + .168*W)*col.r
+					+ (.587 - .587*U + .330*W)*col.g
+					+ (.114 - .114*U - .497*W)*col.b;
+				newCol.g = (.299 - .299*U - .328*W)*col.r
+					+ (.587 + .413*U + .035*W)*col.g
+					+ (.114 - .114*U + .292*W)*col.b;
+				newCol.b = (.299 - .3*U + 1.25*W)*col.r
+					+ (.587 - .588*U - 1.05*W)*col.g
+					+ (.114 + .886*U - .203*W)*col.b;
+				
+				float grayscale;
+				grayscale = dot(float3(0.222, 0.707, 0.071), newCol);
+
+				float3 desatCol;
+				desatCol = float3(grayscale, grayscale, grayscale);
+				
+				col.rgb = lerp(desatCol, newCol.rgb, _Saturation)*_Value;
+
+				return col;
+			}
+
+			ENDCG
+		}
+	}
+}
+
+
+
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/HSV.shader.meta b/Assets/RapidIcon/Shaders/PostProcessing/HSV.shader.meta
new file mode 100644
index 00000000..5f55b91a
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/HSV.shader.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: bbdf8525b70b0674b9fc5434a98da0ad
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/PostProcessing/HSV.shader
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Mask.shader b/Assets/RapidIcon/Shaders/PostProcessing/Mask.shader
new file mode 100644
index 00000000..087f1bf3
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Mask.shader
@@ -0,0 +1,63 @@
+Shader "RapidIcon/PostProcessing/Mask" {
+	Properties{
+		[NoScaleOffset]
+		[MainTexture]
+		_MainTex("Tex", 2D) = "black" {}
+
+		[NoScaleOffset]
+		_MaskTex("Mask", 2D) = "white" {}
+
+		[Toggle]
+		_UseLuminance("Use Luminance", Int) = 1
+	}
+		SubShader
+		{
+			Tags {  "Queue" = "Transparent" "RenderType" = "Transparent" }
+			Blend One OneMinusSrcAlpha
+			Pass
+			{
+				CGPROGRAM
+				#pragma vertex vert_img
+				#pragma fragment frag
+				#include "UnityCG.cginc"
+
+				struct appdata
+				{
+					float4 vertex : POSITION;
+					float2 uv : TEXCOORD0;
+				};
+
+				struct v2f
+				{
+					float2 uv : TEXCOORD0;
+					float4 vertex : SV_POSITION;
+				};
+
+				sampler2D _MainTex;
+				sampler2D _MaskTex;
+				int _UseLuminance;
+
+				fixed4 frag(v2f_img i) : SV_Target
+				{
+					fixed4 col = tex2D(_MainTex, i.uv);
+
+					fixed3 maskCol = tex2D(_MaskTex, i.uv).rgb;
+					if (_UseLuminance == 1)
+					{
+						fixed maskLum = Luminance(maskCol).r;
+						col *= maskLum;
+					}
+					else 
+					{
+						fixed maskLum = maskCol.r;
+						col *= maskLum;
+					}				
+					
+					return col;
+
+				}
+				ENDCG
+			}
+		}
+			FallBack "Diffuse"
+}
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Mask.shader.meta b/Assets/RapidIcon/Shaders/PostProcessing/Mask.shader.meta
new file mode 100644
index 00000000..af1ada69
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Mask.shader.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: 0799f06535cf3f14991a4a50bcc4673c
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/PostProcessing/Mask.shader
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader b/Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader
new file mode 100644
index 00000000..3354abed
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader
@@ -0,0 +1,113 @@
+Shader "RapidIcon/PostProcessing/Overlay"
+{
+    Properties
+    {
+		[NoScaleOffset]
+		_MainTex("Tex", 2D) = "black" {}
+		[NoScaleOffset]
+		_OverlayTex("Overlay Image", 2D) = "black" {}
+		
+		[Toggle]
+		_MatchAspect("Match Image Aspect Ratio", Int) = 1
+		_Scale("Scale", Float) = 1
+		_OffsetX("X Offset", Float) = 0
+		_OffsetY("Y Offset", Float) = 0
+    }
+    SubShader
+    {
+		Blend One OneMinusSrcAlpha
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uvMain : TEXCOORD0;
+				float2 uvOverlay : TEXCOORD1;
+            };
+
+            struct v2f
+            {
+				float2 uvMain : TEXCOORD0;
+				float2 uvOverlay : TEXCOORD1;
+                float4 vertex : SV_POSITION;
+            };
+
+			float4 _MainTex_TexelSize;
+			float4 _OverlayTex_TexelSize;
+			int _MatchAspect;
+			float _Scale;
+			float _OffsetX;
+			float _OffsetY;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+				o.uvMain = v.uvMain;
+				o.uvOverlay = v.uvOverlay;
+				
+				o.uvOverlay.x -= _OffsetX;
+				o.uvOverlay.y -= _OffsetY;
+
+				o.uvOverlay = (o.uvOverlay - 0.5) / _Scale + 0.5;
+				
+				if (_OverlayTex_TexelSize.z > _OverlayTex_TexelSize.w)
+				{
+					float aspectScale = _OverlayTex_TexelSize.x / _OverlayTex_TexelSize.y;
+					o.uvOverlay.y = (o.uvOverlay.y - 0.5) / aspectScale + 0.5;
+				}
+				else
+				{
+					float aspectScale = _OverlayTex_TexelSize.y / _OverlayTex_TexelSize.x;
+					o.uvOverlay.x = (o.uvOverlay.x - 0.5) / aspectScale + 0.5;
+				}
+
+				if (!_MatchAspect) {
+					if (_MainTex_TexelSize.z > _MainTex_TexelSize.w)
+					{
+						float aspectScale = _MainTex_TexelSize.y / _MainTex_TexelSize.x;
+						o.uvOverlay.y = (o.uvOverlay.y - 0.5) / aspectScale + 0.5;
+					}
+					else
+					{
+						float aspectScale = _MainTex_TexelSize.x / _MainTex_TexelSize.y;
+						o.uvOverlay.x = (o.uvOverlay.x - 0.5) / aspectScale + 0.5;
+					}
+				}
+
+                return o;
+            }
+
+            sampler2D _MainTex;
+			sampler2D _OverlayTex;
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                fixed4 main = tex2D(_MainTex, i.uvMain);
+				fixed4 overlay = tex2D(_OverlayTex, i.uvOverlay);
+
+				fixed4 output;
+				if (i.uvOverlay.x < 0 || i.uvOverlay.x > 1 || i.uvOverlay.y < 0 || i.uvOverlay.y > 1)
+					output = main;
+				else
+				{
+					if (overlay.a > 0)
+						output.rgb = lerp(main.rgb, overlay.rgb, overlay.a);
+					else
+						output.rgb = main;
+
+					output.a = 1 - ((1 - main.a)*(1 - overlay.a));
+				}
+				return output;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader.meta b/Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader.meta
new file mode 100644
index 00000000..a005fdef
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: 4ed84d029799b8b42bd7d4b9899db3b2
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/PostProcessing/Overlay.shader
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader b/Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader
new file mode 100644
index 00000000..01d5dbfd
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader
@@ -0,0 +1,53 @@
+Shader "RapidIcon/PostProcessing/Transparency"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+		_Transparency("Transparency", range(0, 1)) = 0
+    }
+    SubShader
+    {
+        // No culling or depth
+        Cull Off ZWrite Off ZTest Always
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                float4 vertex : SV_POSITION;
+            };
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = v.uv;
+                return o;
+            }
+
+            sampler2D _MainTex;
+			float _Transparency;
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                fixed4 col = tex2D(_MainTex, i.uv);
+				col *= 1-_Transparency;
+                return col;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader.meta b/Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader.meta
new file mode 100644
index 00000000..29ff9144
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: 4fbf5a470ce0bd341b7e867ab7ead320
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/PostProcessing/Transparency.shader
+  uploadId: 808938
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader b/Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader
new file mode 100644
index 00000000..e95bafc2
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader
@@ -0,0 +1,112 @@
+Shader "RapidIcon/PostProcessing/Underlay"
+{
+    Properties
+    {
+		[NoScaleOffset]
+		_MainTex("Tex", 2D) = "black" {}
+		[NoScaleOffset]
+		_UnderlayTex("Underlay Image", 2D) = "black" {}
+		
+		[Toggle]
+		_MatchAspect("Match Image Aspect Ratio", Int) = 1
+		_Scale("Scale", Float) = 1
+		_OffsetX("X Offset", Float) = 0
+		_OffsetY("Y Offset", Float) = 0
+    }
+    SubShader
+    {
+		Blend One OneMinusSrcAlpha
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uvMain : TEXCOORD0;
+				float2 uvUnderlay : TEXCOORD1;
+            };
+
+            struct v2f
+            {
+				float2 uvMain : TEXCOORD0;
+				float2 uvUnderlay : TEXCOORD1;
+                float4 vertex : SV_POSITION;
+            };
+
+			float4 _MainTex_TexelSize;
+			float4 _UnderlayTex_TexelSize;
+			int _MatchAspect;
+			float _Scale;
+			float _OffsetX;
+			float _OffsetY;
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+				o.uvMain = v.uvMain;
+				o.uvUnderlay = v.uvUnderlay;
+				
+				o.uvUnderlay.x -= _OffsetX;
+				o.uvUnderlay.y -= _OffsetY;
+
+				o.uvUnderlay = (o.uvUnderlay - 0.5) / _Scale + 0.5;
+				
+				if (_UnderlayTex_TexelSize.z > _UnderlayTex_TexelSize.w)
+				{
+					float aspectScale = _UnderlayTex_TexelSize.x / _UnderlayTex_TexelSize.y;
+					o.uvUnderlay.y = (o.uvUnderlay.y - 0.5) / aspectScale + 0.5;
+				}
+				else
+				{
+					float aspectScale = _UnderlayTex_TexelSize.y / _UnderlayTex_TexelSize.x;
+					o.uvUnderlay.x = (o.uvUnderlay.x - 0.5) / aspectScale + 0.5;
+				}
+
+				if (!_MatchAspect) {
+					if (_MainTex_TexelSize.z > _MainTex_TexelSize.w)
+					{
+						float aspectScale = _MainTex_TexelSize.y / _MainTex_TexelSize.x;
+						o.uvUnderlay.y = (o.uvUnderlay.y - 0.5) / aspectScale + 0.5;
+					}
+					else
+					{
+						float aspectScale = _MainTex_TexelSize.x / _MainTex_TexelSize.y;
+						o.uvUnderlay.x = (o.uvUnderlay.x - 0.5) / aspectScale + 0.5;
+					}
+				}
+
+                return o;
+            }
+
+            sampler2D _MainTex;
+			sampler2D _UnderlayTex;
+
+            fixed4 frag(v2f i) : SV_Target
+            {
+                fixed4 main = tex2D(_MainTex, i.uvMain);
+				fixed4 underlay = tex2D(_UnderlayTex, i.uvUnderlay);
+
+				fixed4 output;
+				if (i.uvUnderlay.x < 0 || i.uvUnderlay.x > 1 || i.uvUnderlay.y < 0 || i.uvUnderlay.y > 1)
+					output = main;
+				else
+				{
+					if (underlay.a > 0)
+						output.rgb = lerp(underlay.rgb, main.rgb, main.a);
+					else
+						output.rgb = main;
+					output.a = 1 - ((1 - main.a)*(1 - underlay.a));
+				}
+				return output;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader.meta b/Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader.meta
new file mode 100644
index 00000000..97284404
--- /dev/null
+++ b/Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: 3ddb549f2327e954b9e89f3dfd58593c
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 204667
+  packageName: RapidIcon | In-Editor Icon Generator
+  packageVersion: 1.7.4
+  assetPath: Assets/RapidIcon/Shaders/PostProcessing/Underlay.shader
+  uploadId: 808938
diff --git a/Assets/XRI Starter Kit/Assets/Interactables/FireHand/FireHand.prefab b/Assets/XRI Starter Kit/Assets/Interactables/FireHand/FireHand.prefab
index eaa4e831..cbcfc87c 100644
--- a/Assets/XRI Starter Kit/Assets/Interactables/FireHand/FireHand.prefab	
+++ b/Assets/XRI Starter Kit/Assets/Interactables/FireHand/FireHand.prefab	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03fae53ac95f6d693d6d6415e05959063e59f833a87974adb3f87bda0ad622c0
-size 982952
+oid sha256:1dbb78336a940280e0407992b079a49aca28e1b6acda10c7ff6582af033d7aaf
+size 944983
diff --git a/Assets/XRI Starter Kit/Hands & Poses/Robot Hand/Material/RobotHand Red.mat b/Assets/XRI Starter Kit/Hands & Poses/Robot Hand/Material/RobotHand Red.mat
index 5b676faf..322c6c90 100644
--- a/Assets/XRI Starter Kit/Hands & Poses/Robot Hand/Material/RobotHand Red.mat	
+++ b/Assets/XRI Starter Kit/Hands & Poses/Robot Hand/Material/RobotHand Red.mat	
@@ -11,9 +11,7 @@ Material:
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _NORMALMAP
-  - _OCCLUSIONMAP
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -52,7 +50,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 23829bbf0f96b9a47aad87191fa57a6c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -117,6 +115,7 @@ Material:
     - _Surface: 0
     - _UVSec: 0
     - _WorkflowMode: 1
+    - _XRMotionVectorsPass: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 94e50240..9311360f 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,6 +1,10 @@
 {
   "dependencies": {
+<<<<<<< HEAD
+    "com.unity.2d.sprite": "1.0.0",
+=======
     "com.unity.ai.navigation": "2.0.13",
+>>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
     "com.unity.burst": "1.8.27",
     "com.unity.cinemachine": "3.1.7",
     "com.unity.cloud.gltfast": "6.19.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 509715b2..f5b49239 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,12 @@
 {
   "dependencies": {
+<<<<<<< HEAD
+    "com.unity.2d.sprite": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+=======
     "com.unity.ai.navigation": {
       "version": "2.0.13",
       "depth": 0,
@@ -8,6 +15,7 @@
         "com.unity.modules.ai": "1.0.0"
       },
       "url": "https://packages.unity.com"
+>>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
     },
     "com.unity.bindings.openimageio": {
       "version": "1.0.2",
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 506d596b..e5096487 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e33f4562e00f0746f27209b3b2406cf8d2195b80868ad68da70dea86dcb7324
-size 614
+oid sha256:da4b5eefc927f8b91bcf9e56a186d2b852f49d9cbe91d466638d26c79d6a83ce
+size 411