Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

# Conflicts:
#	popcorn/Assets/MyGame/Scenes/marketing/marketing.unity

popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt

@@ -1 +1 @@
-9zER4x2VYtqIrv1IDo/9b+5FDruS5oQHusXY2UyCMNEL6IZhn/o8dYZjwgvecI5U
+b022WR6xvqTzMgUJZxplP8cd1vINFi6qUnHnitukZjn+IsGSGzkigyHIAn43B2wv

popcorn/Assets/MyGame/Resources/Data/PanData.txt

@@ -1 +1 @@
-EnYKCQdX0S7nybjUaSVA43od6EK4loPNyR9ACcfwe97WyFKJrjPm7gTloN+L6RApOhbaL7ZNjwQEBM0VQDpPN9DL6tbROyQ+sqvq2dyozK4jmSvZao2DkrmFPdazPrfjoRBOIU7clSHeaObEJ4hxkNxgeAjEH313TdOmYOxdFHsR1nqMeu8VsBB2HECF5/GSZb9PnAmuVKEh0DbhNzfXb8l/KyPbluJhsmt8JaIwlZPoi5oE9m+GidtlEvqoqW8b8mMqlMgRsWJPN+MDlulkuRfeLC5SRO/dPALM5s1ZE1ir36r/nwiYDBicsPK8huRqcyffQrHYNBVojUJF1I2jAw==
+hnfIoHLTIO78KQab+gbOMMtv7vgOyoTHmaWNRDXOxQNzkGdOhXTO57DYilUlMI5HUsbxAe9ctGHP3jwlLulxR9jXP2sdGn+adJV4Zoto5A4ZJE95BrmGURxoPzxhtUZMURjbqxclXW54+4GrDgsjJpcWwLQJmwuj4bIVb3kI/Y1Baey5dXesyqn+x0PrWcGkatmvx5EVrMKmP/BFTheJezvsEl4W7Wpy8hOOJw6hzZqQZgxE/PcSrIz+bBLKd5O4MmXs04pKJ5Z826TWTqPNth22LWIgPU5s29MgBFBCKbQKwz6CMYtkG8HDtwPNO8Z9y0uovbQJh08Sf7EckFiBIg==

popcorn/Assets/MyGame/Scenes/CornField/CornField.unity

@@ -789,18 +789,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
---- !u!114 &387414333 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 387414332}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!224 &387414334 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689,
@@ -1069,7 +1057,6 @@ GameObject:
   m_Component:
   - component: {fileID: 715847676}
   - component: {fileID: 715847675}
-  - component: {fileID: 715847678}
   m_Layer: 0
   m_Name: Manager
   m_TagString: Untagged
@@ -1118,24 +1105,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &715847678
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 715847674}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  coinIconTransform: {fileID: 0}
-  coinCountText: {fileID: 387414333}
-  coinAnimator: {fileID: 0}
-  coinPrefab: {fileID: 0}
-  duration: 1
-  rootTransform: {fileID: 0}
 --- !u!114 &730756546 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7809777061605929427, guid: caaa748dbeed576499e8cae74d33f689,

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs

@@ -52,10 +52,10 @@ public class CornField : MonoBehaviour
         
         // データ
         var gameData = GameDataManager.GameData;
-        CoinManager.Instance.ChangeCoin(gameData.coin);
+        CoinManager.Instance.ChangeCoin(gameData.Coin);
         HeartMeter.Instance.Initialize();
         HeartMeter.Instance.SetHeart(gameData.Heart);
-        counterView.Initialize(gameData.cornSeed);
+        counterView.Initialize(gameData.CornSeed);
         SetData();
 
         // 畑リセット
@@ -167,7 +167,7 @@ public class CornField : MonoBehaviour
                         VibrationManager.Instance.PlayVibrationOnce();
                         var harvestCount = fieldData.FirstOrDefault(x => x.Type == CornFieldUpgradeType.FieldCenter && x.level == (int)progressData.Level)?.harvested ?? 1;
                         var harvestedCorn = fieldData.FirstOrDefault(x => x.Type == CornFieldUpgradeType.Machine && x.level == gameData.MachineLevel)?.harvested ?? 20;
-                        gameData.cornSeed += harvestedCorn * harvestCount;
+                        gameData.CornSeed += harvestedCorn * harvestCount;
                         var seedlingTransform = seedling.transform;
                         
                         var harvestEffect = Instantiate(harvestEffectPrefab, seedlingTransform);

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs

@@ -122,7 +122,7 @@ public class CornFieldReinforcement : MonoBehaviour
             gameData.PlantLineDataList.Add(new PlantLineData(type, CornFieldRank.Rank1));
         }
         CoinManager.Instance.SubCoin(price);
-        gameData.coin = CoinManager.Instance.OwnCoin;
+        gameData.Coin = CoinManager.Instance.OwnCoin;
         GameDataManager.SaveGameData();
     }
     
@@ -131,7 +131,7 @@ public class CornFieldReinforcement : MonoBehaviour
         var gameData = GameDataManager.GameData;
         gameData.MachineLevel++;
         CoinManager.Instance.SubCoin(price);
-        gameData.coin = CoinManager.Instance.OwnCoin;
+        gameData.Coin = CoinManager.Instance.OwnCoin;
         GameDataManager.SaveGameData();
     }
     

popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs

@@ -50,7 +50,7 @@ public class DebugOptionManager : MonoBehaviour
             };
             gameData.SeedlingDataList = new List<SeedlingProgressData>();;
             gameData.MachineLevel = 1;
-            gameData.cornSeed = 0;
+            gameData.CornSeed = 0;
         }).AddTo(this);
 
         resetMaterialButton.OnClickAsObservable().Subscribe(_ =>
@@ -100,10 +100,10 @@ public class DebugOptionManager : MonoBehaviour
             gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList());
         }).AddTo(this);
 
-        coinCount.text = $"{gameData.coin}";
+        coinCount.text = $"{gameData.Coin}";
         coinCount.OnValueChangedAsObservable().Subscribe(x =>
         {
-            gameData.coin = Int32.Parse(x);
+            gameData.Coin = Int32.Parse(x);
         }).AddTo(this);
         
         heartCount.text = $"{gameData.Heart}";

popcorn/Assets/MyGame/Scenes/Main/Main.unity

@@ -3527,7 +3527,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1870432534}
   - component: {fileID: 1870432533}
-  - component: {fileID: 1870432535}
   - component: {fileID: 1870432536}
   m_Layer: 0
   m_Name: Manager
