diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs index 85580610..391de39e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs @@ -42,7 +42,7 @@ namespace MyGame.Scenes.Main.Scripts }); }).AddTo(this); - ResetTimer((int) remainingTime.TotalSeconds, autoCookData.duration); + ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds); } private void SetProgressImage(float value) @@ -61,6 +61,7 @@ namespace MyGame.Scenes.Main.Scripts // タイマーの更新処理 timerDisposable?.Dispose(); SetTime(remainingTime); + SetProgressImage(1f - (float)remainingTime/duration); timerDisposable = Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f)) .Select(x => (int)(remainingTime - x)) .TakeWhile(x => x > 0) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 4a511a72..fa2a836d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -83,7 +83,7 @@ public class KitchenManager : MonoBehaviour var isReady = gameData.AutoCookProducts.Length == 0; if (!isReady) { - autoCookView.ResetTimer((int)remainingTime.TotalSeconds, autoCookData.duration); + autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds); } autoCookView.Button.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => { @@ -97,7 +97,7 @@ public class KitchenManager : MonoBehaviour autoCookView.ShowDialog(CookState.Ready, () => { remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); - autoCookView.ResetTimer((int)remainingTime.TotalSeconds, autoCookData.duration); + autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds); }); }); return; @@ -122,7 +122,7 @@ public class KitchenManager : MonoBehaviour autoCookView.ShowDialog(state, () => { remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); - autoCookView.ResetTimer((int)remainingTime.TotalSeconds, autoCookData.duration); + autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds); }); }).AddTo(this); }