0.3.5.18

2024-12-17 21:54:30 +09:00 · 2024-12-17 21:54:30 +09:00 · ec93fe81ed
commit ec93fe81ed
parent 956ae93ae6
32 changed files with 3273 additions and 299 deletions
--- a/Assets/01.Scenes/01.Tycoon.unity
+++ b/Assets/01.Scenes/01.Tycoon.unity
--- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs
+++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs
@ -24,6 +24,12 @@ namespace BlueWater.BehaviorTrees.Actions

        public override void OnStart()
        {
+            if (!_customer.CanVomit)
+            {
+                _canVomit = false;
+                return;
+            }
+            
            _customer.MoveMoneyCounter();
            var random = Random.Range(0f, 100f);
            if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent)
--- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs
@ -21,7 +21,7 @@ namespace BlueWater.Npcs.Customers
    {
        public const string Idle = "Idle";
        public const string Walk = "Run";
-        public const string Happy = "Happy";
+        public const string Happy = "HappyIdle";
        public const string HappyRun = "HappyRun";
        public const string Upset = "Upset";
        public const string UpsetRun = "UpsetRun";
@ -30,6 +30,30 @@ namespace BlueWater.Npcs.Customers
        public const string VomitingIdle = "VomitingIdle";
        public const string VomitingRun = "VomitingRun";
    }
+    
+    public static class CatSpineAnimation
+    {
+        public const string Idle = "Cat/Idle";
+        public const string Walk = "Cat/Run";
+        public const string Happy = "Cat/HappyIdle";
+        public const string HappyRun = "Cat/HappyRun";
+        public const string Upset = "Cat/Upset";
+        public const string UpsetRun = "Cat/UpsetRun";
+        public const string Vomiting = "Cat/Vomiting";
+        public const string VomitingForm = "Cat/VomitingForm";
+        public const string VomitingIdle = "Cat/VomitingIdle";
+        public const string VomitingRun = "Cat/VomitingRun";
+    }
+    
+    public static class WitchSpineAnimation
+    {
+        public const string Idle = "Witch/Idle";
+        public const string Walk = "Witch/Run";
+        public const string Happy = "Witch/HappyIdle";
+        public const string HappyRun = "Witch/HappyRun";
+        public const string Upset = "Witch/Upset";
+        public const string UpsetRun = "Witch/UpsetRun";
+    }

    public enum CustomerInteractionType
    {
@ -39,8 +63,13 @@ namespace BlueWater.Npcs.Customers

    public enum CustomerSkin
    {
-        Casper = 0,
-        PumkinHead = 1
+        BigCat = 0,
+        Casper = 1,
+        CasperBlack = 2,
+        Cat = 3,
+        PumkinHead = 4,
+        Reaper = 5,
+        Witch = 6
    }
    
    public class Customer : MonoBehaviour, IPlayerInteraction, ICrewInteraction
@ -99,7 +128,6 @@ namespace BlueWater.Npcs.Customers
        [field: SerializeField]
        public string InteractionMessage { get; set; }
        
-        [field: Title("실시간 데이터")]
        [field: SerializeField]
        public LevelData CurrentLevelData { get; private set; }
        
@ -127,6 +155,7 @@ namespace BlueWater.Npcs.Customers
        private CustomerInteractionType _customerInteractionType;
        
        public bool IsMoving { get; private set; }
+        public bool CanVomit { get; private set; }
        public bool IsVomited { get; private set; }

        [SerializeField]
@ -148,7 +177,16 @@ namespace BlueWater.Npcs.Customers
            }
        }
        
-        public int CustomerSkin { get; private set; }
+        [Title("스킨 연출")]
+        [field: SerializeField]
+        public CustomerSkin CustomerSkin { get; private set; }
+
+        [SerializeField]
+        private Vector3 _bigSize = new(1.5f, 1.5f, 1.5f);
+        
+        [SerializeField]
+        private Vector3 _smallSize = new(0.5f, 0.5f, 0.5f);
+        
        public int HurryTime { get; private set; }
        
        private IAstarAI _astarAi;
@ -197,10 +235,20 @@ namespace BlueWater.Npcs.Customers
            {
                if (element.ToString().Equals(currentSkinName))
                {
-                    CustomerSkin = (int)element;
-                    return;
+                    CustomerSkin = element;
+                    break;
                }
            }
+
+            if (CustomerSkin is CustomerSkin.BigCat or CustomerSkin.Witch)
+            {
+                CanVomit = false;
+                transform.localScale = _bigSize;
+            }
+            else
+            {
+                CanVomit = true;
+            }
        }

        private void Update()