@@ -3565,24 +3564,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1870432535
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1870432532}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  coinIconTransform: {fileID: 0}
-  coinCountText: {fileID: 3664916832445709977}
-  coinAnimator: {fileID: 0}
-  coinPrefab: {fileID: 0}
-  duration: 0.5
-  rootTransform: {fileID: 0}
 --- !u!114 &1870432536
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4597,18 +4578,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
---- !u!114 &3664916832445709977 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 3664916832445709976}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!224 &3664916832445709978 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689,

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab

@@ -2019,6 +2019,61 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3664916832844628215}
     m_Modifications:
+    - target: {fileID: 137127162547959670, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127162547959670, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163028694528, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 137127163230790448, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963,
         type: 3}
       propertyPath: m_Name
@@ -2129,6 +2184,22 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 137127164258565651, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: coinPrefab
+      value: 
+      objectReference: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
+        type: 3}
+    - target: {fileID: 7885431782403753906, guid: ac3be7383b736d941b251a588e626963,
+        type: 3}
+      propertyPath: rootTransform
+      value: 
+      objectReference: {fileID: 3664916832844628215}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3}
 --- !u!224 &3664916834242367713 stripped

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a2309e5e619554230b1f6d3d9426ed51
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 66c0408cd45e7422cb6d59d2bdf4e998
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab

@@ -391,6 +391,7 @@ GameObject:
   - component: {fileID: 1628107519061200455}
   - component: {fileID: 1628107519061200449}
   - component: {fileID: 1628107519061200448}
+  - component: {fileID: 6952489502391719718}
   m_Layer: 5
   m_Name: detail_Mission
   m_TagString: Untagged
@@ -457,6 +458,26 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6952489502391719718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1628107519061200454}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 516f465654bf46d094f3493e145a183b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rewardButton: {fileID: 1628107518696448699}
+  disableObject: {fileID: 1628107520490624917}
+  rewardedObject: {fileID: 1628107518883220827}
+  coinFrame: {fileID: 1628107518996228242}
+  coinText: {fileID: 1628107519630045354}
+  missionText: {fileID: 1628107520295442136}
+  progressText: {fileID: 1628107520281042222}
+  progressBar: {fileID: 1628107519738777243}
 --- !u!1 &1628107519296330554
 GameObject:
   m_ObjectHideFlags: 0
@@ -1177,7 +1198,7 @@ GameObject:
   - component: {fileID: 1628107520295442137}
   - component: {fileID: 1628107520295442136}
   m_Layer: 5
-  m_Name: Text_detai
+  m_Name: Text_detail
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab

@@ -363,6 +363,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 137127163028694528}
+  - component: {fileID: 4683425562393467656}
   m_Layer: 5
   m_Name: Icon_Coin
   m_TagString: Untagged
@@ -382,6 +383,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 137127163537145805}
+  - {fileID: 5192989110466567273}
+  - {fileID: 6352661063798339839}
+  - {fileID: 8446457194566633772}
+  - {fileID: 361167645818356693}
+  - {fileID: 3988807289296861174}
+  - {fileID: 3005495916550676559}
+  - {fileID: 809998964083309134}
   m_Father: {fileID: 137127164258565651}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -390,6 +398,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!95 &4683425562393467656
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 137127163028694531}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 483d9c381d24f1f47a5cb159dda7c842, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &137127163230790451
 GameObject:
   m_ObjectHideFlags: 0
@@ -954,6 +981,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 137127164258565651}
+  - component: {fileID: 7885431782403753906}
   - component: {fileID: 137127164258565649}
   - component: {fileID: 137127164258565648}
   - component: {fileID: 137127164258565655}
@@ -986,6 +1014,24 @@ RectTransform:
   m_AnchoredPosition: {x: 26, y: -39}
   m_SizeDelta: {x: 0, y: 74}
   m_Pivot: {x: 0, y: 1}
+--- !u!114 &7885431782403753906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 137127164258565650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  coinIconTransform: {fileID: 137127163028694528}
+  coinCountText: {fileID: 137127163230790449}
+  coinAnimator: {fileID: 4683425562393467656}
+  coinPrefab: {fileID: 0}
+  duration: 0.5
+  rootTransform: {fileID: 0}
 --- !u!222 &137127164258565649
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1255,6 +1301,228 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1682402780698601102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3988807289296861174}
+  - component: {fileID: 5459197641702664116}
+  - component: {fileID: 3448151413456069115}
+  m_Layer: 5
+  m_Name: Image_coin_e
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3988807289296861174
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1682402780698601102}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5459197641702664116
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1682402780698601102}
+  m_CullTransparentMesh: 0
+--- !u!114 &3448151413456069115
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1682402780698601102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 6b6ef205b1355db4f96c259432351c50, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3190352682026950169
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 361167645818356693}
+  - component: {fileID: 7944778184675655917}
+  - component: {fileID: 8089263319837516631}
+  m_Layer: 5
+  m_Name: Image_coin_d
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &361167645818356693
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190352682026950169}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7944778184675655917
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190352682026950169}
+  m_CullTransparentMesh: 0
+--- !u!114 &8089263319837516631
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3190352682026950169}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 60ea2603d1de7db439be110aba8e1a06, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3700318879413716858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3005495916550676559}
+  - component: {fileID: 6753344066014553599}
+  - component: {fileID: 3508190518858147698}
+  m_Layer: 5
+  m_Name: Image_coin_f
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3005495916550676559
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3700318879413716858}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6753344066014553599
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3700318879413716858}
+  m_CullTransparentMesh: 0
+--- !u!114 &3508190518858147698
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3700318879413716858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: aa99a8afce5ebe44eb27d3b7863d3b7a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5097575317734896701
 GameObject:
   m_ObjectHideFlags: 0
