Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg

Assets/02.Scripts/Prop/Tycoon/RewardBox.cs

@@ -11,11 +11,14 @@ namespace BlueWater.Tycoons
         private AnimationController _animationController;
 
         private RewardBoxType _rewardBoxType;
+        private int _requiredGold;
         private bool _isInteracting;
         
-        public void Initialize(RewardBoxType rewardBoxType)
+        public void Initialize(LevelData levelData)
         {
-            _rewardBoxType = rewardBoxType;
+            _rewardBoxType = levelData.RewardBoxType;
+            _requiredGold = levelData.Gold;
+            InteractionCanvas.UnlockUi.Initialize(DataManager.Instance.SpriteDataSo.Gold02, _requiredGold);
         }
         
         public override void Interaction()
@@ -30,6 +33,11 @@ namespace BlueWater.Tycoons
             
         }
 
+        public override bool CanInteraction()
+        {
+            return TycoonManager.Instance.TycoonStatus.CurrentGold >= _requiredGold;
+        }
+
         private IEnumerator OpenRewardBoxCoroutine()
         {
             _isInteracting = true;
@@ -47,6 +55,8 @@ namespace BlueWater.Tycoons
 
             yield return new WaitUntil(() => _animationController.GetCurrentAnimationNormalizedTime() >= 1f);
 
+            TycoonManager.Instance.TycoonStatus.CurrentGold -= _requiredGold;
+
             switch (_rewardBoxType)
             {
                 case RewardBoxType.Normal:

Assets/02.Scripts/ScriptableObject/CardDataTable.asset

@@ -162,7 +162,7 @@ MonoBehaviour:
       <ScriptText>k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD\uB7C9\uC774 20%
         \uC99D\uAC00\uD569\uB2C8\uB2E4."
       <Max>k__BackingField: 10
-      <Ratio>k__BackingField: 4
+      <Ratio>k__BackingField: 5
       <Type>k__BackingField: 0
       <Shop>k__BackingField: 1
       <Price>k__BackingField: 500
@@ -172,7 +172,7 @@ MonoBehaviour:
       <Idx>k__BackingField: GoldBoost
       <ScriptText>k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 20%\uC774 \uC99D\uAC00\uD569\uB2C8\uB2E4."
       <Max>k__BackingField: 10
-      <Ratio>k__BackingField: 4
+      <Ratio>k__BackingField: 5
       <Type>k__BackingField: 0
       <Shop>k__BackingField: 1
       <Price>k__BackingField: 500
@@ -338,7 +338,7 @@ MonoBehaviour:
       <ScriptText>k__BackingField: "\uD50C\uB808\uC774\uC5B4\uAC00 \uC591\uC190\uC5D0
         \uC11C\uBE59\uC774 \uAC00\uB2A5\uD574\uC9D1\uB2C8\uB2E4."
       <Max>k__BackingField: 1
-      <Ratio>k__BackingField: 2
+      <Ratio>k__BackingField: 0
       <Type>k__BackingField: 1
       <Shop>k__BackingField: 1
       <Price>k__BackingField: 1000

Assets/02.Scripts/ScriptableObject/SpriteData.asset

@@ -12,7 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 137091cb8deacc14da9ee9469a96cfc8, type: 3}
   m_Name: SpriteData
   m_EditorClassIdentifier: 
-  <Gold>k__BackingField: {fileID: 21300000, guid: 51c11bee66d04f64d8d44afcb9975321, type: 3}
+  <Gold01>k__BackingField: {fileID: 21300000, guid: 51c11bee66d04f64d8d44afcb9975321, type: 3}
+  <Gold02>k__BackingField: {fileID: 21300000, guid: bb299176ee03f63468d9bb59a8998669, type: 3}
   <EmptyBeerGlass>k__BackingField: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3}
   <FullBeerGlass>k__BackingField: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
   <BarrelLock>k__BackingField: {fileID: 21300000, guid: c0cab5e7cc9fc5147b3f0aef86b2feab, type: 3}

Assets/02.Scripts/SpriteDataSo.cs