@ -407,14 +455,14 @@ namespace BlueWater.Npcs.Customers
        
        public virtual void ShowInteractionUi()
        {
-            SpineController.EnableCustomMaterial();
+            //SpineController.EnableCustomMaterial();
            EventManager.InvokeShowInteractionUi(InteractionMessage);
            EventManager.InvokeHoldInteracting(0f);
        }

        public virtual void HideInteractionUi()
        {
-            SpineController.DisableCustomMaterial();
+            //SpineController.DisableCustomMaterial();
            EventManager.InvokeHideInteractionUi();
        }

--- a/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/State/HappyState.cs
@ -6,7 +6,18 @@ namespace BlueWater.Npcs.Customers
    {
        public void EnterState(Customer character)
        {
-            character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true);
+            if (character.CustomerSkin == CustomerSkin.Cat)
+            {
+                character.SpineController.PlayAnimation(CatSpineAnimation.Happy, true);
+            }
+            else if (character.CustomerSkin == CustomerSkin.Witch)
+            {
+                character.SpineController.PlayAnimation(WitchSpineAnimation.Happy, true);
+            }
+            else
+            {
+                character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true);
+            }
        }

        public void UpdateState(Customer character)
--- a/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/State/IdleState.cs
@ -8,16 +8,62 @@ namespace BlueWater.Npcs.Customers
        {
            if (character.IsVomited)
            {
-                character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingIdle, true);
+                if (character.CustomerSkin == CustomerSkin.Cat)
+                {
+                    character.SpineController.PlayAnimation(CatSpineAnimation.VomitingIdle, true);
+                }
+                else
+                {
+                    character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingIdle, true);
+                }
            }
            else if (character.IsReceivedItem)
            {
-                character.SpineController.PlayAnimation(character.IsOrderedCorrected ?
-                    CustomerSpineAnimation.Happy : CustomerSpineAnimation.Upset, true);
+                if (character.IsOrderedCorrected)
+                {
+                    if (character.CustomerSkin == CustomerSkin.Cat)
+                    {
+                        character.SpineController.PlayAnimation(CatSpineAnimation.Happy, true);
+                    }
+                    else if (character.CustomerSkin == CustomerSkin.Witch)
+                    {
+                        character.SpineController.PlayAnimation(WitchSpineAnimation.Happy, true);
+                    }
+                    else
+                    {
+                        character.SpineController.PlayAnimation(CustomerSpineAnimation.Happy, true);
+                    }
+                }
+                else
+                {
+                    if (character.CustomerSkin == CustomerSkin.Cat)
+                    {
+                        character.SpineController.PlayAnimation(CatSpineAnimation.Upset, true);
+                    }
+                    else if (character.CustomerSkin == CustomerSkin.Witch)
+                    {
+                        character.SpineController.PlayAnimation(WitchSpineAnimation.Upset, true);
+                    }
+                    else
+                    {
+                        character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true);
+                    }
+                }
            }
            else if (!character.IsReceivedItem)
            {
-                character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true);
+                if (character.CustomerSkin == CustomerSkin.Cat)
+                {
+                    character.SpineController.PlayAnimation(CatSpineAnimation.Idle, true);
+                }
+                else if (character.CustomerSkin == CustomerSkin.Witch)
+                {
+                    character.SpineController.PlayAnimation(WitchSpineAnimation.Idle, true);
+                }
+                else
+                {
+                    character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true);
+                }
            }
        }

@ -25,6 +71,18 @@ namespace BlueWater.Npcs.Customers
        {
            if (character.IsMoving)
            {
+                if (character.CustomerSkin == CustomerSkin.Cat)
+                {
+                    character.SpineController.PlayAnimation(CatSpineAnimation.Idle, true);
+                }
+                else if (character.CustomerSkin == CustomerSkin.Witch)
+                {
+                    character.SpineController.PlayAnimation(WitchSpineAnimation.Idle, true);
+                }
+                else
+                {
+                    character.SpineController.PlayAnimation(CustomerSpineAnimation.Idle, true);
+                }
                character.StateMachineController.TransitionToState(character.WalkingState, character);
            }
        }
