From b5c0c871b951cab002ef3f29a33c072113c6480c Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 15 Apr 2022 11:16:43 +0900 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8B=95=E8=AA=BF=E7=90=86=E3=81=AE?= =?UTF-8?q?=E9=80=B2=E6=8D=97=E8=A8=88=E7=AE=97=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Main/Scripts/AutoCookProgressView.cs | 3 ++- popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) 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); }