0.3.3.6 업데이트

Assets/01.Scenes/01.Tycoon.unity

@@ -93,7 +93,7 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
-  m_LightingSettings: {fileID: 0}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 8e8e0d9bb94f2a442ae6c077280e5121, type: 2}
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -6179,7 +6179,7 @@ Transform:
   m_GameObject: {fileID: 473619455}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -7}
+  m_LocalPosition: {x: 1, y: 0, z: -8}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -6643,7 +6643,7 @@ Transform:
   m_GameObject: {fileID: 545850347}
   serializedVersion: 2
   m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 1.11, y: 7.427876, z: -14.970446}
+  m_LocalPosition: {x: 2.145, y: 7.4278765, z: -16.466446}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -10716,7 +10716,7 @@ Transform:
   m_GameObject: {fileID: 873223985}
   serializedVersion: 2
   m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 1.46, y: 7.5424685, z: -15.107012}
+  m_LocalPosition: {x: 0.5, y: 8.188489, z: -16.160696}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -10973,7 +10973,7 @@ Transform:
   m_GameObject: {fileID: 887608711}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -7}
+  m_LocalPosition: {x: 1, y: 0, z: -8}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -20227,7 +20227,7 @@ Transform:
   m_GameObject: {fileID: 1589932375}
   serializedVersion: 2
   m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 1.96, y: 7.67, z: -15}
