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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  仕入れタブのビックリマークの表示ONOFF逆だったので修正

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

@@ -31,7 +31,6 @@ RectTransform:
   m_Children:
   - {fileID: 2912042419614313715}
   - {fileID: 1181189223863516272}
-  - {fileID: 2507491505730647147}
   m_Father: {fileID: 2912042418828803474}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -441,6 +440,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2912042419340105159}
+  - {fileID: 2507491505730647147}
   m_Father: {fileID: 2912042418828803474}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2614,7 +2614,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 2912042418098885679}
+    m_TransformParent: {fileID: 2912042418451981108}
     m_Modifications:
     - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
         type: 3}
@@ -2629,7 +2629,7 @@ PrefabInstance:
     - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
         type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
         type: 3}
@@ -2714,12 +2714,12 @@ PrefabInstance:
     - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 199
+      value: 223.7
       objectReference: {fileID: 0}
     - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 47
+      value: 43.2
       objectReference: {fileID: 0}
     - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
         type: 3}