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

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

@@ -1 +1 @@
-sSWyGJvMwKyrXPGa+UcR7ijwM+qeMX15w5gLe+ThVpwdHKCThwekRwehV+QJtIy+
+LqzefEWOl7H56PREiEe6yHXVsWi1rP2xEXLtQnk4QSVaXJB6jqQqJ4eRIzADDaN5

popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity

@@ -152,31 +152,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &20368557 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7322157958942142026, guid: 041c0f3d96c90d64094cc76c5c87c26f,
-    type: 3}
-  m_PrefabInstance: {fileID: 4559813503860727169}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &236055328
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mTarget: {fileID: 677548462}
 --- !u!1 &434624158
 GameObject:
   m_ObjectHideFlags: 0
@@ -209,6 +184,7 @@ RectTransform:
   - {fileID: 475061233}
   - {fileID: 1275129623}
   - {fileID: 1725870972}
+  - {fileID: 2085388515}
   m_Father: {fileID: 966618983}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -307,19 +283,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2498033716723453584}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &554441275
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mTarget: {fileID: 1455393705}
 --- !u!1 &579812654
 GameObject:
   m_ObjectHideFlags: 0
@@ -404,18 +367,6 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 4559813503860727169}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &677548462 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 5920014628783637860, guid: 041c0f3d96c90d64094cc76c5c87c26f,
-    type: 3}
-  m_PrefabInstance: {fileID: 4559813503860727169}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &966618982
 GameObject:
   m_ObjectHideFlags: 0
@@ -534,19 +485,84 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 7328251774669809636}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1273053210
+--- !u!1 &1266828204
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1266828205}
+  - component: {fileID: 1266828207}
+  - component: {fileID: 1266828206}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1266828205
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1266828204}
+  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: 2085388515}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -40, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1266828206
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 1266828204}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mTarget: {fileID: 2145763165}
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 10
+    m_MaxSize: 65
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "Reset \nPlay Count"
+--- !u!222 &1266828207
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1266828204}
+  m_CullTransparentMesh: 0
 --- !u!224 &1275129623 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5034752975213739508, guid: 199214813202e5f478789161b538685b,
@@ -637,18 +653,6 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 2498033716723453584}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1455393705 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7322157960896418141, guid: 041c0f3d96c90d64094cc76c5c87c26f,
-    type: 3}
-  m_PrefabInstance: {fileID: 4559813503860727169}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!20 &1673325602 stripped
 Camera:
   m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
@@ -774,32 +778,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1725870971}
   m_CullTransparentMesh: 0
---- !u!114 &1759757039
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mTarget: {fileID: 1991749882}
---- !u!114 &1843256529
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mTarget: {fileID: 20368557}
 --- !u!1 &1870432532
 GameObject:
   m_ObjectHideFlags: 0
@@ -870,6 +848,7 @@ MonoBehaviour:
     value: 1
   character: {fileID: 519190655}
   resetScoreButton: {fileID: 1725870973}
+  resetPlayCountButton: {fileID: 2085388516}
 --- !u!114 &1870432536
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -883,18 +862,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   stage: {fileID: 1448010325}
---- !u!114 &1991749882 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7322157960569866670, guid: 041c0f3d96c90d64094cc76c5c87c26f,
-    type: 3}
-  m_PrefabInstance: {fileID: 4559813503860727169}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2055584752
 GameObject:
   m_ObjectHideFlags: 0
@@ -1020,18 +987,125 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a496a110325c47a18a0e9c6e60376b57, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2145763165 stripped
+--- !u!1 &2085388514
-MonoBehaviour:
+GameObject:
-  m_CorrespondingSourceObject: {fileID: 7322157960751385535, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+  m_ObjectHideFlags: 0
-    type: 3}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 4559813503860727169}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2085388515}
+  - component: {fileID: 2085388518}
+  - component: {fileID: 2085388517}
+  - component: {fileID: 2085388516}
+  m_Layer: 5
+  m_Name: Reset Score Button (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2085388515
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085388514}
+  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:
+  - {fileID: 1266828205}
+  m_Father: {fileID: 434624159}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -50, y: -162.02}
+  m_SizeDelta: {x: 300, y: 100}
+  m_Pivot: {x: 1, y: 1}
+--- !u!114 &2085388516
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085388514}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2085388517}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2085388517
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085388514}
   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: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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 &2085388518
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2085388514}
+  m_CullTransparentMesh: 0
 --- !u!1001 &2498033716723453584
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1196,6 +1270,31 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 434624159}
     m_Modifications:
+    - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 406.80444
+      objectReference: {fileID: 0}
+    - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 269.99994
+      objectReference: {fileID: 0}
+    - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 460.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 366787035726103616, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -134.99997
+      objectReference: {fileID: 0}
+    - target: {fileID: 1480716767542757334, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4559813503976204841, guid: 041c0f3d96c90d64094cc76c5c87c26f,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -1236,6 +1335,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4559813504302003085, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4559813504322426652, guid: 041c0f3d96c90d64094cc76c5c87c26f,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4559813504355184344, guid: 041c0f3d96c90d64094cc76c5c87c26f,
         type: 3}
       propertyPath: m_Name

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab

@@ -1114,8 +1114,8 @@ MonoBehaviour:
   materialImage: {fileID: 5034752974552429102}
   materialAmountText: {fileID: 5034752974931089885}
   detailOffset: 250
-  progressDuration: 2
+  progressDuration: 1.5
-  waitButtonActive: 2
+  waitButtonActive: 3
   waitProgress: 1.5
 --- !u!1 &5034752975247083714
 GameObject:

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab

@@ -437,6 +437,7 @@ MonoBehaviour:
   stageHiScore: {fileID: 4559813503965715381}
   button: {fileID: 1185655514}
   lockObject: {fileID: 5937334820095103990}
+  lockText: {fileID: 8182159400137396076}
 --- !u!114 &1185655514
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -727,6 +728,7 @@ MonoBehaviour:
   stageHiScore: {fileID: 4559813505140573275}
   button: {fileID: 490767120}
   lockObject: {fileID: 2922673163823420152}
+  lockText: {fileID: 821365773376196194}
 --- !u!114 &490767120
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2039,6 +2041,7 @@ MonoBehaviour:
   stageHiScore: {fileID: 4559813503956947790}
   button: {fileID: 354011731}
   lockObject: {fileID: 5937334820449219531}
+  lockText: {fileID: 8182159399820554065}
 --- !u!1 &4559813505704525541
 GameObject:
   m_ObjectHideFlags: 0
@@ -2438,18 +2441,30 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3}
---- !u!1 &5937334820449219531 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
-    type: 3}
-  m_PrefabInstance: {fileID: 4559813504394653454}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8190353373877730053 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
     type: 3}
   m_PrefabInstance: {fileID: 4559813504394653454}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8182159399820554065 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
+    type: 3}
+  m_PrefabInstance: {fileID: 4559813504394653454}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &5937334820449219531 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
+    type: 3}
+  m_PrefabInstance: {fileID: 4559813504394653454}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4559813504710053683
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2586,6 +2601,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 4559813504710053683}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8182159400137396076 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
+    type: 3}
+  m_PrefabInstance: {fileID: 4559813504710053683}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5020804910926859837
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2710,18 +2737,30 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3}
---- !u!1 &2922673163823420152 stripped
+--- !u!114 &821365773376196194 stripped
-GameObject:
+MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
+  m_CorrespondingSourceObject: {fileID: 5677746820132208735, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
     type: 3}
   m_PrefabInstance: {fileID: 5020804910926859837}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &811553595295701558 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5687567796488082443, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
     type: 3}
   m_PrefabInstance: {fileID: 5020804910926859837}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2922673163823420152 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab,
+    type: 3}
+  m_PrefabInstance: {fileID: 5020804910926859837}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5218644843236717153
 PrefabInstance:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/detail_NotReleased.prefab

@@ -77,7 +77,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u30E9\u30F3\u30AF10\u3067\u89E3\u653E"
+  m_Text: "\u4E2D\u7D1A\u306E\u30CF\u30A4\u30B9\u30B3\u30A2\nxx\u4EE5\u4E0A\u3067\u958B\u653E"
 --- !u!1 &4855167374259668059
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs

@@ -15,6 +15,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
         private LineRenderer lineRendererFront;
         [SerializeField] private Transform character;
         [SerializeField] private Button resetScoreButton;
+        [SerializeField] private Button resetPlayCountButton;
 
         private void Start()
         {
@@ -26,6 +27,11 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 GameDataManager.GameData.ScrollGameStageScoreList = new List<ScrollGameScoreData>();
             }).AddTo(this);
 
+            resetPlayCountButton.OnClickAsObservable().Subscribe(_ =>
+            {
+                GameDataManager.GameData.ScrollGameTodayPlayCount = 0;
+            }).AddTo(this);
+            
             var debugObject = new GameObject(){name = "debugObject"};
             var orgScale = debugObject.transform.localScale;
             isDebug.Subscribe(x =>

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs

@@ -74,8 +74,10 @@ namespace MyGame.Scenes.MiniGame.Scripts
             scoreUpdate.Subscribe(_ =>
             {
                 // スコア更新
-                stageSelectView.SetScore(gameData.ScrollGamePlaceScoreList.FirstOrDefault(data => data.Id == placeId)?.Score ?? 0);
+                var placeScore = gameData.ScrollGamePlaceScoreList.FirstOrDefault(data => data.Id == placeId)?.Score ?? 0;
+                stageSelectView.SetScore(placeScore);
                 // 達成報酬更新
+                stageSelectView.SetRecipeActive(placeScore < levelPlaceList[1].needScore);
             }).AddTo(this);
             for (var i = 0; i < levelStageList.Length; i++)
             {
@@ -88,6 +90,10 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 itemView.SetData(stageData);
                 var isFirstStage = i == 0;
                 var prevStageData = isFirstStage ? default : levelStageList[i - 1];
+                if (prevStageData != null)
+                {
+                    itemView.SetPrevStageData(prevStageData);
+                }
                 scoreUpdate.Subscribe(_ =>
                 {
                     // ハイスコア更新
@@ -278,8 +284,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
             {
                 ScrollGameWatchVideoDialog.ShowDialog(() =>
                 {
-                    // GameDataManager.GameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary();
+                    GameDataManager.GameData.ScrollGameLastPlayTime = DateTime.UtcNow.ToBinary();
-                    // GameDataManager.GameData.ScrollGameTodayPlayCount++;
+                    GameDataManager.GameData.ScrollGameTodayPlayCount++;
                     // ステージ読み込み
                     ResetGame(placeList, stageData);
                 });
@@ -291,7 +297,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
         private static void UpdatePlayCount()
         {
             // Playカウントリセット
-            // if (GameDataManager.GameData.GetScrollGameLimitTime().TotalSeconds <= 0)
+            if (GameDataManager.GameData.GetScrollGameLimitTime().TotalSeconds <= 0)
             {
                 GameDataManager.GameData.ScrollGameTodayPlayCount = 0;
             }

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs

@@ -25,10 +25,16 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private float waitButtonActive = .5f;
         [SerializeField] private float waitProgress = .5f;
         private float progressValue;
+        private Vector3 defaultDetailObjectPos;
 
         public IObservable<Unit> OnRetry => retryButton.OnClickAsObservable().TakeUntilDestroy(this);
         public IObservable<Unit> OnClose => closeButton.OnClickAsObservable().TakeUntilDestroy(this);
 
+        private void Awake()
+        {
+            defaultDetailObjectPos = detailObject.transform.localPosition;
+        }
+
         public void ShowResult(int score, ScrollGamePlaceData[] placeList, ScrollGameStageData stageData)
         {
             var gameData = GameDataManager.GameData;
@@ -62,7 +68,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
             foreach (var placeData in placeList.Where(data => data.itemId != 0))
             {
                 var amount = Mathf.FloorToInt((float)score / placeData.needScore);
-                var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.itemId);
+                var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.itemId && data.Category == ItemCategory.Material);
                 materialNameText.text = shopData.Name;
                 // materialImage
                 materialAmountText.text = $"x{amount}";
@@ -73,6 +79,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 .OrderBy(data => data.needScore)
                 // .Where(data => !gameData.MyRecipes.Contains(data.recipeId))
                 .FirstOrDefault(data => data.recipeId != 0);
+#if UNITY_EDITOR
+            recipePlaceData = prevPlaceScore < recipePlaceData.needScore ? recipePlaceData : null;
+#endif
             if (recipePlaceData != null && placeScoreData.Score >= recipePlaceData.needScore)
             {
                 if (!gameData.MyRecipes.Contains(recipePlaceData.recipeId))
@@ -89,19 +98,25 @@ namespace MyGame.Scenes.MiniGame.Scripts
             detailObject.SetActive(true);
             
             // 商品獲得済みならレシピ非表示
-            if (prevPlaceScore >= recipePlaceData.needScore)
+            if (recipePlaceData is null)
-            // if (recipePlaceData is null)
             {
                 // detailの表示位置変更
                 detailObject.transform.SetLocalPositionY(detailOffset);
             }
             else
             {
+                detailObject.transform.SetLocalPositionY(defaultDetailObjectPos.y);
                 meterObject.SetActive(true);
                 SetProgress((float)prevPlaceScore / recipePlaceData.needScore, false);
                 this.CallWaitForSeconds(waitProgress, () =>
                 {
-                    SetProgress((float)placeScoreData.Score / recipePlaceData.needScore);
+                    SetProgress((float)placeScoreData.Score / recipePlaceData.needScore, true, () =>
+                    {
+                        if (placeScoreData.Score >= recipePlaceData.needScore)
+                        {
+                            ShopItemExchangeView.ShowDialog(shopDataList.FirstOrDefault(data => data.itemId == recipePlaceData.recipeId && data.Category == ItemCategory.Recipe));
+                        }
+                    });
                 });
             }
             this.CallWaitForSeconds(waitButtonActive, () =>

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs

@@ -11,8 +11,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private Text stageHiScore;
         [SerializeField] private Button button;
         [SerializeField] private GameObject lockObject;
+        [SerializeField] private Text lockText;
         private readonly IntReactiveProperty hiScore = new IntReactiveProperty();
-        private int needScore;
 
         private void Start()
         {
@@ -27,9 +27,26 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
         public IObservable<Unit> OnClick => button.OnClickAsObservable().TakeUntilDestroy(this);
 
+        public void SetPrevStageData(ScrollGameStageData stageData)
+        {
+            switch (stageData.Difficulty)
+            {
+                case ScrollGameDifficulty.Easy:
+                    lockText.text = $"初級のハイスコア{stageData.needScore}以上で開放";
+                    break;
+                case ScrollGameDifficulty.Normal:
+                    lockText.text = $"中級のハイスコア{stageData.needScore}以上で開放";
+                    break;
+                case ScrollGameDifficulty.Hard:
+                    lockText.text = string.Empty;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
         public void SetData(ScrollGameStageData stageData)
         {
-            needScore = stageData.needScore;
             // stageName.text = stageData.id.ToString();
         }
 

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs

@@ -42,5 +42,10 @@ namespace MyGame.Scenes.MiniGame.Scripts
                 }
             }
         }
+
+        public void SetRecipeActive(bool active)
+        {
+            recipeObject.SetActive(active);
+        }
     }
 }

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

@@ -52,12 +52,13 @@ public class Shopping : MonoBehaviour
                 HeartMeter.Instance.AddHeart(pair.Current - pair.Previous);
             }).AddTo(this);
 
-        foreach (var shopData in shopDataList)
+        // 表示するShopDataを制限
+        var filteredShopDataList = shopDataList
+            .Where(data => !data.IsHide)
+            .Where(data => data.Category != ItemCategory.Special);
+        
+        foreach (var shopData in filteredShopDataList)
         {
-            if (shopData.Category == ItemCategory.Special)
-            {
-                continue;
-            }
             var itemView = listView.AddItemView(shopData);
             itemView.SetData(shopData);
             itemView.SetStockCount(GetItemAmount(shopData));

popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs

@@ -448,10 +448,12 @@ public sealed class ShopData {
     public int category;
     public int consumeType;
     public string prefabName;
+    public int hide;
     public string Name => LocalizationManager.GetTranslation($"Item/MaterialName{id:0000}");
     public string Text => LocalizationManager.GetTranslation($"Item/MaterialText{id:0000}");
     public ItemCategory Category => (ItemCategory)category;
     public ShopItemType ConsumeType => (ShopItemType)consumeType;
+    public bool IsHide => hide == 1;
 
     public Transform GetPrefab()
     {
@@ -553,4 +555,5 @@ public sealed class ScrollGameStageData
     public int needScore;
     public string beginPrefabName;
     public string randomPrefabName;
+    public ScrollGameDifficulty Difficulty => (ScrollGameDifficulty)difficulty;
 }