@@ -1373,3 +1641,299 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5887459306579115384
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5192989110466567273}
+  - component: {fileID: 7042203978495017607}
+  - component: {fileID: 5726870976067228893}
+  m_Layer: 5
+  m_Name: Image_coin_a
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5192989110466567273
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5887459306579115384}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7042203978495017607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5887459306579115384}
+  m_CullTransparentMesh: 0
+--- !u!114 &5726870976067228893
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5887459306579115384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 4425aa3ec48519546b72cc0a9448c2ef, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6573687931001727739
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6352661063798339839}
+  - component: {fileID: 7955418308314733384}
+  - component: {fileID: 6051088593504592836}
+  m_Layer: 5
+  m_Name: Image_coin_b
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6352661063798339839
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6573687931001727739}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7955418308314733384
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6573687931001727739}
+  m_CullTransparentMesh: 0
+--- !u!114 &6051088593504592836
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6573687931001727739}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: d919899659cd2714e8396a059015062b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6710226836618071116
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8446457194566633772}
+  - component: {fileID: 1553537307337056418}
+  - component: {fileID: 9122253556801634577}
+  m_Layer: 5
+  m_Name: Image_coin_c
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8446457194566633772
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6710226836618071116}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1553537307337056418
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6710226836618071116}
+  m_CullTransparentMesh: 0
+--- !u!114 &9122253556801634577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6710226836618071116}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: bb3bb9ab8a6fdc64a901cd21bf76a87b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8344812374716399794
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 809998964083309134}
+  - component: {fileID: 3171446885968625601}
+  - component: {fileID: 2339766593651410906}
+  m_Layer: 5
+  m_Name: Image_coin_g
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &809998964083309134
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8344812374716399794}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 137127163028694528}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 86, y: 92}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3171446885968625601
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8344812374716399794}
+  m_CullTransparentMesh: 0
+--- !u!114 &2339766593651410906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8344812374716399794}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 2aba0ae42cd9d5a40bbe1235de7494c4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs

@@ -21,7 +21,7 @@ public class KitchenManager : MonoBehaviour
         });
         
         var gameData = GameDataManager.GameData;
-        CoinManager.Instance.ChangeCoin(gameData.coin);
+        CoinManager.Instance.ChangeCoin(gameData.Coin);
         HeartMeter.Instance.Initialize();
         HeartMeter.Instance.SetHeart(gameData.Heart);
 

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs

@@ -0,0 +1,34 @@
+using System;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MissionCompleteView : MonoBehaviour
+{
+    private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger");
+    private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
+    
+    [SerializeField] private Animator backgroundAnimator;
+    [SerializeField] private GameObject normalMissionObject;
+    [SerializeField] private GameObject dailyMissionObject;
+    [SerializeField] private Button closeButton;
+    [SerializeField] private Text coinText;
+    
+    private void Start()
+    {
+        var (missionData, callback) = LocalCacheManager.Load< (MissionData, Action)>(MissionManager.MissionDataTag);
+        closeButton.OnClickAsObservable().Subscribe(_ =>
+        {
+            callback?.Invoke();
+            transform.SetLocalScale(0);
+            backgroundAnimator.SetTrigger(CloseTrigger);
+            this.CallWaitForSeconds(.25f, () =>
+            {
+                TransitionManager.Instance.UnloadScene(GameScenes.MissionAchievement);
+            });
+        }).AddTo(this);
+        normalMissionObject.SetActive(missionData.Category == MissionCategory.Normal);
+        dailyMissionObject.SetActive(missionData.Category == MissionCategory.Daily);
+        coinText.text = missionData.reward.ToString();
+    }
+}

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionCompleteView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5f2a9cddac65495987f3657236411f7a
+timeCreated: 1632987547

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MissionListView : MonoBehaviour
+{
+    [SerializeField] private MissionTabView normalTab;
+    [SerializeField] private MissionTabView dailyTab;
+    [SerializeField] private ScrollRect scrollRect;
+    [SerializeField] private MissionView itemViewPrefab;
+
+    private readonly ReactiveProperty<MissionCategory> selectedTab = new ReactiveProperty<MissionCategory>();
+    public IReadOnlyReactiveProperty<MissionCategory> SelectedTab => selectedTab;
+    private readonly List<(MissionCategory category, RectTransform content)> tabs = new List<(MissionCategory, RectTransform)>();
+
+    private void Awake()
+    {
+        scrollRect.content.DestroyAllChildrens();
+    }
+    
+    private void Start()
+    {
+        selectedTab.AddTo(this);
+        selectedTab.Value = MissionCategory.Normal;
+        selectedTab.Subscribe(tabName =>
+        {
+            // タブ表示切り替え
+            normalTab.SetToggle(tabName == MissionCategory.Normal);
+            dailyTab.SetToggle(tabName == MissionCategory.Daily);
+            // コンテンツ切り替え
+            tabs.ForEach(x =>
+            {
+                x.content.gameObject.SetActive(x.category == tabName);
+                if (x.category == tabName)
+                {
+                    scrollRect.content = x.content;
+                    LayoutRebuilder.ForceRebuildLayoutImmediate(scrollRect.content);
+                    scrollRect.verticalNormalizedPosition = 1;
+                }
+            });
+        }).AddTo(this);
+        normalTab.ClickObservable.Select(_ => MissionCategory.Normal)
+            .Merge(dailyTab.ClickObservable.Select(_ => MissionCategory.Daily))
+            .Subscribe(tabName =>
+            {
+                selectedTab.Value = tabName;
+            }).AddTo(this);
+    }
+
+    public MissionView AddItemView(MissionData missionData)
+    {
+        var index = tabs.FindIndex(x => x.category == missionData.Category);
+        if (index == -1)
+        {
+            index = tabs.Count;
+            var content = scrollRect.content;
+            tabs.Add((missionData.Category, Instantiate(content, content.parent)));
+        }
+        return Instantiate(itemViewPrefab, tabs[index].content);
+    }
+
+    public void SetTab(MissionCategory category)
+    {
+        selectedTab.SetValueAndForceNotify(category);
+    }
+}

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bd3a66b31b924bb5858007ae9ebe1729
+timeCreated: 1632980593

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs

@@ -0,0 +1,99 @@
+using System;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MissionManager : MonoBehaviour
+{
+    public static readonly string MissionDataTag = "MissionData";
+    private static readonly string TimeFormat = "更新まで：{0}時間{1}分{2}秒";
+    private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger");
+    private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
+    
+    [SerializeField] private Animator backgroundAnimator;
+    [SerializeField] private Button closeButton;
+    [SerializeField] private MissionListView listView;
+    [SerializeField] private Text timeLimitText;
+
+    private void Start()
+    {
+        closeButton.OnClickAsObservable().Subscribe(_ =>
+        {
+            LocalCacheManager.Remove(MissionDataTag);
+            transform.SetLocalScale(0);
+            backgroundAnimator.SetTrigger(CloseTrigger);
+            this.CallWaitForSeconds(.25f, () =>
+            {
+                TransitionManager.Instance.UnloadScene(GameScenes.Mission);
+            });
+        }).AddTo(this);
+
+        listView.SelectedTab.Subscribe(category =>
+        {
+            timeLimitText.gameObject.SetActive(category == MissionCategory.Daily);
+        }).AddTo(this);
+
+        // ミッション読み込み
+        var missionList = SpreadsheetDataManager.Instance.GetBaseDataList<MissionData>(Const.MissionDataSheet);
+        
+        // ミッション表示
+        foreach (var missionData in missionList)
+        {
+            var missionView = listView.AddItemView(missionData);
+            var progressValue = GetProgressValue(missionData);
+            missionView.SetData(missionData, progressValue);
+            missionView.SetButtonActive(missionData.count <= progressValue);
+            if (GameDataManager.GameData.AchievedMission.Contains(missionData.id)) // 達成済み
+            {
+                missionView.SetRewarded();
+            }
+            
+            // リワード獲得
+            missionView.RewardButton.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
+            {
+                LocalCacheManager.Save(MissionDataTag, (missionData, new Action(() =>
+                {
+                    GetReward(missionData);
+                    missionView.SetRewarded();
+                    // 達成ID保存
+                    GameDataManager.GameData.AchievedMission.Add(missionData.id);
+                })));
+                TransitionManager.Instance.LoadSceneAdditive(GameScenes.MissionAchievement);
+            }).AddTo(missionView);
+        }
+        listView.SetTab(MissionCategory.Normal);
+    }
+
+    private int GetProgressValue(MissionData missionData)
+    {
+        var gameData = GameDataManager.GameData;
+        switch (missionData.Condition)
+        {
+            case MissionCondition.CornCount:
+                return gameData.TotalAddCornSeed;
+            case MissionCondition.CustomerCount: // タップor来客した数
+                return gameData.TotalCustomerCount;
+            case MissionCondition.SalesCount: // 売った数
+                return gameData.TotalSales;
+            case MissionCondition.RareSalesCount: // レアを売った数
+                return gameData.RareTotalSales;
+            case MissionCondition.RecipeCount: // レシピの数
+                return gameData.MyRecipes.Length;
+            case MissionCondition.CoinConsumeCount: // コイン消費数
+                return gameData.TotalSubCoin;
+            case MissionCondition.SaltSalesCount:
+                return gameData.GetTotalSalesByFlavor(2);
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+
+    private void GetReward(MissionData missionData)
+    {
+        if (missionData.RewardType == MissionRewardType.Coin)
+        {
+            CoinManager.Instance.AddCoinWithEffect(missionData.reward, () => {});
+            GameDataManager.GameData.Coin = CoinManager.Instance.OwnCoin;
+        }
+    }
+}

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f36629f9262b466a9fab4c31cdf6f56c
+timeCreated: 1632979804

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionTabView.cs

@@ -0,0 +1,18 @@
+using System;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MissionTabView : MonoBehaviour
+{
+    [SerializeField] private Button button;
+    [SerializeField] private GameObject onObject;
+    [SerializeField] private GameObject offObject;
+
+    public IObservable<Unit> ClickObservable => button.OnClickAsObservable().TakeUntilDestroy(this);
+    public void SetToggle(bool active)
+    {
+        onObject.SetActive(active);
+        offObject.SetActive(!active);
+    }
+}

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionTabView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 43c4132ef676491aa70fbf56f67e8436
+timeCreated: 1632987044

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs

@@ -0,0 +1,41 @@
+using System;
+using TMPro;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MissionView : MonoBehaviour
+{
+    private static readonly string progressFormat = "{0} / {1}";
+    [SerializeField] private Button rewardButton;
+    [SerializeField] private GameObject disableObject;
+    [SerializeField] private GameObject rewardedObject;
+    [SerializeField] private GameObject coinFrame;
+    [SerializeField] private Text coinText;
+    [SerializeField] private Text missionText;
+    [SerializeField] private TextMeshProUGUI progressText;
+    [SerializeField] private Slider progressBar;
+    public IObservable<Unit> RewardButton => rewardButton.OnClickAsObservable().TakeUntilDestroy(this);
+
+    public void SetData(MissionData missionData, int curentValue)
+    {
+        coinText.text = missionData.reward.ToString();
+        progressBar.value = Mathf.InverseLerp(0, missionData.count, curentValue);
+        progressText.text = string.Format(progressFormat, curentValue, missionData.count);
+    }
+
+    public void SetButtonActive(bool active)
+    {
+        rewardButton.gameObject.SetActive(active);
+        disableObject.SetActive(!active);
+        rewardedObject.SetActive(false);
+    }
+
+    public void SetRewarded()
+    {
+        coinFrame.SetActive(false);
+        rewardButton.gameObject.SetActive(false);
+        disableObject.SetActive(false);
+        rewardedObject.SetActive(true);
+    }
+}

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 516f465654bf46d094f3493e145a183b
+timeCreated: 1632979820

popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity

@@ -316,6 +316,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
     - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_IsActive
@@ -421,6 +426,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -22
       objectReference: {fileID: 0}
+    - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
     - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -621,11 +631,26 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
     - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5047569869407099398, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
     - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_IsActive
@@ -641,6 +666,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 670
       objectReference: {fileID: 0}
+    - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
 --- !u!224 &219610912 stripped
@@ -680,18 +715,6 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 219610911}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &219610916 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 219610911}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &493087540
 GameObject:
   m_ObjectHideFlags: 0
@@ -996,7 +1019,6 @@ GameObject:
   m_Component:
   - component: {fileID: 586451195}
   - component: {fileID: 586451196}
-  - component: {fileID: 586451197}
   m_Layer: 0
   m_Name: Manager
   m_TagString: Untagged
@@ -1032,24 +1054,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tastingButton: {fileID: 1280872481}
   view: {fileID: 639967259}
---- !u!114 &586451197
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 586451194}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  coinIconTransform: {fileID: 0}
-  coinCountText: {fileID: 219610916}
-  coinAnimator: {fileID: 0}
-  coinPrefab: {fileID: 0}
-  duration: 0.5
-  rootTransform: {fileID: 0}
 --- !u!1 &613202084
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using TMPro;
 using UniRx;
 using UniRx.Triggers;
 using UnityEngine;
@@ -25,6 +26,8 @@ public class Market : MonoBehaviour
     [SerializeField] private GameObject closeSign;
     [SerializeField] private GameObject customerPrefab;
     [SerializeField] private GameObject orderPosisionObject;
+    [SerializeField] private Transform coinPrefab;
+    [SerializeField] private Transform rootTransform;
 
     private List<int> displayFlavors;
     private List<int> shuffledOrder;
@@ -44,16 +47,14 @@ public class Market : MonoBehaviour
         orderSubject.AddTo(this);
         
         var gameData = GameDataManager.GameData;
