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

0.3.2.12 업데이트

Browse Source
This commit is contained in:
NTG_Lenovo 2024-10-28 21:02:31 +09:00
parent 4b2eb0c117
commit 11c4e11a14
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs
View File

@ -55,7 +55,10 @@ namespace BlueWater.Npcs.Crews.Bartender
public void MakingCocktail() public void MakingCocktail()
{ {
OrderedCustomer.CurrentBill?.BartenderMakingCocktail(); if (OrderedCustomer.CurrentBill)
{
OrderedCustomer.CurrentBill.BartenderMakingCocktail();
}
BalloonUi.OrderItem(OrderedCustomer.OrderedCocktailData.Idx, 0, 15); BalloonUi.OrderItem(OrderedCustomer.OrderedCocktailData.Idx, 0, 15);
IsMakingCocktail = true; IsMakingCocktail = true;
@ -63,7 +66,11 @@ namespace BlueWater.Npcs.Crews.Bartender
public void CompletedMakingCocktail() public void CompletedMakingCocktail()
{ {
OrderedCustomer.CurrentBill?.BartenderCompleteMakingCocktail(); if (OrderedCustomer.CurrentBill)
{
OrderedCustomer.CurrentBill.BartenderCompleteMakingCocktail();
}
BalloonUi.DiscardItem(); BalloonUi.DiscardItem();
MyBartenderTable.CompleteMakingCocktail(OrderedCustomer.OrderedCocktailData); MyBartenderTable.CompleteMakingCocktail(OrderedCustomer.OrderedCocktailData);
IsMakingCocktail = false; IsMakingCocktail = false;

3
Assets/02.Scripts/Tycoon/CrewController.cs
View File

@ -132,6 +132,9 @@ namespace BlueWater.Tycoons
{ {
var waitTime = new WaitForSeconds(2f); var waitTime = new WaitForSeconds(2f);
var tycoonIngredientController = TycoonManager.Instance.TycoonIngredientController; var tycoonIngredientController = TycoonManager.Instance.TycoonIngredientController;
yield return new WaitForSeconds(0.5f);
while (true) while (true)
{ {
foreach (var element in BartenderCrews) foreach (var element in BartenderCrews)

4
Assets/02.Scripts/Ui/Tycoon/Bill.cs
View File

@ -178,15 +178,11 @@ namespace BlueWater
public void BartenderMakingCocktail() public void BartenderMakingCocktail()
{ {
if (!gameObject) return;
_makingCocktailPivotObject.gameObject.SetActive(true); _makingCocktailPivotObject.gameObject.SetActive(true);
} }
public void BartenderCompleteMakingCocktail() public void BartenderCompleteMakingCocktail()
{ {
if (!gameObject) return;
_makingCocktailPivotObject.gameObject.SetActive(false); _makingCocktailPivotObject.gameObject.SetActive(false);
_checkImageObject.gameObject.SetActive(true); _checkImageObject.gameObject.SetActive(true);
_animationController.SetAnimationParameter("isBartenderChecked", true); _animationController.SetAnimationParameter("isBartenderChecked", true);