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