--- a/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/State/UpsetState.cs
@ -6,7 +6,18 @@ namespace BlueWater.Npcs.Customers
    {
        public void EnterState(Customer character)
        {
-            character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true);
+            if (character.CustomerSkin == CustomerSkin.Cat)
+            {
+                character.SpineController.PlayAnimation(CatSpineAnimation.Upset, true);
+            }
+            else if (character.CustomerSkin == CustomerSkin.Witch)
+            {
+                character.SpineController.PlayAnimation(WitchSpineAnimation.Upset, true);
+            }
+            else
+            {
+                character.SpineController.PlayAnimation(CustomerSpineAnimation.Upset, true);
+            }
        }

        public void UpdateState(Customer character)
--- a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs
@ -10,7 +10,14 @@ namespace BlueWater.Npcs.Customers
        
        public void EnterState(Customer character)
        {
-            character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingForm, false);
+            if (character.CustomerSkin == CustomerSkin.Cat)
+            {
+                character.SpineController.PlayAnimation(CatSpineAnimation.VomitingForm, false);
+            }
+            else
+            {
+                character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingForm, false);
+            }
        }

        public void UpdateState(Customer character)
@ -18,7 +25,14 @@ namespace BlueWater.Npcs.Customers
            if (!_isVomiting && character.SpineController.IsAnimationComplete())
            {
                AudioManager.Instance.PlaySfx(_vomitSfxName);
-                character.SpineController.PlayAnimation(CustomerSpineAnimation.Vomiting, false);
+                if (character.CustomerSkin == CustomerSkin.Cat)
+                {
+                    character.SpineController.PlayAnimation(CatSpineAnimation.Vomiting, false);
+                }
+                else
+                {
+                    character.SpineController.PlayAnimation(CustomerSpineAnimation.Vomiting, false);
+                }
                _isVomiting = true;
            }

--- a/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/State/WalkingState.cs
@ -8,16 +8,62 @@ namespace BlueWater.Npcs.Customers
        {
            if (character.IsVomited)
            {
-                character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingRun, true);
+                if (character.CustomerSkin == CustomerSkin.Cat)
+                {
+                    character.SpineController.PlayAnimation(CatSpineAnimation.VomitingRun, true);
+                }
+                else
+                {
+                    character.SpineController.PlayAnimation(CustomerSpineAnimation.VomitingRun, true);
+                }
            }
            else if (character.IsReceivedItem)
            {
-                character.SpineController.PlayAnimation(character.IsOrderedCorrected ?
-                    CustomerSpineAnimation.HappyRun : CustomerSpineAnimation.UpsetRun, true);
+                if (character.IsOrderedCorrected)
+                {
+                    if (character.CustomerSkin == CustomerSkin.Cat)
+                    {
+                        character.SpineController.PlayAnimation(CatSpineAnimation.HappyRun, true);
+                    }
+                    else if (character.CustomerSkin == CustomerSkin.Witch)
+                    {
+                        character.SpineController.PlayAnimation(WitchSpineAnimation.HappyRun, true);
+                    }
+                    else
+                    {
+                        character.SpineController.PlayAnimation(CustomerSpineAnimation.HappyRun, true);
+                    }
+                }
+                else
+                {
+                    if (character.CustomerSkin == CustomerSkin.Cat)
+                    {
+                        character.SpineController.PlayAnimation(CatSpineAnimation.UpsetRun, true);
+                    }
+                    else if (character.CustomerSkin == CustomerSkin.Witch)
+                    {
+                        character.SpineController.PlayAnimation(WitchSpineAnimation.UpsetRun, true);
+                    }
+                    else
+                    {
+                        character.SpineController.PlayAnimation(CustomerSpineAnimation.UpsetRun, true);
+                    }
+                }
            }
            else if (!character.IsReceivedItem)
            {
-                character.SpineController.PlayAnimation(CustomerSpineAnimation.Walk, true);
+                if (character.CustomerSkin == CustomerSkin.Cat)
+                {
+                    character.SpineController.PlayAnimation(CatSpineAnimation.Walk, true);
+                }
+                else if (character.CustomerSkin == CustomerSkin.Witch)
+                {
+                    character.SpineController.PlayAnimation(WitchSpineAnimation.Walk, true);
+                }
+                else
+                {
+                    character.SpineController.PlayAnimation(CustomerSpineAnimation.Walk, true);
+                }
            }
        }

--- a/Assets/02.Scripts/EventManager.cs
+++ b/Assets/02.Scripts/EventManager.cs
@ -232,8 +232,8 @@ namespace BlueWater
        }

        // 손님이 퇴장하기 전에 스킨을 확인하는 이벤트 
