diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 817b39bc3..b9ebf5fac 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:128038ec4bebf184e3e25685d6ba8b93d1185d041df5a4d32f55d434ae3c89f8 +oid sha256:0fbc5c82e6400866f12f4a776985d65f98c1a9e27d9c5104d528026b30388f47 size 10883 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index da054320c..09b034e02 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -26,7 +26,7 @@ Transform: 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_LocalPosition: {x: -0.5, y: -0.165, z: -0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -102,6 +102,7 @@ GameObject: - component: {fileID: 29040892075516248} - component: {fileID: 1332098886975329103} - component: {fileID: 3786917981383564029} + - component: {fileID: 1886819858489010523} m_Layer: 7 m_Name: RestaurantOrder m_TagString: Untagged @@ -252,26 +253,26 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4103096974375017811} - m_Enabled: 0 + 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 + Width: 0.5 Opacity: 1 _focusedStyle: Color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} - Width: 1 + Width: 0.5 Opacity: 1 _unavailableStyle: Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} Width: 0.5 - Opacity: 1 + Opacity: 0.5 _objectiveStyle: Color: {r: 0, g: 1, b: 1, a: 1} - Width: 1 + Width: 0.5 Opacity: 1 _breathingSpeed: 2 _breathingRange: 0.3 @@ -479,9 +480,64 @@ MonoBehaviour: seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 seeThroughChildrenSortingMode: 0 - rmsCount: 1 + rmsCount: 2 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!212 &1886819858489010523 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4103096974375017811} + 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 diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab index 2a2467dee..15b6b6071 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Prop_CustomerTable.prefab @@ -8,17 +8,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: + - target: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Radius + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.z + value: 0.1 + objectReference: {fileID: 0} - 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 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.z - value: 0.2 + value: 0.165 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalRotation.w @@ -70,17 +122,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8881739536043914635} m_Modifications: + - target: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 29040892075516248, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1664322405549350652, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Radius + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.y + value: -0.165 + objectReference: {fileID: 0} + - target: {fileID: 2950132940454135295, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} + propertyPath: m_Center.z + value: -0.1 + objectReference: {fileID: 0} - 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 + value: 0.2 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalPosition.z - value: 0.2 + value: 0.165 objectReference: {fileID: 0} - target: {fileID: 3697702677815423220, guid: 2bbe3f26765344e6097aa9fd0f020fbf, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index 234795d0e..4e2728746 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -1947,9 +1947,9 @@ MonoBehaviour: m_NumColorKeys: 2 m_NumAlphaKeys: 2 outlineGradientInLocalSpace: 0 - outlineWidth: 0.45 + outlineWidth: 0.2 outlineBlurPasses: 2 - outlineQuality: 3 + outlineQuality: 2 outlineEdgeMode: 0 outlineEdgeThreshold: 0.995 outlineSharpness: 1 diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs index 4248d0aa1..31b36cdb7 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs @@ -96,7 +96,7 @@ public bool TryTeleportToPosition(Vector3 position) public bool HasReachedDestination() { - return _iAstarAi.pathPending == false && _iAstarAi.reachedEndOfPath; + return _iAstarAi.pathPending == false && _iAstarAi.reachedDestination; } public bool IsPositionMovable(Vector3 endPosition) diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs index 8ff387554..f2d0eeb04 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs @@ -95,11 +95,16 @@ public void RegisterHighlightProxy(GameObject highlightProxyObject) { var highlightProxy = highlightProxyObject.GetComponent(); _highlightProxy = highlightProxy; + _highlightProxy.enabled = true; ApplyHighlightSettings(highlightProxy); } public void ClearHighlightProxy() { + if (_highlightProxy) + { + _highlightProxy.enabled = false; + } _highlightProxy = null; }