From 161ee3db113ad89eed94f7444b205c20e21ddddb Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Mon, 1 Sep 2025 19:52:24 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A0=88=EC=8A=A4=ED=86=A0=EB=9E=91=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20Dirty=20=EC=83=81=ED=83=9C=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Raw/Sprites/Ui/Common/DirtyDishStew.png.meta | 2 +- .../Event/Cosmetic/InteractableHighlight.cs | 2 ++ .../Ui/OrderUi/Component/PropUiDisplayComponent.cs | 11 ++++++++++- .../OrderUi/Component/RestaurantUiDisplayComponent.cs | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Assets/_DDD/_Raw/Sprites/Ui/Common/DirtyDishStew.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common/DirtyDishStew.png.meta index c978f44b2..fbc38c719 100644 --- a/Assets/_DDD/_Raw/Sprites/Ui/Common/DirtyDishStew.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/Common/DirtyDishStew.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 diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs index f2d0eeb04..8de49d7f3 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs @@ -136,6 +136,8 @@ private void ApplyHighlightSettings(HighlightEffect highlightComponent) private void Update() { FetchPlayerInteractorComponent(); + if(_interactor == null) + return; var currentType = GetCurrentOutlineType(); _currentOutlineType = currentType; // 디버그용 diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index 412581a87..bab4288c6 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -17,7 +17,9 @@ public abstract class PropUiDisplayComponent : SerializedMonoBehaviour where protected IInteractable _interactable; protected SpriteRenderer _spriteRenderer; protected Transform _spriteTransform; - private void Awake() + + private bool _isInitialized = false; + private void Start() { Initialize(); } @@ -44,6 +46,8 @@ protected virtual void Initialize() UpdateSpriteTransform(); _internalMaterials = GetInteractionDisplayMaterials(); + + _isInitialized = true; } private void UpdateSprite() @@ -86,6 +90,11 @@ protected virtual Vector3 GetDisplayRotation() private void Update() { + if (!_isInitialized || !GameFlowManager.Instance.IsGameStarted()) + { + return; + } + T interactionType = _interactionSubsystemObject.GetInteractionSubsystemType(); if (EqualityComparer.Default.Equals(_currentInteractionType, interactionType)) return; SetCurrentInteractionType(interactionType); diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 56880d5a5..499c8f295 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -52,6 +52,11 @@ protected override Sprite GetDisplaySprite() return sprite; } } + else if (GetCurrentInteractionType() == RestaurantOrderType.Dirty) + { + var sprite = DataManager.Instance.GetSprite(SpriteConstants.DirtyDish); + return sprite; + } return base.GetDisplaySprite(); }