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

revert 大量注文nextOrder判定処理

This commit is contained in:
kimura 2022-04-21 16:54:26 +09:00
parent ff4e5c4f3b
commit e82750e7ca
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,17 +368,16 @@ public class KitchenManager : MonoBehaviour
private (bool newOrder, int nextOrderId, int nextOrderLevel) CheckBulkOrder() private (bool newOrder, int nextOrderId, int nextOrderLevel) CheckBulkOrder()
{ {
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
var nextOrderLevel = gameData.AchievedOrderLevel + 1; var nextOrderLevel = 0;
var nextOrderId = gameData.OrderIdInProgress; var nextOrderId = gameData.OrderIdInProgress;
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
if (!(bulkOrderList.FirstOrDefault(data => data.shopLevel >= gameData.AchievedOrderLevel + 1) is BulkOrderData bulkOrderData))
// 店舗レベルより大量注文レベルが大きい場合オーダーなし
if (gameData.ViewedShopLevel < nextOrderLevel)
{ {
return (false, nextOrderId, nextOrderLevel); return (false, nextOrderId, nextOrderLevel);
} }
// 大量注文レベルが上限の場合オーダーなし
if (bulkOrderList.FirstOrDefault(data => data.shopLevel >= gameData.AchievedOrderLevel + 1) is null) nextOrderLevel = bulkOrderData.shopLevel;
if (gameData.ViewedShopLevel < nextOrderLevel)
{ {
return (false, nextOrderId, nextOrderLevel); return (false, nextOrderId, nextOrderLevel);
} }