From 61b6f17673636fd7249079e6b872ea3b5028c666 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 24 Jun 2022 14:07:10 +0900
Subject: [PATCH] =?UTF-8?q?const=E3=81=9D=E3=81=AE=E4=BB=96=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs   | 1 -
 popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs  | 6 +++---
 popcorn/Assets/MyGame/Scripts/Const.cs                     | 5 +++++
 popcorn/Assets/MyGame/Scripts/GameDataManager.cs           | 7 +++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
index e66f9440..e50e6c73 100644
--- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs
@@ -89,7 +89,6 @@ namespace MyGame.Scenes.MiniGame.Scripts
                             }).AddTo(this);
                         break;
                     case GameState.Success:
-                        resultManager.ShowResult();
                         break;
                     case GameState.Failure:
                         break;
diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
index b9e4a8b8..3452336d 100644
--- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
+++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
@@ -154,7 +154,7 @@ public class Shopping : MonoBehaviour
         }
     }
 
-    private void AddItem(ShopData shopData, int amount)
+    public static void AddItem(ShopData shopData, int amount)
     {
         var gameData = GameDataManager.GameData;
         switch (shopData.Category)
@@ -178,13 +178,13 @@ public class Shopping : MonoBehaviour
                     gameData.MyRecipes = new List<int>(gameData.MyRecipes){shopData.itemId}.ToArray();
                     gameData.DailyRecipeGetCount++;
                 }
-            break;
+                break;
             case ItemCategory.Pan:
                 if (!gameData.Pans.Contains(shopData.itemId))
                 {
                     gameData.Pans = new List<int>(gameData.Pans){shopData.itemId}.ToArray();
                 }
-            break;
+                break;
             default:
                 throw new ArgumentOutOfRangeException();
         }
diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs
index 6e045411..d6e19eba 100644
--- a/popcorn/Assets/MyGame/Scripts/Const.cs
+++ b/popcorn/Assets/MyGame/Scripts/Const.cs
@@ -32,6 +32,7 @@ public static class Const {
     public static readonly int ShopCustomizeDefaultDecoration2Id = 5;
     public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5;
     public static readonly int ScrollGameDailyPlayMaxCount = 4;
+    public static readonly int ScrollGameDailyResetOffsetHours = 0; // 翌日0時基準
 
     // tag
     public static readonly string GameDataTag = "GameData";
@@ -62,6 +63,8 @@ public static class Const {
     public static readonly string ShopCustomizeDataSheet = "ShopCustomizeData";
     public static readonly string ShopCustomizeLevelDataSheet = "ShopCustomizeLevelData";
     public static readonly string ShopCustomizeBonusDataSheet = "ShopCustomizeBonusData";
+    public static readonly string ScrollGamePlaceDataSheet = "ScrollGamePlaceData";
+    public static readonly string ScrollGameStageDataSheet = "ScrollGameStageData";
 
     // language
     public static readonly string LangJapanDataSheet = "LangJapanData";
@@ -99,6 +102,8 @@ public static class Const {
         new SheetData(Const.ShopCustomizeDataSheet),
         new SheetData(Const.ShopCustomizeLevelDataSheet),
         new SheetData(Const.ShopCustomizeBonusDataSheet),
+        new SheetData(Const.ScrollGamePlaceDataSheet),
+        new SheetData(Const.ScrollGameStageDataSheet),
     };
     public static readonly SheetData[] LanguageSheetNameList = new SheetData[]{
         new SheetData(Const.LangJapanDataSheet, "LanguageData"),
diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs
index 792c5a44..e84c2b72 100644
--- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs
@@ -366,6 +366,7 @@ public sealed class GameData {
         return DateTime.FromBinary(lastDailyMissionSetTime).ToLocalTime().AddHours(Const.DailyMissionResetOffset).Date
             .AddDays(1).AddHours(-Const.DailyMissionResetOffset)
             .Subtract(DateTime.UtcNow.ToLocalTime());
+        // return CalcLimitTime(lastDailyMissionSetTime, Const.DailyMissionResetOffset); // 要検証
     }
 
     public void FinishTutorial()
@@ -430,6 +431,12 @@ public sealed class GameData {
             FlavorId = -1,
         });
     }
+    
+    private TimeSpan CalcLimitTime(long time, int offsetHour) => DateTime.FromBinary(time).ToLocalTime()
+        .Date.AddDays(1).AddHours(offsetHour)
+        .Subtract(DateTime.UtcNow.ToLocalTime());
+
+    public TimeSpan GetScrollGameLimitTime() => CalcLimitTime(ScrollGameLastPlayTime, Const.ScrollGameDailyResetOffsetHours);
 
     // public void ChangeAvatar(AvatarData avatarData){
     //     newAvatarIdList.Remove(avatarData.id);