From 1b039ea8c8b65e509233602f07d65f6b4353fbd9 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 17:19:49 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=EC=98=A4=EB=8A=98=EC=9D=98=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=20=ED=82=A4=EB=B3=B4=EB=93=9C=EB=A1=9C=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=ED=95=A0=20=EB=95=8C,=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs b/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs index 803522936..2e8b361cf 100644 --- a/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs @@ -269,6 +269,13 @@ public void OnSubmit(BaseEventData eventData) public void SetInteractable(bool interactable) { _button.interactable = interactable; + if (interactable == false) + { + _isHighlighted = false; + _isPressed = false; + _isSelected = false; + _isToggled = false; + } UpdateVisualState(); } From 627b0aedf5078ee24921da56c872409410643316 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 17:20:09 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20?= =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=B0=8F=20=EC=B0=BE=EB=8A=94=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RestaurantManagementUi.cs | 16 +++------- .../TabUi/TabGroupUi.cs | 32 +++++-------------- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs index 83edb0270..945d046bd 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs @@ -65,7 +65,6 @@ protected override void OnCreatedInitializePopup() { InitializeViews(); InitializeTabGroups(); - SetupCategoryTabs(); SetupBindings(); } @@ -173,12 +172,6 @@ private void InitializeViews() } } - private void SetupCategoryTabs() - { - _menuCategoryTabs.UseDefaultAllowedValues(); - _cookwareCategoryTabs.UseDefaultAllowedValues(); - } - private void InitializeTabGroups() { _sectionTabs.Initialize(OnSectionTabSelected); @@ -189,7 +182,7 @@ private void InitializeTabGroups() private void UpdateSectionTabs() { if (_viewModel == null) return; - _sectionTabs.SelectTab((int)_viewModel.CurrentSection); + _sectionTabs.TrySelectTab((int)_viewModel.CurrentSection); } private void UpdateCategoryTabs() @@ -199,10 +192,10 @@ private void UpdateCategoryTabs() switch (_viewModel.CurrentSection) { case SectionButtonType.Menu: - _menuCategoryTabs.SelectTab((int)_viewModel.CurrentCategory); + _menuCategoryTabs.TrySelectTab((int)_viewModel.CurrentCategory); break; case SectionButtonType.Cookware: - _cookwareCategoryTabs.SelectTab((int)_viewModel.CurrentCategory); + _cookwareCategoryTabs.TrySelectTab((int)_viewModel.CurrentCategory); break; } } @@ -264,7 +257,8 @@ private void HandleCloseRequested() private void HandleMenuCategorySelected(InventoryCategoryType category) { - _menuCategoryTabs.SelectTab((int)category); + if (_menuCategoryTabs.TrySelectTab((int)category)) return; + if (_cookwareCategoryTabs.TrySelectTab((int)category)) return; } private void OnSectionTabSelected(int sectionValue) diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs index 550ee59cf..b060b6325 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs @@ -76,22 +76,6 @@ public void Initialize(Action onTabSelected) InitializeTabs(); } - /// - /// 기본 허용 값들을 사용하여 탭을 초기화합니다. - /// - public void UseDefaultAllowedValues() - { - if (TabButtonConfig.TryGetValue(_tabButtonType, out List defaultValues)) - { - // 기본값을 바로 사용하여 탭 초기화 - InitializeTabsWithValues(defaultValues); - } - else - { - Debug.LogWarning($"TabButtonType {_tabButtonType}에 대한 설정이 정의되지 않았습니다.", this); - } - } - /// /// 지정된 값들로 탭들을 초기화합니다. /// @@ -144,24 +128,23 @@ private void InitializeTabs() /// private void HandleTabButtonClicked(int tabValue) { - SelectTab(tabValue); + TrySelectTab(tabValue); } /// /// 지정된 값을 가진 탭을 선택합니다. /// - public void SelectTab(int tabValue) + public bool TrySelectTab(int tabValue) { if (_tabLookup == null || _tabLookup.Count == 0) { Debug.LogWarning("탭 룩업이 초기화되지 않았습니다.", this); - return; + return false; } - if (!_tabLookup.ContainsKey(tabValue)) + if (_tabLookup.ContainsKey(tabValue) == false) { - Debug.LogWarning($"탭 값 {tabValue}에 해당하는 탭을 찾을 수 없습니다.", this); - return; + return false; } CurrentTabValue = tabValue; @@ -174,6 +157,7 @@ public void SelectTab(int tabValue) // 이벤트 호출 OnTabSelected?.Invoke(tabValue); + return true; } /// @@ -185,7 +169,7 @@ public void SelectFirstTab() if (_tabButtons[0] != null) { var firstTabValue = _tabButtons[0].TabValue; - SelectTab(firstTabValue); + TrySelectTab(firstTabValue); } } @@ -223,7 +207,7 @@ public void Move(int direction) // 상호작용 가능한 탭을 찾았으면 이동 if (IsTabInteractable(tabValues[newIndex])) { - SelectTab(tabValues[newIndex]); + TrySelectTab(tabValues[newIndex]); } } From 2b2cc2b320416144e0dd768bf9a3e8417e9a5e37 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:01:25 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=EC=95=88=EC=93=B0=EB=8A=94=20=EC=83=81?= =?UTF-8?q?=EC=88=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/Utilities/Constants.cs | 22 --------------------- 1 file changed, 22 deletions(-) diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index 8bc7ccd7a..914ec629a 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -10,28 +10,6 @@ public static class CommonConstants public const string BlockImage = "BlockImage"; } - public static class DataConstants - { - public const string GameStateSo = "GameStateSo"; - public const string InventoryTestDataSo = "InventoryTestDataSo"; - public const string ItemDataSo = "ItemDataAsset"; - public const string RecipeDataSo = "RecipeDataAsset"; - public const string FoodDataSo = "FoodDataAsset"; - public const string DrinkDataSo = "DrinkDataAsset"; - public const string IngredientDataSo = "IngredientDataAsset"; - public const string CookwareDataSo = "CookwareDataAsset"; - public const string TasteDataSo = "TasteDataAsset"; - public const string EnvironmentDataSo = "EnvironmentDataAsset"; - public const string LevelDataSo = "LevelDataAsset"; - public const string CustomerPoolDataSo = "CustomerPoolDataAsset"; - public const string UiInputBindingSo = "UiInputBindingSo"; - - public const string RestaurantDataSo = "RestaurantDataSo"; - - public const string AtlasLabel = "Atlas"; - public const string BasePropSpriteMaterial = "BasePropSpriteMaterial"; - } - public static class RestaurantPlayerAnimationType { public const string Idle = "Idle"; From 5e8f08a7b99407cdd5a75c858bcc6671d81c2f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Mon, 1 Sep 2025 18:01:34 +0900 Subject: [PATCH 04/11] =?UTF-8?q?CustomerPatienceUiComponent=20=EC=88=98?= =?UTF-8?q?=EC=A0=95:=20=EC=83=81=ED=83=9C=20=EC=B4=88=EA=B8=B0=ED=99=94?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80,=20=EC=8A=AC=EB=9D=BC=EC=9D=B4=EB=8D=94?= =?UTF-8?q?=EB=A5=BC=20=ED=86=B5=ED=95=9C=20RemainingPatienceTime=20?= =?UTF-8?q?=EC=8B=9C=EA=B0=81=ED=99=94=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84,=20=EA=B4=80=EB=A0=A8=20Prefab=20=EB=B0=8F=20?= =?UTF-8?q?=EB=B8=94=EB=9E=99=EB=B3=B4=EB=93=9C=20Key=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AI/Customer/Subtree/OrderSubtree.asset | 4 +- .../_Addressables/Prefabs/CustomerNpc.prefab | 350 +++++++++++++++++- .../AI/Common/Decorator/TimeLimiter.cs | 3 +- .../Customer/Decorator/CustomerTimeLimiter.cs | 3 +- .../Interfaces/ICustomerBlackboard.cs | 3 +- .../Ui/OrderUi/CustomerPatienceUiComponent.cs | 78 +++- 6 files changed, 425 insertions(+), 16 deletions(-) diff --git a/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset b/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset index dfc57475d..38908aa26 100644 --- a/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset +++ b/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb82276e36ca7c53a3674df1108655ddac7cade525c3f24b0045e24f6063cc29 -size 23457 +oid sha256:202ad7081128e8607b69e2698acfbaf2ef9ea1adf22f382fb4c19b0f6f623f72 +size 23569 diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index 4e2728746..ae9e28304 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -1,5 +1,280 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &633131044254461841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3251801155585931500} + m_Layer: 10 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3251801155585931500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633131044254461841} + 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: 609795798002784246} + m_Father: {fileID: 4124712097831813607} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6108830054777696831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 609795798002784246} + - component: {fileID: 5096550498312619918} + - component: {fileID: 6088464776038824938} + m_Layer: 10 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &609795798002784246 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6108830054777696831} + 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: 3251801155585931500} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5096550498312619918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6108830054777696831} + m_CullTransparentMesh: 1 +--- !u!114 &6088464776038824938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6108830054777696831} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6934217169991235231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6896730674754028691} + - component: {fileID: 2778170821913614564} + - component: {fileID: 5385555677689984514} + m_Layer: 10 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6896730674754028691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934217169991235231} + 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: 4124712097831813607} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2778170821913614564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934217169991235231} + m_CullTransparentMesh: 1 +--- !u!114 &5385555677689984514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934217169991235231} + 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: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7478348093145584255 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4124712097831813607} + - component: {fileID: 290174062369355600} + m_Layer: 10 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4124712097831813607 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7478348093145584255} + 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: 6896730674754028691} + - {fileID: 3251801155585931500} + m_Father: {fileID: 6787772463908443990} + 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: -122.7} + m_SizeDelta: {x: 80, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &290174062369355600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7478348093145584255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6088464776038824938} + m_FillRect: {fileID: 609795798002784246} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &6675463944788402332 PrefabInstance: m_ObjectHideFlags: 0 @@ -8,6 +283,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1177268455256782109, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_BlockingMask.m_Bits + value: 1023 + objectReference: {fileID: 0} - target: {fileID: 2686192822530022837, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_IsTrigger value: 1 @@ -1686,11 +1965,11 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 90ef4d2128c770b4cb83806c33867a79, type: 2} - target: {fileID: 4246001044237372826, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4900607124439125211, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5108021082109611361, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: _availableInteractions @@ -1698,7 +1977,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5523461449651244940, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5654854357519457123, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: gravity.x @@ -1726,7 +2005,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6312111630636169229, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 6 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6336425934484470474, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_SortingOrder @@ -1754,7 +2033,11 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: d018debe5b8bedf4c8f19cba9e4facec, type: 2} - target: {fileID: 6558328110360087691, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: m_Layer - value: 6 + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6558328110360087691, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 6826437533270866908, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} propertyPath: externalBehavior @@ -1799,7 +2082,10 @@ PrefabInstance: m_RemovedComponents: - {fileID: 133104368464330048, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 186617915120465866, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + insertIndex: -1 + addedObject: {fileID: 4124712097831813607} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} insertIndex: -1 @@ -1813,6 +2099,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} insertIndex: -1 addedObject: {fileID: 7166420413980924482} + - targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + insertIndex: -1 + addedObject: {fileID: 7529813704779128435} m_SourcePrefab: {fileID: 100100000, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} --- !u!1 &4266090516809920735 stripped GameObject: @@ -1843,6 +2132,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 784c770c13244dc0a0804056065eaf92, type: 3} m_Name: m_EditorClassIdentifier: + _blackboardSo: {fileID: 0} --- !u!114 &3825874317044733320 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2055,3 +2345,51 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!114 &7529813704779128435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266090516809920735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e509fdc10cff4d3487080f126f32544f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: _targetOrderType + Entry: 7 + Data: 0|System.Collections.Generic.HashSet`1[[DDD.Restaurant.RestaurantOrderType, + Assembly-CSharp]], System.Core + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 3 + Data: 4 + - Name: + Entry: 3 + Data: 2 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + _currentOrderType: 0 + _prevOrderType: 0 + _patienceSlider: {fileID: 0} +--- !u!224 &6787772463908443990 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 186617915120465866, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + m_PrefabInstance: {fileID: 6675463944788402332} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs index 4a4a5bd03..332990eb1 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs @@ -248,7 +248,8 @@ public class SharedTimeLimiter : DecoratorNode [Tooltip("하단 블랙보드 키에 현재 시간을 저장할 지")] [SerializeField] protected bool _isBlackboardWriteEnabled = false; - [SerializeField] protected T _blackboardKey; + [SerializeField] protected T _remainTimeblackboardKey; + [SerializeField] protected T _maxTimeblackboardKey; public SharedVariable TimeLimit { diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs index b4a56660e..94d38de25 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs @@ -14,13 +14,14 @@ public override void OnStart() { Debug.LogError($"[{GetType().Name}] 블랙보드를 찾을 수 없습니다. 게임오브젝트 해시코드: {gameObject.GetHashCode()}"); } + _blackboard.SetBlackboardValue(_maxTimeblackboardKey, TimeLimit.Value); } public override TaskStatus OnUpdate() { if (_isBlackboardWriteEnabled && _blackboard != null) { - _blackboard.SetBlackboardValue(_blackboardKey, Time.time - _startTime); + _blackboard.SetBlackboardValue(_remainTimeblackboardKey, TimeLimit.Value - (Time.time - _startTime)); } return base.OnUpdate(); diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs index 768c70b7f..e88fc8167 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs @@ -13,7 +13,8 @@ public enum RestaurantCustomerBlackboardKey CurrentTargetGameObject, SatisfactionLevel, CumulativeOrderCount, - Remaining + MaxPatienceTime, + RemainingPatienceTime } public interface ICustomerBlackboard diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs index 2a4b38eaf..cdc6560c2 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs @@ -1,26 +1,94 @@ using System.Collections.Generic; +using Sirenix.OdinInspector; +using Sirenix.Serialization; using UnityEngine; +using UnityEngine.UI; namespace DDD.Restaurant { - public class CustomerPatienceUiComponent : MonoBehaviour + public class CustomerPatienceUiComponent : SerializedMonoBehaviour { private IAISharedBlackboard _blackboard; - [SerializeField] HashSet _targetOrderType; - [SerializeField] RestaurantOrderType _currentOrderType; + [OdinSerialize] private HashSet _targetOrderType = new(); + [SerializeField] private RestaurantOrderType _currentOrderType; + [SerializeField] private RestaurantOrderType _prevOrderType; + private bool _initialized; + private IInteractionSubsystemObject _subsystem; + + [SerializeField] private Slider _patienceSlider; private void Start() { - if (!TryGetComponent(out _blackboard)) + var canvas = GetComponentInChildren(); + canvas.worldCamera = Camera.main; + + _patienceSlider = GetComponentInChildren(); + if (_patienceSlider == null) { - Debug.LogWarning($"[{GetType().Name}] 블랙보드가 존재하지 않음 오브젝트 해시코드 {gameObject.GetHashCode()}"); + Debug.LogWarning($"[{GetType().Name}] 슬라이더가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}"); return; } + if (!TryGetComponent(out _blackboard)) + { + Debug.LogWarning($"[{GetType().Name}] 블랙보드가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}"); + return; + } + + var targetObject = _blackboard.GetBlackboardValue(RestaurantCustomerBlackboardKey.CurrentTargetGameObject); + if (targetObject == null) + { + Debug.LogWarning($"[{GetType().Name}] 타겟 오브젝트가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}"); + return; + } + + if (!targetObject.TryGetComponent(out var subsystemOwner)) + { + Debug.LogWarning($"[{GetType().Name}] 서브시스템 오너가 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}"); + return; + } + subsystemOwner.TryGetSubsystemObject(out _subsystem); + + if (_subsystem == null) + { + Debug.LogWarning($"[{GetType().Name}] RestaurantOrderType 서브시스템이 존재하지 않음 오브젝트 해시코드: {gameObject.GetHashCode()}"); + return; + } + + _currentOrderType = _subsystem.GetInteractionSubsystemType(); + + _initialized = true; + _patienceSlider.enabled = false; } private void Update() { + if (!_initialized) return; + _currentOrderType = _subsystem.GetInteractionSubsystemType(); + if (!_targetOrderType.Contains(_currentOrderType)) + { + _patienceSlider.enabled = false; + return; + } + + if (_currentOrderType != _prevOrderType) + { + SetPatience(); + } + + _patienceSlider.value = _blackboard.GetBlackboardValue(RestaurantCustomerBlackboardKey.RemainingPatienceTime); + if (_patienceSlider.value <= 0) + { + _patienceSlider.enabled = false; + } + } + + private void SetPatience() + { + _prevOrderType = _currentOrderType; + _patienceSlider.maxValue = _blackboard.GetBlackboardValue(RestaurantCustomerBlackboardKey.MaxPatienceTime); + _patienceSlider.value = _patienceSlider.maxValue; + _patienceSlider.enabled = true; } } } \ No newline at end of file From f13e9e13c4643b62e7295b69764b39c543f73cf8 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:04:36 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/Game/GameData/DataManager.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs b/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs index 0133b43ef..09a3d593d 100644 --- a/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs +++ b/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs @@ -13,6 +13,7 @@ public class DataManager : Singleton, IManager private const string AssetLabel = "GoogleSheetSo"; private const string Icon = "_icon"; + private const string AtlasLabel = "Atlas"; public void PreInit() { @@ -21,7 +22,7 @@ public void PreInit() public async Task Init() { - await LoadAllGameDataSo(); + await LoadAllGameDataAssets(); await LoadSpriteAtlas(); } @@ -30,7 +31,7 @@ public void PostInit() } - private async Task LoadAllGameDataSo() + private async Task LoadAllGameDataAssets() { var assets = await AssetManager.Instance.LoadAssetsByLabel(AssetLabel); _dataAssetTable = new Dictionary(assets.Count); @@ -45,7 +46,7 @@ private async Task LoadAllGameDataSo() private async Task LoadSpriteAtlas() { - List spriteAtlases = await AssetManager.Instance.LoadAssetsByLabel(DataConstants.AtlasLabel); + List spriteAtlases = await AssetManager.Instance.LoadAssetsByLabel(AtlasLabel); _spriteAtlas = new Dictionary(spriteAtlases.Count); foreach (var atlas in spriteAtlases) From 4351edf318b5016c98ab4a1099197a5dbd15ec26 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:05:03 +0900 Subject: [PATCH 06/11] =?UTF-8?q?AssetPostProcessors=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetPostprocessors/AssetPostProcessors.cs | 7 ++----- .../AssetPostprocessorSprite.cs | 18 ------------------ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs index c5fca9a11..092196f23 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs @@ -9,16 +9,13 @@ public class AssetPostProcessors : AssetPostprocessor private void OnPreprocessTexture() { var importer = assetImporter as TextureImporter; + if (!importer) return; var upperPath = importer.assetPath.ToUpper(); if (upperPath.Contains(PathConstants.RawSpritesPathUpper)) { - if (upperPath.Contains(PathConstants.RawOnlyAtlasPathUpper)) - { - AssetPostprocessorSprite.OnPreprocessTextureOnlyAtlas(importer); - } - else if (upperPath.Contains(PathConstants.RawUiPathUpper)) + if (upperPath.Contains(PathConstants.RawUiPathUpper)) { AssetPostprocessorSprite.OnPreprocessTextureForUi(importer); } diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs index 1c4c17d5e..be7a8dd5d 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs @@ -16,7 +16,6 @@ public static class AssetPostprocessorSprite public static void OnPreprocessTexture(TextureImporter importer) { importer.textureType = TextureImporterType.Sprite; - importer.spriteImportMode = SpriteImportMode.Single; importer.GetSourceTextureWidthAndHeight(out var width, out var height); importer.spritePixelsPerUnit = width <= height ? width : height; @@ -25,7 +24,6 @@ public static void OnPreprocessTexture(TextureImporter importer) importer.isReadable = true; importer.mipmapEnabled = false; importer.streamingMipmaps = false; - importer.wrapMode = TextureWrapMode.Clamp; importer.filterMode = FilterMode.Bilinear; importer.textureCompression = TextureImporterCompression.Uncompressed; @@ -44,16 +42,11 @@ public static void OnPreprocessTexture(TextureImporter importer) public static void OnPreprocessTextureForUi(TextureImporter importer) { importer.textureType = TextureImporterType.Sprite; - importer.spriteImportMode = SpriteImportMode.Single; - - // 기본 PPU (UI는 100 또는 1 고정 추천) - importer.spritePixelsPerUnit = 100f; importer.sRGBTexture = true; importer.isReadable = false; importer.mipmapEnabled = false; importer.streamingMipmaps = false; - importer.wrapMode = TextureWrapMode.Clamp; importer.filterMode = FilterMode.Bilinear; importer.textureCompression = TextureImporterCompression.Uncompressed; @@ -68,17 +61,6 @@ public static void OnPreprocessTextureForUi(TextureImporter importer) importer.SetTextureSettings(textureSettings); } - - public static void OnPreprocessTextureOnlyAtlas(TextureImporter importer) - { - if (importer.textureType == TextureImporterType.Sprite) - { - return; - } - - importer.textureType = TextureImporterType.Sprite; - importer.spriteImportMode = SpriteImportMode.Single; - } private static void TryApplyPivotAfterImport(string path) { From 23631f97bc44419c881c49674ae1641739bf5641 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:05:25 +0900 Subject: [PATCH 07/11] =?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta | 8 -------- .../OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta | 8 -------- .../RestaurantManagementUi}/CheckLine.png | 0 .../RestaurantManagementUi}/CheckLine.png.meta | 4 ++-- .../RestaurantManagementUi}/CookwareDetailPanel.png | 0 .../RestaurantManagementUi}/CookwareDetailPanel.png.meta | 4 ++-- .../RestaurantManagementUi}/IngredientDetailPanel.png | 0 .../IngredientDetailPanel.png.meta | 4 ++-- .../RestaurantManagementUi}/RecipeDetailPanel.png | 0 .../RestaurantManagementUi}/RecipeDetailPanel.png.meta | 4 ++-- 10 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta delete mode 100644 Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/CheckLine.png (100%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/CheckLine.png.meta (99%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/CookwareDetailPanel.png (100%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/CookwareDetailPanel.png.meta (99%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/IngredientDetailPanel.png (100%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/IngredientDetailPanel.png.meta (99%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/RecipeDetailPanel.png (100%) rename Assets/_DDD/_Raw/Sprites/{OnlyAtlas/RestaurantManagementUi_OnlyAtlas => Ui/RestaurantManagementUi}/RecipeDetailPanel.png.meta (99%) diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta deleted file mode 100644 index a169001a6..000000000 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09f4966f14db79b4f89e830531b01e9e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta deleted file mode 100644 index 868ef6d9f..000000000 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c5930b6ad0c4b449a092f59c48a2559 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta index 7d78ccbaa..d95754f39 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.45117188} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta index 602052b69..cce2edf34 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta index 3ce8123c6..e4d0aad09 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta index f32937c65..95f234d57 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} From 065d0fbbd7de60f188f1a86e9a682ecea0c7eae9 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:11:53 +0900 Subject: [PATCH 08/11] =?UTF-8?q?=ED=98=84=EC=A7=80=ED=99=94=20db=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Global_Message/Global_Message Shared Data.asset | 4 ++-- .../Localization/Global_Message/Global_Message_en.asset | 4 ++-- .../Localization/Global_Message/Global_Message_ja.asset | 4 ++-- .../Localization/Global_Message/Global_Message_ko.asset | 4 ++-- .../Interaction_Message/Interaction_Message Shared Data.asset | 4 ++-- .../Interaction_Message/Interaction_Message_en.asset | 4 ++-- .../Interaction_Message/Interaction_Message_ja.asset | 4 ++-- .../Interaction_Message/Interaction_Message_ko.asset | 4 ++-- .../Item_Description/Item_Description Shared Data.asset | 2 +- .../Localization/Item_Description/Item_Description_en.asset | 2 +- .../Localization/Item_Description/Item_Description_ja.asset | 2 +- .../Localization/Item_Description/Item_Description_ko.asset | 2 +- .../Localization/Item_Name/Item_Name Shared Data.asset | 2 +- .../_ScriptAssets/Localization/Item_Name/Item_Name_en.asset | 2 +- .../_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset | 2 +- .../_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset | 2 +- .../Localization/Item_Taste/Item_Taste Shared Data.asset | 2 +- .../_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset | 2 +- .../_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset | 2 +- .../_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset index 6c4800beb..d8fe41e6d 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd6f246c77e4b967b82e361d0aa0ab6d1ad79cfaba4d6252ea11d03ea8e9723a -size 1958 +oid sha256:26c3adfa5b70107bb6c5169ea96adbabc26193c183c57e0708f7a7e0d6fe9618 +size 2060 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset index b85ddc541..ac9de9104 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb4207c67a170673a7c6108c7ba9b3b825612c39a48e85ec3ff11c3d71fb3f4 -size 2504 +oid sha256:1fca5c7e2ead58cf5b83e5bd9caf847ef8cb257066d959b81016cf7251b9eea3 +size 2584 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset index 6d982bcd2..a9d555f3e 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21cb08a57e3a57f2e4b357c3b58115af62148c85efb7978c94dc94b8bae7082f -size 2447 +oid sha256:899bcabcf791b0a43bbe60ceda2f084a560001902e0508c1f6478b4f0050b10a +size 2527 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset index a2f5e0ba3..c31ef6df4 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69f65a6cd9b7bb2e5afcbac5ff99b0ff1aebe8c25aaca388e0ce0fd123bf22c0 -size 4292 +oid sha256:e59f10566fecafc1be07f4aeea70ee0a8bddb7f6f441b889b0c9216a6e020f58 +size 4573 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset index 220a1a9d6..a88c9a23d 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e73e6ac12f59190cbfb77da0f0b3b65d4623f5027388eb7554fe05a0840f2264 -size 1801 +oid sha256:5333426da435487e48c8b05c4e99aa138dc2a8082d733550550987bc36cb41e6 +size 1811 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset index f2758af73..8d0bec8c9 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:691ddcf7a799e7daaff9d575a796af089fdfa4b514a906ef0362efdca2955844 -size 1393 +oid sha256:ea3c269c2537f173e3a5702e8560b3672da96c0d0fbc50e99b673990a8872a1b +size 1403 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset index 0a489a1e5..3a9c53247 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76d377fc62db31dd86625aac8125005b239eac708a51ffcfb6bf0dc73954ebae -size 1393 +oid sha256:585bb46aa52e0ea4bd39b53a7671328105b55c87779b2e600eaf871a1748e624 +size 1403 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset index 68df4a8c9..f149eebce 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3384191d17bcdb460dfaf3f9eddf3332112c1ca16535958c6104f12fb5c21bea -size 2048 +oid sha256:b1a72819a89839c6988a76fe9dda3ab5c8dc8870ac37684e3906c25c4343e6b9 +size 2120 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset index d2bacf822..ab569e327 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61f9e98daed479199a120bdf0637da420b0cde26dff6fe0ac8cef4ca409a55fa +oid sha256:2e24cc3daa5752e408b9b7a7b11ece964d22fac6757c31583372bd93d88f79d0 size 5985 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset index 7964a46ba..9cb3a05d1 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bca12d1979ce4a43c7460f2d385e9a62b72f0578689b5dcb9e13c11ab4e28bb +oid sha256:07d9eddad4ef9ba794c0a75217587fc57600f14f76f06b09c96aa85abf36524d size 4610 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset index bb3d2785c..d53e6644c 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05e88ba4b9aa594fcea3d708b3b5f04efc911cf7853fd6683f619df654e77fd3 +oid sha256:1b6b16d07f3e18c965c4b518ba05d095153cecaf74894ab6b365e6d6b6f8a0e2 size 4610 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset index caa48a68e..13086e1c8 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f2b2bfbd0a1ae282b5f39ad76ff35489a507f784251cfddc2b61683f226b2d0 +oid sha256:841e326cb884d53c17751a1eaf54f4116bba2ae9b580e4c82dc1e0fa66994339 size 13456 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset index ae073198b..9a039a3c7 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:519967efddde4486ae815ac76788132022ab25083a7a8eb9e7b774308bab1685 +oid sha256:41d655c9e170643c4bf0aa9a9ebbffb0621ada578c63c8a8590f333fad503de0 size 5621 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset index 505b9ee2d..d87c1a209 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25b76cd77f763d71e4c8d6f26d0e6cb6ad7af4043022321bce0925b8e0647458 +oid sha256:3fc86dec7ab1df2dcff3995d8cb37b53cf962011efdf63868a26403dfd20ac27 size 5206 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset index 284554670..e709f926f 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddc5085fa397005bcab5673942cdca7727e866415dc523b10cb5d8679e3f2734 +oid sha256:ed16c98a2a8666bfb1c7fa7d5fa297e9f4e8d3818b48d57507dc04334b2b5861 size 4603 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset index e7d9bbd1f..236ac1cc4 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d0c9649f133e44070c433312bc78a7499f9353cbfb3447b05e742b78aa6fa58 +oid sha256:ba87a6f071b6541a146e6dc27a49396c0972ea312c9b1de29bd8a49a618634da size 5889 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset index ced06e8b9..d2e243ded 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94c528a87db6e8d7d466872b7234bb7855ef2c134ff79427da08055552cd36aa +oid sha256:126b7564696a13af5926bdcddb73f386637567d3327a6aebb980cb369f9a015d size 2379 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset index 893162c9d..db5d046f6 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a90d7b0f25142bbcd9a3278f0bd9ded867dae3b7476b36c96396c9406ae31f2e +oid sha256:19799ef501be556e6394f6c2c337a1900133259990b532fa5b67f0cc44449363 size 2168 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset index 32800077c..f2add326d 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f25bdba88ce3dde4fa24b24ae43dfb9e383801466e3add61ac726bb527f8c999 +oid sha256:071eef293043adedf30e022e41be392204ed53d1fb7ad0a7c93b2be32c97a16f size 2044 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset index 3c456432f..43d4d8e81 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f27aaa4dd2a5dda3d79a680f8d3befd23fa188cc21acf19521734dae34665fb +oid sha256:643aaea1f09cf8d111367384ea40347e6441acf467276f38ef427f6398ab1141 size 2410 From f19f66fdb1daa044da6e8f614fc653f7ce73db55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Mon, 1 Sep 2025 18:21:08 +0900 Subject: [PATCH 09/11] =?UTF-8?q?CustomerPatienceUiComponent=20=EC=88=98?= =?UTF-8?q?=EC=A0=95:=20PatienceSlider=20=ED=99=9C=EC=84=B1=ED=99=94=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EA=B0=9C=EC=84=A0=20(enabled=20=E2=86=92?= =?UTF-8?q?=20SetActive),=20RemainingPatienceTime=20=EC=8B=9C=EA=B0=81?= =?UTF-8?q?=ED=99=94=20=EC=B6=94=EA=B0=80,=20Prefab=20=EB=B0=8F=20?= =?UTF-8?q?=EB=B8=94=EB=9E=99=EB=B3=B4=EB=93=9C=20Key=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8.=20TimeLimiter=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=ED=98=B8=EC=B6=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab | 6 +++--- .../Character/AI/Common/Decorator/TimeLimiter.cs | 1 - .../AI/Customer/Decorator/CustomerTimeLimiter.cs | 1 + .../Ui/OrderUi/CustomerPatienceUiComponent.cs | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index ae9e28304..830102b1c 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -33,8 +33,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6108830054777696831 GameObject: @@ -71,7 +71,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5096550498312619918 CanvasRenderer: diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs index 332990eb1..f9a4f62e0 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs @@ -268,7 +268,6 @@ public TaskStatus TimeoutStatus public override void OnStart() { - base.OnStart(); _startTime = Time.time; } diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs index 94d38de25..57f635efc 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Decorator/CustomerTimeLimiter.cs @@ -15,6 +15,7 @@ public override void OnStart() Debug.LogError($"[{GetType().Name}] 블랙보드를 찾을 수 없습니다. 게임오브젝트 해시코드: {gameObject.GetHashCode()}"); } _blackboard.SetBlackboardValue(_maxTimeblackboardKey, TimeLimit.Value); + _blackboard.SetBlackboardValue(_remainTimeblackboardKey, TimeLimit.Value); } public override TaskStatus OnUpdate() diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs index cdc6560c2..8c793b571 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/CustomerPatienceUiComponent.cs @@ -57,7 +57,7 @@ private void Start() _currentOrderType = _subsystem.GetInteractionSubsystemType(); _initialized = true; - _patienceSlider.enabled = false; + _patienceSlider.gameObject.SetActive(false); } private void Update() @@ -66,7 +66,7 @@ private void Update() _currentOrderType = _subsystem.GetInteractionSubsystemType(); if (!_targetOrderType.Contains(_currentOrderType)) { - _patienceSlider.enabled = false; + _patienceSlider.gameObject.SetActive(false); return; } @@ -74,12 +74,12 @@ private void Update() { SetPatience(); } - + _patienceSlider.maxValue = _blackboard.GetBlackboardValue(RestaurantCustomerBlackboardKey.MaxPatienceTime); _patienceSlider.value = _blackboard.GetBlackboardValue(RestaurantCustomerBlackboardKey.RemainingPatienceTime); if (_patienceSlider.value <= 0) { - _patienceSlider.enabled = false; + _patienceSlider.gameObject.SetActive(false); } } @@ -88,7 +88,7 @@ private void SetPatience() _prevOrderType = _currentOrderType; _patienceSlider.maxValue = _blackboard.GetBlackboardValue(RestaurantCustomerBlackboardKey.MaxPatienceTime); _patienceSlider.value = _patienceSlider.maxValue; - _patienceSlider.enabled = true; + _patienceSlider.gameObject.SetActive(true); } } } \ No newline at end of file From d850a4f2126dcb761ab02e826ec45f2ae8592fbe Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:29:35 +0900 Subject: [PATCH 10/11] =?UTF-8?q?=EC=9A=94=EB=A6=AC=20=EC=95=A0=EB=8B=88?= =?UTF-8?q?=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CookingTabUi.controller | 2336 +++++++++++++++++ .../CookingTabUi.controller.meta | 8 + .../Elements/Buttons/ItemSlotTabButton.prefab | 57 +- .../Prefabs/Uis/GameUi/PopupUis/CookUi.prefab | 194 +- .../RestaurantManagementData.asset | 4 +- .../_ScriptAssets/Prefabs/UiManager.prefab | 162 +- .../DataObjects/RestaurantManagementData.cs | 1 + .../Ui/CookUi/AddedCookSlotUiStrategy.cs | 2 +- 8 files changed, 2749 insertions(+), 15 deletions(-) create mode 100644 Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller create mode 100644 Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller.meta diff --git a/Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller b/Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller new file mode 100644 index 000000000..65d294aab --- /dev/null +++ b/Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller @@ -0,0 +1,2336 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8454442321133926692 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Toggled + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Selected + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6259034119004896615} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &-7150382109633608345 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9254903 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8431373 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5333334 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.r + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.g + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.b + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.a + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4080383872 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2333811533 + attribute: 2659956753 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 1656131046 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 258697485 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 2130812290 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 3859336248 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9254903 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8431373 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5333334 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.r + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.g + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.b + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.a + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &-6259034119004896615 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -1942334234897072010} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5157379931379195945 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6259034119004896615} + m_Position: {x: 460, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4170228312314127899} + m_Position: {x: 540, y: 70, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2429834667517848280} + m_Position: {x: 520, y: 140, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6386372134413823796} + m_Position: {x: 510, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: -755592736906726463} + m_Position: {x: 430, y: 270, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 768286118201508997} + - {fileID: -2947644494943107051} + - {fileID: 814151823820984193} + - {fileID: 5688398759945136006} + - {fileID: -8454442321133926692} + - {fileID: 6411128944415862464} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6259034119004896615} +--- !u!74 &-4886527885153573937 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8980393 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8588236 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4080383872 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2333811533 + attribute: 2659956753 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8980393 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8588236 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &-4170228312314127899 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8658580069386572766} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2947644494943107051 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2429834667517848280} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-2429834667517848280 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -4886527885153573937} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!74 &-1942334234897072010 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8980393 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8588236 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.7176471 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4080383872 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2333811533 + attribute: 2659956753 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8980393 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8588236 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.7176471 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &-755592736906726463 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5939040793034423229} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CookingTabUi + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Disabled + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Pressed + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Toggled + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Selected + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Highlighted + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5157379931379195945} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &768286118201508997 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Pressed + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Toggled + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Selected + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -755592736906726463} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &814151823820984193 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6386372134413823796} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5688398759945136006 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4170228312314127899} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &5939040793034423229 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5529412 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5254902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4470589 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2333811533 + attribute: 2659956753 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5529412 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.5254902 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4470589 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1102 &6386372134413823796 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -7150382109633608345} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6411128944415862464 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Toggled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6386372134413823796} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &8658580069386572766 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8980393 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8588236 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.r + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.g + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.b + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.a + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4080383872 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4080383872 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2333811533 + attribute: 2659956753 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 1656131046 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 258697485 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 2130812290 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 990839867 + attribute: 3859336248 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8980393 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.8588236 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue + path: Background/_OutlineAlpha Override + classID: 114 + script: {fileID: 11500000, guid: 035dcf41a5a94b9ba8c514a7714b4fbb, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.r + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.g + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.b + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: propertyValue.a + path: Background/_OutlineColor Override + classID: 114 + script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller.meta b/Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller.meta new file mode 100644 index 000000000..5ba16821f --- /dev/null +++ b/Assets/_DDD/_Addressables/AnimationController/CookingTabUi.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3aec645efb9e7a49a6b421d9a60f8c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlotTabButton.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlotTabButton.prefab index 2b6c6a8aa..a42e0647f 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlotTabButton.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlotTabButton.prefab @@ -1,5 +1,52 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &7850297018468800652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7183539670929002447} + - component: {fileID: 3020200883419247994} + m_Layer: 5 + m_Name: _OutlineColor Override + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7183539670929002447 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7850297018468800652} + serializedVersion: 2 + 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: [] + m_Father: {fileID: 1145774483742868458} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3020200883419247994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7850297018468800652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0769e07e9d844582aed9c22013f56c3b, type: 3} + m_Name: + m_EditorClassIdentifier: + propertyName: _OutlineColor + propertyValue: {r: 1, g: 1, b: 1, a: 1} + isHDR: 0 --- !u!1001 &5991135733323538638 PrefabInstance: m_ObjectHideFlags: 0 @@ -98,12 +145,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6683994851862995748, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} + insertIndex: -1 + addedObject: {fileID: 7183539670929002447} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 733902947636509683, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} insertIndex: -1 addedObject: {fileID: 7297891606913519494} m_SourcePrefab: {fileID: 100100000, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} +--- !u!224 &1145774483742868458 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6683994851862995748, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} + m_PrefabInstance: {fileID: 5991135733323538638} + m_PrefabAsset: {fileID: 0} --- !u!1 &6416383596375464765 stripped GameObject: m_CorrespondingSourceObject: {fileID: 733902947636509683, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab index 983ccc0aa..dd0695530 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab @@ -2167,6 +2167,188 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &3477427597930815052 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7330412726684592059} + m_Modifications: + - target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.x + value: 45.14 + objectReference: {fileID: 0} + - target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.y + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 22.57 + objectReference: {fileID: 0} + - target: {fileID: 545562010045447622, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: -24.5 + objectReference: {fileID: 0} + - target: {fileID: 3643576478450009530, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_Name + value: CookKeyLayout + objectReference: {fileID: 0} + - target: {fileID: 4995302901292615342, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_text + value: "\uC694\uB9AC\uD558\uAE30" + objectReference: {fileID: 0} + - target: {fileID: 5903102430418324167, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_text + value: T + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.x + value: 172.86 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.y + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 232.78 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: -6.5 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7865319533890706095, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8762267192074770118, guid: 337a095b1f02706458dc265504e220c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 337a095b1f02706458dc265504e220c5, type: 3} +--- !u!224 &7317153595074350300 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6181627633083568784, guid: 337a095b1f02706458dc265504e220c5, type: 3} + m_PrefabInstance: {fileID: 3477427597930815052} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3564175063392541128 PrefabInstance: m_ObjectHideFlags: 0 @@ -3219,7 +3401,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1837337877009618859, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 237.315 + value: 440.17502 objectReference: {fileID: 0} - target: {fileID: 1837337877009618859, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y @@ -3487,7 +3669,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2550093527582931782, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} + insertIndex: 1 + addedObject: {fileID: 7317153595074350300} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} --- !u!224 &3916868401897859374 stripped @@ -3495,6 +3680,11 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8107209452760937939, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} m_PrefabInstance: {fileID: 5105141356604677373} m_PrefabAsset: {fileID: 0} +--- !u!224 &7330412726684592059 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2550093527582931782, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} + m_PrefabInstance: {fileID: 5105141356604677373} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5209202590184013229 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantManagementData.asset b/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantManagementData.asset index 9778b8fdd..48ee5bb3a 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantManagementData.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantManagementData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74433896bbfaa03f75efefdbe6eff58624d851d9e8e7e6e8de207e3ee59ec671 -size 1324 +oid sha256:f5fe63d11ac64a66fe1eae6e30912581f45eba5ecac7ffe87620af9ec7864337 +size 1425 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab index db86ca833..5adf610b8 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab @@ -421,7 +421,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1008003955756573696, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 83.369995 objectReference: {fileID: 0} - target: {fileID: 1008003955756573696, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.y @@ -717,7 +717,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4130017465905115418, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 116.35 objectReference: {fileID: 0} - target: {fileID: 4130017465905115418, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_AnchoredPosition.x @@ -737,7 +737,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4223787967856646522, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 84.6 objectReference: {fileID: 0} - target: {fileID: 4223787967856646522, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_AnchoredPosition.x @@ -933,7 +933,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6783010733222258758, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 66.4 objectReference: {fileID: 0} - target: {fileID: 6783010733222258758, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_AnchoredPosition.x @@ -961,7 +961,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6892356896533285718, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 181.93 objectReference: {fileID: 0} - target: {fileID: 6892356896533285718, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_AnchoredPosition.x @@ -1009,7 +1009,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7713383399699078732, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 45.14 objectReference: {fileID: 0} - target: {fileID: 7713383399699078732, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.y @@ -1033,7 +1033,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7974438497134857488, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 66.4 objectReference: {fileID: 0} - target: {fileID: 7974438497134857488, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_AnchoredPosition.x @@ -1153,10 +1153,58 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2895631047819282398, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3080325846008693413, guid: 86a58b93c36851e4787861c23023b094, type: 3} propertyPath: m_Name value: RestaurantHud objectReference: {fileID: 0} + - target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3494828945181302518, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4664972416674662382, guid: 86a58b93c36851e4787861c23023b094, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1237,6 +1285,78 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5310309091478669842, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5531837051647323018, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5763713121236530573, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7495439814947728977, guid: 86a58b93c36851e4787861c23023b094, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1261,6 +1381,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8315279841667679794, guid: 86a58b93c36851e4787861c23023b094, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3054,7 +3198,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1561416421336272141, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 140 objectReference: {fileID: 0} - target: {fileID: 1561416421336272141, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.y @@ -3078,7 +3222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1574507451341098674, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 45.14 objectReference: {fileID: 0} - target: {fileID: 1574507451341098674, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.y diff --git a/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs index 205cd272a..159e442b5 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs @@ -30,5 +30,6 @@ public class RestaurantManagementData : ScriptableObject public RuntimeAnimatorController TodayMenuSlotUiAnimatorController; public RuntimeAnimatorController InventorySlotUiAnimatorController; + public RuntimeAnimatorController CookingTabUiAnimatorController; } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs index 917afd3ce..166bc1557 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs @@ -43,7 +43,7 @@ public void Setup(ItemSlotUi ui, ItemModel model) public RuntimeAnimatorController GetAnimatorController() { - return RestaurantData.Instance.ManagementData.InventorySlotUiAnimatorController; + return RestaurantData.Instance.ManagementData.CookingTabUiAnimatorController; } } } \ No newline at end of file From 58367221aadbd5036606ba44ad254c4e26984448 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 1 Sep 2025 18:31:13 +0900 Subject: [PATCH 11/11] =?UTF-8?q?=EC=86=90=EB=8B=98=20=EC=8A=AC=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=8D=94=20=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab | 2 +- .../So/RestaurantData/DataObjects/RestaurantPlayerData.asset | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index 830102b1c..c08f7476d 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -237,7 +237,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} diff --git a/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantPlayerData.asset b/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantPlayerData.asset index 890a0f723..4d63d37ff 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantPlayerData.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantData/DataObjects/RestaurantPlayerData.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0b7877dd04da4027a47c923d7c38dbbdb1c4aae40c4a709411f0845190e7cf7 -size 2001 +oid sha256:c547bb4c8e960c6504b74f52fce7db1ef4e186627a316a5d33086c848c515ec2 +size 1999