From 7bd87844e92aaefcf3416ec55968b03573ef694f Mon Sep 17 00:00:00 2001 From: NTG Date: Wed, 27 Aug 2025 03:06:44 +0900 Subject: [PATCH] =?UTF-8?q?cook=20ui=20=EC=B4=88=EC=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CategoryTabUi.controller | 45 ++- .../CommonButton.controller | 45 ++- .../InventorySlotUi.controller | 45 ++- .../SectionTabUi.controller | 45 ++- .../TodayMenuSlotUi.controller | 45 ++- .../Prefabs/Uis/GameUi/PopupUis/CookUi.prefab | 320 ++++++++++-------- .../PopupUis/RestaurantManagementUi.prefab | 8 + .../_ScriptAssets/Prefabs/UiManager.prefab | 18 +- .../CookUi/AddedCookSlotUiStrategy.cs | 49 +++ .../CookUi/AddedCookSlotUiStrategy.cs.meta | 3 + .../GameUi/BaseUi/PopupUis/CookUi/CookUi.cs | 3 +- .../BaseUi/PopupUis/CookUi/CookViewModel.cs | 80 ++++- .../ItemUi/ItemSlotUi.cs | 1 + .../TabUi/TabButtonUi.cs | 8 +- .../TodayCookwareSlotUiStrategy.cs | 2 +- Assets/_DDD/_Scripts/GameUi/CommonButton.cs | 29 +- .../AutoCreated/Classes/CookwareDataSo.cs | 16 +- ...estaurantManagementInteractionSubsystem.cs | 2 +- 18 files changed, 542 insertions(+), 222 deletions(-) create mode 100644 Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Addressables/AnimationController/CategoryTabUi.controller b/Assets/_DDD/_Addressables/AnimationController/CategoryTabUi.controller index 2078ad694..68e62a550 100644 --- a/Assets/_DDD/_Addressables/AnimationController/CategoryTabUi.controller +++ b/Assets/_DDD/_Addressables/AnimationController/CategoryTabUi.controller @@ -510,12 +510,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: CanDisabled - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 1 - m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -537,8 +531,17 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: CanDisabled + - 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 @@ -1669,6 +1672,7 @@ AnimatorStateMachine: - {fileID: 8410860602511447315} - {fileID: -4959916750101030702} - {fileID: 7122475715172880790} + - {fileID: 8231722473980992614} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -2054,6 +2058,31 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] +--- !u!1101 &8231722473980992614 +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: -2657841246124178625} + 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 &8410860602511447315 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/_DDD/_Addressables/AnimationController/CommonButton.controller b/Assets/_DDD/_Addressables/AnimationController/CommonButton.controller index 2854e37ab..fbfe6d74d 100644 --- a/Assets/_DDD/_Addressables/AnimationController/CommonButton.controller +++ b/Assets/_DDD/_Addressables/AnimationController/CommonButton.controller @@ -374,6 +374,7 @@ AnimatorStateMachine: - {fileID: 5381093293389739199} - {fileID: 1846144826618844133} - {fileID: -8454442321133926692} + - {fileID: 7029150103301362506} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -952,8 +953,17 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: CanDisabled + - 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 @@ -1037,12 +1047,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: CanDisabled - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 1 - m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -1387,6 +1391,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7029150103301362506 +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 diff --git a/Assets/_DDD/_Addressables/AnimationController/InventorySlotUi.controller b/Assets/_DDD/_Addressables/AnimationController/InventorySlotUi.controller index 7811362b0..3588462f8 100644 --- a/Assets/_DDD/_Addressables/AnimationController/InventorySlotUi.controller +++ b/Assets/_DDD/_Addressables/AnimationController/InventorySlotUi.controller @@ -400,6 +400,7 @@ AnimatorStateMachine: - {fileID: 814151823820984193} - {fileID: 5688398759945136006} - {fileID: -8454442321133926692} + - {fileID: 6411128944415862464} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -1162,12 +1163,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: CanDisabled - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 1 - m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -1189,8 +1184,17 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: CanDisabled + - 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 @@ -1591,6 +1595,31 @@ AnimatorState: 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 diff --git a/Assets/_DDD/_Addressables/AnimationController/SectionTabUi.controller b/Assets/_DDD/_Addressables/AnimationController/SectionTabUi.controller index 97b10e9a4..f5e9a0cf5 100644 --- a/Assets/_DDD/_Addressables/AnimationController/SectionTabUi.controller +++ b/Assets/_DDD/_Addressables/AnimationController/SectionTabUi.controller @@ -868,7 +868,7 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] ---- !u!1101 &-4112017457821995473 +--- !u!1101 &-4444178815014159967 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -877,7 +877,41 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: CanDisabled + m_ConditionEvent: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5490678238363298755} + 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 &-4112017457821995473 +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 @@ -927,6 +961,7 @@ AnimatorStateMachine: - {fileID: 8862062841961532378} - {fileID: -6580421973980778535} - {fileID: -30650213741062983} + - {fileID: -4444178815014159967} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -1033,12 +1068,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: CanDisabled - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 1 - m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/_DDD/_Addressables/AnimationController/TodayMenuSlotUi.controller b/Assets/_DDD/_Addressables/AnimationController/TodayMenuSlotUi.controller index 4ab2e7af4..a878c4a54 100644 --- a/Assets/_DDD/_Addressables/AnimationController/TodayMenuSlotUi.controller +++ b/Assets/_DDD/_Addressables/AnimationController/TodayMenuSlotUi.controller @@ -425,6 +425,7 @@ AnimatorStateMachine: - {fileID: 5381093293389739199} - {fileID: 1846144826618844133} - {fileID: -8454442321133926692} + - {fileID: -3652767657903651365} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -765,6 +766,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3652767657903651365 +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!1102 &-2429834667517848280 AnimatorState: serializedVersion: 6 @@ -1105,8 +1131,17 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: CanDisabled + - 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 @@ -1190,12 +1225,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: CanDisabled - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 1 - m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab index 3d1c8f020..983ccc0aa 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/CookUi.prefab @@ -981,19 +981,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_SizeDelta.x - value: 36.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.x - value: 33.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.y @@ -1520,7 +1520,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -1528,15 +1528,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -1568,11 +1568,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 78.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -219 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1626,7 +1626,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -1634,15 +1634,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -1674,11 +1674,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 723.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1716,19 +1716,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_SizeDelta.x - value: 36.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.x - value: 33.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.y @@ -2072,7 +2072,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -2080,15 +2080,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 130.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -2120,11 +2120,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 71.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2138,6 +2138,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5368412743748922375, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} + propertyPath: _canDisabledAnimation + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6416383596375464765, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_Name value: ItemSlotTabButton @@ -2193,7 +2197,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -2201,15 +2205,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -2241,11 +2245,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 336.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2404,7 +2408,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -2412,15 +2416,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 130.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -2452,11 +2456,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 332.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2470,6 +2474,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5368412743748922375, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} + propertyPath: _canDisabledAnimation + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6416383596375464765, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_Name value: ItemSlotTabButton_002 @@ -2647,7 +2655,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -2655,15 +2663,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -2695,11 +2703,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 336.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -219 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2745,7 +2753,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -2753,15 +2761,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 130.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -2793,11 +2801,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 462.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2811,6 +2819,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5368412743748922375, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} + propertyPath: _canDisabledAnimation + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6416383596375464765, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_Name value: ItemSlotTabButton_003 @@ -2866,7 +2878,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -2874,15 +2886,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -2914,11 +2926,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 723.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -219 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3081,19 +3093,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_SizeDelta.x - value: 54.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4250572641673376081, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_AnchoredPosition.x - value: 42.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8857436002959004668, guid: f24fb953ac9ddf547b7d995610f03ca4, type: 3} propertyPath: m_Pivot.x @@ -3215,27 +3227,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 88.56 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 40.69 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 137.65 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2418783700055957396, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: -4.1550007 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2451091866420006696, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_IsActive @@ -3243,7 +3255,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2550093527582931782, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 328.28 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2678955646328359672, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_IsActive @@ -3275,27 +3287,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 59.37 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 41.684998 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3832518280535675901, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: -5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5019251911750780373, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_Name @@ -3303,27 +3315,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5145197518110156248, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5145197518110156248, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5145197518110156248, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 61.21 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5145197518110156248, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 40.69 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5145197518110156248, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 85.744995 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5145197518110156248, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: -4.1550007 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5414520022118496509, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y @@ -3351,27 +3363,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.x - value: 21.14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_SizeDelta.y - value: 39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.57 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6042001140281731505, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_AnchoredPosition.y - value: -5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8107209452760937939, guid: 3e9030561e4db584cb648f33c4315e6b, type: 3} propertyPath: m_Pivot.x @@ -3670,7 +3682,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -3678,15 +3690,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -3718,11 +3730,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 594.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3932,7 +3944,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -3940,15 +3952,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -3980,11 +3992,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 207.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -219 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4030,7 +4042,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -4038,15 +4050,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 130.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -4078,11 +4090,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 723.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4096,6 +4108,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5368412743748922375, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} + propertyPath: _canDisabledAnimation + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6416383596375464765, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_Name value: ItemSlotTabButton_005 @@ -4163,7 +4179,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4845916953007548565, guid: fdffdf2f516c10248b94da9029036e36, type: 3} propertyPath: m_SizeDelta.y - value: -312 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4845916953007548565, guid: fdffdf2f516c10248b94da9029036e36, type: 3} propertyPath: m_LocalPosition.x @@ -4325,7 +4341,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -4333,15 +4349,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -4373,11 +4389,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 594.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -219 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4423,7 +4439,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -4431,15 +4447,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 130.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -4471,11 +4487,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 593.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4489,6 +4505,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5368412743748922375, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} + propertyPath: _canDisabledAnimation + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6416383596375464765, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_Name value: ItemSlotTabButton_004 @@ -4536,7 +4556,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.x @@ -4544,15 +4564,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.x - value: 130.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalPosition.x @@ -4584,11 +4604,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.x - value: 201.75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_AnchoredPosition.y - value: -89 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4148690371914054078, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4602,6 +4622,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5368412743748922375, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} + propertyPath: _canDisabledAnimation + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6416383596375464765, guid: 6c7c6411f7b02be4996a5e71820445c8, type: 3} propertyPath: m_Name value: ItemSlotTabButton_001 @@ -4774,7 +4798,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -4782,15 +4806,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -4822,11 +4846,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 465.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -219 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5168,7 +5192,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -5176,15 +5200,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -5216,11 +5240,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 207.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5266,11 +5290,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3193108641552257316, guid: 3042958ab9668ed4aa25e965fc39b7f9, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3193108641552257316, guid: 3042958ab9668ed4aa25e965fc39b7f9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3193108641552257316, guid: 3042958ab9668ed4aa25e965fc39b7f9, type: 3} propertyPath: m_SizeDelta.x @@ -5832,7 +5856,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -5840,15 +5864,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -5880,11 +5904,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 78.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5938,7 +5962,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.x @@ -5946,15 +5970,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.x - value: 131 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_SizeDelta.y - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalPosition.x @@ -5986,11 +6010,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.x - value: 465.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_AnchoredPosition.y - value: -83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7689845634213550448, guid: 1ad3a3bc80a837444b272ed226c73c9a, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab index c444859b1..4a3c1d5e3 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab @@ -7711,6 +7711,10 @@ PrefabInstance: propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 1423582709212085279, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: _isUsed + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1423582709212085279, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} propertyPath: _isEnabled value: 0 @@ -7815,6 +7819,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: _isUsed + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} propertyPath: _isEnabled value: 0 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab index 69db28402..db86ca833 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: 83.369995 + value: 0 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: 116.35 + value: 0 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: 84.6 + value: 0 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: 66.4 + value: 0 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: 181.93 + value: 0 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: 45.14 + value: 0 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: 66.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7974438497134857488, guid: b995fff30cf814848a9d50fa0cb083a4, type: 3} propertyPath: m_AnchoredPosition.x @@ -3054,7 +3054,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1561416421336272141, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.x - value: 140 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1561416421336272141, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.y @@ -3078,7 +3078,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1574507451341098674, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.x - value: 45.14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1574507451341098674, guid: 67b28d928cd16794eba49dade35d395d, type: 3} propertyPath: m_SizeDelta.y diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs new file mode 100644 index 000000000..c53aa7554 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs @@ -0,0 +1,49 @@ +using UnityEngine; + +namespace DDD +{ + public class AddedCookSlotUiStrategy : IItemSlotUiStrategy + { + private readonly RecipeType _recipeType; + + public AddedCookSlotUiStrategy(RecipeType recipeType) + { + _recipeType = recipeType; + } + + public void Setup(ItemSlotUi ui, ItemModel model) + { + if (model == null) + { + string emptySpriteKey = null; + if (_recipeType == RecipeType.FoodRecipe) + { + emptySpriteKey = SpriteConstants.EmptyFoodSpriteKey; + } + else if (_recipeType == RecipeType.DrinkRecipe) + { + emptySpriteKey = SpriteConstants.EmptyDrinkSpriteKey; + } + + ui.SetIcon(DataManager.Instance.GetSprite(emptySpriteKey)); + ui.HideCountText(); + ui.HideMark(); + ui.SetButtonInteractable(false); + ui.SetCommonButtonUsed(false); + + return; + } + + ui.SetIcon(model.ItemSprite); + ui.ShowCountText(); + ui.HideMark(); + ui.SetButtonInteractable(true); + ui.SetCommonButtonUsed(true); + } + + public RuntimeAnimatorController GetAnimatorController() + { + return RestaurantData.Instance.ManagementData.InventorySlotUiAnimatorController; + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs.meta new file mode 100644 index 000000000..27d377619 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8bb4f6eeecb942e43984ee4b16a032da +timeCreated: 1753788899 diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs index a832c1b1a..28aa2f1bd 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs @@ -48,6 +48,7 @@ public override void Open(OpenPopupUiEvent evt) } _viewModel.CreateAddedCookItemSlot(_addedCookContent); + _viewModel.CreateIngredientInventoryItemSlot(_cookIngredientContent); _addedCookTabGroup.SelectFirstTab(); @@ -88,7 +89,7 @@ protected override GameObject GetInitialSelected() { if (IsInitialized == false) return null; - var initialSelected = _selectedIngredients[0].gameObject; + var initialSelected = _viewModel.GetInitialSelected(); if (initialSelected) { return initialSelected; diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs index c1a2baf76..382343373 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs @@ -76,14 +76,23 @@ public int CurrentCookIndex get => _currentCookIndex; set => SetField(ref _currentCookIndex, value); } + + private readonly Dictionary _cookIngredientSlotLookup = new(); + private InventorySortType _currentSortType = InventorySortType.None; public event Action OnAddedIngredients; + public GameObject GetInitialSelected() => _addedCookItemSlots[0].gameObject; + public void SetCookwareType(CookwareType cookwareType) { + if (_currentCookwareType == cookwareType) return; + _currentCookwareType = cookwareType; var cookwareDatas = DataManager.Instance.GetDataSo().GetDataList(); - // CookwareIcon = cookwareDatas.Find(data => data.CookwareType == cookwareType).Id; + var cookwareKey = cookwareDatas.Find(data => data.CookwareType == cookwareType).Id; + CookwareIcon = DataManager.Instance.GetIcon(cookwareKey); + CookwareName = LocalizationManager.Instance.GetLocalizedName(cookwareKey); } public void SetAddedCook(int index) @@ -99,7 +108,6 @@ public void SetAddedCook(int index) public void CreateAddedCookItemSlot(Transform parent) { - // TODO : 추후에 data에서 max값 가져오기 (현재는 8이라 시스템상 지금 가져오면 오류) _addedCookItemSlots = new List(parent.GetComponentsInChildren()); // Dictionary 하나로 레시피 ID와 개수를 함께 관리 @@ -140,7 +148,72 @@ public void CreateAddedCookItemSlot(Transform parent) model = ItemViewModelFactory.CreateByItemId(recipe.Key); model?.SetCount(recipe.Value); } - _addedCookItemSlots[i].Initialize(model, new TodayMenuSlotUiStrategy(RecipeType.FoodRecipe)); + _addedCookItemSlots[i].Initialize(model, new AddedCookSlotUiStrategy(RecipeType.FoodRecipe)); + } + } + + public void CreateIngredientInventoryItemSlot(Transform parent) + { + Utils.DestroyAllChildren(parent); + var models = ItemViewModelFactory.CreateRestaurantManagementInventoryItem(); + + _cookIngredientSlotLookup.Clear(); + foreach (var model in models) + { + if (model.ItemType != ItemType.Ingredient) continue; + + var itemSlotUi = Instantiate(GetRestaurantManagementData().ItemSlotUiPrefab, parent); + var slot = itemSlotUi.GetComponent(); + slot.Initialize(model, new InventorySlotUiStrategy()); + itemSlotUi.name = model.Id; + + // var interactor = itemSlotUi.GetComponent(); + // if (model.ItemType == ItemType.Recipe) + // { + // interactor.Initialize(TodayMenuEventType.Add, new TodayMenuInteractorStrategy()); + // } + // else + // { + // if (DataManager.Instance.GetDataSo().TryGetDataById(model.Id, out var cookwareData)) + // { + // interactor.Initialize(TodayMenuEventType.Add, new TodayCookwareInteractorStrategy()); + // } + // } + + _cookIngredientSlotLookup[model.Id] = slot; + } + + UpdateCookIngredient(); + } + + private IEnumerable SortSlots(IEnumerable slots) + { + return _currentSortType switch + { + InventorySortType.NameAscending => slots.OrderByDescending(slot => slot.Model.HasItem).ThenBy(slot => slot.Model.DisplayName), + InventorySortType.NameDescending => slots.OrderByDescending(slot => slot.Model.HasItem).ThenByDescending(slot => slot.Model.DisplayName), + InventorySortType.QuantityAscending => slots.OrderByDescending(slot => slot.Model.HasItem).ThenBy(slot => slot.Model.Count), + InventorySortType.QuantityDescending => slots.OrderByDescending(slot => slot.Model.HasItem).ThenByDescending(slot => slot.Model.Count), + InventorySortType.None => slots.OrderBy(slot => slot.Model.Id), + _ => slots + }; + } + + public void UpdateCookIngredient() + { + var filteredSlots = _cookIngredientSlotLookup.Values; + var sortedSlots = SortSlots(filteredSlots); + + int siblingIndex = 0; + + foreach (var slot in sortedSlots) + { + var model = slot.Model; + + if (model.HasItem) + { + slot.transform.SetSiblingIndex(siblingIndex++); + } } } @@ -153,7 +226,6 @@ private void UpdateSelectedCook() { var selectedItemModel = SelectedCookSlot.Model; string key = selectedItemModel.GetRecipeResultKey; - var cookwareKey = selectedItemModel.GetCookwareKey; var nameLocalizedString = LocalizationManager.Instance.GetLocalizedName(key); var descriptionLocalizedString = LocalizationManager.Instance.GetLocalizedDescription(key); var cookIcon = selectedItemModel.GetResultIcon; diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs index a220f5689..eafc0343e 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs @@ -48,6 +48,7 @@ public void ShowMark(Sprite sprite) _markImage.gameObject.SetActive(true); } public void HideMark() => _markImage.gameObject.SetActive(false); + public void SetCommonButtonUsed(bool isUsed) => _commonButton.SetIsUsed(isUsed); public void SetButtonInteractable(bool interactable) => _commonButton.SetInteractable(interactable); public void SetActive(bool value) => gameObject.SetActive(value); public void OnSelect(BaseEventData eventData) diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs index b3b80177f..8e368a449 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs @@ -44,8 +44,6 @@ public void Initialize(int tabValue, UnityAction onSelected) _commonButton = GetComponent(); gameObject.SetActive(true); - if (_commonButton.CanDisabledAnimation) return; - _tabButtonValue = tabValue; OnSelected = onSelected; _commonButton.AddListener(OnSelected); @@ -53,8 +51,8 @@ public void Initialize(int tabValue, UnityAction onSelected) public void SetSelected(bool isSelected) { - if (_commonButton.CanDisabledAnimation) return; - + if (_commonButton.GetIsUsed() == false) return; + _isSelected = isSelected; SetActiveContents(isSelected); _commonButton.SetToggle(_isSelected); @@ -62,6 +60,8 @@ public void SetSelected(bool isSelected) private void SetActiveContents(bool isActive) { + if (_commonButton.GetIsUsed() == false) return; + foreach (var content in _content) { content.SetActive(isActive); diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs index f181dbc46..1872ecc68 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs @@ -27,7 +27,7 @@ public void Setup(ItemSlotUi ui, ItemModel model) } ui.SetIcon(model.ItemSprite); ui.HideCountText(); - ui.ShowMark(DataManager.Instance.GetSprite(markSpriteKey)); // TODO : 추후에 장비와 매칭 + ui.ShowMark(DataManager.Instance.GetSprite(markSpriteKey)); ui.SetButtonInteractable(true); } diff --git a/Assets/_DDD/_Scripts/GameUi/CommonButton.cs b/Assets/_DDD/_Scripts/GameUi/CommonButton.cs index f9619ac05..803522936 100644 --- a/Assets/_DDD/_Scripts/GameUi/CommonButton.cs +++ b/Assets/_DDD/_Scripts/GameUi/CommonButton.cs @@ -22,14 +22,14 @@ public enum ButtonType } [RequireComponent(typeof(Button))] - public class CommonButton : MonoBehaviour, IInteractableUi, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler, + public class CommonButton : MonoBehaviour, IInteractableUi, IPointerEnterHandler, IPointerExitHandler, IPointerDownHandler, IPointerUpHandler, ISelectHandler, IDeselectHandler, ISubmitHandler { [SerializeField] private Button _button; [SerializeField] private Animator _animator; - [SerializeField] private bool _canDisabledAnimation = true; - [SerializeField] private bool _synchronizeStates = true; [SerializeField] private ButtonType _buttonType; + [SerializeField] private bool _synchronizeStates = true; + [SerializeField] private bool _isUsed = true; private bool _isPressed; private bool _isHighlighted; @@ -42,7 +42,6 @@ public class CommonButton : MonoBehaviour, IInteractableUi, IPointerClickHandler private readonly int _selectedHash = Animator.StringToHash("Selected"); private readonly int _toggleHash = Animator.StringToHash("Toggled"); private readonly int _disabledHash = Animator.StringToHash("Disabled"); - private readonly int _canDisabled = Animator.StringToHash("CanDisabled"); private void OnEnable() { @@ -51,6 +50,12 @@ private void OnEnable() _isSelected = false; _isToggled = false; + if (_isUsed == false) + { + SetInteractable(false); + return; + } + UpdateVisualState(); } @@ -98,7 +103,7 @@ private ButtonState GetCurrentState() { return ButtonState.Pressed; } - if (_isSelected || _isHighlighted) + if (_isHighlighted) { return ButtonState.Highlighted; } @@ -121,7 +126,6 @@ private void ApplyVisualState(ButtonState state) private void ApplyAnimatorState(ButtonState state) { - _animator.SetBool(_canDisabled, _canDisabledAnimation); _animator.SetBool(_highlightedHash, _isHighlighted); _animator.SetBool(_pressedHash, _isPressed); _animator.SetBool(_selectedHash, _isSelected); @@ -131,14 +135,11 @@ private void ApplyAnimatorState(ButtonState state) public void OnInteract() { + if (_button.interactable == false) return; + _button.onClick.Invoke(); } - public void OnPointerClick(PointerEventData eventData) - { - UpdateVisualState(); - } - public void OnPointerEnter(PointerEventData eventData) { if (_button.interactable == false) return; @@ -261,10 +262,10 @@ public void OnSubmit(BaseEventData eventData) public void AddListener(UnityAction action) => _button.onClick.AddListener(action); public void RemoveListener(UnityAction action) => _button?.onClick.RemoveListener(action); public void RemoveAllListeners() => _button.onClick.RemoveAllListeners(); - - public bool CanDisabledAnimation => _canDisabledAnimation; public bool IsInteractable => _button.interactable; + public bool GetIsUsed() => _isUsed; + public void SetIsUsed(bool isUsed) => _isUsed = isUsed; public void SetInteractable(bool interactable) { _button.interactable = interactable; @@ -273,6 +274,8 @@ public void SetInteractable(bool interactable) public void SetToggle(bool isSelected) { + if (_isUsed == false) return; + if (_buttonType == ButtonType.Toggle) { _isToggled = isSelected; diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs index 42c211eaf..44f684862 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs @@ -1,9 +1,23 @@ // File: CookwareDataSo.cs using System.Collections.Generic; +using System.Linq; using UnityEngine; namespace DDD { [CreateAssetMenu(fileName = "CookwareDataSo", menuName = "GoogleSheet/CookwareDataSo")] - public class CookwareDataSo : DataSo { } + public class CookwareDataSo : DataSo + { + public bool TryGetValueByCookwareType(CookwareType cookwareType, out CookwareData cookwareData) + { + if (_datas == null) + { + cookwareData = null; + return false; + } + + cookwareData = _datas.FirstOrDefault(data => data != null && data.CookwareType == cookwareType); + return cookwareData != null; + } + } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs index d28ce09e6..e7e3249f6 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs @@ -61,7 +61,7 @@ public ScriptableObject GetPayload() _cachedPayload = ScriptableObject.CreateInstance(typeof(CookwareTypePayload)); } - var payload = _cachedPayload as CookwareTypePayload; + var payload = _cachedPayload as CookwareTypePayload; payload.CookwareType = _cookwareType; return payload; }