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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  文字フォント太さ変更
  ボタン調整

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

@@ -783,7 +783,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
     m_FontSize: 45
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 1
     m_MinSize: 45
     m_MaxSize: 45
@@ -15057,6 +15057,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1507187604180242769, guid: 21599f8e6d1104a07b0b14b49f8c1429,
+        type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 21599f8e6d1104a07b0b14b49f8c1429, type: 3}
 --- !u!114 &1507187603938887411 stripped

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

@@ -128,6 +128,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2377818822785157574, guid: 5a98de00194aa40f6a3050df19f4e5f5,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2377818823490934338, guid: 5a98de00194aa40f6a3050df19f4e5f5,
         type: 3}
       propertyPath: m_Pivot.x

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

@@ -238,5 +238,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7864277048177254394, guid: a2309e5e619554230b1f6d3d9426ed51,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a2309e5e619554230b1f6d3d9426ed51, type: 3}

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

@@ -528,7 +528,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
     m_FontSize: 45
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 1
     m_MinSize: 45
     m_MaxSize: 45
@@ -711,7 +711,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535

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

@@ -318,5 +318,20 @@ PrefabInstance:
       propertyPath: m_Camera
       value: 
       objectReference: {fileID: 1015955096}
+    - 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}

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

@@ -208,6 +208,21 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8326132141119378160, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 2048
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141119378160, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 2736
+      objectReference: {fileID: 0}
+    - target: {fileID: 8326132141119378160, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8326132141332391088, guid: dcd945ce96b2149a0a5f9f2be4b2fbea,
         type: 3}
       propertyPath: m_Pivot.x

popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab

@@ -368,8 +368,6 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 2912042419150224393}
-  - {fileID: 2912042419929665552}
   - {fileID: 2912042419400614768}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -912,12 +910,12 @@ RectTransform:
   m_Children:
   - {fileID: 2912042418702301919}
   - {fileID: 2912042418828803474}
-  m_Father: {fileID: 2912042418274684491}
+  m_Father: {fileID: 2912042419400614768}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 12, y: -564}
+  m_AnchoredPosition: {x: 12, y: 11}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2912042419150224407
@@ -1135,9 +1133,11 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 2912042419150224393}
+  - {fileID: 2912042419929665552}
   - {fileID: 2912042419879831596}
   m_Father: {fileID: 2912042418274684491}
-  m_RootOrder: 2
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1431,7 +1431,7 @@ RectTransform:
   m_Children:
   - {fileID: 2912042418150409391}
   m_Father: {fileID: 2912042419400614768}
-  m_RootOrder: 0
+  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}
@@ -1463,11 +1463,11 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2912042419929665555}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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: 2912042418274684491}
+  m_Father: {fileID: 2912042419400614768}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}