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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  煙調整
  販売画面背景iPhoneXカメラサイズ用に調整
  畑背景調整
  販売背景調整
  SE調整、畑ボタン位置調整
  位置調整

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

@@ -902,7 +902,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 374
+      value: 385
       objectReference: {fileID: 0}
     - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
       propertyPath: m_AnchoredPosition.y

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

@@ -1817,7 +1817,7 @@ PrefabInstance:
     - target: {fileID: 5505851828519651022, guid: 0b1e1a744f3d5447d88970ba4f22d761,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -240
+      value: -233
       objectReference: {fileID: 0}
     - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761,
         type: 3}
@@ -2002,7 +2002,7 @@ PrefabInstance:
     - target: {fileID: 8157765726200260526, guid: 0b1e1a744f3d5447d88970ba4f22d761,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -236.00012
+      value: -229.00006
       objectReference: {fileID: 0}
     - target: {fileID: 8908151885642361585, guid: 0b1e1a744f3d5447d88970ba4f22d761,
         type: 3}

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

@@ -2433,7 +2433,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 969022924}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -9.13, z: 0}
+  m_LocalPosition: {x: 0, y: -11.97, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1102296790}
@@ -2948,7 +2948,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1102296789}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 1.28, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2066991625}
@@ -3065,7 +3065,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1165998903}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 4.05, y: -0.18, z: 0}
+  m_LocalPosition: {x: 4.05, y: -1.27, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1102296790}
@@ -3305,6 +3305,21 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
+        type: 3}
+      propertyPath: m_ClearFlags
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
+        type: 3}
+      propertyPath: orthographic size
+      value: 11.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 32
+      objectReference: {fileID: 0}
     - target: {fileID: 9117079084301130545, guid: 021717b65b165374faa3fcffaafedfc2,
         type: 3}
       propertyPath: m_RootOrder
@@ -3397,7 +3412,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1280903570}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -6.67, y: 3.724, z: 0}
+  m_LocalPosition: {x: -6.67, y: 3.88, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_Children:
   - {fileID: 438315599}
@@ -3741,7 +3756,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1506158579}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.38, z: 0}
+  m_LocalPosition: {x: 0, y: -0.07, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_Children:
   - {fileID: 1178501604}
@@ -4825,7 +4840,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2048621274}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.83399993, z: 0}
+  m_LocalPosition: {x: 0, y: 0.99000007, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1064237506}
@@ -5006,7 +5021,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2066991624}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 5.53, z: 0}
+  m_LocalPosition: {x: 0, y: 5.24, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1102296790}
@@ -5088,7 +5103,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2070127406}
   m_LocalRotation: {x: -0, y: -0, z: -0.16968642, w: 0.98549813}
-  m_LocalPosition: {x: -3.08, y: 8.06, z: 0}
+  m_LocalPosition: {x: -3.08, y: 7.87, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1102296790}
@@ -5240,9 +5255,9 @@ ParticleSystem:
     enabled: 1
     startLifetime:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 1.5
-      minScalar: 5
+      minScalar: 3
       maxCurve:
         serializedVersion: 2
         m_Curve:
@@ -5347,8 +5362,8 @@ ParticleSystem:
     startColor:
       serializedVersion: 2
       minMaxState: 2
