yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

表示データ修正

This commit is contained in:
kimura 2021-10-11 11:42:51 +09:00
parent 42856db58a
commit 505449cbe8
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
View File

@ -48,7 +48,7 @@ public class BulkOrder : MonoBehaviour
// 試食時のお客さんの増加ってどれくらいなんだろ // 試食時のお客さんの増加ってどれくらいなんだろ
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet); var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(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; messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText;
coinText.text = bulkOrderData.rewardCoin.ToString(); coinText.text = bulkOrderData.rewardCoin.ToString();
heartText.text = bulkOrderData.rewardHeart.ToString(); heartText.text = bulkOrderData.rewardHeart.ToString();

5
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs
View File

@ -23,10 +23,9 @@ public class BulkOrderNotifyView : MonoBehaviour
{ {
if (LocalCacheManager.Load<BulkOrderData>(BulkOrder.DataTag, null) is BulkOrderData orderData) if (LocalCacheManager.Load<BulkOrderData>(BulkOrder.DataTag, null) is BulkOrderData orderData)
{ {
// Textは固定なのでID保持してここに反映かな？ var gameData = GameDataManager.GameData;
var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet); var messageList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderTextData>(Const.BulkOrderTextDataSheet);
var orderTextIndex = 0; messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText;
messageText.text = messageList.Where(data => data.shopLevel == orderData.shopLevel).ToList()[orderTextIndex].requestText;
coinText.text = orderData.rewardCoin.ToString(); coinText.text = orderData.rewardCoin.ToString();
heartText.text = orderData.rewardHeart.ToString(); heartText.text = orderData.rewardHeart.ToString();

7
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -67,13 +67,12 @@ public class KitchenManager : MonoBehaviour
gameData.OrderIdInProgress = result.nextOrderId; gameData.OrderIdInProgress = result.nextOrderId;
if (nextMessageList.Exists(data => data.id == gameData.OrderTextId)) if (nextMessageList.Exists(data => data.id == gameData.OrderTextId))
{ {
var messageCount = nextMessageList.Count; var nextMessageIndex = nextMessageList.FindIndex(data => data.id == gameData.OrderTextId) + 1;
var nextMessageIndex = nextMessageList.FindIndex(data => data.id == result.nextOrderId) + 1; gameData.OrderTextId = nextMessageList[nextMessageIndex >= nextMessageList.Count ? 0 : nextMessageIndex].id;
gameData.OrderTextId = messageList[nextMessageIndex >= messageCount ? 0 : nextMessageIndex].id;
} }
else else
{ {
gameData.OrderTextId = messageList.First().id; gameData.OrderTextId = nextMessageList.First().id;
} }
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();