-        public static Action<int> OnCheckedSkin;
-        public static void InvokeCheckedSkin(int skinIndex)
+        public static Action<CustomerSkin> OnCheckedSkin;
+        public static void InvokeCheckedSkin(CustomerSkin skinIndex)
        {
            OnCheckedSkin?.Invoke(skinIndex);
        }
--- a/Assets/02.Scripts/Tycoon/LevelData.cs
+++ b/Assets/02.Scripts/Tycoon/LevelData.cs
@ -8,8 +8,9 @@ namespace BlueWater
 {
    public enum RewardBoxType
    {
-        Normal = 0,
-        Rare = 1
+        None = 0,
+        Normal = 1,
+        Rare = 2
    }
   
    [Serializable]
--- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs
+++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs
@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using BlueWater.Audios;
 using BlueWater.Items;
 using BlueWater.Utility;
 using Sirenix.OdinInspector;
@ -157,7 +156,7 @@ namespace BlueWater.Tycoons
        [Button("노말 상자 생성")]
        public void CreateChest(LevelData levelData)
        {
-            if (levelData.Idx == "1") return;
+            if (levelData.Idx == "1" || levelData.RewardBoxType == RewardBoxType.None) return;
            
            var spawnPosition = Utils.RandomPositionOnGraph(1);

--- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs
+++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs
@ -2,12 +2,14 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using BlueWater.Audios;
+using BlueWater.Npcs.Customers;
 using BlueWater.Tycoons;
 using BlueWater.Utility;
 using UnityEngine;
 using Sirenix.OdinInspector;
 using TMPro;
 using UnityEngine.InputSystem;
+using UnityEngine.Serialization;
 using UnityEngine.UI;

 namespace BlueWater.Uis
@ -63,6 +65,13 @@ namespace BlueWater.Uis

        [SerializeField]
        private GameObject _customerContents;
+        
+        [SerializeField]
+        private GameObject _bigCatPanel;
+
+        [SerializeField]
+        private TMP_Text _bigCatText;
+        private int _bigCatCount;

        [SerializeField]
        private GameObject _casperPanel;
@ -71,6 +80,20 @@ namespace BlueWater.Uis
        private TMP_Text _casperText;
        private int _casperCount;
        
+        [SerializeField]
+        private GameObject _casperBlackPanel;
+
+        [SerializeField]
+        private TMP_Text _casperBlackText;
+        private int _casperBlackCount;
+        
+        [SerializeField]
+        private GameObject _catPanel;
+
+        [SerializeField]
+        private TMP_Text _catText;
+        private int _catCount;
+        
        [SerializeField]
        private GameObject _pumpkinPanel;
        
@ -78,6 +101,20 @@ namespace BlueWater.Uis
        private TMP_Text _pumpkinText;
        private int _pumpkinCount;
        
+        [SerializeField]
+        private GameObject _reaperPanel;
+
+        [SerializeField]
+        private TMP_Text _reaperText;
+        private int _reaperCount;
+        
+        [SerializeField]
+        private GameObject _witchPanel;
+
+        [SerializeField]
+        private TMP_Text _witchText;
+        private int _witchCount;
+        
        [Title("서비스")]
        [SerializeField]
        private GameObject _serviceTitlePanel;
@ -220,8 +257,13 @@ namespace BlueWater.Uis
            _mainMenuButton.onClick.AddListener(() => SceneController.Instance.LoadScene(SceneName.TycoonTile));
            _restartButton.onClick.AddListener(SceneController.Instance.RestartCurrentScene);

+            _bigCatCount = 0;
            _casperCount = 0;
+            _casperBlackCount = 0;
+            _catCount = 0;
            _pumpkinCount = 0;
+            _reaperCount = 0;
+            _witchCount = 0;
            _goodServingCount = 0;
            _failedServingCount = 0;
            _missServingCount = 0;
@ -311,8 +353,13 @@ namespace BlueWater.Uis
            _textPanel.SetActive(true);
            _customerPanel.SetActive(true);
            _customerContents.SetActive(true);
+            _bigCatPanel.SetActive(true);
            _casperPanel.SetActive(true);
+            _casperBlackPanel.SetActive(true);
+            _catPanel.SetActive(true);
            _pumpkinPanel.SetActive(true);
+            _reaperPanel.SetActive(true);
+            _witchPanel.SetActive(true);
            yield return panelWaitingTime;
            
            _serviceTitlePanel.SetActive(true);
@ -375,8 +422,13 @@ namespace BlueWater.Uis
            _textPanel.SetActive(isActive);
            _customerPanel.SetActive(isActive);
            _customerContents.SetActive(isActive);
+            _bigCatPanel.SetActive(isActive);
            _casperPanel.SetActive(isActive);
+            _casperBlackPanel.SetActive(isActive);
+            _catPanel.SetActive(isActive);
            _pumpkinPanel.SetActive(isActive);
+            _reaperPanel.SetActive(isActive);
+            _witchPanel.SetActive(isActive);
            _serviceTitlePanel.SetActive(isActive);
            _serviceContents.SetActive(isActive);
            _goodServingPanel.SetActive(isActive);
@ -412,8 +464,13 @@ namespace BlueWater.Uis
            
            _roundText.text = $"{Utils.GetLocalizedString("Round")} : {TycoonManager.Instance.GetCurrentLevelData().Idx}";
            _playTimeText.text = $"{Utils.GetLocalizedString("PlayTime")} : {Mathf.FloorToInt(_playTime / 60f):D2} : {Mathf.FloorToInt(_playTime % 60f):D2}";
+            _bigCatText.text = _bigCatCount.ToString();
            _casperText.text = _casperCount.ToString();
+            _casperBlackText.text = _casperBlackCount.ToString();
+            _catText.text = _catCount.ToString();
            _pumpkinText.text = _pumpkinCount.ToString();
+            _reaperText.text = _reaperCount.ToString();
+            _witchText.text = _witchCount.ToString();
            _goodServingText.text = _goodServingCount.ToString();
            _failedServingText.text = _failedServingCount.ToString();
            _missServingText.text = _missServingCount.ToString();
@ -448,17 +505,32 @@ namespace BlueWater.Uis
            SetActiveUi(true);
        }

-        private void AddCustomerCount(int skinIndex)
+        private void AddCustomerCount(CustomerSkin skinIndex)
        {
            switch (skinIndex)
            {
-                case 0:
+                case CustomerSkin.BigCat:
+                    _bigCatCount++;
+                    break;
+                case CustomerSkin.Casper:
                    _casperCount++;
                    break;
-                case 1:
+                case CustomerSkin.CasperBlack:
+                    _casperBlackCount++;
+                    break;
+                case CustomerSkin.Cat:
+                    _catCount++;
+                    break;
+                case CustomerSkin.PumkinHead:
                    _pumpkinCount++;
                    break;
-                default:;
+                case CustomerSkin.Reaper:
+                    _reaperCount++;
+                    break;
+                case CustomerSkin.Witch:
+                    _witchCount++;
+                    break;
+                default:
                    throw new Exception("손님 스킨 인덱스 오류");
            }
        }
--- a/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat
+++ b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat
@ -49,7 +49,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 1a4f3c20594f16b49ba571734aa21edd, type: 3}
+        m_Texture: {fileID: 2800000, guid: f8793b351e8b00242aa8e46a47765795, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@ -132,7 +132,7 @@ Material:
    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 0, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
--- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab
+++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab
@ -255,7 +255,10 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: eaf5a1e524cd8ae439ec7b6036090474, type: 2}
+  - {fileID: 2100000, guid: b5430080246bbb048b939d6a0a5621cd, type: 2}
+  - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
+  - {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2}
+  - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -289,7 +292,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  skeletonDataAsset: {fileID: 11400000, guid: 90f596bc1a735a544985584af0b4180a, type: 2}
+  skeletonDataAsset: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2}
  initialSkinName: Casper
  fixPrefabOverrideViaMeshFilter: 2
  initialFlipX: 0
