diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common.meta b/Assets/_DDD/Restaurant/Environments/Interactables/Common.meta new file mode 100644 index 000000000..56795ff88 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8b8b2fde5b3b345e292e0b6b951a4abd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab new file mode 100644 index 000000000..24036b0a6 --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3857692527302447930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1664322405549350652} + - component: {fileID: 8522104897182006738} + m_Layer: 0 + m_Name: InteractionPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1664322405549350652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3857692527302447930} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.4, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3697702677815423220} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8522104897182006738 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3857692527302447930} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: c607300554a0c44469620484fccbf239, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4103096974375017811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3697702677815423220} + - component: {fileID: 3591347921553422000} + - component: {fileID: 4456475204957017828} + m_Layer: 7 + m_Name: RestaurantOrder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3697702677815423220 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1664322405549350652} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3591347921553422000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 201f9e6d7ca7404baa9945950292a392, type: 3} + m_Name: + m_EditorClassIdentifier: + _interactionType: 4 + _executionParameters: + _holdTime: 0 + _displayParameters: + _messageKey: + _interactionAvailableFlows: 2 + _aiInteractionPoints: + - {fileID: 1664322405549350652} +--- !u!114 &4456475204957017828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0b1e0992510498b8d33d5b6094b8f4b, type: 3} + m_Name: + m_EditorClassIdentifier: + orderType: 0 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab.meta b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab.meta new file mode 100644 index 000000000..f06bbbf9f --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bbe3f26765344e6097aa9fd0f020fbf +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Restaurant/Environments/Props/CustomerTable.meta b/Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/CustomerTable.meta rename to Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.mat b/Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.mat similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.mat rename to Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.mat diff --git a/Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.mat.meta b/Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.mat.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.mat.meta rename to Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.mat.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.png b/Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.png similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.png rename to Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.png diff --git a/Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.png.meta b/Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.png.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/CustomerTable/CustomerTable.png.meta rename to Assets/_DDD/Restaurant/Environments/Interactables/CustomerTable/CustomerTable.png.meta diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab new file mode 100644 index 000000000..718e7e94e --- /dev/null +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab @@ -0,0 +1,238 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2565741073186224478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8881739536043914635} + m_Modifications: + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.x + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4103096974375017811, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Name + value: RestaurantOrder_001 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} +--- !u!4 &1210262234305268138 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + m_PrefabInstance: {fileID: 2565741073186224478} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4510296826299878002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8881739536043914635} + m_Modifications: + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4103096974375017811, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Name + value: RestaurantOrder + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} +--- !u!4 &992810551159552646 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + m_PrefabInstance: {fileID: 4510296826299878002} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4777358697124966162 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Name + value: Prop_CustomerTable + objectReference: {fileID: 0} + - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 56d0a02ae31152e45ba2da46f7694378, type: 2} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.x + value: 0.93 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Size.z + value: 0.31 + objectReference: {fileID: 0} + - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + propertyPath: m_Center.z + value: 0.14 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + insertIndex: -1 + addedObject: {fileID: 992810551159552646} + - targetCorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + insertIndex: -1 + addedObject: {fileID: 1210262234305268138} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} +--- !u!4 &8881739536043914635 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4111453722694982297, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} + m_PrefabInstance: {fileID: 4777358697124966162} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_CustomerTable.prefab.meta b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab.meta similarity index 100% rename from Assets/_DDD/Restaurant/Environments/Props/Prop_CustomerTable.prefab.meta rename to Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab.meta diff --git a/Assets/_DDD/Restaurant/Environments/Props/Prop_CustomerTable.prefab b/Assets/_DDD/Restaurant/Environments/Props/Prop_CustomerTable.prefab deleted file mode 100644 index 7d256654c..000000000 --- a/Assets/_DDD/Restaurant/Environments/Props/Prop_CustomerTable.prefab +++ /dev/null @@ -1,377 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4777358697124966162 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2204914584875671904, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Name - value: Prop_CustomerTable - objectReference: {fileID: 0} - - target: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7856941568993672895, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8282162905857597943, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8467019391491472137, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 56d0a02ae31152e45ba2da46f7694378, type: 2} - - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Size.x - value: 0.93 - objectReference: {fileID: 0} - - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Size.z - value: 0.31 - objectReference: {fileID: 0} - - target: {fileID: 8516969404588314361, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - propertyPath: m_Center.z - value: 0.14 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - insertIndex: -1 - addedObject: {fileID: 8605899758048842936} - - targetCorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - insertIndex: -1 - addedObject: {fileID: 6282952769554945552} - - targetCorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - insertIndex: -1 - addedObject: {fileID: 4598203232635129220} - m_SourcePrefab: {fileID: 100100000, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} ---- !u!1 &9211739394093953175 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4438924429928472453, guid: 1d634c3376e4a4684bc984ced9134847, type: 3} - m_PrefabInstance: {fileID: 4777358697124966162} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8605899758048842936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211739394093953175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0b1e0992510498b8d33d5b6094b8f4b, type: 3} - m_Name: - m_EditorClassIdentifier: - _interactionType: 4 - _executionParameters: - _holdTime: 1 - _displayParameters: - _messageKey: - _interactionAvailableFlows: 1 - _aiInteractionPoints: [] - _initialOrderInteractionType: 0 ---- !u!114 &6282952769554945552 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211739394093953175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} - m_Name: - m_EditorClassIdentifier: - profile: {fileID: 0} - profileSync: 0 - camerasLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - effectGroup: 0 - effectTarget: {fileID: 0} - effectGroupLayer: - serializedVersion: 2 - m_Bits: 4294967295 - effectNameFilter: - effectNameUseRegEx: 0 - combineMeshes: 0 - alphaCutOff: 0 - cullBackFaces: 1 - padding: 0 - ignoreObjectVisibility: 0 - reflectionProbes: 0 - GPUInstancing: 1 - sortingPriority: 0 - optimizeSkinnedMesh: 1 - depthClip: 0 - cameraDistanceFade: 0 - cameraDistanceFadeNear: 0 - cameraDistanceFadeFar: 1000 - normalsOption: 0 - ignore: 0 - _highlighted: 0 - fadeInDuration: 0 - fadeOutDuration: 0 - flipY: 0 - constantWidth: 1 - extraCoveragePixels: 0 - minimumWidth: 0 - subMeshMask: -1 - overlay: 0 - overlayMode: 0 - overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - overlayAnimationSpeed: 1 - overlayMinIntensity: 0.5 - overlayBlending: 1 - overlayTexture: {fileID: 0} - overlayTextureUVSpace: 0 - overlayTextureScale: 1 - overlayTextureScrolling: {x: 0, y: 0} - overlayVisibility: 0 - outline: 1 - outlineColor: {r: 0, g: 0, b: 0, a: 1} - outlineColorStyle: 0 - outlineGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - outlineGradientInLocalSpace: 0 - outlineWidth: 0.45 - outlineBlurPasses: 2 - outlineQuality: 3 - outlineEdgeMode: 0 - outlineEdgeThreshold: 0.995 - outlineSharpness: 1 - outlineDownsampling: 1 - outlineVisibility: 0 - glowBlendMode: 0 - outlineBlitDebug: 0 - outlineIndependent: 0 - outlineContourStyle: 0 - outlineMaskMode: 0 - glow: 0 - glowWidth: 0.4 - glowQuality: 3 - glowBlurMethod: 0 - glowDownsampling: 2 - glowHQColor: {r: 0.64, g: 1, b: 0, a: 1} - glowDithering: 1 - glowDitheringStyle: 0 - glowMagicNumber1: 0.75 - glowMagicNumber2: 0.5 - glowAnimationSpeed: 1 - glowVisibility: 0 - glowBlitDebug: 0 - glowBlendPasses: 1 - glowPasses: - - offset: 4 - alpha: 0.1 - color: {r: 0.64, g: 1, b: 0, a: 1} - - offset: 3 - alpha: 0.2 - color: {r: 0.64, g: 1, b: 0, a: 1} - - offset: 2 - alpha: 0.3 - color: {r: 0.64, g: 1, b: 0, a: 1} - - offset: 1 - alpha: 0.4 - color: {r: 0.64, g: 1, b: 0, a: 1} - glowMaskMode: 0 - innerGlow: 0 - innerGlowWidth: 1 - innerGlowColor: {r: 1, g: 1, b: 1, a: 1} - innerGlowBlendMode: 0 - innerGlowVisibility: 0 - targetFX: 0 - targetFXTexture: {fileID: 0} - targetFXColor: {r: 1, g: 1, b: 1, a: 1} - targetFXCenter: {fileID: 0} - targetFXRotationSpeed: 50 - targetFXInitialScale: 4 - targetFXEndScale: 1.5 - targetFXScaleToRenderBounds: 1 - targetFXUseEnclosingBounds: 0 - targetFXAlignToGround: 0 - targetFXOffset: {x: 0, y: 0, z: 0} - targetFXFadePower: 32 - targetFXGroundMaxDistance: 10 - targetFXGroundLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - targetFXTransitionDuration: 0.5 - targetFXStayDuration: 1.5 - targetFXVisibility: 1 - iconFX: 0 - iconFXMesh: {fileID: 0} - iconFXLightColor: {r: 1, g: 1, b: 1, a: 1} - iconFXDarkColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - iconFXCenter: {fileID: 0} - iconFXRotationSpeed: 50 - iconFXAnimationOption: 0 - iconFXAnimationAmount: 0.1 - iconFXAnimationSpeed: 3 - iconFXScale: 1 - iconFXScaleToRenderBounds: 0 - iconFXOffset: {x: 0, y: 1, z: 0} - iconFXTransitionDuration: 0.5 - iconFXStayDuration: 1.5 - seeThrough: 2 - seeThroughOccluderMask: - serializedVersion: 2 - m_Bits: 4294967295 - seeThroughOccluderThreshold: 0.3 - seeThroughOccluderMaskAccurate: 0 - seeThroughOccluderCheckInterval: 1 - seeThroughOccluderCheckIndividualObjects: 0 - seeThroughDepthOffset: 0 - seeThroughMaxDepth: 0 - seeThroughIntensity: 0.8 - seeThroughTintAlpha: 0.5 - seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} - seeThroughNoise: 1 - seeThroughBorder: 0 - seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} - seeThroughBorderOnly: 0 - seeThroughBorderWidth: 0.45 - seeThroughOrdered: 0 - seeThroughTexture: {fileID: 0} - seeThroughTextureUVSpace: 0 - seeThroughTextureScale: 1 - seeThroughChildrenSortingMode: 0 - rmsCount: 1 - hitFxInitialIntensity: 0 - hitFxMode: 0 - hitFxFadeOutDuration: 0.25 - hitFxColor: {r: 1, g: 1, b: 1, a: 1} - hitFxRadius: 0.5 ---- !u!114 &4598203232635129220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211739394093953175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f0feb22ab60a4d1885271637838f43b9, type: 3} - m_Name: - m_EditorClassIdentifier: - _availableStyle: - Color: {r: 1, g: 1, b: 1, a: 1} - Width: 1 - Opacity: 1 - _focusedStyle: - Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - Width: 1 - Opacity: 1 - _unavailableStyle: - Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - Width: 0.5 - Opacity: 1 - _objectiveStyle: - Color: {r: 0, g: 1, b: 1, a: 1} - Width: 1 - Opacity: 1 - _breathingSpeed: 2 - _breathingRange: 0.3 - _enableBreathingEffect: 1 - _alphaCutOff: 0.5 - _combineMeshes: 1 - _constantWidth: 1 - _outlineQuality: 2 - _outlineIndependent: 1 - _outlineBlurPasses: 1 - _outlineSharpness: 8 - _currentOutlineType: 0 - _currentOpacityMultiplier: 1 diff --git a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs b/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs index c52bd47fd..9f65a3ddc 100644 --- a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs +++ b/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs @@ -20,7 +20,7 @@ public struct InteractionExecutionParameters { [SerializeField] private float _holdTime; public float HoldTime => _holdTime; - public InteractionExecutionParameters(float holdTime = 1f) + public InteractionExecutionParameters(float holdTime = 0f) { _holdTime = holdTime; } diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs index 40b619387..97c52ac12 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs @@ -6,11 +6,12 @@ namespace DDD [Flags] public enum RestaurantOrderType : uint { - Wait = 0, - Order = 1u << 0, - Serve = 1u << 1, + Wait = 0u, + Reserved = 1u, + Order = 1u << 1, + Serve = 1u << 2, } - + public class RestaurantOrderInteractionSubsystem : MonoBehaviour, IInteractionSubsystemObject { [SerializeField] protected RestaurantOrderType orderType = RestaurantOrderType.Wait; @@ -25,11 +26,8 @@ private void Start() public bool CanInteract() { - // 현재 RestaurantOrderInteractionType를 수행할 수 있는지? if (GetInteractionSubsystemType() == RestaurantOrderType.Wait) { - Debug.Assert(false); // TODO - // Check WaitCustomer return true; } return false; @@ -37,7 +35,6 @@ public bool CanInteract() public bool OnInteracted(IInteractor interactor, ScriptableObject payloadSo = null) { - // _currentRestaurantOrderInteractionType에 따라 동작이 달라지겠지 if (GetInteractionSubsystemType() == RestaurantOrderType.Wait) { // DO WAIT CUSTOMER diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrderSolver.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrderSolver.cs index 38bfe2d87..6fc753ec3 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrderSolver.cs +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrderSolver.cs @@ -10,6 +10,7 @@ public static class RestaurantOrderSolvers public static Dictionary TypeToOrderSolver = new() { { RestaurantOrderType.Wait, typeof(RestaurantOrderSolver_Wait) }, + { RestaurantOrderType.Reserved, typeof(RestaurantOrderSolver_Reserved) }, { RestaurantOrderType.Order, typeof(RestaurantOrderSolver_Order) }, { RestaurantOrderType.Serve, typeof(RestaurantOrderSolver_Serve) } }; diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs new file mode 100644 index 000000000..c12a9ab2b --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs @@ -0,0 +1,19 @@ +using UnityEngine; + +namespace DDD.RestaurantOrders +{ + public class RestaurantOrderSolver_Reserved : MonoBehaviour, IInteractionSubsystemSolver + { + public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payloadSo = null) + { + // TODO : DO SOMETHING!!! + return true; + } + + public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, + ScriptableObject payloadSo = null) + { + return true; + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta new file mode 100644 index 000000000..9d4d3307f --- /dev/null +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f62abf1706184529880b9353b63a2adc +timeCreated: 1755682089 \ No newline at end of file