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

Merge branch 'feature/update_ver1.2.0' of bitbucket.org:usaya/popcorn into feature/update_ver1.2.0

This commit is contained in:
koya_15 2022-04-08 15:38:18 +09:00
parent d2dded4e5a bac22de726
commit 4aba10d92a
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,9 +325,24 @@ public class KitchenManager : MonoBehaviour
else if (achieved || gameData.OrderIdInProgress == gameData.CancelOrderId && gameData.CancelOrderId > 0) else if (achieved || gameData.OrderIdInProgress == gameData.CancelOrderId && gameData.CancelOrderId > 0)
{ {
// 達成済みか、キャンセルされた場合次のIDを設定 // 達成済みか、キャンセルされた場合次のIDを設定
// 未達成のオーダー
var orderList = nextOrderList.Where(data => !gameData.DeliveredOrder.Contains(data.id)).ToList(); var orderList = nextOrderList.Where(data => !gameData.DeliveredOrder.Contains(data.id)).ToList();
var nextIndex = orderList.FindIndex(data => data.id > gameData.OrderIdInProgress);
nextOrderId = orderList[Mathf.Max(0, nextIndex)].id; if (orderList.Count > 0)
{
var nextIndex = orderList.FindIndex(data => data.id > gameData.OrderIdInProgress);
nextOrderId = orderList[Mathf.Max(0, nextIndex)].id;
}
else
{
#if UNITY_EDITOR
// オーダーリストがすべて達成済みの場合エラー
Debug.LogError($"店舗レベル{nextOrderLevel}に受けられるオーダーがありませんデータを確認してください\n" +
$"maxOrder:{nextOrderList[0].maxOrder}\n" +
$"delivered:{gameData.DeliveredOrder.Aggregate(string.Empty, (s, data) => $"{s}, {data}")}\n" +
$"orderList:{nextOrderList.Aggregate(string.Empty, (s, data) => $"{s}, {data.id}")}");
#endif
}
} }
if (gameData.OrderIdInProgress == nextOrderId) if (gameData.OrderIdInProgress == nextOrderId)