diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs index d70db6d6..697a24f0 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerAnimator.cs @@ -93,6 +93,10 @@ public class CustomerAnimator : MonoBehaviour Instantiate(prefab, rightPopcornTarget).ChangeRarity(rarity); Instantiate(prefab, frontPopcornTarget).ChangeRarity(rarity); Instantiate(prefab, wantFlavorSpriteTarget).ChangeRarity(rarity); + } + + public void ShowWantFlavor() + { orderPopup.SetActive(true); } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 7ed977d2..345c2d21 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -291,6 +291,11 @@ public class MarketManager : MonoBehaviour { customerAnimator.SetSide(x); }).AddTo(customerAnimator); + // フレーバー設定 + if (productDataList.FirstOrDefault(data => data.id == (controller.WantFlavor.Value?.FlavorId ?? -1))?.GetMarketPrefab() is MarketPopcornView initialPrefab) + { + customerAnimator.SetWantFlavor(initialPrefab, controller.WantFlavor.Value.Rarity); + } controller.WantFlavor .SkipLatestValueOnSubscribe() .Subscribe(wantData => @@ -298,6 +303,7 @@ public class MarketManager : MonoBehaviour if (productDataList.FirstOrDefault(data => data.id == wantData.FlavorId)?.GetMarketPrefab() is MarketPopcornView prefab) { customerAnimator.SetWantFlavor(prefab, wantData.Rarity); + customerAnimator.ShowWantFlavor(); } }).AddTo(customerAnimator); controller.IsComplain