diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 637bc7dd..9a892db0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -165,7 +165,7 @@ public class KitchenManager : MonoBehaviour bulkOrderData.productId3, }; var completed = gameData.CompletedProductList.Count == orderList.Count(x => x != 0); - orderIndicatorView.SetBadgeActive(completed && !achieved); + orderIndicatorView.SetBadgeActive(completed && !achieved && !cancelled); } else { @@ -212,7 +212,7 @@ public class KitchenManager : MonoBehaviour } GameDataManager.SaveGameData(); - + var orderData = bulkOrderList.First(data => data.id == result.nextOrderId); LocalCacheManager.Save(BulkOrder.DataTag, orderData); BulkOrderNotifyView.ShowDialog(BulkOrderShowDialogWithSetup);