@@ -6,7 +6,10 @@ namespace BlueWater
     public class SpriteDataSo : ScriptableObject
     {
         [field: SerializeField]
-        public Sprite Gold { get; private set; }
+        public Sprite Gold01 { get; private set; }
+        
+        [field: SerializeField]
+        public Sprite Gold02 { get; private set; }
         
         [field: SerializeField]
         public Sprite EmptyBeerGlass { get; private set; }

Assets/02.Scripts/Tycoon/CardDataSo.cs

@@ -50,15 +50,15 @@ namespace BlueWater
         public CardData SubstitutionLiquid(CardData cardData, LevelData levelData)
         {
             if (cardData.Idx.Equals("AddLiquidB") || cardData.Idx.Equals("AddLiquidC") || cardData.Idx.Equals("AddLiquidD") || 
-                cardData.Idx.Equals("AddLiquidE") || cardData.Idx.Equals("AddGarnish1") || cardData.Idx.Equals("AddGarnish2") || cardData.Idx.Equals("AddAllLiquid"))
+                cardData.Idx.Equals("AddLiquidE") || cardData.Idx.Equals("AddGarnish1") || cardData.Idx.Equals("AddGarnish2") || cardData.Idx.Equals("AllLiquidAdd"))
             {
-                int levelIdx = Int32.Parse(levelData.Idx);
+                int levelIdx = int.Parse(levelData.Idx);
                 
                 if (levelIdx <= 5)
                 {
                     return null; 
                 }
-                else if (cardData.Idx.Equals("AddAllLiquid")) 
+                else if (cardData.Idx.Equals("AllLiquidAdd")) 
                 {
                     return cardData;
                 }

Assets/02.Scripts/Tycoon/TycoonStageController.cs

@@ -149,7 +149,7 @@ namespace BlueWater.Tycoons
             };
 
             var instance = Instantiate(rewardBox, spawnPosition, rewardBox.transform.rotation);
-            instance.Initialize(levelData.RewardBoxType);
+            instance.Initialize(levelData);
         }
         
         public void ServingBonus()

Assets/02.Scripts/Ui/InteractionCanvas.cs

@@ -7,9 +7,13 @@ namespace BlueWater.Uis
         [field: SerializeField]
         public BalloonUi BalloonUi { get; private set; }
         
+        [field: SerializeField]
+        public UnlockUi UnlockUi { get; private set; }
+
         private void Awake()
         {
-            BalloonUi = transform.GetComponentInChildren<BalloonUi>();
+            BalloonUi = transform.Find("BalloonUi").GetComponent<BalloonUi>();
+            UnlockUi = transform.Find("UnlockUi").GetComponent<UnlockUi>();
         }
     }
 }

Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs

@@ -138,7 +138,7 @@ namespace BlueWater.Uis
             _isOrdered = true;
             _isWaitTimeOver = false;
             _isItemReceived = false;
-            SetItemSprite(DataManager.Instance.SpriteDataSo.Gold);
+            SetItemSprite(DataManager.Instance.SpriteDataSo.Gold01);
             ShowUi();
 
             _tween = _fillImage.DOFillAmount(1f, hurryTime)

Assets/02.Scripts/Ui/Tycoon/UnlockUi.cs

@@ -0,0 +1,43 @@
+using Sirenix.OdinInspector;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace BlueWater.Uis
+{
+    public class UnlockUi : MonoBehaviour
+    {
+        [SerializeField]
+        private GameObject _panel;
+
+        [SerializeField]
+        private Image _image;
+
+        [SerializeField]
+        private TMP_Text _text;
+
+        private void Awake()
+        {
+            InitializeComponents();
+        }
+
+        [Button("컴포넌트 초기화")]
+        private void InitializeComponents()
+        {
+            _panel = transform.Find("Panel").gameObject;
+            _image = _panel.transform.Find("Image").GetComponent<Image>();
+            _text = _panel.transform.Find("Text").GetComponent<TMP_Text>();
+        }
+
+        public void ShowUi() => _panel.SetActive(true);
+        public void HideUi() => _panel.SetActive(false);
+
+        public void Initialize(Sprite sprite, int gold)
+        {
+            _image.sprite = sprite;
+            _text.text = gold.ToString("N0");
+            
+            ShowUi();
+        }
+    }
+}

Assets/02.Scripts/Ui/Tycoon/UnlockUi.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: aecf544b2f4ca984e87e268f19b07cd2

Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab

@@ -74,6 +74,34 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 59116252242674988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
@@ -102,6 +130,34 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 80
       objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964312638543694257, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -130,6 +186,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6069594819010820018, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6365458266480896368, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -172,15 +232,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalPosition.x
@@ -222,6 +282,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.2
+      objectReference: {fileID: 0}
     - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -234,7 +314,8 @@ PrefabInstance:
       propertyPath: m_WasSpriteAssigned
       value: 1
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
     - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}

Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab

@@ -172,15 +172,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1
+      value: 1.5
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalPosition.x
@@ -222,6 +222,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8775206665121787609, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0.2
+      objectReference: {fileID: 0}
     - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_Sprite
       value: 

Assets/05.Prefabs/Uis/InteractionCanvas.prefab

