From 11c4e11a145acbd09aa7d93666ba9593bc4db1e0 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Mon, 28 Oct 2024 21:02:31 +0900 Subject: [PATCH] =?UTF-8?q?0.3.2.12=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Character/Npc/Crew/Bartender/BartenderCrew.cs | 11 +++++++++-- Assets/02.Scripts/Tycoon/CrewController.cs | 3 +++ Assets/02.Scripts/Ui/Tycoon/Bill.cs | 4 ---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs b/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs index 5174f0a5a..3eb60c14d 100644 --- a/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs +++ b/Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs @@ -55,7 +55,10 @@ namespace BlueWater.Npcs.Crews.Bartender public void MakingCocktail() { - OrderedCustomer.CurrentBill?.BartenderMakingCocktail(); + if (OrderedCustomer.CurrentBill) + { + OrderedCustomer.CurrentBill.BartenderMakingCocktail(); + } BalloonUi.OrderItem(OrderedCustomer.OrderedCocktailData.Idx, 0, 15); IsMakingCocktail = true; @@ -63,7 +66,11 @@ namespace BlueWater.Npcs.Crews.Bartender public void CompletedMakingCocktail() { - OrderedCustomer.CurrentBill?.BartenderCompleteMakingCocktail(); + if (OrderedCustomer.CurrentBill) + { + OrderedCustomer.CurrentBill.BartenderCompleteMakingCocktail(); + } + BalloonUi.DiscardItem(); MyBartenderTable.CompleteMakingCocktail(OrderedCustomer.OrderedCocktailData); IsMakingCocktail = false; diff --git a/Assets/02.Scripts/Tycoon/CrewController.cs b/Assets/02.Scripts/Tycoon/CrewController.cs index 7a711bd5b..e7b73bd03 100644 --- a/Assets/02.Scripts/Tycoon/CrewController.cs +++ b/Assets/02.Scripts/Tycoon/CrewController.cs @@ -132,6 +132,9 @@ namespace BlueWater.Tycoons { var waitTime = new WaitForSeconds(2f); var tycoonIngredientController = TycoonManager.Instance.TycoonIngredientController; + + yield return new WaitForSeconds(0.5f); + while (true) { foreach (var element in BartenderCrews) diff --git a/Assets/02.Scripts/Ui/Tycoon/Bill.cs b/Assets/02.Scripts/Ui/Tycoon/Bill.cs index 788298de1..d2e1fd4b3 100644 --- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs +++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs @@ -178,15 +178,11 @@ namespace BlueWater public void BartenderMakingCocktail() { - if (!gameObject) return; - _makingCocktailPivotObject.gameObject.SetActive(true); } public void BartenderCompleteMakingCocktail() { - if (!gameObject) return; - _makingCocktailPivotObject.gameObject.SetActive(false); _checkImageObject.gameObject.SetActive(true); _animationController.SetAnimationParameter("isBartenderChecked", true);