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

自動調理受け取り後のUI修正

This commit is contained in:
kimura 2022-04-15 16:03:45 +09:00
parent 40e375639d
commit 45983e2b70
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookView.cs
View File

@ -21,6 +21,11 @@ namespace MyGame.Scenes.Main.Scripts
private IDisposable timerDisposable; private IDisposable timerDisposable;
public void Initialize() public void Initialize()
{
Ready();
}
public void Ready()
{ {
cookAnimator.enabled = false; cookAnimator.enabled = false;
SetProgress(0f); SetProgress(0f);
@ -71,7 +76,7 @@ namespace MyGame.Scenes.Main.Scripts
AutoCookProgressView.ShowDialog(); AutoCookProgressView.ShowDialog();
break; break;
case CookState.Complete: case CookState.Complete:
AutoCookCompleteView.ShowDialog(); AutoCookCompleteView.ShowDialog(onClose);
break; break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();

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

@ -80,8 +80,7 @@ public class KitchenManager : MonoBehaviour
{ {
CookState state; CookState state;
var remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); var remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
var isReady = gameData.AutoCookProducts.Length == 0; if (gameData.AutoCookProducts.Length > 0)
if (!isReady)
{ {
autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds); autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds);
} }
@ -104,13 +103,11 @@ public class KitchenManager : MonoBehaviour
} }
remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
isReady = gameData.AutoCookProducts.Length == 0; if (gameData.AutoCookProducts.Length == 0)
var isFinished = remainingTime.TotalSeconds <= 0;
if (isReady)
{ {
state = CookState.Ready; state = CookState.Ready;
} }
else if (isFinished) else if (remainingTime.TotalSeconds <= 0)
{ {
state = CookState.Complete; state = CookState.Complete;
} }
@ -120,9 +117,16 @@ public class KitchenManager : MonoBehaviour
} }
autoCookView.ShowDialog(state, () => autoCookView.ShowDialog(state, () =>
{
if (gameData.AutoCookProducts.Length == 0)
{
autoCookView.Ready();
}
else
{ {
remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow); remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds); autoCookView.ResetTimer((int)remainingTime.TotalSeconds, (int)TimeSpan.FromHours(autoCookData.duration).TotalSeconds);
}
}); });
}).AddTo(this); }).AddTo(this);
} }