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

メインシーンワールド対応

This commit is contained in:
kimura 2022-10-14 15:39:19 +09:00
parent fef3ca9223
commit bd8ae721f5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,16 +27,18 @@ public class KitchenManager : MonoBehaviour
private readonly Subject<Unit> showAdDialogSubject = new Subject<Unit>(); private readonly Subject<Unit> showAdDialogSubject = new Subject<Unit>();
private IDisposable timerDisposable = null; private IDisposable timerDisposable = null;
private IDisposable tapPhoneDisposable; private IDisposable tapPhoneDisposable;
private GameData globalGameData;
private GameData cityGameData;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
showAdDialogSubject.AddTo(this); showAdDialogSubject.AddTo(this);
SoundManager.Instance.PlayBGM("bgm_Main"); SoundManager.Instance.PlayBGM("bgm_Main");
var globalGameData = GameDataManager.GameData; globalGameData = GameDataManager.GameData;
cityGameData = GameDataManager.GetCurrentCityGameData();
// globalGameData.CustomizeCoinElapsed = Int32.MaxValue / 2; // globalGameData.CustomizeCoinElapsed = Int32.MaxValue / 2;
// PartTimerManager.Instance.UpdateList(); // PartTimerManager.Instance.UpdateList();
var cityGameData = GameDataManager.GetCurrentCityGameData();
// レシピの表示 // レシピの表示
cookingButton.OnClickAsObservable().Subscribe(_ => cookingButton.OnClickAsObservable().Subscribe(_ =>
@ -369,8 +371,7 @@ public class KitchenManager : MonoBehaviour
return; return;
} }
var gameData = GameDataManager.GameData; var cancelled = cityGameData.OrderIdInProgress == cityGameData.CancelOrderId;
var cancelled = gameData.OrderIdInProgress == gameData.CancelOrderId;
if (cancelled) if (cancelled)
{ {
return; return;
@ -395,10 +396,9 @@ public class KitchenManager : MonoBehaviour
tapPhoneDisposable = orderIndicatorView.TappedPhone.Take(1).Subscribe(_ => tapPhoneDisposable = orderIndicatorView.TappedPhone.Take(1).Subscribe(_ =>
{ {
// タップで更新 // タップで更新
var gameData = GameDataManager.GameData; cityGameData.CompletedProductList.Clear();
gameData.CompletedProductList.Clear(); cityGameData.OrderIdInProgress = nextOrderData.id;
gameData.OrderIdInProgress = nextOrderData.id; cityGameData.OrderTextId = nextMessageList.FirstOrDefault(data => data.id > cityGameData.OrderTextId)?.id ?? nextMessageList[0].id;
gameData.OrderTextId = nextMessageList.FirstOrDefault(data => data.id > gameData.OrderTextId)?.id ?? nextMessageList[0].id;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
SetPhoneTap(); SetPhoneTap();