diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 03e9b95b..f9942e22 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -252,7 +252,7 @@ public class Market : SingletonMonoBehaviour }).AddTo(controller); controller.State - .Where(x => x == CustomerState.EatingLeave) + .Where(x => x != CustomerState.Order) .Subscribe(c => { orderSubject.OnNext(default); @@ -269,6 +269,11 @@ public class Market : SingletonMonoBehaviour { return; } + + if (gameData.isFirstPlay) + { + return; + } // 一般客orセレブ var (isSpecial, orderCount) = GetCustomerData(isCustomer); @@ -504,6 +509,25 @@ public class Market : SingletonMonoBehaviour }); } + public CustomerController SetTutorialCustomer() + { + var customerController = SpawnCustomer(); + customerController.SetupCenter(orderPosisionObject.transform.GetComponentsInChildren().ToList().Skip(1).ToList()); + customerController.OrderCount = 1; + customerController.CustomerPrefab = customerData.ChooseNormalPrefab(); + customerControllerList.Add(customerController); + + // タップ後customerList.Add() + customerController.ChangeCustomerState(CustomerState.CenterStop); + customerController.TappedObservable + .Take(1) + .Subscribe(_ => + { + customerList.Add(customerController); + }).AddTo(customerController); + return customerController; + } + private void CheckAndFixStock() { if (GameDataManager.GameData.ShopStock.Count > ShopStockCount)