畑コーン演出調整

2021-09-29 20:24:54 +09:00 · 2021-09-29 20:24:54 +09:00 · 6a2a600c7f
parent 1dfab2348d
commit 6a2a600c7f
24 changed files with 21939 additions and 6691 deletions
--- a/popcorn/Assets/MyGame/Resource/Animation/CornField_lv1.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/CornField_lv1.controller
@ -19,7 +19,7 @@ AnimatorStateTransition:
  serializedVersion: 3
  m_TransitionDuration: 0
  m_TransitionOffset: 0
-  m_ExitTime: 0.75
+  m_ExitTime: 0.99974555
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -39,9 +39,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.07454425
+  m_TransitionDuration: 0.14600891
  m_TransitionOffset: 0
-  m_ExitTime: 0.8042498
+  m_ExitTime: 0.7743075
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -93,9 +93,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0
+  m_TransitionDuration: 0.16258526
  m_TransitionOffset: 0
-  m_ExitTime: 0.975
+  m_ExitTime: 0.9836658
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -115,13 +115,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Save
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
--- a/popcorn/Assets/MyGame/Resource/Animation/CornField_lv2.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/CornField_lv2.controller
@ -63,9 +63,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.07454425
+  m_TransitionDuration: 0.08350915
  m_TransitionOffset: 0
-  m_ExitTime: 0.8042498
+  m_ExitTime: 0.87321013
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -117,9 +117,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0
+  m_TransitionDuration: 0.16565323
  m_TransitionOffset: 0
-  m_ExitTime: 0.975
+  m_ExitTime: 0.9834062
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -186,13 +186,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Grow
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
--- a/popcorn/Assets/MyGame/Resource/Animation/CornField_lv3.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/CornField_lv3.controller
@ -39,9 +39,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.07454425
+  m_TransitionDuration: 0.049779832
  m_TransitionOffset: 0
-  m_ExitTime: 0.8042498
+  m_ExitTime: 0.9234235
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -64,9 +64,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0
+  m_TransitionDuration: 0.18195057
  m_TransitionOffset: 0
-  m_ExitTime: 0.97504157
+  m_ExitTime: 0.9818304
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -115,13 +115,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Grow
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
--- a/popcorn/Assets/MyGame/Resource/Animation/CornField_lv4.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/CornField_lv4.controller
@ -61,9 +61,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0.07454425
+  m_TransitionDuration: 0.047599554
  m_TransitionOffset: 0
-  m_ExitTime: 0.8042498
+  m_ExitTime: 0.9261127
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
@ -112,13 +112,13 @@ AnimatorController:
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  - m_Name: Grow
    m_Type: 9
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -176,9 +176,9 @@ AnimatorStateTransition:
  m_Mute: 0
  m_IsExit: 0
  serializedVersion: 3
-  m_TransitionDuration: 0
+  m_TransitionDuration: 0.1623106
  m_TransitionOffset: 0
-  m_ExitTime: 0.975
+  m_ExitTime: 0.9835802
  m_HasExitTime: 0
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
--- a/popcorn/Assets/MyGame/Resource/Animation/Corn_save.anim
+++ b/popcorn/Assets/MyGame/Resource/Animation/Corn_save.anim
@ -49,14 +49,14 @@ AnimationClip:
      - serializedVersion: 3
        time: 0.25
        value: {x: 1.1264708, y: 0.6128282, z: 1}
-        inSlope: {x: 0.3533711, y: -1.1313775, z: 0}
-        outSlope: {x: 0.3533711, y: -1.1313775, z: 0}
+        inSlope: {x: 0.18174885, y: -0.3831828, z: 0}
+        outSlope: {x: 0.18174885, y: -0.3831828, z: 0}
        tangentMode: 0
        weightedMode: 0
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.20481789, y: 0.16865274, z: 0.33333334}
+        outWeight: {x: 0.2724981, y: 0.31176496, z: 0.33333334}
      - serializedVersion: 3