+  m_LocalPosition: {x: 0, y: 8.38, z: -16}
   m_LocalScale: {x: 1, y: 1, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -21871,6 +21871,7 @@ MonoBehaviour:
   - {fileID: 1062518307}
   - {fileID: 883069349}
   - {fileID: 195540918}
+  - {fileID: 1909132787}
   <Crews>k__BackingField: []
   <CleanerCrews>k__BackingField: []
   <ServerCrews>k__BackingField: []
@@ -23410,7 +23411,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   version: 1073741824
   data:
-    dataString: UEsDBBQAAAgIAABIIewzkQKUtwIAAPUFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4kAM/StozksFpaVlb7tA2z20RaWrHpYeJhmHjBhmovko0Ir/vvZkIIFKkRLZz/bzs50vJrWrIPfG3lspHo0A9rPD6Jv96DTOB9jypdFz+QkHzJsUviQQj5gX7qVBe5/CnFmDtzL/pZeKwD00Bi0LY9dTsYSxcd6hueDKAbqs8RSt0fTVYdsUsEvvT3p39viVg/Zgv6O6vYt+AnZHERl0rvi6AkGMm4D+6OI6xQwjTmMzCVLnyI1S0iUuzO+q2OuYVy5gJwgQkmNvkQXhS5DL0sfw63b4c1E48Imj5buJtChSnZf9NrVya+5WNbkPrgJVGtxeRV512sdv/mHtLqxZPxwq93tUw5cyX73wXc6db0nbNk9OqQe94WrFMwVvJegnc29N0AKd3gYKDQ4uJ61Ux97GJeSrBldzPTOG6vuY+s0w97H77dxD9dAoeNVY/zpwc2Wi/CkleZJlRCnB4vD+YD9xd1wqhFbiiPGvfNlesuS4k9Z5dCU+yUrYGU4IBOgcku5dAmiil5lgKRebRq4kRvBjYzVEcyJYgebK72aY0Z+vwJmvxevMc8fp3hK75Duc0VlINDf4Xu/MNTOb47Atrq+LO334+vdOQ3Cl2TyCK5+DV1K31CbHEwo8NlrXm9sW8xA2D7bgeSvMw9YHCxPueayGdHDBRDsUtYwROihFuxwbiIywAXreSd+SY10VzezJ6Hh7J+9IfxmkOL0Q1uM3fCSy4vqynw1vbrPuIBtAlsMg6w0FDEd9Fk9IapSbq1mtV1IJt0s3vWg8F8r4As7zYLmOkxeWb+7l59q0Ji91Yea5BdDPdYZjs2CxCP5gxFRIbHMO3ksd95J9LZgy+QrE4phoEYWdbr3liybLglXyw3iyLNg4/gMXjMzHi8TV/ZCwoeInyUDh6EC8SgVrXpGrt2f7/1BLAwQUAAAICAAASCHs/aPJUmsAAAB3AAAACQAkAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAatWKkstKs7Mz1OyUjDVM9Qz1FFQSi9KLMgoBgqAOaWZKSB2tJJBonmiZUpSmqmRYZKZuUWSrnGScWpScqpxkoFZSqqZpaFSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEgh7DORApS3AgAA9QUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJAAAAAAAAAAAAAAABAMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAAC6AwAAAAA=
+    dataString: UEsDBBQAAAgIAABIIezKglMquAIAAPcFAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVE1v4jAQ/SvI56WC0tKyt12g7R7aotJVD0sPTjwhFsaO/FGgFf99ZxxDApUiJZo3H2/ezOSLSe0qyL2x91aKRyOA/eww+mY/Og34AFu+NHouP+Hg8yaFL8mJR58X7qVBe5/CnFmDtzL/pZeKnHtoDFoWxq6nYglj47xDc8GVA4Ss8RSt0fTVYdsUsEvvT3p39viVg/Zgv3t1exf95NgdXVxH36BzxdcVCOLchPQRT1E30U9jO8mlzpIbpaRLbJjfVbHbMa9cwF7QQUiO3UUe5F+CXJY+hl+3w5+LwoFPLC3fTaRFmeq87LeptVtzt6rJfXAVqNLg9iryqtM+fsOHNVxYs344VO73qIYvZb564bucO98St22enFIPesPVimcK3krQT+bemqAFgt4GCg0OLietVMfexiXkq8av5npmDNX3QfWbce5j99u5h+qhUfCqsf514ObKRPlTSkKSZUQpweLw/mA/cXtcKoRW4ojxr3zZXrME3EnrPEKJT7KS7wwnBAJ0Dkn3LjloopeZYCkXm0auJEbwY2M1RHMiWIHmyu9mmNGfr8AZ1uJ1htxxurjELmGHQzoLiebGv9c7g2Zmcxy2xfV1cacPX//eaQiuNJtHcOVz8ErqltoEPKHAY6N1vbltMQ9h82ALnrfCPGx9sDDhnsdqSAcXTLRDUcsYoYNStMuxgcgIG6DnnfQtOdZV0cyejI63d/KO9JdBitMLYT1+w0ciK64v+9nw5jbrDrIBZDkMst5QwHDUZ/GEpEa5uZrVeiWVcLt004vGc6GML+A8D5brOHlh+eZefq5Na/JSF2aeWwD9XGc4NgsWi+APRkyFxDbn4L3UcS/Z14Ipk69ALI6JFlHY6dZbvmiyLFglP4wny4KN419wwch8vEhc3Q8JGyp+kgwUjg7Eq1Sw5hVBvT3b/wdQSwMEFAAACAgAAEgh7P2jyVJrAAAAdwAAAAkAJABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQGrVipLLSrOzM9TslIw1TPUM9RRUEovSizIKAYKgDmlmSkgdrSSQaJ5omVKUpqpkWGSmblFkq5xknFqUnKqcZKBWUqqmaWhUixQfUllQapfYm4qRE9AYklGWmZeSmZeup57UWaKO8hopdhaAFBLAQItABQAAAgIAABIIezKglMquAIAAPcFAAALACQAAAAAAAAAAAAAAAAAAABncmFwaDAuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLAQItABQAAAgIAABIIez9o8lSawAAAHcAAAAJACQAAAAAAAAAAAAAAAUDAABtZXRhLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFQSwUGAAAAAAIAAgC4AAAAuwMAAAAA
     file_cachedStartup: {fileID: 0}
     cacheStartup: 0
   showNavGraphs: 1
@@ -25906,6 +25907,11 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1909132787 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5552104592123853480, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+  m_PrefabInstance: {fileID: 1336734153}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1909799356
 GameObject:
   m_ObjectHideFlags: 0
@@ -29321,7 +29327,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 1.11
+      value: 2.145
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.y
@@ -29329,7 +29335,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -7.31
+      value: -8.806
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalRotation.w

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

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using TMPro;
 using UnityEngine;
 using Random = System.Random;
 
@@ -8,6 +7,9 @@ namespace BlueWater.Tycoons
 {
     public class CustomerTable : MonoBehaviour
     {
+        [SerializeField]
+        private GameObject _carpetObject;
+        
         [SerializeField]
         private List<TableSeat> _tableSeats;
 
@@ -53,5 +55,17 @@ namespace BlueWater.Tycoons
             }
             return null;
         }
+
+        public void Show()
+        {
+            gameObject.SetActive(true);
+            _carpetObject.SetActive(true);
+        }
+        
+        public void Hide()
+        {
+            gameObject.SetActive(false);
+            _carpetObject.SetActive(false);
+        }
     }
 }