-      minColor: {r: 0.756141, g: 0.9056604, b: 0.88124907, a: 1}
-      maxColor: {r: 0.77254903, g: 0.98823535, b: 0.8901961, a: 1}
+      minColor: {r: 0.84313726, g: 0.91764706, b: 0.8352941, a: 1}
+      maxColor: {r: 0.8784314, g: 0.98823535, b: 0.8901961, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5991,7 +6006,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 10
+      scalar: 8
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -6109,29 +6124,29 @@ ParticleSystem:
         - serializedVersion: 3
           time: 0
           value: 0
-          inSlope: 3.386139
-          outSlope: 3.386139
-          tangentMode: 0
-          weightedMode: 0
+          inSlope: 6.0501666
+          outSlope: 4.4347043
+          tangentMode: 1
+          weightedMode: 2
           inWeight: 0
-          outWeight: 0.2099401
+          outWeight: 0.23630567
         - serializedVersion: 3
-          time: 0.5013961
-          value: 0.9108906
-          inSlope: 0.57507986
-          outSlope: 0.57507986
+          time: 0.6625901
+          value: 0.9692301
+          inSlope: 0.0000004162707
+          outSlope: 0.0000004162707
           tangentMode: 0
           weightedMode: 0
-          inWeight: 0.33333334
-          outWeight: 0.31076887
+          inWeight: 0.27415186
+          outWeight: 0.21169788
         - serializedVersion: 3
           time: 1
-          value: 0.97029686
-          inSlope: 0.119145244
+          value: 0
+          inSlope: -4.850296
           outSlope: 0.120677724
-          tangentMode: 5
-          weightedMode: 0
-          inWeight: 0.1645966
+          tangentMode: 1
+          weightedMode: 1
+          inWeight: 0.22513114
           outWeight: 0
         m_PreInfinity: 2
         m_PostInfinity: 2
@@ -6446,7 +6461,7 @@ ParticleSystem:
         key5: {r: 0, g: 0, b: 0, a: 0}
         key6: {r: 0, g: 0, b: 0, a: 0}
         key7: {r: 0, g: 0, b: 0, a: 0}
-        ctime0: 0
+        ctime0: 4241
         ctime1: 65535
         ctime2: 0
         ctime3: 0
@@ -6454,7 +6469,7 @@ ParticleSystem:
         ctime5: 0
         ctime6: 0
         ctime7: 0
-        atime0: 9445
+        atime0: 23708
         atime1: 32960
         atime2: 65535
         atime3: 0
@@ -7485,7 +7500,7 @@ ParticleSystem:
       m_Bits: 4294967295
     influenceList: []
   ClampVelocityModule:
-    enabled: 1
+    enabled: 0
     x:
       serializedVersion: 2
       minMaxState: 0
@@ -8632,7 +8647,7 @@ ParticleSystem:
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
-        key1: {r: 1, g: 1, b: 1, a: 0.7058824}
+        key1: {r: 1, g: 1, b: 1, a: 0.4627451}
         key2: {r: 0, g: 0, b: 0, a: 0}
         key3: {r: 0, g: 0, b: 0, a: 0}
         key4: {r: 0, g: 0, b: 0, a: 0}

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

@@ -775,6 +775,11 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 203041985174341361, guid: 667a93fb2929943078b944050cddd464,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -82
+      objectReference: {fileID: 0}
     - target: {fileID: 203041985587704421, guid: 667a93fb2929943078b944050cddd464,
         type: 3}
       propertyPath: m_AnchorMax.y
@@ -1010,6 +1015,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 21
       objectReference: {fileID: 0}
+    - target: {fileID: 5255014595623885689, guid: 667a93fb2929943078b944050cddd464,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 816
+      objectReference: {fileID: 0}
     - target: {fileID: 8406322788473649226, guid: 667a93fb2929943078b944050cddd464,
         type: 3}
       propertyPath: m_AnchorMax.y

popcorn/ProjectSettings/EditorBuildSettings.asset

@@ -9,10 +9,10 @@ EditorBuildSettings:
     path: Assets/MyGame/Scenes/Main/Main.unity
     guid: 7f040d1b248234841802683edae3c4fa
   - enabled: 1
-    path: Assets/MyGame/Scenes/recipe/recipe.unity
+    path: Assets/MyGame/Scenes/Recipe/recipe.unity
     guid: e3d17c6b649257641bd3b50559692087
   - enabled: 1
-    path: Assets/MyGame/Scenes/recipe/RecipeChoice.unity
+    path: Assets/MyGame/Scenes/Recipe/RecipeChoice.unity
     guid: 303178fa574d90d4f81046cb6a3a1b9c
   - enabled: 1
     path: Assets/MyGame/Scenes/Cooking/Cooking.unity
@@ -36,13 +36,13 @@ EditorBuildSettings:
     path: Assets/MyGame/Scenes/marketing/Tasting.unity
     guid: 79a0196644bebaa49a6d8e1df6ada879
   - enabled: 1
-    path: Assets/MyGame/Scenes/shopping/shopping.unity
+    path: Assets/MyGame/Scenes/Shopping/shopping.unity
     guid: 9c9b9e2851656c84e91e3c457a81433d
   - enabled: 1
-    path: Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity
+    path: Assets/MyGame/Scenes/Shopping/ShoppingExplanation.unity
     guid: 56dcb15cfd0593b4ab5045ee38a03b1f
   - enabled: 1
-    path: Assets/MyGame/Scenes/shopping/Purchase.unity
+    path: Assets/MyGame/Scenes/Shopping/Purchase.unity
     guid: 6cdf801ecd42cd543a2b68afba311048
   - enabled: 1
     path: Assets/MyGame/Scenes/DebugOption/DebugOption.unity
@@ -75,7 +75,7 @@ EditorBuildSettings:
     path: Assets/MyGame/Scenes/marketing/StoreLevel.unity
     guid: dc598de0b6795c7438594565a5c87cba
   - enabled: 1
-    path: Assets/MyGame/Scenes/marketing/Conversation.unity
+    path: Assets/MyGame/Scenes/marketing/conversation.unity
     guid: 92908ec648b4a114c80cb309941b14f4
   - enabled: 1
     path: Assets/MyGame/Scenes/Main/Information.unity