diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 003272451..249c94e7f 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -172,7 +172,7 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 2 + Data: 4 - Name: $v Entry: 10 Data: 0 @@ -184,7 +184,7 @@ MonoBehaviour: Data: - Name: $k Entry: 3 - Data: 4 + Data: 2 - Name: $v Entry: 10 Data: 0 @@ -200,7 +200,9 @@ MonoBehaviour: _rotation: {x: 40, y: 0, z: 0} _defaultSprite: {fileID: 21300000, guid: 94f9e78fc7b864b93842bdfa21276f09, type: 3} _offset: {x: 0, y: 1.5, z: 1.35} - _fixedSpriteSize: {x: 0.2, y: 0.2} + _disabledOffset: {x: 0, y: 0.2, z: 0.165} + _fixedLocalScale: {x: 0.2, y: 0.2} + _disabledColor: {r: 0.6627451, g: 0.6627451, b: 0.6627451, a: 0.5} --- !u!114 &1332098886975329103 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs index 707183dcc..160b71c9b 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/PropUiDisplayComponent.cs @@ -12,7 +12,7 @@ public abstract class PropUiDisplayComponent : SerializedMonoBehaviour where [SerializeField] protected Sprite _defaultSprite; private IInteractionSubsystemObject _interactionSubsystemObject; - private Dictionary _materialDictionary; + private Dictionary _internalMaterials; private T _currentInteractionType; protected IInteractable _interactable; protected SpriteRenderer _spriteRenderer; @@ -22,7 +22,7 @@ private void Awake() Initialize(); } - protected abstract Dictionary SetMaterialDictionary(); + protected abstract Dictionary GetInteractionDisplayMaterials(); protected virtual void Initialize() { @@ -44,7 +44,7 @@ protected virtual void Initialize() uiGameObject.layer = LayerMask.NameToLayer("WorldUI"); UpdateSpriteTransform(); - _materialDictionary = SetMaterialDictionary(); + _internalMaterials = GetInteractionDisplayMaterials(); } protected virtual void UpdateSpriteTransform() @@ -109,7 +109,7 @@ virtual protected Color GetSpriteColor() private bool UpdateSpriteMaterial(T state) { - if (!_materialDictionary.TryGetValue(state, out var material) || material == null) + if (!_internalMaterials.TryGetValue(state, out var material) || material == null) { // TODO 캔버스 다운 _spriteRenderer.enabled = false; diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs index 9bf89c93f..636f936ea 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/OrderUi/Component/RestaurantUiDisplayComponent.cs @@ -19,11 +19,16 @@ public class RestaurantUiDisplayComponent : PropUiDisplayComponent _materialDictionary = new(); - protected override Dictionary SetMaterialDictionary() + protected override Dictionary GetInteractionDisplayMaterials() { return _materialDictionary; } + protected override void Initialize() + { + base.Initialize(); + } + protected override void UpdateSpriteTransform() { base.UpdateSpriteTransform();