iwnc2020/ProjectDDD
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/WaitingQueue

Browse Source
This commit is contained in:
김산 2025-09-02 12:43:46 +09:00
commit 4e73a15afd
20 changed files with 237 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab
View File

@ -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

2
Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble.mat
View File

@ -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:

2
Assets/_DDD/_Addressables/Materials/Restaurant/Order/SpatialUi_SpriteBubble_Translucent.mat
View File

@ -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:

150
Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab
View File

@ -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: []

2
Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_001.png.meta
View File

@ -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

2
Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_002.png.meta
View File

@ -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

2
Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_003.png.meta
View File

@ -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

2
Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_004.png.meta
View File

@ -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

2
Assets/_DDD/_Raw/Sprites/Ui/Common/common_dirty_dish_005.png.meta
View File

@ -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

2
Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta
View File

@ -43,7 +43,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 2
spriteMeshType: 0
alignment: 0

2
Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta
View File

@ -43,7 +43,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 2
spriteMeshType: 0
alignment: 0

2
Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta
View File

@ -43,7 +43,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 2
spriteMeshType: 0
alignment: 0

2
Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta
View File

@ -43,7 +43,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteMode: 2
spriteExtrude: 2
spriteMeshType: 0
alignment: 0

2
Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/BlackboardSO.cs
View File

@ -22,7 +22,7 @@ public SharedVariable<T1> GetVariable<T1>(T key)
return null;
}
public void SetVariable<T1>(T key, T1 value)
public virtual void SetVariable<T1>(T key, T1 value)
{
var outVariable = GetVariable<T1>(key);
if (outVariable != null)

29
Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/CheckFoodMenu.cs Normal file
View File

@ -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;
}
}
}

3
Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/CheckFoodMenu.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 45338d8d0c054d12a9e151d613c50d6b
timeCreated: 1756780405

2
Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs
View File

@ -1,4 +1,4 @@
namespace DDD
namespace DDD.Restaurant
{
public class ContinueRestaurantOrder
{

39
Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardSo.cs
View File

@ -7,6 +7,43 @@ namespace DDD.Restaurant
[Serializable]
public class CustomerBlackboardSo : BlackboardSo<RestaurantCustomerBlackboardKey>
{
public GameObject SelfGameObject;
public string CustomerDataId;
public GameObject CurrentTargetGameObject;
public EmotionType SatisfactionLevel;
public int CumulativeOrderCount;
public float MaxPatienceTime;
public float RemainingPatienceTime;
public override void SetVariable<T1>(RestaurantCustomerBlackboardKey key, T1 value)
{
base.SetVariable(key, value);
switch (key)
{
case RestaurantCustomerBlackboardKey.SelfGameObject:
SelfGameObject = value as GameObject;
break;
case RestaurantCustomerBlackboardKey.CustomerDataId:
CustomerDataId = value as string;
break;
case RestaurantCustomerBlackboardKey.CurrentTargetGameObject:
CurrentTargetGameObject = value as GameObject;
break;
case RestaurantCustomerBlackboardKey.SatisfactionLevel:
SatisfactionLevel = (EmotionType)(object)value;
break;
case RestaurantCustomerBlackboardKey.CumulativeOrderCount:
CumulativeOrderCount = (int)(object)value;
break;
case RestaurantCustomerBlackboardKey.MaxPatienceTime:
MaxPatienceTime = (float)(object)value;
break;
case RestaurantCustomerBlackboardKey.RemainingPatienceTime:
RemainingPatienceTime = (float)(object)value;
break;
default:
throw new ArgumentOutOfRangeException(nameof(key), key, null);
}
}
}
}

2
Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs
View File

@ -1,3 +1,5 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace DDD

3
Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_StartCooking.cs
View File

@ -19,6 +19,9 @@ public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable in
public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
{
var isCarrying = interactor?.GetInteractorGameObject().GetComponent<ICarrier>().IsCarrying();
if (isCarrying == null || isCarrying == true) return false;
_cookwareType = CookwareType.None;
var iCookware = interactable?.GetInteractableGameObject().GetComponent<ICookware>();
if (iCookware == null) return false;