diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index c1aa1e62..dd176f9c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -200,9 +200,9 @@ public class Market : SingletonMonoBehaviour var flavors = orders.Select(x => displayFlavors[x]).ToList(); var coin = SellPopcorn(flavors); - // 獲得処理 - gameData.Coin += coin; - gameData.Heart += customers.Count; + // 獲得処理(遅延追加用変数に加算) + gameData.WaitAddCoin += coin; + gameData.WaitAddHeart += customers.Count; GameDataManager.SaveGameData(); // 商品補充 @@ -226,12 +226,20 @@ public class Market : SingletonMonoBehaviour this.CallWaitForSeconds(waitSellTime, () => { + // 獲得処理 + gameData.MoveCoin(coin); + GameDataManager.SaveGameData(); + sellObservable.OnNext(coin); sellOrderSubject.OnNext(orders); CheckStock(gameData.ShopStock); this.CallWaitForSeconds(waitRefillTime, () => { + // 獲得処理 + gameData.MoveHeart(customers.Count); + GameDataManager.SaveGameData(); + refillSubject.OnNext((isReorder, refillList)); foreach (var controller in customers) { diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index e7509a59..77487ecf 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -135,6 +135,12 @@ public sealed class GameData { // フライパン [DataMember(Name = "Data39")] public int SelectedPanId; + + // 遅延追加用加算枠 + [DataMember(Name = "Data40")] + public int WaitAddCoin; + [DataMember(Name = "Data41")] + public int WaitAddHeart; // mission [DataMember(Name = "Data1001")] @@ -291,6 +297,26 @@ public sealed class GameData { kitchenRefreshTime = DateTime.UtcNow.ToBinary(); } + public void MoveCoin(int value) + { + // 退避していたコインを加算 + WaitAddCoin -= value; + Coin += value; + } + + public void MoveHeart(int value) + { + WaitAddHeart -= value; + Heart += value; + } + + public void MoveAllWaitValue() + { + Debug.Log($"WaitAddValue:{WaitAddCoin},{WaitAddHeart}"); + MoveCoin(WaitAddCoin); + MoveHeart(WaitAddHeart); + } + // public void ChangeAvatar(AvatarData avatarData){ // newAvatarIdList.Remove(avatarData.id); // } diff --git a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs index a3962ef9..cd7ed8de 100644 --- a/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs +++ b/popcorn/Assets/MyGame/Scripts/InitializeUnitySettings.cs @@ -27,5 +27,9 @@ public sealed class InitializeUnitySettings : MonoBehaviour { Application.targetFrameRate = 60; Input.multiTouchEnabled = false; + + // 遅延させていたパラメータを追加 + GameDataManager.GameData.MoveAllWaitValue(); + GameDataManager.SaveGameData(); } }