diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 75a2b68b..97635eeb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -48,7 +48,7 @@ public class BulkOrder : MonoBehaviour // 試食時のお客さんの増加ってどれくらいなんだろ var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); - var bulkOrderData = bulkOrderList[gameData.OrderIdInProgress]; + var bulkOrderData = bulkOrderList.First(data => data.id == gameData.OrderIdInProgress); messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; coinText.text = bulkOrderData.rewardCoin.ToString(); heartText.text = bulkOrderData.rewardHeart.ToString(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs index 049985f6..d17ca902 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs @@ -23,10 +23,9 @@ public class BulkOrderNotifyView : MonoBehaviour { if (LocalCacheManager.Load(BulkOrder.DataTag, null) is BulkOrderData orderData) { - // Textは固定なのでID保持してここに反映かな? + var gameData = GameDataManager.GameData; var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); - var orderTextIndex = 0; - messageText.text = messageList.Where(data => data.shopLevel == orderData.shopLevel).ToList()[orderTextIndex].requestText; + messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; coinText.text = orderData.rewardCoin.ToString(); heartText.text = orderData.rewardHeart.ToString(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 3017dc2a..ead4c879 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -67,13 +67,12 @@ public class KitchenManager : MonoBehaviour gameData.OrderIdInProgress = result.nextOrderId; if (nextMessageList.Exists(data => data.id == gameData.OrderTextId)) { - var messageCount = nextMessageList.Count; - var nextMessageIndex = nextMessageList.FindIndex(data => data.id == result.nextOrderId) + 1; - gameData.OrderTextId = messageList[nextMessageIndex >= messageCount ? 0 : nextMessageIndex].id; + var nextMessageIndex = nextMessageList.FindIndex(data => data.id == gameData.OrderTextId) + 1; + gameData.OrderTextId = nextMessageList[nextMessageIndex >= nextMessageList.Count ? 0 : nextMessageIndex].id; } else { - gameData.OrderTextId = messageList.First().id; + gameData.OrderTextId = nextMessageList.First().id; } GameDataManager.SaveGameData();