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

Merge branch 'feature/update_ver1.2.0' of bitbucket.org:usaya/popcorn into feature/update_ver1.2.0

This commit is contained in:
koya_15 2022-04-15 10:43:11 +09:00
parent 510f1cd987 2ef32ee565
commit 5938a90aa6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
View File

@ -252,11 +252,15 @@ public class DebugOptionManager : MonoBehaviour
.DistinctUntilChanged() .DistinctUntilChanged()
.Subscribe(x => .Subscribe(x =>
{ {
gameData.AutoCookUsesCount = 0;
gameData.AutoCookLevel = autoCookList[x].level; gameData.AutoCookLevel = autoCookList[x].level;
// level1ならチュートリアル復活 // level1ならチュートリアル復活
if (gameData.AutoCookLevel == 1) if (gameData.AutoCookLevel == 1)
{ {
gameData.FinishedFlags &= ~TutorialFlag.AutoCook; gameData.FinishedFlags &= ~TutorialFlag.AutoCook;
gameData.AutoCookFinishTime = DateTime.UtcNow.ToBinary();
gameData.AutoCookProducts = Array.Empty<int>();
gameData.AutoCookUsesCount = 0;
} }
}).AddTo(this); }).AddTo(this);

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

@ -94,7 +94,11 @@ public class KitchenManager : MonoBehaviour
{ {
gameData.FinishedFlags |= TutorialFlag.AutoCook; gameData.FinishedFlags |= TutorialFlag.AutoCook;
GameDataManager.SaveGameData(); GameDataManager.SaveGameData();
autoCookView.ShowDialog(CookState.Ready); autoCookView.ShowDialog(CookState.Ready, () =>
{
remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
autoCookView.ResetTimer((int)remainingTime.TotalSeconds, autoCookData.duration);
});
}); });
return; return;
} }
@ -117,6 +121,7 @@ public class KitchenManager : MonoBehaviour
autoCookView.ShowDialog(state, () => autoCookView.ShowDialog(state, () =>
{ {
remainingTime = DateTime.FromBinary(gameData.AutoCookFinishTime).Subtract(DateTime.UtcNow);
autoCookView.ResetTimer((int)remainingTime.TotalSeconds, autoCookData.duration); autoCookView.ResetTimer((int)remainingTime.TotalSeconds, autoCookData.duration);
}); });
}).AddTo(this); }).AddTo(this);