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

* 'develop' of https://bitbucket.org/usaya/popcorn: 強化POP一部調整強化POP追加強化POP途中強化POP途中
2021-08-11 11:20:37 +09:00 · 2021-08-11 11:20:37 +09:00 · dc23933a63
parent b3cf8e9d75 7885b7ca56
commit dc23933a63
18 changed files with 4410 additions and 82 deletions
--- a/popcorn/Assets/MyGame/Resource/Animation/BackgroundWhite.anim
+++ b/popcorn/Assets/MyGame/Resource/Animation/BackgroundWhite.anim
@ -30,7 +30,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.25
+        time: 0.16666667
        value: 0.3137255
        inSlope: 0
        outSlope: 0
@ -66,7 +66,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.25
+    m_StopTime: 0.16666667
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -95,7 +95,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.25
+        time: 0.16666667
        value: 0.3137255
        inSlope: 0
        outSlope: 0
--- a/popcorn/Assets/MyGame/Resource/Animation/BackgroundWhite_disappear.anim
+++ b/popcorn/Assets/MyGame/Resource/Animation/BackgroundWhite_disappear.anim
@ -30,7 +30,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.25
+        time: 0.16666667
        value: 0
        inSlope: 0
        outSlope: 0
@ -66,7 +66,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.25
+    m_StopTime: 0.16666667
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -95,7 +95,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.25
+        time: 0.16666667
        value: 0
        inSlope: 0
        outSlope: 0
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop.png.meta
@ -46,7 +46,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 104, y: 110, z: 104, w: 110}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame.png.meta
@ -46,7 +46,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 90, y: 90, z: 90, w: 90}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame_soil.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_ComField_pop_MediumFrame_soil.png.meta
@ -46,7 +46,7 @@ TextureImporter:
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 260, y: 17, z: 260, w: 59}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_Blue_small.png
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_Blue_small.png
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_Blue_small.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/Reinforcement/ui_button_Blue_small.png.meta
@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 40ed79e6ffdfa424fbf23ffa60973bb2
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 46, y: 40, z: 46, w: 40}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png
+++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png
--- a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_button_Blue_small.png.meta
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_change.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_change.prefab
@ -30,11 +30,11 @@ RectTransform:
  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
  m_Children: []
  m_Father: {fileID: 3910593344630799909}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 41.3, y: 17.50005}
+  m_AnchoredPosition: {x: 41.3, y: 17.5}
  m_SizeDelta: {x: 170, y: 404}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5411650623436018722
@ -104,11 +104,11 @@ RectTransform:
  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
  m_Children: []
  m_Father: {fileID: 3910593344630799909}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 41.3, y: 17.50005}
+  m_AnchoredPosition: {x: 41.3, y: 17.5}
  m_SizeDelta: {x: 170, y: 404}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &497755294262526009
@ -179,7 +179,7 @@ RectTransform:
  m_Children:
  - {fileID: 3910593342547943750}
  m_Father: {fileID: 3910593344630799909}
-  m_RootOrder: 4
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -387,7 +387,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 3910593344630799909}
-  m_RootOrder: 0
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -454,10 +454,11 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3910593344630799910}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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: 7320877948714771483}
  - {fileID: 3910593343680838032}
  - {fileID: 4409112968089360317}
  - {fileID: 199668613266706433}
@ -471,6 +472,80 @@ RectTransform:
  m_AnchoredPosition: {x: -160, y: 41}
  m_SizeDelta: {x: 200, y: 220}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5208769480954757392
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7320877948714771483}
+  - component: {fileID: 7730610960078161165}
+  - component: {fileID: 1032536407935869193}
+  m_Layer: 5
+  m_Name: soil_frame
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7320877948714771483
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5208769480954757392}
+  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: []
+  m_Father: {fileID: 3910593344630799909}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -77.13}
+  m_SizeDelta: {x: 200, y: 65.744385}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7730610960078161165
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5208769480954757392}
+  m_CullTransparentMesh: 0
+--- !u!114 &1032536407935869193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5208769480954757392}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4627451, g: 0.32156864, b: 0.20784314, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 2e124af6eaea54b0ab5378b97039ad76, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8792014694231266041
 GameObject:
  m_ObjectHideFlags: 0
@ -501,7 +576,7 @@ RectTransform:
  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
  m_Children: []
  m_Father: {fileID: 3910593344630799909}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_small.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_small.prefab
@ -0,0 +1,262 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1900773927654150363
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1900773927654150362}
+  - component: {fileID: 1900773927654150360}
+  - component: {fileID: 1900773927654150361}
+  m_Layer: 5
+  m_Name: Seedling_c
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1900773927654150362
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773927654150363}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998}
+  m_Children: []
+  m_Father: {fileID: 1900773928035009608}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 29}
+  m_SizeDelta: {x: 170, y: 404}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1900773927654150360
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773927654150363}
+  m_CullTransparentMesh: 0
+--- !u!114 &1900773927654150361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773927654150363}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 87c3532876a47b24d8d80ad90bf34317, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1900773928035009609
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1900773928035009608}
+  m_Layer: 5
+  m_Name: Seedling_small
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1900773928035009608
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773928035009609}
+  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: 1900773928939151479}
+  - {fileID: 1900773929261835484}
+  - {fileID: 1900773927654150362}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -250, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1900773928939151480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1900773928939151479}
+  - component: {fileID: 1900773928939151477}
+  - component: {fileID: 1900773928939151478}
+  m_Layer: 5
+  m_Name: Seedling_a
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1900773928939151479
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773928939151480}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998}
+  m_Children: []
+  m_Father: {fileID: 1900773928035009608}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 29}
+  m_SizeDelta: {x: 170, y: 404}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1900773928939151477
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773928939151480}
+  m_CullTransparentMesh: 0
+--- !u!114 &1900773928939151478
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773928939151480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 23f3adb30ad565d4e819ecc541cb56e7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1900773929261835485
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1900773929261835484}
+  - component: {fileID: 1900773929261835482}
+  - component: {fileID: 1900773929261835483}
+  m_Layer: 5
+  m_Name: Seedling_b
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1900773929261835484
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773929261835485}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.39999998, y: 0.39999998, z: 0.39999998}
+  m_Children: []
+  m_Father: {fileID: 1900773928035009608}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 29}
+  m_SizeDelta: {x: 170, y: 404}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1900773929261835482
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773929261835485}
+  m_CullTransparentMesh: 0
+--- !u!114 &1900773929261835483
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900773929261835485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 54809ccaffeeb7448a678de69ad4996b, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_small.prefab.meta
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/Seedling_small.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9ebb93e1ff784e2419d2996e1ee519bf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab.meta
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/detail.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3b83b2dcff1e08e4da1ac3efa5bd349c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Reinforcement.unity
--- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity
+++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity
@ -601,7 +601,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 20, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 705, y: 705}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1027618685
--- a/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity
+++ b/popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity
@ -934,7 +934,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 20, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 705, y: 705}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &571286297
--- a/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity
+++ b/popcorn/Assets/MyGame/Scenes/shopping/ShoppingExplanation.unity
@ -784,7 +784,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 20, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 590, y: 622}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1857183107