From 6efd66818926bbde8f74e9f4215dba3d7dcded92 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Thu, 23 Jun 2022 16:42:10 +0900
Subject: [PATCH] add scroll game param

---
 .../Scenes/MiniGame/Scripts/ScrollGameScoreData.cs  |  8 ++++++++
 .../MiniGame/Scripts/ScrollGameScoreData.cs.meta    |  3 +++
 popcorn/Assets/MyGame/Scripts/Const.cs              |  1 +
 popcorn/Assets/MyGame/Scripts/GameDataManager.cs    | 13 +++++++++++++
 popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs    |  9 +++++++++
 popcorn/Assets/MyGame/Scripts/TransitionManager.cs  |  2 ++
 popcorn/ProjectSettings/EditorBuildSettings.asset   |  3 +++
 7 files changed, 39 insertions(+)
 create mode 100644 popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs
 create mode 100644 popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs.meta

diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs
new file mode 100644
index 00000000..e4a1e675
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs
@@ -0,0 +1,8 @@
+namespace MyGame.Scenes.MiniGame.Scripts
+{
+    public class ScrollGameScoreData
+    {
+        public int Id;
+        public int Score;
+    }
+}
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs.meta b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs.meta
new file mode 100644
index 00000000..b14a756c
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameScoreData.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5926a78d10f24c7cb6e2015911ea3f5e
+timeCreated: 1655970230
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs
index be6a4bb3..6e045411 100644
--- a/popcorn/Assets/MyGame/Scripts/Const.cs
+++ b/popcorn/Assets/MyGame/Scripts/Const.cs
@@ -31,6 +31,7 @@ public static class Const {
     public static readonly int ShopCustomizeDefaultStockId = 4;
     public static readonly int ShopCustomizeDefaultDecoration2Id = 5;
     public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5;
+    public static readonly int ScrollGameDailyPlayMaxCount = 4;
 
     // tag
     public static readonly string GameDataTag = "GameData";
diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs
index 48112e3c..792c5a44 100644
--- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
 using MyGame.Scenes.marketing.Scripts;
+using MyGame.Scenes.MiniGame.Scripts;
 using MyGame.Scripts;
 
 public enum AdRewardType {
@@ -174,6 +175,16 @@ public sealed class GameData {
     public int[] ShopCustomizeMyItems;
     [DataMember(Name = "Data61")] 
     public ShopCustomizeSettings ShopCustomizeSettings;
+    
+    // スクロールゲーム
+    [DataMember(Name = "Data62")]
+    public int ScrollGameTodayPlayCount;
+    [DataMember(Name = "Data63")]
+    public long ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary();
+    [DataMember(Name = "Data64")]
+    public List<ScrollGameScoreData> ScrollGamePlaceScoreList;
+    [DataMember(Name = "Data65")]
+    public List<ScrollGameScoreData> ScrollGameStageScoreList;
 
 
         // mission
@@ -503,6 +514,8 @@ public sealed class GameData {
         AutoCookProducts = AutoCookProducts ?? Array.Empty<int>();
         ShopCustomizeSettings = ShopCustomizeSettings ?? new ShopCustomizeSettings();
         ShopCustomizeMyItems = ShopCustomizeMyItems ?? Array.Empty<int>();
+        ScrollGamePlaceScoreList = ScrollGamePlaceScoreList ?? new List<ScrollGameScoreData>();
+        ScrollGameStageScoreList = ScrollGameStageScoreList ?? new List<ScrollGameScoreData>();
     }
     private Dictionary<int, int> ArrayToDictionary(KeyValueOfintint[] array){
         var dictionary = new Dictionary<int, int>();
diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
index e45e3e84..970a2068 100644
--- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
+++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs
@@ -166,6 +166,13 @@ public enum ShopCustomizeBonusCategory
     AdWalker = 3,
 }
 
+public enum ScrollGameDifficulty
+{
+    Easy = 1,
+    Normal = 2,
+    Hard = 3,
+}
+
 [Serializable]
 public sealed class MissionData
 {
@@ -518,6 +525,7 @@ public sealed class ScrollGamePlaceData
     public int placeId;
     public int needScore;
     public int itemId;
+    public int recipeId;
     public int customizeId;
 }
 
@@ -526,6 +534,7 @@ public sealed class ScrollGameStageData
 {
     public int id;
     public int placeId;
+    public int difficulty;
     public int needScore;
     public string beginPrefabName;
     public string randomPrefabName;
diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs
index d2ad1773..5034329b 100644
--- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs
@@ -49,6 +49,8 @@ public enum GameScenes
     CustomizationDetails,
     Customize,
     CustomizeExplanation,
+    MiniGame,
+    WatchMovieMiniGame,
 }
 
 public enum SceneType
diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset
index 1b1389b2..cec746b5 100644
--- a/popcorn/ProjectSettings/EditorBuildSettings.asset
+++ b/popcorn/ProjectSettings/EditorBuildSettings.asset
@@ -140,4 +140,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/MyGame/Scenes/MiniGame/MiniGameStageTest.unity
     guid: 764d0f7b58a7c43efb0d780f9af61b71
+  - enabled: 1
+    path: Assets/MyGame/Scenes/MiniGame/WatchMovieMiniGame.unity
+    guid: e39bbcad90cf4704f9164a3d6d574a76
   m_configObjects: {}