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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  レシピPOP背景追加
  仕入れ画面配置途中

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

@@ -1106,8 +1106,8 @@ Camera:
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
   m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
+  m_HDR: 0
+  m_AllowMSAA: 0
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
   m_OcclusionCulling: 1

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

@@ -1329,8 +1329,8 @@ Camera:
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
   m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
+  m_HDR: 0
+  m_AllowMSAA: 0
   m_AllowDynamicResolution: 0
   m_ForceIntoRT: 0
   m_OcclusionCulling: 1

popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity

@@ -1259,7 +1259,7 @@ GameObject:
   - component: {fileID: 858120092}
   - component: {fileID: 858120091}
   m_Layer: 5
-  m_Name: Image
+  m_Name: background
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1297,7 +1297,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843}
   m_RaycastTarget: 0
   m_Maskable: 1
   m_OnCullStateChanged:

popcorn/Assets/MyGame/Scenes/shopping.meta

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

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9c9b9e2851656c84e91e3c457a81433d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: