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

大量注文通知処理移動

This commit is contained in:
kimura 2021-12-15 10:28:44 +09:00
parent 1cc9ebf0c3
commit e6c045e2b1
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,29 @@ public class KitchenManager : MonoBehaviour
RecipeSelectDialog.ShowDialog(ProductViewType.Default); RecipeSelectDialog.ShowDialog(ProductViewType.Default);
}); });
// 大量注文データ
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
var bulkOrderData = bulkOrderList.FirstOrDefault(data => data.id == gameData.OrderIdInProgress);
var achieved = bulkOrderData is null || gameData.DeliveredOrder.Contains(bulkOrderData.id) || gameData.AchievedOrderLevel == bulkOrderData.shopLevel;
var cancelled = gameData.OrderIdInProgress == gameData.CancelOrderId;
// 大量注文達成通知
if (bulkOrderData == null)
{
orderIndicatorView.SetBadgeActive(false);
}
else
{
var orderList = new List<int>
{
bulkOrderData.productId1,
bulkOrderData.productId2,
bulkOrderData.productId3,
};
var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0);
orderIndicatorView.SetBadgeActive(completed && !achieved && !cancelled);
}
// tutorial // tutorial
if (!gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) if (!gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay))
{ {
@ -176,38 +199,15 @@ public class KitchenManager : MonoBehaviour
} }
#if UNITY_EDITOR #if UNITY_EDITOR
Debug.Log($"remaining: {remaining}"); Debug.Log($"remaining: {remaining}");
Market.StockFlavorLog();
#endif #endif
// 大量注文
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
var result = CheckBulkOrder(); var result = CheckBulkOrder();
var bulkOrderData = bulkOrderList.FirstOrDefault(data => data.id == gameData.OrderIdInProgress);
var achieved = bulkOrderData is null || gameData.DeliveredOrder.Contains(bulkOrderData.id) || gameData.AchievedOrderLevel == bulkOrderData.shopLevel;
var cancelled = gameData.OrderIdInProgress == gameData.CancelOrderId;
GameDataManager.SaveGameData();
if (bulkOrderData != null)
{
var orderList = new List<int>
{
bulkOrderData.productId1,
bulkOrderData.productId2,
bulkOrderData.productId3,
};
var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0);
orderIndicatorView.SetBadgeActive(completed && !achieved && !cancelled);
}
else
{
orderIndicatorView.SetBadgeActive(false);
}
orderIndicatorView.SetIndicate(result.newOrder, achieved || cancelled); orderIndicatorView.SetIndicate(result.newOrder, achieved || cancelled);
if (LocalCacheManager.Load(Const.ProductViewTypeTag, ProductViewType.Default) == ProductViewType.BulkOrder) if (LocalCacheManager.Load(Const.ProductViewTypeTag, ProductViewType.Default) == ProductViewType.BulkOrder)
{ {
BulkOrderShowDialogWithSetup(); BulkOrderShowDialogWithSetup();
} }
if (!result.newOrder) if (!result.newOrder)
{ {
if (gameData.OrderIdInProgress != gameData.CancelOrderId) if (gameData.OrderIdInProgress != gameData.CancelOrderId)
@ -257,10 +257,6 @@ public class KitchenManager : MonoBehaviour
}).AddTo(this); }).AddTo(this);
}).AddTo(this); }).AddTo(this);
} }
#if UNITY_EDITOR
Market.StockFlavorLog();
#endif
} }
private void BulkOrderShowDialogWithSetup() private void BulkOrderShowDialogWithSetup()