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

納品後のUI非表示を修正

This commit is contained in:
kimura 2021-10-11 19:26:15 +09:00
parent 8e1b044c95
commit af9049e78c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
View File

@ -35,6 +35,10 @@ public class BulkOrderAchievedView : MonoBehaviour
{ {
callback.Invoke(); callback.Invoke();
} }
if (LocalCacheManager.Load<Action>(KitchenManager.ArchivedCallbackTag, null) is Action kitchenCallback)
{
kitchenCallback.Invoke();
}
transform.parent.SetLocalScale(0); transform.parent.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger); backgroundAnimator.SetTrigger(CloseTrigger);
this.CallWaitForSeconds(.25f, () => this.CallWaitForSeconds(.25f, () =>

4
popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderCancelView.cs
View File

@ -36,9 +36,9 @@ public class BulkOrderCancelView : MonoBehaviour
{ {
callback.Invoke(); callback.Invoke();
} }
if (LocalCacheManager.Load<Action>(KitchenManager.CancelCallbackTag, null) is Action callback2) if (LocalCacheManager.Load<Action>(KitchenManager.ArchivedCallbackTag, null) is Action kitchenCallback)
{ {
callback2.Invoke(); kitchenCallback.Invoke();
} }
transform.parent.SetLocalScale(0); transform.parent.SetLocalScale(0);
backgroundAnimator.SetTrigger(CloseTrigger); backgroundAnimator.SetTrigger(CloseTrigger);

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

@ -9,7 +9,7 @@ using UnityEngine.UI;
public class KitchenManager : MonoBehaviour public class KitchenManager : MonoBehaviour
{ {
public static readonly string CancelCallbackTag = "KitchenCancelCallback"; public static readonly string ArchivedCallbackTag = "KitchenCancelCallback";
[SerializeField] private Button cookingButton; [SerializeField] private Button cookingButton;
[SerializeField] private Button adButton; [SerializeField] private Button adButton;
[SerializeField] private KitchenView kitchenView; [SerializeField] private KitchenView kitchenView;
@ -48,10 +48,11 @@ public class KitchenManager : MonoBehaviour
// 大量注文 // 大量注文
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet); var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
var bulkOrderData = bulkOrderList.First(data => data.id == gameData.OrderIdInProgress);
var result = CheckBulkOrder(); var result = CheckBulkOrder();
var achieved = HeartMeter.Instance.ShopLevel.Value == gameData.AchievedOrderLevel; var achieved = bulkOrderData.shopLevel == gameData.AchievedOrderLevel;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
LocalCacheManager.Save(CancelCallbackTag, new Action(() => LocalCacheManager.Save(ArchivedCallbackTag, new Action(() =>
{ {
orderIndicatorView.SetIndicate(false, true); orderIndicatorView.SetIndicate(false, true);
})); }));