Assets/02.Scripts/ScriptableObject/CardDataTable.asset

@@ -137,7 +137,7 @@ MonoBehaviour:
     <Value>k__BackingField:
       <Idx>k__BackingField: BartenderNpcAdd
       <ScriptText>k__BackingField: "\uBC14\uD150\uD130 \uC885\uC5C5\uC6D0 \uCD94\uAC00"
-      <Max>k__BackingField: 5
+      <Max>k__BackingField: 6
       <Ratio>k__BackingField: 5
       <Type>k__BackingField: 0
       <Shop>k__BackingField: 1

Assets/02.Scripts/Tycoon/CustomerTableController.cs

@@ -67,12 +67,12 @@ namespace BlueWater.Tycoons
 
         public void ShowCustomerTable(int index)
         {
-            _customerTables[index].gameObject.SetActive(true);
+            _customerTables[index].Show();
         }
         
         public void HideCustomerTable(int index)
         {
-            _customerTables[index].gameObject.SetActive(false);
+            _customerTables[index].Hide();
         }
     }
 }

Assets/05.Prefabs/Characters/Npcs/Crews/BartenderCrew.prefab

@@ -254,7 +254,8 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: cc610b9acc31ccb41befa5093f0db428, type: 2}
+  - {fileID: 2100000, guid: 4b69878329f04c541838d4c090ad9978, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -283,7 +284,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 813964778509222274}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
   m_Name: 
@@ -818,6 +819,7 @@ MonoBehaviour:
   <BalloonUi>k__BackingField: {fileID: 1469338590548789471}
   <SpineController>k__BackingField: {fileID: 5279376384905517670}
   <AIMovement>k__BackingField: {fileID: 17978457728262906}
+  _makingCocktailTime: 15
 --- !u!1 &7812544424410854405
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -63,7 +63,8 @@ MonoBehaviour:
   <Food>k__BackingField: {fileID: 8752266548893034047}
   TableDirection: {x: -1, y: 0, z: 0}
   TableNumber: 0
-  _interactionHoldingTime: 3
+  _playerHoldingTime: 3
+  _crewHoldingTime: 9
 --- !u!1 &1352874222752200122
 GameObject:
   m_ObjectHideFlags: 0
@@ -139,7 +140,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 2
   m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -226,7 +227,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 2
   m_Sprite: {fileID: 21300000, guid: 514247b5965aef447b13b5da95f3281a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -313,7 +314,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 3
   m_Sprite: {fileID: 21300000, guid: af252e8e96a18af4b8d4658788901bbe, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -388,7 +389,8 @@ MonoBehaviour:
   <Food>k__BackingField: {fileID: 4724775134085759924}
   TableDirection: {x: 1, y: 0, z: 0}
   TableNumber: 0
-  _interactionHoldingTime: 3
+  _playerHoldingTime: 3
+  _crewHoldingTime: 9
 --- !u!1 &6493535781353555306
 GameObject:
   m_ObjectHideFlags: 0
@@ -763,6 +765,10 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_WasSpriteAssigned
       value: 1
@@ -853,7 +859,7 @@ PrefabInstance:
       addedObject: {fileID: 9182593229863186613}
     - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       insertIndex: -1
-      addedObject: {fileID: 3389074959205472123}
+      addedObject: {fileID: 5695615210136494061}
   m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
 --- !u!4 &203741387490724426 stripped
 Transform:
@@ -886,7 +892,7 @@ MonoBehaviour:
   - {fileID: 6383913593085221228}
   - {fileID: 6277647266874368514}
   _tableNumber: 0
---- !u!210 &3389074959205472123
+--- !u!210 &5695615210136494061
 SortingGroup:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}

Assets/05.Prefabs/Props/Mini/WallPart.prefab

@@ -24,18 +24,22 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: ac890e57ae5de9c478c3a57560ca453b, type: 3}
-    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.9659258
-      objectReference: {fileID: 0}
-    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.2588191
-      objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 30
       objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 6
+      objectReference: {fileID: 0}
     - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -76,7 +80,8 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 7346555703223556724, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []

Assets/Resources/JSON/CardDataTable.json

@@ -110,7 +110,7 @@
   {
     "Idx": "BartenderNpcAdd",
     "ScriptText": "바텐터 종업원 추가",
-    "Max": 5,
+    "Max": 6,
     "Ratio": 5,
     "Type": 0,
     "Shop": 1,