@@ -33,6 +33,7 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 3619548578334970641}
+  - {fileID: 2964810709115633174}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -85,7 +86,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &5028824454365225125
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -116,6 +117,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   <BalloonUi>k__BackingField: {fileID: 3593684458396504088}
+  <UnlockUi>k__BackingField: {fileID: 5466358161436579768}
 --- !u!1001 &1629413000685138696
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -169,3 +171,120 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
   m_PrefabInstance: {fileID: 1629413000685138696}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6358232486751081611
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4648285208244819224}
+    m_Modifications:
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 579886215640121704, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0.35
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2449241557394099701, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 4710095542977623793, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231439677206584695, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_Name
+      value: UnlockUi
+      objectReference: {fileID: 0}
+    - target: {fileID: 6693939832226345974, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -0.35000002
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149797217611934365, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149797217611934365, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149797217611934365, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149797217611934365, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149797217611934365, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+--- !u!224 &2964810709115633174 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8149797217611934365, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+  m_PrefabInstance: {fileID: 6358232486751081611}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5466358161436579768 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1432317353405285171, guid: a38bd422f81b28443a68b80c17e540fb, type: 3}
+  m_PrefabInstance: {fileID: 6358232486751081611}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aecf544b2f4ca984e87e268f19b07cd2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/05.Prefabs/Uis/Tycoons/Bill.prefab

@@ -274,8 +274,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2.5, y: -65}
+  m_AnchoredPosition: {x: 0, y: -65}
-  m_SizeDelta: {x: -105, y: 50}
+  m_SizeDelta: {x: -110, y: 50}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5844400383110585303
 CanvasRenderer:

Assets/05.Prefabs/Uis/Tycoons/Card.prefab

@@ -257,14 +257,14 @@ MonoBehaviour:
   m_text: 'hello '
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
-  m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4279250235
+    rgba: 4294967295
-  m_fontColor: {r: 0.23137257, g: 0.1764706, b: 0.0627451, a: 1}
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/05.Prefabs/Uis/UnlockUi.prefab

@@ -0,0 +1,365 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3534664589947693860
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2449241557394099701}
+  - component: {fileID: 1923530767285064634}
+  - component: {fileID: 7770131586619210529}
+  m_Layer: 19
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2449241557394099701
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3534664589947693860}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6693939832226345974}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0.3, y: -0.15}
+  m_SizeDelta: {x: 0.35, y: 0.3}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1923530767285064634
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3534664589947693860}
+  m_CullTransparentMesh: 1
+--- !u!114 &7770131586619210529
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3534664589947693860}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 100
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 0.2
+  m_fontSizeBase: 0.2
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 0.1
+  m_fontSizeMax: 5
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &3736260048439958039
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 579886215640121704}
+  - component: {fileID: 844177666738102044}
+  - component: {fileID: 5446734218939531315}
+  - component: {fileID: 5756263110559320819}
+  m_Layer: 19
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &579886215640121704
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3736260048439958039}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6693939832226345974}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.15}
+  m_SizeDelta: {x: 0.3, y: 0.3}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &844177666738102044
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3736260048439958039}
+  m_CullTransparentMesh: 1
+--- !u!114 &5446734218939531315
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3736260048439958039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: bb299176ee03f63468d9bb59a8998669, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5756263110559320819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3736260048439958039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 0.3
+  m_PreferredHeight: 0.3
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &4710095542977623793
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6693939832226345974}
+  - component: {fileID: 7735130997828345425}
+  - component: {fileID: 5255273256389389057}
+  m_Layer: 19
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6693939832226345974
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710095542977623793}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 579886215640121704}
+  - {fileID: 2449241557394099701}
+  m_Father: {fileID: 8149797217611934365}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -0.35000002, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7735130997828345425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710095542977623793}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &5255273256389389057
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710095542977623793}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &6231439677206584695
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8149797217611934365}
+  - component: {fileID: 1432317353405285171}
+  m_Layer: 19
+  m_Name: UnlockUi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8149797217611934365
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6231439677206584695}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 6693939832226345974}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 1}
+  m_SizeDelta: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1432317353405285171
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6231439677206584695}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aecf544b2f4ca984e87e268f19b07cd2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _panel: {fileID: 4710095542977623793}
+  _image: {fileID: 5446734218939531315}
+  _text: {fileID: 7770131586619210529}

Assets/05.Prefabs/Uis/UnlockUi.prefab.meta

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

Assets/Resources/JSON/CardDataTable.json

@@ -129,7 +129,7 @@
     "Idx": "ExpBoost",
     "ScriptText": "경험치 획득량이 20% 증가합니다.",
     "Max": 10,
-    "Ratio": 4,
+    "Ratio": 5,
     "Type": 0,
     "Shop": 1,
     "Price": 500
@@ -138,7 +138,7 @@
     "Idx": "GoldBoost",
     "ScriptText": "골드 획득 20%이 증가합니다.",
     "Max": 10,
-    "Ratio": 4,
+    "Ratio": 5,
     "Type": 0,
     "Shop": 1,
     "Price": 500
@@ -246,7 +246,7 @@
     "Idx": "PassiveDoubleServing",
     "ScriptText": "플레이어가 양손에 서빙이 가능해집니다.",
     "Max": 1,
-    "Ratio": 2,
+    "Ratio": 0,
     "Type": 1,
     "Shop": 1,
     "Price": 1000