-        time: 0.5
+        time: 1
        value: {x: 1.157135, y: 0.5067291, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -90,7 +90,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.5
+    m_StopTime: 1
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -130,14 +130,14 @@ AnimationClip:
      - serializedVersion: 3
        time: 0.25
        value: 1.1264708
-        inSlope: 0.3533711
-        outSlope: 0.3533711
+        inSlope: 0.18174885
+        outSlope: 0.18174885
        tangentMode: 0
        weightedMode: 0
        inWeight: 0.33333334
-        outWeight: 0.20481789
+        outWeight: 0.2724981
      - serializedVersion: 3
-        time: 0.5
+        time: 1
        value: 1.157135
        inSlope: 0
        outSlope: 0
@ -176,14 +176,14 @@ AnimationClip:
      - serializedVersion: 3
        time: 0.25
        value: 0.6128282
-        inSlope: -1.1313775
-        outSlope: -1.1313775
+        inSlope: -0.3831828
+        outSlope: -0.3831828
        tangentMode: 0
        weightedMode: 0
        inWeight: 0.33333334
-        outWeight: 0.16865274
+        outWeight: 0.31176496
      - serializedVersion: 3
-        time: 0.5
+        time: 1
        value: 0.5067291
        inSlope: 0
        outSlope: 0
@ -220,7 +220,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.5
+        time: 1
        value: 1
        inSlope: 0
        outSlope: 0
--- a/popcorn/Assets/MyGame/Resource/Animation/corn_grow.anim
+++ b/popcorn/Assets/MyGame/Resource/Animation/corn_grow.anim
@ -22,15 +22,15 @@ AnimationClip:
      - serializedVersion: 3
        time: 0
        value: {x: 1.1187928, y: 0.4375, z: 1}
-        inSlope: {x: -11.89252, y: 23.593138, z: 0}
-        outSlope: {x: -11.89252, y: 23.593138, z: 0}
+        inSlope: {x: -11.89252, y: 43.533127, z: 0}
+        outSlope: {x: -11.89252, y: 43.533127, z: 0}
        tangentMode: 0
        weightedMode: 0
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.17447603, y: 0.22432633, z: 0.33333334}
+        outWeight: {x: 0.17447603, y: 0.10803505, z: 0.33333334}
      - serializedVersion: 3
        time: 0.05