-        CoinManager.Instance.ChangeCoin(gameData.coin);
+        CoinManager.Instance.ChangeCoin(gameData.Coin);
+        HeartMeter.Instance.Initialize();
+        HeartMeter.Instance.SetHeart(gameData.Heart);
         
         var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
         var shopLevelToCustomerList = shopLevelList.Select(shopLevel => (level:shopLevel.shopLevel, tenMinCustomer:shopLevel.customer));
-        HeartMeter.Instance.Initialize();
-        HeartMeter.Instance.SetHeart(gameData.Heart);
-
-        // 在庫数表示
-        stockView.SetStock(gameData.StorageTanks);
         
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
         CheckAndFixStock();
         StockFlavorLog();
         
@@ -137,8 +138,8 @@ public class Market : MonoBehaviour
             if (gameData.ShopStock.Count == 0)
             {
                 shopState.Value = ShopState.Close;
-            }           
+            }
-            var coin = 0;
+            
             var orders = new List<int>();
             var dontBuyCustomerList = new List<CustomerController>();
             foreach (var controller in customers)
@@ -177,12 +178,12 @@ public class Market : MonoBehaviour
             }
             
             // 購入
-            var flavors = orders.Select(x => (displayFlavors[x], 0)).ToList();
+            var flavors = orders.Select(x => (displayFlavors[x], ProductRarity.Normal)).ToList();
 #if UNITY_EDITOR
             Debug.Log($"bb order: {orders.Count} {orders.Aggregate("", (s, i) => $"{s},{i}")}");
             Debug.Log($"bb shuffledOrder:{shuffledOrder.Count} {shuffledOrder.Aggregate("", (s, i) => $"{s},{i}")}");
 #endif
-            coin += SellPopcorn(flavors);
+            var coin = SellPopcorn(flavors);
             var remainStockCount = gameData.ShopStock.Count;
                 
             // 自動補充 refill
@@ -221,8 +222,9 @@ public class Market : MonoBehaviour
                 }
                 blueView.SellAction();
                 // コイン獲得
+                CoinEffect(coin);
                 CoinManager.Instance.AddCoinWithEffect(coin, () => { });
-                gameData.coin = CoinManager.Instance.OwnCoin;
+                gameData.Coin = CoinManager.Instance.OwnCoin;
                 gameData.Heart += customers.Count;
                 GameDataManager.SaveGameData();
                 shopState.Value = gameData.ShopStock.Count == 0 ? ShopState.Close : ShopState.Open;
@@ -455,7 +457,7 @@ public class Market : MonoBehaviour
             }).AddTo(this);
     }
 
-    private int SellPopcorn(List<(int flavor, int bonusRate)> flavors)
+    private int SellPopcorn(List<(int flavor, ProductRarity rarity)> flavors)
     {
         var gameData = GameDataManager.GameData;
         // 品切れ
@@ -465,14 +467,17 @@ public class Market : MonoBehaviour
         }
 
         // フレーバーを売る
+        var recipeList = RecipeData.GetAllRecipe();
+        var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
         var coin = 0;
         foreach (var flavorData in flavors)
         {
             var targetIndex = gameData.ShopStock.FindIndex(x => x == flavorData.flavor);
-            var flavorRecipe = RecipeData.GetAllRecipe().First(x => x.RecipeId == gameData.ShopStock[targetIndex]);
+            var flavorRecipe = recipeList.First(data => data.RecipeId == gameData.ShopStock[targetIndex]);
+            var rarityData = rarityList.First(data => data.Rarity == flavorData.rarity);
             gameData.ShopStock.RemoveAt(targetIndex);
-            var bonusRate = 0;
+            gameData.AddSalesCount(flavorData.flavor, 1, flavorData.rarity);
-            coin += flavorRecipe.Price * (1 + bonusRate / 100);
+            coin += flavorRecipe.Price * (1 + rarityData.rate / 100);
         }
         return coin;
     }
@@ -507,6 +512,13 @@ public class Market : MonoBehaviour
         }
         GameDataManager.SaveGameData();
     }
+
+    private void CoinEffect(int count)
+    {
+        var effect = Instantiate(coinPrefab, Vector3.zero, Quaternion.identity, rootTransform);
+        effect.GetComponentInChildren<TextMeshProUGUI>().text = count.ToString();
+        Destroy(effect.gameObject, 1f);
+    }
     
     private void CheckAndFixStock()
     {

popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs

@@ -22,7 +22,7 @@ public class ProductManagement : MonoBehaviour
         state.AddTo(this);
         state.Value = ManagementState.None;
         var gameData = GameDataManager.GameData;
-        CoinManager.Instance.ChangeCoin(gameData.coin);
+        CoinManager.Instance.ChangeCoin(gameData.Coin);
         HeartMeter.Instance.Initialize();
         HeartMeter.Instance.SetHeart(gameData.Heart);
 
@@ -84,7 +84,7 @@ public class ProductManagement : MonoBehaviour
                             tankView.SetData(gameData.StorageTanks[tankView.TankNumber - 1]);
                             tankView.SetState(TankState.Unlock);
                             CoinManager.Instance.SubCoin(shopData.price);
-                            gameData.coin = CoinManager.Instance.OwnCoin;
+                            gameData.Coin = CoinManager.Instance.OwnCoin;
                             GameDataManager.SaveGameData();
                             // 次に大きいタンクの購入ボタンを表示
                             if (tankView.TankNumber + 1 <= tankList.Count)

popcorn/Assets/MyGame/Scenes/marketing/marketing.unity

@@ -400,37 +400,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1 &77455594 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3664916832310506793, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 714437464}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &77455595 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 714437464}
-  m_PrefabAsset: {fileID: 0}
---- !u!95 &77455597
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 77455594}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 483d9c381d24f1f47a5cb159dda7c842, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!4 &82988135 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 7689040401039027174, guid: 6ecdd4b8fb7ad486fba3b4949386d6c9,
@@ -1336,12 +1305,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 5368382573410461785}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &393700031 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 714437464}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &438315598
 GameObject:
   m_ObjectHideFlags: 0
@@ -1442,154 +1405,6 @@ MonoBehaviour:
   popcornImage: {fileID: 53013342}
   maxPosision: 0.5
   minPosision: -1.47
---- !u!1 &471454546
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 471454547}
-  - component: {fileID: 471454549}
-  - component: {fileID: 471454548}
-  m_Layer: 5
-  m_Name: Image_coin_g
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &471454547
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 471454546}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &471454548
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 471454546}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2aba0ae42cd9d5a40bbe1235de7494c4, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &471454549
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 471454546}
-  m_CullTransparentMesh: 0
---- !u!1 &638760963
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 638760964}
-  - component: {fileID: 638760966}
-  - component: {fileID: 638760965}
-  m_Layer: 5
-  m_Name: Image_coin_d
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &638760964
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 638760963}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &638760965
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 638760963}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 60ea2603d1de7db439be110aba8e1a06, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &638760966
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 638760963}
-  m_CullTransparentMesh: 0
 --- !u!1 &658354827
 GameObject:
   m_ObjectHideFlags: 0
