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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
capers 2024-10-28 21:20:08 +09:00
commit 6374e23a46
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
using BlueWater.Interfaces; using BlueWater.Interfaces;
using BlueWater.Items;
using BlueWater.Npcs.Customers; using BlueWater.Npcs.Customers;
using BlueWater.Tycoons; using BlueWater.Tycoons;
@ -13,6 +14,8 @@ namespace BlueWater.Npcs.Crews.Bartender
public StateMachineController<BartenderCrew> StateMachineController { get; private set; } public StateMachineController<BartenderCrew> StateMachineController { get; private set; }
public IStateMachine<BartenderCrew> IdleState { get; private set; } public IStateMachine<BartenderCrew> IdleState { get; private set; }
public IStateMachine<BartenderCrew> MakingCocktailState { get; private set; } public IStateMachine<BartenderCrew> MakingCocktailState { get; private set; }
private CocktailData _makingCocktailData;
protected override void Update() protected override void Update()
{ {
@ -38,6 +41,7 @@ namespace BlueWater.Npcs.Crews.Bartender
OrderedCustomer = null; OrderedCustomer = null;
IsMakingCocktail = false; IsMakingCocktail = false;
_makingCocktailData = null;
} }
public override bool IsCompletedMission() public override bool IsCompletedMission()
@ -50,30 +54,29 @@ namespace BlueWater.Npcs.Crews.Bartender
public void SetOrderedCustomer(Customer orderedCustomer) public void SetOrderedCustomer(Customer orderedCustomer)
{ {
OrderedCustomer = orderedCustomer; OrderedCustomer = orderedCustomer;
_makingCocktailData = OrderedCustomer.OrderedCocktailData;
IsOnMission = true; IsOnMission = true;
} }
public void MakingCocktail() public void MakingCocktail()
{ {
if (OrderedCustomer.CurrentBill) if (OrderedCustomer && OrderedCustomer.CurrentBill)
{ {
OrderedCustomer.CurrentBill.BartenderMakingCocktail(); OrderedCustomer.CurrentBill.BartenderMakingCocktail();
} }
BalloonUi.OrderItem(OrderedCustomer.OrderedCocktailData.Idx, 0, 15); BalloonUi.OrderItem(_makingCocktailData.Idx, 0, 15);
IsMakingCocktail = true; IsMakingCocktail = true;
} }
public void CompletedMakingCocktail() public void CompletedMakingCocktail()
{ {
if (OrderedCustomer.CurrentBill) if (OrderedCustomer && OrderedCustomer.CurrentBill)
{ {
OrderedCustomer.CurrentBill.BartenderCompleteMakingCocktail(); OrderedCustomer.CurrentBill.BartenderCompleteMakingCocktail();
} }
BalloonUi.DiscardItem(); MyBartenderTable.CompleteMakingCocktail(_makingCocktailData);
MyBartenderTable.CompleteMakingCocktail(OrderedCustomer.OrderedCocktailData);
IsMakingCocktail = false;
ResetMission(); ResetMission();
} }
} }