-        value: {x: 0.7283679, y: 1.2127587, z: 1}
+        value: {x: 0.7283679, y: 1.3594261, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -39,7 +39,7 @@ AnimationClip:
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
        time: 0.13333334
-        value: {x: 1.0826416, y: 0.92041016, z: 1}
+        value: {x: 1.1222534, y: 0.8784332, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -47,7 +47,7 @@ AnimationClip:
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
-        time: 0.26666668
+        time: 0.21666667
        value: {x: 0.97602844, y: 1.0246887, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -56,25 +56,7 @@ AnimationClip:
        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
      - serializedVersion: 3
-        time: 0.41666666
-        value: {x: 1, y: 1, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.5
-        value: {x: 0.98552704, y: 1.0151901, z: 1}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-      - serializedVersion: 3
-        time: 0.65
+        time: 0.33333334
        value: {x: 1, y: 1, z: 1}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -91,7 +73,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: {x: 0.55389, y: 0.55389, z: 0.55389}
+        value: {x: 0, y: 0, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
        tangentMode: 0
@ -171,7 +153,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 0.41666666
+        time: 0.33333334
        value: 0
        inSlope: Infinity
        outSlope: Infinity
@ -228,7 +210,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.65
+    m_StopTime: 0.33333334
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -267,7 +249,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.13333334
-        value: 1.0826416
+        value: 1.1222534
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -275,7 +257,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.26666668
+        time: 0.21666667
        value: 0.97602844
        inSlope: 0
        outSlope: 0
@ -284,25 +266,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.41666666
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.5
-        value: 0.98552704
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.65
+        time: 0.33333334
        value: 1
        inSlope: 0
        outSlope: 0
@ -323,15 +287,15 @@ AnimationClip:
      - serializedVersion: 3
        time: 0
        value: 0.4375
-        inSlope: 23.593138
-        outSlope: 23.593138
+        inSlope: 43.533127
+        outSlope: 43.533127
        tangentMode: 0
        weightedMode: 0
        inWeight: 0.33333334
-        outWeight: 0.22432633
+        outWeight: 0.10803505
      - serializedVersion: 3
        time: 0.05
-        value: 1.2127587
+        value: 1.3594261
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -340,7 +304,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.13333334
-        value: 0.92041016
+        value: 0.8784332
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -348,7 +312,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.26666668
+        time: 0.21666667
        value: 1.0246887
        inSlope: 0
        outSlope: 0
@ -357,25 +321,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.41666666
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.5
-        value: 1.0151901
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.65
+        time: 0.33333334
        value: 1
        inSlope: 0
        outSlope: 0
@ -421,7 +367,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.26666668
+        time: 0.21666667
        value: 1
        inSlope: 0
        outSlope: 0
@ -430,25 +376,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 0.41666666
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.5
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.65
+        time: 0.33333334
        value: 1
        inSlope: 0
        outSlope: 0
@ -496,7 +424,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: 0.55389
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -542,7 +470,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: 0.55389
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -588,7 +516,7 @@ AnimationClip:
      m_Curve:
      - serializedVersion: 3
        time: 0
-        value: 0.55389
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@ -642,7 +570,7 @@ AnimationClip:
        inWeight: 0
        outWeight: 0
      - serializedVersion: 3
-        time: 0.41666666
+        time: 0.33333334
        value: 0
        inSlope: Infinity
        outSlope: Infinity
--- a/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Sand.prefab
+++ b/popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Sand.prefab
@ -4768,7 +4768,7 @@ SortingGroup:
  m_Enabled: 1
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 22
+  m_SortingOrder: 35
 --- !u!1 &4087301220832393016
 GameObject:
  m_ObjectHideFlags: 0
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta
--- a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta
--- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
+++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
@ -190,7 +190,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 30
+  m_SortingOrder: 35
  m_Sprite: {fileID: 21300000, guid: 7128e1c9a50b74d85a99cb38a73bd817, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -809,7 +809,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 31
+  m_SortingOrder: 38
  m_Sprite: {fileID: 21300000, guid: b53241a370603445a8ff76d0ffd7ee4c, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -1074,7 +1074,7 @@ MonoBehaviour:
  coinCountText: {fileID: 387414333}
  coinAnimator: {fileID: 0}
  coinPrefab: {fileID: 0}
-  duration: 0.5
+  duration: 1
  rootTransform: {fileID: 0}
 --- !u!114 &730756546 stripped
 MonoBehaviour:
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv2.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv2.prefab
@ -98,10 +98,15 @@ PrefabInstance:
      value: 
      objectReference: {fileID: -8081369559182651804, guid: 7cc1fdf9915ec42e6bfaf9a3bd6fdd4f,
        type: 3}
+    - target: {fileID: 7710888547271871327, guid: 69479a942167f499382e0114aed64476,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.029
+      objectReference: {fileID: 0}
    - target: {fileID: 7710888547271871327, guid: 69479a942167f499382e0114aed64476,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.942
+      value: -1.98
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 69479a942167f499382e0114aed64476, type: 3}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv3.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv3.prefab
@ -15,22 +15,22 @@ PrefabInstance:
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Center.x
-      value: -0.037053764
+      value: -0.045188904
      objectReference: {fileID: 0}
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Center.y
-      value: 1.0492141
+      value: 1.4276152
      objectReference: {fileID: 0}
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Extent.x
-      value: 0.81999826
+      value: 0.8200029
      objectReference: {fileID: 0}
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Extent.y
-      value: 1.687804
+      value: 1.6877956
      objectReference: {fileID: 0}
    - target: {fileID: 5117737557916342245, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
@ -96,12 +96,17 @@ PrefabInstance:
    - target: {fileID: 8590825953928804796, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.311
+      value: -1.71
+      objectReference: {fileID: 0}
+    - target: {fileID: 8957260552474391363, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.033
      objectReference: {fileID: 0}
    - target: {fileID: 8957260552474391363, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.958
+      value: -1.987
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 2c7c89d1c9c7a4ddab79278effae1bee, type: 3}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv4.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv4.prefab
@ -21,32 +21,42 @@ PrefabInstance:
    - target: {fileID: 3335635759838720365, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_Bounds.m_Center.x
-      value: -0.022116005
+      value: -0.049779356
      objectReference: {fileID: 0}
    - target: {fileID: 3335635759838720365, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_Bounds.m_Center.y
-      value: 1.2078639
+      value: 1.5905352
      objectReference: {fileID: 0}
    - target: {fileID: 3335635759838720365, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_Bounds.m_Extent.x
-      value: 0.8179424
+      value: 0.81794256
      objectReference: {fileID: 0}
    - target: {fileID: 3335635759838720365, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_Bounds.m_Extent.y
-      value: 1.9149978
+      value: 1.9149911
+      objectReference: {fileID: 0}
+    - target: {fileID: 6137360429209194683, guid: 3d9074ff9e2da4fca8b472ae71154e17,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.034
      objectReference: {fileID: 0}
    - target: {fileID: 6137360429209194683, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.941
+      value: -1.949
+      objectReference: {fileID: 0}
+    - target: {fileID: 6192791481742927895, guid: 3d9074ff9e2da4fca8b472ae71154e17,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.052
      objectReference: {fileID: 0}
    - target: {fileID: 6192791481742927895, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.226
+      value: -1.609
      objectReference: {fileID: 0}
    - target: {fileID: 7955334935270667293, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv2.prefab
@ -25,7 +25,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 768578857333566901}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.019, y: -1.852, z: 0}
+  m_LocalPosition: {x: 0.019, y: -1.869, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 5785395396630622201}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab
@ -78,7 +78,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2154562451383801257}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.019, y: -1.899, z: 0}
+  m_LocalPosition: {x: 0.009, y: -1.903, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 5117737557916342245}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab
@ -105,7 +105,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3784245152176354897}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.019, y: -1.866, z: 0}
+  m_LocalPosition: {x: 0.019, y: -1.886, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 7955334935270667293}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv1.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv1.prefab
@ -7,6 +7,11 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 1410483195900839529, guid: 29ad64acc5cd34684bb30b97ddc077ae,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.938
+      objectReference: {fileID: 0}
    - target: {fileID: 2943178000437240527, guid: 29ad64acc5cd34684bb30b97ddc077ae,
        type: 3}
      propertyPath: m_RootOrder
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv2.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv2.prefab
@ -96,7 +96,7 @@ PrefabInstance:
    - target: {fileID: 7710888547271871327, guid: 69479a942167f499382e0114aed64476,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.945
+      value: -1.956
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 69479a942167f499382e0114aed64476, type: 3}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv3.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv3.prefab
@ -15,22 +15,22 @@ PrefabInstance:
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Center.x
-      value: -0.026245952
+      value: -0.03900534
      objectReference: {fileID: 0}
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Center.y
-      value: 0.8650747
+      value: 1.024581
      objectReference: {fileID: 0}
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Extent.x
-      value: 0.81499934
+      value: 0.81500334
      objectReference: {fileID: 0}
    - target: {fileID: 991646161400911388, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_Bounds.m_Extent.y
-      value: 1.3249992
+      value: 1.3249965
      objectReference: {fileID: 0}
    - target: {fileID: 5117737557916342245, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
@ -93,15 +93,25 @@ PrefabInstance:
      value: 
      objectReference: {fileID: 4970532240456704257, guid: db0018d67c9e64f2ca2641e362ccd734,
        type: 3}
+    - target: {fileID: 8590825953928804796, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.039
+      objectReference: {fileID: 0}
    - target: {fileID: 8590825953928804796, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.52
+      value: -1.672
+      objectReference: {fileID: 0}
+    - target: {fileID: 8957260552474391363, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.028
      objectReference: {fileID: 0}
    - target: {fileID: 8957260552474391363, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.957
+      value: -1.999
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 2c7c89d1c9c7a4ddab79278effae1bee, type: 3}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv4.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv4.prefab
@ -38,10 +38,15 @@ PrefabInstance:
      propertyPath: m_Bounds.m_Extent.y
      value: 1.4949992
      objectReference: {fileID: 0}
+    - target: {fileID: 6137360429209194683, guid: 3d9074ff9e2da4fca8b472ae71154e17,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.027
+      objectReference: {fileID: 0}
    - target: {fileID: 6137360429209194683, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: -1.926
+      value: -1.954
      objectReference: {fileID: 0}
    - target: {fileID: 6192791481742927895, guid: 3d9074ff9e2da4fca8b472ae71154e17,
        type: 3}
--- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/corn_harvest.prefab
+++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/corn_harvest.prefab
@ -101,7 +101,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 21
+  m_SortingOrder: 30
  m_Sprite: {fileID: 21300000, guid: 1dbb30abe096f134fade3bf0e41796c6, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
--- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity
--- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity.meta
+++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7f040d1b248234841802683edae3c4fa
+guid: 182afe41c8e664bf3a0e8f43acbdb199
 DefaultImporter:
  externalObjects: {}
  userData: