confirm ui 수정

Assets/_DDD/Restaurant/Ui/ConfirmUi.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e764d6b594d087b4086f0da8ed158f38
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/Restaurant/Ui/ConfirmUi/ConfirmUiButton.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 662dee01fb75baf4a8b0706a2a8997d1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Animations.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a512130c5ad36c741a44d54e5d5eb1fb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Animations/CategoryTabUi.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 70ba574d65bf7cb44b95e74fa7add7ac
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Animations/SectionTabUi.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 778cc67ede0cadb4087ad9199c327ff2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/_Addressables/AnimationController/CategoryTabUi.controller

@@ -510,7 +510,7 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
-  - m_Name: Enabled
+  - m_Name: CanDisabled
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
@@ -537,8 +537,8 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 2
+  - m_ConditionMode: 1
-    m_ConditionEvent: Enabled
+    m_ConditionEvent: CanDisabled
     m_EventTreshold: 0
   - m_ConditionMode: 1
     m_ConditionEvent: Disabled

Assets/_DDD/_Addressables/AnimationController/CommonButton.controller

@@ -127,7 +127,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.5333334
+        value: 0.3
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -163,27 +163,6 @@ AnimationClip:
     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
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -228,15 +207,6 @@ AnimationClip:
       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
@@ -307,7 +277,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0.5333334
+        value: 0.3
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -343,27 +313,6 @@ AnimationClip:
     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
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
@@ -534,27 +483,6 @@ AnimationClip:
     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
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -599,15 +527,6 @@ AnimationClip:
       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
@@ -714,27 +633,6 @@ AnimationClip:
     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
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
@@ -892,27 +790,6 @@ AnimationClip:
     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
@@ -957,15 +834,6 @@ AnimationClip:
       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
@@ -1072,27 +940,6 @@ AnimationClip:
     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
@@ -1105,6 +952,9 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: CanDisabled
+    m_EventTreshold: 0
   - m_ConditionMode: 1
     m_ConditionEvent: Disabled
     m_EventTreshold: 0
@@ -1187,7 +1037,7 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
-  - m_Name: Enabled
+  - m_Name: CanDisabled
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
@@ -1357,27 +1207,6 @@ AnimationClip:
     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
@@ -1422,15 +1251,6 @@ AnimationClip:
       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
@@ -1537,27 +1357,6 @@ AnimationClip:
     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
@@ -1689,27 +1488,6 @@ AnimationClip:
     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
@@ -1754,15 +1532,6 @@ AnimationClip:
       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
@@ -1869,27 +1638,6 @@ AnimationClip:
     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

Assets/_DDD/_Addressables/AnimationController/CommonButton.controller.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 077fbb30d2367574db4211e2945acda0
+guid: 1ccba7a2ea7adb54b9c10f748eb5e15c
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000

Assets/_DDD/_Addressables/AnimationController/CompleteButton.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1ccba7a2ea7adb54b9c10f748eb5e15c
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_DDD/_Addressables/AnimationController/InventorySlotUi.controller

@@ -1162,7 +1162,7 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
-  - m_Name: Enabled
+  - m_Name: CanDisabled
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
@@ -1189,6 +1189,9 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: CanDisabled
+    m_EventTreshold: 0
   - m_ConditionMode: 1
     m_ConditionEvent: Disabled
     m_EventTreshold: 0

Assets/_DDD/_Addressables/AnimationController/SectionTabUi.controller

@@ -876,8 +876,8 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 2
+  - m_ConditionMode: 1
-    m_ConditionEvent: Enabled
+    m_ConditionEvent: CanDisabled
     m_EventTreshold: 0
   - m_ConditionMode: 1
     m_ConditionEvent: Disabled
@@ -1033,7 +1033,7 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
-  - m_Name: Enabled
+  - m_Name: CanDisabled
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0

Assets/_DDD/_Addressables/AnimationController/TodayMenuSlotUi.controller

@@ -1105,6 +1105,9 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: CanDisabled
+    m_EventTreshold: 0
   - m_ConditionMode: 1
     m_ConditionEvent: Disabled
     m_EventTreshold: 0
@@ -1187,7 +1190,7 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
-  - m_Name: Enabled
+  - m_Name: CanDisabled
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0

Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/BaseButton.prefab

@@ -104,7 +104,7 @@ Animator:
   m_GameObject: {fileID: 7153853149712347897}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 077fbb30d2367574db4211e2945acda0, type: 2}
+  m_Controller: {fileID: 9100000, guid: 1ccba7a2ea7adb54b9c10f748eb5e15c, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -150,6 +150,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _button: {fileID: 7876932839802805243}
   _animator: {fileID: 6141761943717344037}
+  _canDisabledAnimation: 1
   _synchronizeStates: 1
   _buttonType: 0
 --- !u!1001 &1381293524313834950

Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/TabButton.prefab

@@ -112,6 +112,10 @@ PrefabInstance:
       propertyPath: m_fontSize
       value: 36
       objectReference: {fileID: 0}
+    - target: {fileID: 6220058918333870789, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
     - target: {fileID: 6930594362999665433, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3}
       propertyPath: m_Name
       value: TabButton
@@ -120,6 +124,10 @@ PrefabInstance:
       propertyPath: _buttonType
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8333232481367262243, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3}
+      propertyPath: _canDisabledAnimation
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/ConfirmUi.prefab

@@ -630,17 +630,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 9048682655274794071, guid: c7ae409f7430c9a408d36ccf54ef4164, type: 3}
   m_PrefabInstance: {fileID: 7306972725390776686}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &3495127426411772216 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6189840460486090838, guid: c7ae409f7430c9a408d36ccf54ef4164, type: 3}
-  m_PrefabInstance: {fileID: 7306972725390776686}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &7334955628972040157 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 48813585706763955, guid: c7ae409f7430c9a408d36ccf54ef4164, type: 3}
@@ -801,6 +790,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 6952779389930089995, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3}
       insertIndex: -1
       addedObject: {fileID: 2166279541668122659}
+    - targetCorrespondingSourceObject: {fileID: 6952779389930089995, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4851084330822594573}
   m_SourcePrefab: {fileID: 100100000, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3}
 --- !u!1 &953076962193729772 stripped
 GameObject:
@@ -822,10 +814,21 @@ MonoBehaviour:
   <UiType>k__BackingField: 3
   _enableBlockImage: 1
   _uiActionsInputBinding: {fileID: 11400000, guid: 99d3d87bd43df65488e757c43a308f36, type: 2}
-  _messageLabel: {fileID: 3495127426411772216}
   _messageLabelLocalizeStringEvent: {fileID: 7334955628972040157}
   _cancelButton: {fileID: 3767486664176736975}
   _confirmButton: {fileID: 8554221910551001898}
+--- !u!114 &4851084330822594573
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 953076962193729772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7552fc9cc76345e09148a145ed7799a5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &1239966994818037661 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8967231042952671610, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3}

Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab

@@ -1102,10 +1102,6 @@ PrefabInstance:
       propertyPath: m_fontSize
       value: 36
       objectReference: {fileID: 0}
-    - target: {fileID: 3906332291023473401, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
     - target: {fileID: 4927180218007255658, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
       propertyPath: m_MinWidth
       value: 200
@@ -1958,18 +1954,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 8461276653178463723}
     m_Modifications:
-    - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3}
-      propertyPath: _tabGroupType
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3}
-      propertyPath: _tabButtonType
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3}
-      propertyPath: _tabButtons.Array.size
-      value: 3
-      objectReference: {fileID: 0}
     - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3}
       propertyPath: _tabButtonType
       value: 1
@@ -4873,10 +4857,6 @@ PrefabInstance:
       propertyPath: m_fontSize
       value: 36
       objectReference: {fileID: 0}
-    - target: {fileID: 3906332291023473401, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
     - target: {fileID: 4927180218007255658, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
       propertyPath: m_MinWidth
       value: 200
@@ -5432,6 +5412,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5362875186961533286, guid: 58ae0c57367fe0641baa61ad17086ce2, type: 3}
+      propertyPath: _synchronizeStates
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6336799592573654878, guid: 58ae0c57367fe0641baa61ad17086ce2, type: 3}
       propertyPath: m_Navigation.m_Mode
       value: 0
@@ -5440,10 +5424,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: CompleteBatchButton
       objectReference: {fileID: 0}
-    - target: {fileID: 8042095202224553856, guid: 58ae0c57367fe0641baa61ad17086ce2, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: 1ccba7a2ea7adb54b9c10f748eb5e15c, type: 2}
     - target: {fileID: 8965898531745589557, guid: 58ae0c57367fe0641baa61ad17086ce2, type: 3}
       propertyPath: m_text
       value: "\uBC30\uCE58 \uC644\uB8CC"
@@ -8395,6 +8375,10 @@ PrefabInstance:
       propertyPath: _isEnabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1423582709212085279, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
+      propertyPath: _canDisabledAnimation
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 2720195383270857804, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
       propertyPath: m_text
       value: "\uC810\uC6D0"
@@ -8403,10 +8387,6 @@ PrefabInstance:
       propertyPath: m_fontSize
       value: 36
       objectReference: {fileID: 0}
-    - target: {fileID: 3906332291023473401, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: f4d962d603a720241a76750fc7b19d07, type: 2}
     - target: {fileID: 4927180218007255658, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3}
       propertyPath: m_MinWidth
       value: 200

Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs

@@ -19,7 +19,7 @@ protected override void Update()
         {
             base.Update();
             
-            if (IsOpenPanel() == false || IsInitialized == false) return;
+            if (IsOpenPanel() == false || IsInitialized == false || IsTopPopup == false) return;
 
             var currentSelectedGameObject = EventSystem.current.currentSelectedGameObject;
             if (!currentSelectedGameObject || currentSelectedGameObject.activeInHierarchy == false)

Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs

@@ -1,5 +1,3 @@
-using System;
-using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
@@ -9,62 +7,62 @@
 
 namespace DDD
 {
+    [RequireComponent(typeof(ConfirmViewModel))]
     public class ConfirmUi : PopupUi<RestaurantUiActions, ConfirmViewModel>
     {
-        [SerializeField] private TextMeshProUGUI _messageLabel;
         [SerializeField] private LocalizeStringEvent _messageLabelLocalizeStringEvent;
         [SerializeField] private CommonButton _cancelButton;
         [SerializeField] private CommonButton _confirmButton;
-
-        private UnityAction _onCancel;
-        private UnityAction _onConfirm;
         
         protected override GameObject GetInitialSelected()
         {
             return _confirmButton.gameObject;
         }
-
+        
-        protected override void Start()
+        protected override void OnCreatedInitialize()
         {
-            base.Start();
+            base.OnCreatedInitialize();
+            
+            _messageLabelLocalizeStringEvent.OnUpdateString.Invoke(string.Empty);
+            SetupBindings();
+        }
+        
+        protected override void SetupBindings()
+        {
+            base.SetupBindings();
+            
+            BindingHelper.BindLocalizedStringEvent(_bindingContext, _messageLabelLocalizeStringEvent, nameof(_viewModel.MessageLocalizedString));
+            BindingHelper.BindActive(_bindingContext, _cancelButton.gameObject, nameof(_viewModel.IsCancelButtonVisible));
+            
+            _cancelButton.AddListener(() =>
+            {
+                _viewModel.ExecuteCancel();
+                Close();
+            });
 
-            _messageLabel.text = string.Empty;
+            _confirmButton.AddListener(() =>
+            {
+                _viewModel.ExecuteConfirm();
+                Close();
+            });
         }
         
         public override void Open(OpenPopupUiEvent evt)
         {
             base.Open(evt);
             
-            _messageLabelLocalizeStringEvent.StringReference = LocalizationManager.Instance.GetLocalizedString(evt.NewMessageKey);
+            UnityAction onConfirmAction = evt.OnConfirm != null ? new UnityAction(evt.OnConfirm) : null;
-
+            UnityAction onCancelAction = evt.OnCancel != null ? new UnityAction(evt.OnCancel) : null;
-            if (_onCancel != null)
-            {
-                _cancelButton.RemoveListener(_onCancel);
-            }
-            if (_onConfirm != null)
-            {
-                _confirmButton.RemoveListener(_onConfirm);
-            }
-
-            _onCancel = () =>
-            {
-                evt.OnCancel?.Invoke();
-                Close();
-            };
-
-            _onConfirm = () =>
-            {
-                evt.OnConfirm?.Invoke();
-                Close();
-            };
-
-            _cancelButton.AddListener(_onCancel);
-            _confirmButton.AddListener(_onConfirm);
             
-            _cancelButton.gameObject.SetActive(evt.IsCancelButtonVisible);
+            _viewModel?.SetupConfirm(evt.NewMessageKey, onConfirmAction, onCancelAction, evt.IsCancelButtonVisible);
         }
         
-        
+        protected override void OnOpenedEvents()
+        {
+            base.OnOpenedEvents();
+            
+            IsInitialized = true;
+        }
         
         protected override bool OnInputPerformed(RestaurantUiActions actionEnum, InputAction.CallbackContext context)
         {
@@ -85,7 +83,8 @@ protected override bool OnInputPerformed(RestaurantUiActions actionEnum, InputAc
 
         private void HandleCancelPerformed()
         {
-            _onCancel?.Invoke();
+            _viewModel?.ExecuteCancel();
+            Close();
         }
 
         private void HandleInteract1Performed()

Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs

@@ -1,7 +1,55 @@
+using UnityEngine.Events;
+using UnityEngine.Localization;
+
 namespace DDD
 {
     public class ConfirmViewModel : SimpleViewModel
     {
+        private LocalizedString _messageLocalizedString;
+        private bool _isCancelButtonVisible = true;
+        private UnityAction _onCancel;
+        private UnityAction _onConfirm;
+
+        public LocalizedString MessageLocalizedString
+        {
+            get => _messageLocalizedString;
+            set => SetField(ref _messageLocalizedString, value);
+        }
+
+        public bool IsCancelButtonVisible
+        {
+            get => _isCancelButtonVisible;
+            set => SetField(ref _isCancelButtonVisible, value);
+        }
         
+        public override void Initialize()
+        {
+            base.Initialize();
+        }
+
+        public override void Cleanup()
+        {
+            base.Cleanup();
+            _onCancel = null;
+            _onConfirm = null;
+        }
+
+        public void SetupConfirm(string messageKey, UnityAction onConfirm, UnityAction onCancel, bool showCancelButton)
+        {
+            MessageLocalizedString = LocalizationManager.Instance.GetLocalizedString(messageKey);
+            _onConfirm = onConfirm;
+            _onCancel = onCancel;
+            IsCancelButtonVisible = showCancelButton;
+        }
+
+        public void ExecuteCancel()
+        {
+            _onCancel?.Invoke();
+        }
+
+        public void ExecuteConfirm()
+        {
+            _onConfirm?.Invoke();
+        }
     }
 }

Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs

@@ -74,6 +74,8 @@ public void Initialize(RestaurantManagementViewModel viewModel)
             _viewModel = viewModel;
             
             _cookwareImage.sprite = null;
+            _nameLocalizeStringEvent.OnUpdateString.Invoke(string.Empty);
+            _descriptionLocalizeStringEvent.OnUpdateString.Invoke(string.Empty);
             
             EventBus.Register<ItemSlotSelectedEvent>(this);
         }

Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs

@@ -121,6 +121,8 @@ protected override GameObject GetInitialSelected()
 
         protected override void SetupBindings()
         {
+            base.SetupBindings();
+            
             BindingHelper.BindImageFilled(_bindingContext, _completeBatchFilledImage, nameof(RestaurantManagementViewModel.NormalizedHoldProgress));
             
             _itemDetailView.SetupBindings(_bindingContext);

Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs

@@ -44,7 +44,7 @@ public void Initialize(int tabValue, UnityAction onSelected)
             _commonButton = GetComponent<CommonButton>();
             gameObject.SetActive(true);
             
-            if (_commonButton.IsEnabled == false) return;
+            if (_commonButton.CanDisabledAnimation) return;
             
             _tabButtonValue = tabValue;
             OnSelected = onSelected;
@@ -53,7 +53,7 @@ public void Initialize(int tabValue, UnityAction onSelected)
 
         public void SetSelected(bool isSelected)
         {
-            if (_commonButton.IsEnabled == false) return;
+            if (_commonButton.CanDisabledAnimation) return;
 
             _isSelected = isSelected;
             SetActiveContents(isSelected);

Assets/_DDD/_Scripts/GameUi/CommonButton.cs

@@ -1,9 +1,8 @@
-using System;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
 using UnityEngine.EventSystems;
-using UnityEngine.InputSystem;
+using UnityEngine.Serialization;
 
 namespace DDD
 {
@@ -28,7 +27,7 @@ public class CommonButton : MonoBehaviour, IInteractableUi, IPointerClickHandler
     {
         [SerializeField] private Button _button;
         [SerializeField] private Animator _animator;
-        [SerializeField] private bool _isEnabled = true;
+        [SerializeField] private bool _canDisabledAnimation = true;
         [SerializeField] private bool _synchronizeStates = true;
         [SerializeField] private ButtonType _buttonType;
         
@@ -43,7 +42,7 @@ 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 _isEnabledHash = Animator.StringToHash("Enabled");
+        private readonly int _canDisabled = Animator.StringToHash("CanDisabled");
 
         private void OnEnable()
         {
@@ -122,7 +121,7 @@ private void ApplyVisualState(ButtonState state)
         
         private void ApplyAnimatorState(ButtonState state)
         {
-            _animator.SetBool(_isEnabledHash, _isEnabled);
+            _animator.SetBool(_canDisabled, _canDisabledAnimation);
             _animator.SetBool(_highlightedHash, _isHighlighted);
             _animator.SetBool(_pressedHash, _isPressed);
             _animator.SetBool(_selectedHash, _isSelected);
@@ -241,7 +240,7 @@ public void OnSubmit(BaseEventData eventData)
         public void RemoveListener(UnityAction action) => _button?.onClick.RemoveListener(action);
         public void RemoveAllListeners() => _button.onClick.RemoveAllListeners();
 
-        public bool IsEnabled => _isEnabled;
+        public bool CanDisabledAnimation => _canDisabledAnimation;
         public bool IsInteractable => _button.interactable;
 
         public void SetInteractable(bool interactable)