diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 5c7e5dc9..059d6a39 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -54,8 +54,7 @@ public class KitchenManager : MonoBehaviour gameData.CornSeed = 90; gameData.Coin = 10; // 店舗レベル1達成表示 - LocalCacheManager.Save(ShopLevelUp.DataTag, 1); - LocalCacheManager.Save(ShopLevelUp.CallbackTag, new Action(() => + ShopLevelUp.ShowDialog(1, () => { TutorialManager.Instance.ShowTutorialConversation(1, () => { diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index e67bb793..7a3b6b28 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -9,8 +9,8 @@ using UnityEngine.UI; public class ShopLevelUp : MonoBehaviour { - public static readonly string DataTag = "ShopLevelUpData"; - public static readonly string CallbackTag = "ShopLevelUpCallback"; + private static readonly string DataTag = "ShopLevelUpData"; + private static readonly string CallbackTag = "ShopLevelUpCallback"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); @@ -58,8 +58,8 @@ public class ShopLevelUp : MonoBehaviour var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); shopLevelText.text = shopLevel.ToString(); - achievementText.text = shopLevelList.First(data => data.shopLevel == shopLevel).achievement; - recipeNameText.text = productList.First(data => data.shopLevel == shopLevel).name; + achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.achievement ?? ""; + recipeNameText.text = productList.FirstOrDefault(data => data.shopLevel == shopLevel)?.name ?? ""; summaryObject.SetActive(false); this.CallWaitForSeconds(1f, () =>