Added CheckFoodMenu action and adjusted asset parameters for consistency

2025-09-02 12:16:16 +09:00 · 2025-09-02 12:16:16 +09:00 · c71b16e9dd
commit c71b16e9dd
parent 95cfd0eb32
12 changed files with 189 additions and 13 deletions
--- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab
+++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab
@ -197,7 +197,7 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 3
-      Data: 8
+      Data: 16
    - Name: $v
      Entry: 10
      Data: 1
@ -209,7 +209,7 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 3
-      Data: 16
+      Data: 32
    - Name: $v
      Entry: 10
      Data: 1
--- a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat
+++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat
@ -85,7 +85,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
--- a/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat
+++ b/Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat
@ -85,7 +85,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
--- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab
+++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab
@ -571,7 +571,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_Pivot.x
-      value: 0.5
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_Pivot.y
@ -579,7 +579,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_AnchorMax.x
-      value: 0.5
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_AnchorMax.y
@ -587,7 +587,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_AnchorMin.x
-      value: 0.5
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_AnchorMin.y
@ -649,10 +649,154 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1003698800654844653, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1003698800654844653, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1003698800654844653, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1003698800654844653, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1003698800654844653, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1003698800654844653, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1531966926992972741, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1531966926992972741, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1531966926992972741, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1531966926992972741, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1531966926992972741, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1531966926992972741, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6244044418086159105, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6244044418086159105, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6244044418086159105, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6244044418086159105, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6244044418086159105, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6244044418086159105, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6333764397848776115, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
      propertyPath: m_Name
      value: BillHud
      objectReference: {fileID: 0}
+    - target: {fileID: 7568171459681496761, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568171459681496761, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568171459681496761, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568171459681496761, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568171459681496761, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568171459681496761, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7655645677637562558, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7655645677637562558, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7655645677637562558, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7655645677637562558, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7655645677637562558, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7655645677637562558, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7813888696583048993, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7813888696583048993, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7813888696583048993, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7813888696583048993, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7813888696583048993, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7813888696583048993, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_001.png.meta
+++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_001.png.meta
@ -48,7 +48,7 @@ TextureImporter:
  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_002.png.meta
+++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_002.png.meta
@ -48,7 +48,7 @@ TextureImporter:
  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_003.png.meta
+++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_003.png.meta
@ -48,7 +48,7 @@ TextureImporter:
  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_004.png.meta
+++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_004.png.meta
@ -48,7 +48,7 @@ TextureImporter:
  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_005.png.meta
+++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_005.png.meta
@ -48,7 +48,7 @@ TextureImporter:
  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/CheckFoodMenu.cs
+++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/CheckFoodMenu.cs
@ -0,0 +1,29 @@
+using Opsive.BehaviorDesigner.Runtime.Tasks;
+using Opsive.BehaviorDesigner.Runtime.Tasks.Actions;
+using UnityEngine;
+
+
+namespace DDD.Restaurant
+{
+    public class CheckFoodMenu : Action
+    {
+        public override TaskStatus OnUpdate()
+        {
+            var blackboard = gameObject.GetComponent<IAISharedBlackboard<RestaurantCustomerBlackboardKey>>();
+            if (blackboard == null)
+            {
+                Debug.LogWarning($"블랙보드가 존재하지 않음 해시코드: {gameObject.GetHashCode()}");
+                return TaskStatus.Failure;
+            }
+            
+            var currentTarget = blackboard.GetBlackboardValue<GameObject>(RestaurantCustomerBlackboardKey.CurrentTargetGameObject);
+            if (currentTarget == null) return TaskStatus.Failure;
+            
+            var orderObject = currentTarget.GetComponent<IRestaurantOrderObject>();
+            string servedFoodId = orderObject?.GetOrderObjectState().ServedFoodId;
+            if (servedFoodId == null) return TaskStatus.Failure;
+            
+            return servedFoodId == orderObject.GetOrderObjectState().FoodId? TaskStatus.Success : TaskStatus.Failure;
+        }   
+    }
+}
--- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/CheckFoodMenu.cs.meta
+++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/CheckFoodMenu.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 45338d8d0c054d12a9e151d613c50d6b
+timeCreated: 1756780405
--- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs
+++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs
@ -1,4 +1,4 @@
-namespace DDD
+namespace DDD.Restaurant
 {
    public class ContinueRestaurantOrder
    {