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

@@ -152,8 +152,88 @@ Transform:
   - {fileID: 279224990}
   - {fileID: 1958951428}
   m_Father: {fileID: 1501215306}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &184001911
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1501215306}
+    m_Modifications:
+    - target: {fileID: 7854448232971748896, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_Name
+      value: Brother_pink
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748896, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 4.39
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: febae22cb9bba384992e30ac63891778, type: 3}
+--- !u!4 &184001912 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7854448232971748899, guid: febae22cb9bba384992e30ac63891778,
+    type: 3}
+  m_PrefabInstance: {fileID: 184001911}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &279224989
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -292,7 +372,7 @@ Transform:
   - {fileID: 1793483901}
   - {fileID: 998360038}
   m_Father: {fileID: 1501215306}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &282523124
 MonoBehaviour:
@@ -1145,7 +1225,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1501215306}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &998360037
 GameObject:
@@ -1488,6 +1568,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 184001912}
   - {fileID: 1989990598}
   - {fileID: 895001959}
   - {fileID: 282523123}
@@ -1797,7 +1878,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1501215306}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1989990599
 SpriteRenderer:

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Arrow_movie.prefab

@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1959016262968426608
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2653322548499967351}
+  - component: {fileID: 2083873889221709403}
+  m_Layer: 0
+  m_Name: Arrow_movie
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2653322548499967351
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959016262968426608}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.48, y: -0.16, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2083873889221709403
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1959016262968426608}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 50
+  m_Sprite: {fileID: 21300000, guid: 95b78347887235547944e937a86d74ad, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.5, y: 0.52}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Arrow_movie.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a9c63e2e1915fc34fa16c47e94ad4a6f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/ShortenedArrow_movie.prefab

@@ -0,0 +1,280 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5673955171362880518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5673955171362880516}
+  - component: {fileID: 5673955171362880517}
+  m_Layer: 0
+  m_Name: ShortenedArrow_movie
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5673955171362880516
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5673955171362880518}
+  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:
+  - {fileID: 7099206160146715967}
+  - {fileID: 3236582970492527212}
+  - {fileID: 6385139363532439470}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &5673955171362880517
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5673955171362880518}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 2365e5cf9386fbf48ae7c13f5c16d500, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1001 &592462892257169179
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5673955171362880516}
+    m_Modifications:
+    - target: {fileID: 1959016262968426608, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_Name
+      value: Arrow (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.44
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9c63e2e1915fc34fa16c47e94ad4a6f, type: 3}
+--- !u!4 &3236582970492527212 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+    type: 3}
+  m_PrefabInstance: {fileID: 592462892257169179}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5068533853452286024
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5673955171362880516}
+    m_Modifications:
+    - target: {fileID: 1959016262968426608, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_Name
+      value: Arrow
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.48
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.16
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9c63e2e1915fc34fa16c47e94ad4a6f, type: 3}
+--- !u!4 &7099206160146715967 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+    type: 3}
+  m_PrefabInstance: {fileID: 5068533853452286024}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8957356911383614169
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5673955171362880516}
+    m_Modifications:
+    - target: {fileID: 1959016262968426608, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_Name
+      value: Arrow (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.48
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.62
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9c63e2e1915fc34fa16c47e94ad4a6f, type: 3}
+--- !u!4 &6385139363532439470 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2653322548499967351, guid: a9c63e2e1915fc34fa16c47e94ad4a6f,
+    type: 3}
+  m_PrefabInstance: {fileID: 8957356911383614169}
+  m_PrefabAsset: {fileID: 0}

popcorn/Assets/MyGame/Scenes/CornField/Prefabs/ShortenedArrow_movie.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 88dad79710e831d429a89be0768b9071
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Brother_pink.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: febae22cb9bba384992e30ac63891778
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: