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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  レベルアップ時の黒透過背景見切れていたのを調整
  SEがなかったところ追加

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

@@ -690,6 +690,7 @@ GameObject:
   - component: {fileID: 445566317}
   - component: {fileID: 445566316}
   - component: {fileID: 445566315}
+  - component: {fileID: 445566318}
   m_Layer: 5
   m_Name: Button_relaxation
   m_TagString: Untagged
@@ -796,6 +797,22 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 445566313}
   m_CullTransparentMesh: 0
+--- !u!114 &445566318
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 445566313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onClickPlaySEFilename: se_ButtonTap
+  randomPlaySEFilenames: []
+  randomPlayVoiceFilenames: []
+  vibrationType: 0
 --- !u!1 &456808378
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab

@@ -11296,10 +11296,10 @@ RectTransform:
   m_Father: {fileID: 8660695105553703406}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.9951172}
+  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 2000, y: 2500}
+  m_SizeDelta: {x: 1027.7856, y: 528}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8660695105907544111
 CanvasRenderer:

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

@@ -323,20 +323,5 @@ PrefabInstance:
       propertyPath: m_SortingOrder
       value: 200
       objectReference: {fileID: 0}
-    - target: {fileID: 8660695105907544098, guid: 7a0e45165860f4e5099d690b636937a8,
-        type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 2048
-      objectReference: {fileID: 0}
-    - target: {fileID: 8660695105907544098, guid: 7a0e45165860f4e5099d690b636937a8,
-        type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 2736
-      objectReference: {fileID: 0}
-    - target: {fileID: 8660695105907544098, guid: 7a0e45165860f4e5099d690b636937a8,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7a0e45165860f4e5099d690b636937a8, type: 3}