Merge branches 'develop', 'develop' and 'develop' of https://bitbucket.org/usaya/popcorn into develop

* 'develop' of https://bitbucket.org/usaya/popcorn:
  畑素材位置調整
  ボタン調整

* 'develop' of https://bitbucket.org/usaya/popcorn:
  畑素材位置調整
  ボタン調整

* 'develop' of https://bitbucket.org/usaya/popcorn:
  畑素材位置調整
  ボタン調整

popcorn/Assets/MyGame/Resource/UI/old.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5f950a6a7b6edf846a8f11c426f443dc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -337,6 +337,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 149181931}
     m_Modifications:
+    - target: {fileID: 334932330918419862, guid: 5e326851a49dc4fd9b51d54fb58f4e02,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5.033
+      objectReference: {fileID: 0}
+    - target: {fileID: 450955862584847016, guid: 5e326851a49dc4fd9b51d54fb58f4e02,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.13
+      objectReference: {fileID: 0}
     - target: {fileID: 5984684976362293252, guid: 5e326851a49dc4fd9b51d54fb58f4e02,
         type: 3}
       propertyPath: m_RootOrder
@@ -397,6 +407,21 @@ PrefabInstance:
       propertyPath: m_Name
       value: Center
       objectReference: {fileID: 0}
+    - target: {fileID: 7492351322203168974, guid: 5e326851a49dc4fd9b51d54fb58f4e02,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5.03
+      objectReference: {fileID: 0}
+    - target: {fileID: 7999896198779198817, guid: 5e326851a49dc4fd9b51d54fb58f4e02,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.06
+      objectReference: {fileID: 0}
+    - target: {fileID: 8429967330658841282, guid: 5e326851a49dc4fd9b51d54fb58f4e02,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.28
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5e326851a49dc4fd9b51d54fb58f4e02, type: 3}
 --- !u!4 &279224990 stripped
@@ -2743,6 +2768,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 149181931}
     m_Modifications:
+    - target: {fileID: 334932330918419862, guid: 0949d70c1a73342ca8955c7f59c04fe0,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5.033
+      objectReference: {fileID: 0}
     - target: {fileID: 5984684976362293252, guid: 0949d70c1a73342ca8955c7f59c04fe0,
         type: 3}
       propertyPath: m_RootOrder
@@ -2803,6 +2833,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Top
       objectReference: {fileID: 0}
+    - target: {fileID: 7492351322203168974, guid: 0949d70c1a73342ca8955c7f59c04fe0,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5.03
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0949d70c1a73342ca8955c7f59c04fe0, type: 3}
 --- !u!4 &1589622940 stripped
@@ -3030,6 +3065,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 149181931}
     m_Modifications:
+    - target: {fileID: 334932330918419862, guid: 0949d70c1a73342ca8955c7f59c04fe0,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5.033
+      objectReference: {fileID: 0}
     - target: {fileID: 3767471200807653374, guid: 0949d70c1a73342ca8955c7f59c04fe0,
         type: 3}
       propertyPath: lineName
@@ -3095,6 +3135,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Bottom
       objectReference: {fileID: 0}
+    - target: {fileID: 7492351322203168974, guid: 0949d70c1a73342ca8955c7f59c04fe0,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -5.03
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0949d70c1a73342ca8955c7f59c04fe0, type: 3}
 --- !u!4 &1958951428 stripped