@ -716,7 +719,6 @@ MonoBehaviour:
    returnAfterBeingPushedAway: 0
    progressAverage: 0
    lastJobDensityResult: 0
-  centerOffsetCompatibility: NaN
  repathRateCompatibility: NaN
  canSearchCompability: 0
  orientation: 0
@ -727,7 +729,6 @@ MonoBehaviour:
    sensitivity: 10
    maximumPeriod: 2
    visualizeSensitivity: 0
-  targetCompatibility: {fileID: 0}
  maxAcceleration: -2.5
  rotationSpeed: 360
  slowdownDistance: 1
@ -811,7 +812,7 @@ MonoBehaviour:
  _initialSkinName: Casper
  _isRandomSkin: 1
  _isRandomRange: 1
-  _randomRange: {x: 1, y: 3}
+  _randomRange: {x: 0, y: 7}
  _randomStrings: []
 --- !u!114 &17978457728262906
 MonoBehaviour:
@ -852,7 +853,6 @@ MonoBehaviour:
  <EnableInteraction>k__BackingField: 1
  <InteractionRadius>k__BackingField: 1
  <InteractionMessage>k__BackingField: 
-  _vomiting: {fileID: 7264946127367919962, guid: d02f28b2bb526af478050f2f027be8e9, type: 3}
  <CurrentLevelData>k__BackingField:
    <Idx>k__BackingField: 
    <CustomerRespawn>k__BackingField: 0