@@ -2034,20 +1849,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689,
+    - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
-      propertyPath: m_LocalScale.x
+      propertyPath: m_RootOrder
-      value: 0.9
+      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689,
-        type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.9
-      objectReference: {fileID: 0}
-    - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689,
-        type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.9
       objectReference: {fileID: 0}
     - target: {fileID: 1174152333972670060, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
@@ -2144,6 +1949,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -22
       objectReference: {fileID: 0}
+    - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
     - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -2304,15 +2114,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3664916832825273574, guid: caaa748dbeed576499e8cae74d33f689,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 3664916832825273575, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
+      propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
@@ -2331,14 +2136,24 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3664916833545329524, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
+      propertyPath: m_LocalPosition.y
-      value: -77.60156
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
     - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689,
         type: 3}
       propertyPath: m_IsActive
@@ -2359,6 +2174,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 670
       objectReference: {fileID: 0}
+    - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
 --- !u!1 &757275525
@@ -2606,6 +2431,12 @@ Transform:
   m_Father: {fileID: 203299121}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!224 &928467735 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689,
+    type: 3}
+  m_PrefabInstance: {fileID: 714437464}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &966116774
 GameObject:
   m_ObjectHideFlags: 0
@@ -3032,7 +2863,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1025201115}
-  - component: {fileID: 1025201114}
   - component: {fileID: 1025201116}
   m_Layer: 0
   m_Name: Manager
@@ -3041,25 +2871,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &1025201114
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1025201113}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  coinIconTransform: {fileID: 393700031}
-  coinCountText: {fileID: 1898034353}
-  coinAnimator: {fileID: 77455597}
-  coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
-    type: 3}
-  duration: 0.5
-  rootTransform: {fileID: 1991225675}
 --- !u!4 &1025201115
 Transform:
   m_ObjectHideFlags: 0
@@ -3094,6 +2905,9 @@ MonoBehaviour:
   customerPrefab: {fileID: 5409985849651702440, guid: 6fbb038c9aae840f2bea57bce30740f7,
     type: 3}
   orderPosisionObject: {fileID: 384574881}
+  coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
+    type: 3}
+  rootTransform: {fileID: 928467735}
 --- !u!1 &1035509476
 GameObject:
   m_ObjectHideFlags: 0
@@ -3262,80 +3076,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1066327839
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1066327840}
-  - component: {fileID: 1066327842}
-  - component: {fileID: 1066327841}
-  m_Layer: 5
-  m_Name: Image_coin_a
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1066327840
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1066327839}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1066327841
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1066327839}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 4425aa3ec48519546b72cc0a9448c2ef, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1066327842
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1066327839}
-  m_CullTransparentMesh: 0
 --- !u!1001 &1075915152
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4273,80 +4013,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1472008186
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1472008187}
-  - component: {fileID: 1472008189}
-  - component: {fileID: 1472008188}
-  m_Layer: 5
-  m_Name: Image_coin_b
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1472008187
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1472008186}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1472008188
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1472008186}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d919899659cd2714e8396a059015062b, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1472008189
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1472008186}
-  m_CullTransparentMesh: 0
 --- !u!1 &1482901210
 GameObject:
   m_ObjectHideFlags: 0
@@ -5204,80 +4870,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1686710150
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1686710151}
-  - component: {fileID: 1686710153}
-  - component: {fileID: 1686710152}
-  m_Layer: 5
-  m_Name: Image_coin_e
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1686710151
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1686710150}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1686710152
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1686710150}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6b6ef205b1355db4f96c259432351c50, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1686710153
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1686710150}
-  m_CullTransparentMesh: 0
 --- !u!1 &1749782973
 GameObject:
   m_ObjectHideFlags: 0
@@ -5943,18 +5535,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &1898034353 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 714437464}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1898891707
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6147,12 +5727,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1959722117}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &1991225675 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3664916832844628215, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 714437464}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2011193247
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6240,80 +5814,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: db6c3e3cc4bd48f480264f676924cb14, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &2016817760
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2016817761}
-  - component: {fileID: 2016817763}
-  - component: {fileID: 2016817762}
-  m_Layer: 5
-  m_Name: Image_coin_f
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2016817761
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2016817760}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2016817762
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2016817760}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: aa99a8afce5ebe44eb27d3b7863d3b7a, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &2016817763
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2016817760}
-  m_CullTransparentMesh: 0
 --- !u!1 &2031857953
 GameObject:
   m_ObjectHideFlags: 0
@@ -6486,80 +5986,6 @@ Transform:
   m_Father: {fileID: 2104509456}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2057951083
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2057951084}
-  - component: {fileID: 2057951086}
-  - component: {fileID: 2057951085}
-  m_Layer: 5
-  m_Name: Image_coin_c
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2057951084
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2057951083}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 77455595}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 86, y: 92}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2057951085
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2057951083}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bb3bb9ab8a6fdc64a901cd21bf76a87b, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &2057951086
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2057951083}
-  m_CullTransparentMesh: 0
 --- !u!1 &2060155507
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs

@@ -45,13 +45,14 @@ public class RecipeDetailView : MonoBehaviour
             LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value);
             // 消費
             var gameData = GameDataManager.GameData;
-            gameData.cornSeed -= data.MaterialList[0].amount;
+            gameData.CornSeed -= data.MaterialList[0].amount;
-            var flavorIndex1 = gameData.Material.FindIndex(x => x.Id == data.MaterialList[1].id);
+            if (gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id) is MaterialData material1)
-            gameData.Material[flavorIndex1].Amount -= data.MaterialList[1].amount;
-            if (data.GetMaterialCount() == 3)
             {
-                var flavorIndex2 = gameData.Material.FindIndex(x => x.Id == data.MaterialList[2].id);
+                material1.Amount -= data.MaterialList[1].amount;
-                gameData.Material[flavorIndex2].Amount -= data.MaterialList[2].amount;
+            }
+            if (data.GetMaterialCount() == 3 && gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[2].id) is MaterialData material2)
+            {
+                material2.Amount -= data.MaterialList[2].amount;
             }
             GameDataManager.SaveGameData();
             TransitionManager.Instance.LoadScene(GameScenes.Cooking);
@@ -76,56 +77,33 @@ public class RecipeDetailView : MonoBehaviour
         flavorStock.text = string.Format(flavorStockFormat, shopStock + tankStock);
         flavorName.text = data.name;
         flavorPrice.text = data.price.ToString();
-        cornAmountText.text = string.Format(cornAmountFormat, gameData.cornSeed, data.MaterialList[0].amount);
+        cornAmountText.text = string.Format(cornAmountFormat, gameData.CornSeed, data.MaterialList[0].amount);
 
-        var flavor1Amount = 0;
+        var flavor1Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[1].id)?.Amount ?? 0;
-        var flavorIndex1 = gameData.Material.FindIndex(x => x.Id == data.MaterialList[1].id);
-        if (flavorIndex1 != -1)
-        {
-            flavor1Amount = gameData.Material[flavorIndex1].Amount;
-        }
         flavor1AmountText.text = string.Format(flavorAmountFormat, flavor1Amount, data.MaterialList[1].amount);
-        
+        var flavor2Amount = gameData.Material.FirstOrDefault(x => x.Id == data.MaterialList[2].id)?.Amount ?? 0;
-        var flavor2Amount = 0;
+        flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.MaterialList[2].amount);
-        if (data.GetMaterialCount() == 3)
+        flavor2View.SetActive(data.GetMaterialCount() == 3);
-        {
-            var flavorIndex2 = gameData.Material.FindIndex(x => x.Id == data.MaterialList[2].id);
-            if (flavorIndex2 != -1)
-            {
-                flavor2Amount = gameData.Material[flavorIndex2].Amount;
-            }
-            flavor2View.SetActive(true);
-            flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.MaterialList[2].amount);
-        }
-        else
-        {
-            flavor2View.SetActive(false);
-        }
     }
 
     private bool CheckAmount(ProductData data)
     {
         var flag = true;
         var gameData = GameDataManager.GameData;
-        if (gameData.cornSeed < data.MaterialList[0].amount)
+        if (gameData.CornSeed < data.MaterialList[0].amount)
         {
             flag = false;
             cornAmountText.color = Color.red;
         }
-        var flavorIndex1 = gameData.Material.FindIndex(x => x.Id == data.MaterialList[1].id);
+        if (gameData.Material.Exists(x => x.Id == data.MaterialList[1].id && x.Amount < data.MaterialList[1].amount))
-        if (flavorIndex1 == -1 || gameData.Material[flavorIndex1].Amount < data.MaterialList[1].amount)
         {
             flag = false;
             flavor1AmountText.color = Color.red;
         }
-        if (data.GetMaterialCount() == 3)
+        if (data.GetMaterialCount() == 3 && gameData.Material.Exists(x => x.Id == data.MaterialList[2].id && x.Amount < data.MaterialList[2].amount))
         {
-            var flavorIndex2 = gameData.Material.FindIndex(x => x.Id == data.MaterialList[2].id);
+            flag = false;
-            if (flavorIndex2 == -1 || gameData.Material[flavorIndex2].Amount < data.MaterialList[2].amount)
+            flavor2AmountText.color = Color.red;
-            {
-                flag = false;
-                flavor2AmountText.color = Color.red;
-            }
         }
         return flag;
     }

popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs

@@ -28,7 +28,18 @@ public class RecipeSelectDialog : MonoBehaviour
             var view = Instantiate(recipePrefab, content.transform);
             view.SetRecipe(productData);
             // 所持レシピ確認
-            if (gameData.MyRecipes.Contains(productData.id) || productData.shopLevel <= HeartMeter.Instance.ShopLevel.Value)
+            var hasRecipe = false;
+            if (gameData.MyRecipes.Contains(productData.id))
+            {
+                hasRecipe = true;
+            }
+            else if (productData.shopLevel <= HeartMeter.Instance.ShopLevel.Value)
+            {
+                // レシピ開放
+                gameData.MyRecipes = new List<int>(gameData.MyRecipes){productData.id}.ToArray();
+                hasRecipe = true;
+            }
+            if (hasRecipe)
             {
                 view.SetLockPanel(false);
                 view.RecipeClickObservable.Subscribe(_ =>

popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs

@@ -15,7 +15,7 @@ public class Shopping : MonoBehaviour
         changeCoinSubject.AddTo(this);
         
         var gameData = GameDataManager.GameData;
-        CoinManager.Instance.ChangeCoin(gameData.coin);
+        CoinManager.Instance.ChangeCoin(gameData.Coin);
         HeartMeter.Instance.Initialize();
         HeartMeter.Instance.SetHeart(gameData.Heart);
         
@@ -39,8 +39,8 @@ public class Shopping : MonoBehaviour
                 AddItem(shopData, amount);
                 itemView.SetStockCount(GetItemAmount(shopData));
                 CoinManager.Instance.SubCoin(shopData.price * amount);
-                gameData.coin = CoinManager.Instance.OwnCoin;
+                gameData.Coin = CoinManager.Instance.OwnCoin;
-                changeCoinSubject.OnNext(gameData.coin);
+                changeCoinSubject.OnNext(gameData.Coin);
                 GameDataManager.SaveGameData();
             }).AddTo(itemView);
             // アイテム購入クリック購読

popcorn/Assets/MyGame/Scenes/shopping/shopping.unity

@@ -441,7 +441,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 980038345}
-  - component: {fileID: 980038344}
   - component: {fileID: 980038343}
   m_Layer: 0
   m_Name: Manager
@@ -463,24 +462,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   listView: {fileID: 1188209735}
---- !u!114 &980038344
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 980038342}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  coinIconTransform: {fileID: 0}
-  coinCountText: {fileID: 1098091309}
-  coinAnimator: {fileID: 0}
-  coinPrefab: {fileID: 0}
-  duration: 0.5
-  rootTransform: {fileID: 0}
 --- !u!4 &980038345
 Transform:
   m_ObjectHideFlags: 0
@@ -859,18 +840,6 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 1098091307}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1098091309 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689,
-    type: 3}
-  m_PrefabInstance: {fileID: 1098091307}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1188209733
 PrefabInstance:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scripts/CoinManager.cs

@@ -47,23 +47,19 @@ public class CoinManager : SingletonMonoBehaviour<CoinManager>
         // 生成ポジション決め、生成
         InstantiateEffeect(coinPrefab, count, Vector3.zero, coinIconTransform.position, () =>
         {
-            coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration + count * 0.1f);
+            coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration);
             callback.Invoke();
         });
     }
 
     private void InstantiateEffeect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback)
     {
-        var effect = Instantiate(prefab, Vector3.zero, Quaternion.identity, rootTransform);
-        effect.GetComponentInChildren<TextMeshProUGUI>().text = count.ToString();
         // アニメ50フレーム
         this.CallWaitForSeconds(1.0f, () => {
             // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
             VibrationManager.Instance.PlayVibrationOnceWeak();
             coinAnimator.SetTrigger(Add);
             // SoundManager.Instance.PlaySE("se_coin_count");
-            // コインは削除
-            Destroy(effect.gameObject);
             callback.Invoke();
         });
     }

popcorn/Assets/MyGame/Scripts/GameDataManager.cs

@@ -37,10 +37,17 @@ public sealed class GameData {
     public int adCount;
     [DataMember(Name = "Data5")]
     public int stage = 1;
+
     // [DataMember(Name = "Data6")]
     // public int avatarId = Const.DefaultAvatarId;
-    [DataMember(Name = "Data7")]
+    [DataMember(Name = "Data7")] 
-    public int coin;
+    private int coin;
+    public int Coin
+    {
+        get => coin;
+        set => ChangeCoin(value);
+    }
+
     // [DataMember(Name = "Data8")]
     // private int[] avatarIdArray;
     // public List<int> avatarIdList;
@@ -55,12 +62,18 @@ public sealed class GameData {
     [DataMember(Name = "Data12")] 
     public List<PlantLineData> PlantLineDataList = new List<PlantLineData>();
     // [DataMember(Name = "Data13")] 
+    
     [DataMember(Name = "Data14")] 
     public int MachineLevel = 1;
     [DataMember(Name = "Data15")] 
     public List<SeedlingProgressData> SeedlingDataList = new List<SeedlingProgressData>();
     [DataMember(Name = "Data16")] 
-    public int cornSeed;
+    private int cornSeed;
+    public int CornSeed
+    {
+        get => cornSeed;
+        set => ChangeCornSeed(value);
+    }
     // Main
     // 所持レシピ
     [DataMember(Name = "Data17")] 
@@ -80,9 +93,71 @@ public sealed class GameData {
     [DataMember(Name = "Data22")]
     public int[] Pans;
     // [DataMember(Name = "Data23")]
+    
     [DataMember(Name = "Data24")]
     public ProductRefillMode RefillMode;
-    // [DataMember(Name = "Data25")]
+    [DataMember(Name = "Data25")]
+    private int[] achievedMission;
+    public List<int> AchievedMission;
+    
+    // mission
+    [DataMember(Name = "Data1001")] 
+    public int TotalAddCoin { get; private set; }
+    [DataMember(Name = "Data1002")] 
+    public int TotalSubCoin { get; private set; }
+    [DataMember(Name = "Data1003")] 
+    public int TotalAddCornSeed { get; private set; }
+    [DataMember(Name = "Data1004")] 
+    public int TotalCustomerCount { get; private set; }
+    [DataMember(Name = "Data1005")] 
+    public List<ProductStockData> TotalSalesList { get; private set; }
+    public int TotalSales => TotalSalesList.Sum(data => data.Stock);
+    public int RareTotalSales => TotalSalesList.Where(data => data.Rarity != ProductRarity.Normal).Sum(data => data.Stock);
+
+    private void ChangeCornSeed(int value)
+    {
+        if (cornSeed < value)
+        {
+            TotalAddCornSeed += value - cornSeed;
+        }
+        cornSeed = value;
+    }
+
+    private void ChangeCoin(int value)
+    {
+        Debug.Log($"{coin} {value}");
+        if (coin < value)
+        {
+            TotalAddCoin += value - coin;
+        }
+        else
+        {
+            TotalSubCoin += coin - value;
+        }
+        coin = value;
+    }
+
+    public void AddCustomerCount(int value)
+    {
+        TotalCustomerCount += value;
+    }
+
+    public void AddSalesCount(int id, int stock, ProductRarity rarity)
+    {
+        if (TotalSalesList.FirstOrDefault(x => x.Rarity == rarity) is ProductStockData stockData)
+        {
+            stockData.Stock += stock;
+        }
+        else
+        {
+            TotalSalesList.Add(new ProductStockData{FlavorId = id, Rarity = rarity, Stock = stock});
+        }
+    }
+
+    public int GetTotalSalesByFlavor(int id)
+    {
+        return TotalSalesList.Where(data => data.FlavorId == id).Sum(data => data.Stock);
+    }
 
     // public void ChangeAvatar(AvatarData avatarData){
     //     newAvatarIdList.Remove(avatarData.id);
@@ -123,6 +198,8 @@ public sealed class GameData {
         // lastAdRewardTimeList = lastAdRewardTimeArray == null ? new List<long>() : lastAdRewardTimeArray.ToList();
         ShopStock = shopStock?.ToList() ?? new List<int>();
         Pans = Pans ?? new int[0];
+        TotalSalesList = TotalSalesList ?? new List<ProductStockData>();
+        AchievedMission = achievedMission?.ToList() ?? new List<int>();
     }
     private Dictionary<int, int> ArrayToDictionary(KeyValueOfintint[] array){
         var dictionary = new Dictionary<int, int>();
@@ -138,6 +215,7 @@ public sealed class GameData {
         // newAvatarIdArray = newAvatarIdList.ToArray();
         // lastAdRewardTimeArray = lastAdRewardTimeList.ToArray();
         shopStock = ShopStock.ToArray();
+        achievedMission = AchievedMission.ToArray();
     }
     private KeyValueOfintint[] DictionaryToArray(Dictionary<int, int> dictionary){
         var array = new KeyValueOfintint[dictionary.Count];

popcorn/Assets/MyGame/Scripts/HeaderManager.cs

@@ -11,14 +11,14 @@ public class HeaderManager : MonoBehaviour
 
     private void Start()
     {
-        settingButton.OnClickAsObservable().Subscribe(_ =>
+        settingButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
         {
         });
-        missionButton.OnClickAsObservable().Subscribe(_ =>
+        missionButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
         {
             TransitionManager.Instance.LoadSceneAdditive(GameScenes.Mission);
         });
-        informationButton.OnClickAsObservable().Subscribe(_ =>
+        informationButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
         {
         });
     }

popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs

@@ -45,9 +45,10 @@ public enum MissionCondition
     CornCount = 1,
     CustomerCount = 2,
     SalesCount = 3,
-    RecipeCount = 4,
+    RareSalesCount = 4,
-    CoinConsumeCount = 5,
+    RecipeCount = 5,
-    SaltSalesCount = 6,
+    CoinConsumeCount = 6,
+    SaltSalesCount = 7,
 }
 
 public enum MissionRewardType