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

Merge branch 'develop' of http://gitea.capers.co.kr:3000/iwnc2020/ProjectDDD into develop

Browse Source
This commit is contained in:
Jeonghyeon Ha 2025-09-02 12:16:27 +09:00
commit 4d65131ee8
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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) 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; _cookwareType = CookwareType.None;
var iCookware = interactable?.GetInteractableGameObject().GetComponent<ICookware>(); var iCookware = interactable?.GetInteractableGameObject().GetComponent<ICookware>();
if (iCookware == null) return false; if (iCookware == null) return false;