@ -890,6 +890,9 @@ MonoBehaviour:
  _customerInteractionType: 0
  _succeedServingSfxName: SucceedServing
  _failedServingSfxName: FailedServing
+  <CustomerSkin>k__BackingField: 0
+  _bigSize: {x: 1.4, y: 1.5, z: 1.5}
+  _smallSize: {x: 0.5, y: 0.5, z: 0.5}
 --- !u!114 &2085349091043731492
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -998,8 +1001,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\uBB50\uAC00 \uC88B\uC744\uAE4C.."
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
+  m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
--- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
+++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
@ -8547,18 +8547,6 @@ PrefabInstance:
      propertyPath: Idx
      value: LiquidA
      objectReference: {fileID: 0}
-    - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 5.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 5.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 5.5
-      objectReference: {fileID: 0}
    - target: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3}
      propertyPath: m_LocalPosition.x
      value: 1.2
@ -8599,6 +8587,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3229405889651544752, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 5897095096647521783, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3}
      propertyPath: m_Name
      value: LiquidA
@ -15430,10 +15422,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: MoneyCounter
      objectReference: {fileID: 0}
+    - target: {fileID: 7103883662070814397, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
+      propertyPath: m_fontAsset
+      value: 
+      objectReference: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
    - target: {fileID: 7103883662070814397, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
      propertyPath: m_sharedMaterial
      value: 
-      objectReference: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
+      objectReference: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
@ -324,15 +324,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.x
-      value: 6
+      value: 4.5
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.y
-      value: 6
+      value: 4.5
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.z
-      value: 6
+      value: 4.5
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.atlas.txt
@ -1,170 +1,171 @@
 Guest.png
-size:2033,2033
+size:2008,2030
 filter:Linear,Linear
-scale:0.65
-BigCat/Body
-bounds:2,795,429,595
-BigCat/Eyes
-bounds:523,1545,486,339
-rotate:90
-BigCat/Eyes_upset
-bounds:864,1545,486,339
-rotate:90
 BigCat/Hand_Left
-bounds:1194,1399,144,189
+bounds:2,733,222,290
 rotate:90
 BigCat/Hand_Right
-bounds:1538,685,136,196
+bounds:1274,1540,209,301
 rotate:90
 BigCat/Mouse
-bounds:627,803,220,85
+bounds:2,1817,338,131
 BigCat/Upset_mouse
-bounds:1531,1348,127,53
-Black/Body
-bounds:421,293,400,500
+bounds:525,1946,195,82
 Black/Eyes
-bounds:1901,80,227,100
-rotate:90
+bounds:1624,1714,349,154
 Black/Gliter
-bounds:1736,618,291,157
+bounds:353,415,448,242
 Black/Gliter2
-bounds:1619,526,157,103
-rotate:90
+bounds:1764,1870,242,158
 Black/Hand_Left
-bounds:1063,804,139,185
+bounds:977,1352,214,285
+rotate:90
 Black/Hand_Right
-bounds:1342,662,139,185
+bounds:1264,1324,214,285
 rotate:90
 Black/Mouse
-bounds:1973,1575,112,51
-rotate:90
+bounds:175,1950,173,78
 Black/Sword
-bounds:1712,1341,307,203
-Cat/Body
-bounds:2,259,534,417
-rotate:90
+bounds:314,101,473,312
 Cat/Eyes
-bounds:1273,6,304,118
-rotate:90
+bounds:602,1577,467,182
+Cat/Eyes_upset
+bounds:1528,1085,467,217
 Cat/Eyes_vomiting
-bounds:1453,1546,304,142
+bounds:986,886,467,219
 Cat/Eyes_vomiting2
-bounds:1267,312,304,176
-rotate:90
+bounds:1110,359,467,270
 Cat/Face
-bounds:1646,1691,198,181
-rotate:90
-Cat/Tail
-bounds:1204,803,213,332
-rotate:90
+bounds:803,375,305,279
 Cat/vomitiong1
-bounds:594,42,139,249
-Cat/vomitiong2
-bounds:297,7,149,250
-Cat/vomitiong3
-bounds:448,41,144,250
-Guest2/Pumkinhead
-bounds:2,7,293,250
-Heart
-bounds:1863,450,166,166
-Reaper/Body
-bounds:823,304,442,497
-Reaper/Eyes
-bounds:1538,921,205,96
-Reaper/Eyes_Upset
-bounds:1538,823,205,96
-Reaper/Eyes_Vomiting
-bounds:1759,1891,244,140
-Reaper/Gliter1
-bounds:735,45,246,132
+bounds:1551,1304,214,383
 rotate:90
+Cat/vomitiong2
+bounds:1256,631,229,384
+rotate:90
+Cat/vomitiong3
+bounds:1455,862,221,385
+rotate:90
+Heart
+bounds:646,659,256,256
+Reaper/Eyes
+bounds:639,1767,316,147
+Reaper/Eyes_Upset
+bounds:957,1761,316,147
+Reaper/Eyes_Vomiting
+bounds:1150,1107,376,215
+Reaper/Gliter1
+bounds:2,1418,379,203
 Reaper/Gliter2
-bounds:1205,1546,246,132
+bounds:596,1372,379,203
 Reaper/Hand_Left
-bounds:1807,309,139,185
+bounds:2,1202,214,285
 rotate:90
 Reaper/Hand_Right
-bounds:1619,195,139,185
+bounds:289,1176,214,285
 rotate:90
-Reaper/Mask
-bounds:1205,1680,351,225
-rotate:90
-Reaper/Scythe
-bounds:2,1392,519,639
 Upset01
-bounds:1445,529,124,131
-Upset02
-bounds:1385,1401,111,143
-Witch/Accessory
-bounds:1588,336,217,188
-Witch/Body
-bounds:869,2,300,402
+bounds:1071,1568,191,201
 rotate:90
-Witch/Body_upset
-bounds:835,991,300,402
+Upset02
+bounds:2,1644,171,220
+rotate:90
+Witch/Accessory
+bounds:1579,329,334,289
 Witch/Eyes
-bounds:523,1394,149,137
+bounds:383,1392,229,211
 rotate:90
 Witch/Eyes_upset1
-bounds:1498,1403,212,141
+bounds:2,957,326,217
 Witch/Eyes_upset2
-bounds:1759,1546,212,141
+bounds:330,937,326,217
 Witch/Eyes_upset3
-bounds:1445,312,212,141
-rotate:90
-Witch/Hair_Back
-bounds:1531,1019,320,213
-rotate:90
-Witch/Hair_Front
-bounds:1393,13,297,224
-rotate:90
+bounds:658,917,326,217
 Witch/Hat
-bounds:1137,1018,375,211
-rotate:90
+bounds:1366,2,577,325
 Witch/Hat_Back
-bounds:1350,1023,374,179
-rotate:90
+bounds:789,82,575,275
 Witch/Head
-bounds:1829,1689,202,200
+bounds:2,155,310,308
 casper/Eyes
-bounds:835,891,226,98
+bounds:1275,1751,347,151
 casper/Eyes_Vomiting
-bounds:1746,1214,244,125
+bounds:1577,1520,376,192
 casper/Face_Upset
-bounds:1746,935,227,156
-casper/Gliter1
-bounds:1432,1690,341,212
-rotate:90
+bounds:1642,620,349,240
 casper/Gliter2
-bounds:1724,539,137,77
+bounds:1227,1910,211,118
 casper/Mouse
-bounds:1646,1982,111,49
+bounds:2,1952,171,76
 casper/Mouse_Upset
-bounds:1975,979,112,51
-rotate:90
+bounds:350,1950,173,78
 casper/Mouse_Vomiting
-bounds:1120,1395,148,72
-rotate:90
+bounds:722,1917,228,111
 casper/Vomiting/01
-bounds:433,800,192,88
+bounds:342,1808,295,136
 casper/Vomiting/02
-bounds:849,808,209,81
+bounds:1440,1904,322,124
 casper/Vomiting/03
-bounds:1267,624,177,73
-rotate:90
+bounds:952,1916,273,112
 casper/Vomiting/Eyes_Vomiting2
-bounds:1746,1093,244,119
+bounds:224,1623,376,183
 casper/Vomiting/Vomiting
-bounds:662,1395,148,227
+bounds:294,707,228,350
 rotate:90
 casper/Vomiting/Vomiting2
-bounds:891,1395,148,227
+bounds:904,656,228,350
 rotate:90
-casper/body
-bounds:433,890,400,500
 casper/face
-bounds:1745,777,227,156
+bounds:2,465,349,240
 casper/left
-bounds:1619,8,139,185
+bounds:576,1156,214,285
+rotate:90
 casper/right
-bounds:1760,8,139,185
+bounds:863,1136,214,285
+rotate:90
+
+Guest_2.png
+size:1993,1951
+filter:Linear,Linear
+BigCat/Eyes
+bounds:623,619,748,521
+BigCat/Eyes_upset
+bounds:1373,392,748,521
+rotate:90
+Black/Body
+bounds:2,2,615,770
+rotate:90
+Cat/Tail
+bounds:528,1622,327,510
+rotate:90
+Guest2/Pumkinhead
+bounds:544,1235,451,385
+Reaper/Mask
+bounds:2,1274,540,346
+Witch/Body
+bounds:997,1142,461,619
+rotate:90
+Witch/Body_upset
+bounds:2,772,461,619
+rotate:90
+Witch/Hair_Back
+bounds:1040,1622,492,327
+Witch/Hair_Front
+bounds:1534,1605,457,344
+casper/Gliter1
+bounds:2,1623,524,326
+
+Guest_3.png
+size:1945,1759
+filter:Linear,Linear
+BigCat/Body
+bounds:803,841,660,916
+Cat/Body
+bounds:1301,17,822,642
+rotate:90
+Reaper/Body
+bounds:2,7,680,765
+Reaper/Scythe
+bounds:2,774,799,983
+casper/body
+bounds:684,2,615,770
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest.png
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.png
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest.skel.bytes
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png.meta
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_2.png.meta
@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: da55c6e632938384f86998fd4af15571
+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: 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: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  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: 
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png.meta
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_3.png.meta
@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 693b3fc6909cc664d9a477c9036987b2
+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: 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: 1
+  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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: iOS
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  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: 
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Atlas.asset
@ -16,4 +16,6 @@ MonoBehaviour:
  onDemandTextureLoader: {fileID: 0}
  atlasFile: {fileID: 4900000, guid: 4aec2ab48721652439bb877430ab355a, type: 3}
  materials:
-  - {fileID: 2100000, guid: 86834288f1ca9884daab639810d1ddef, type: 2}
+  - {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2}
+  - {fileID: 2100000, guid: 0bc9c8216989ef64ab468d6aa08cca35, type: 2}
+  - {fileID: 2100000, guid: b5430080246bbb048b939d6a0a5621cd, type: 2}
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat
@ -7,7 +7,7 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Guest_Material
+  m_Name: Guest_Guest
  m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Material.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 86834288f1ca9884daab639810d1ddef
+guid: d018debe5b8bedf4c8f19cba9e4facec
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat
@ -0,0 +1,46 @@
+%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: Guest_Guest_2
+  m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: da55c6e632938384f86998fd4af15571, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Cutoff: 0.1
+    - _DoubleSidedLighting: 0
+    - _LightAffectsAdditive: 0
+    - _ReceiveShadows: 0
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _TintBlack: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Black: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat.meta
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_2.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0bc9c8216989ef64ab468d6aa08cca35
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat
@ -0,0 +1,46 @@
+%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: Guest_Guest_3
+  m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _STRAIGHT_ALPHA_INPUT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 693b3fc6909cc664d9a477c9036987b2, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Cutoff: 0.1
+    - _DoubleSidedLighting: 0
+    - _LightAffectsAdditive: 0
+    - _ReceiveShadows: 0
+    - _StencilComp: 8
+    - _StencilRef: 1
+    - _StraightAlphaInput: 1
+    - _TintBlack: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Black: {r: 0, g: 0, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat.meta
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_Guest_3.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b5430080246bbb048b939d6a0a5621cd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset
+++ b/Assets/08.Spines/Characters/Npcs/Customers/Guest_SkeletonData.asset
@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  atlasAssets:
  - {fileID: 11400000, guid: 62de5342effc1a04c8da3a3b926d1044, type: 2}
-  scale: 0.01
+  scale: 0.001
  skeletonJSON: {fileID: 4900000, guid: acf01b6c27b441946b118a4b68e9b602, type: 3}
  isUpgradingBlendModeMaterials: 0
  blendModeMaterials:
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -140,7 +140,7 @@ PlayerSettings:
  loadStoreDebugModeEnabled: 0
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
-  bundleVersion: 0.3.5.17
+  bundleVersion: 0.3.5.18
  preloadedAssets:
  - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
  - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}