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

popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity

@@ -8883,9 +8883,9 @@ MonoBehaviour:
   panSpeed: 0.1369657
   panFactor: 0.002
   deadZone: 0.009
-  baseIncreaseSpeed: 0.18
+  baseIncreaseSpeed: 0.1
   coldIncreaseSpeed: 0.5
-  hotIncreaseSpeed: 0.18
+  hotIncreaseSpeed: 0.1
   maxDecreaseSpeed: 0.5
   coldValue: 0.35
   hotValue: 0.65
@@ -8922,8 +8922,10 @@ MonoBehaviour:
   baseCornPopTime: 12.5
   cornBurntDuration: 1.5
   cornBurntRandom: 5
-  cornSpillSpeed: 160
+  cornSpillSpeed: 115
   cornPopSpeed: 30
+  screenKoProbability: 0.1
+  maxScreenKoCount: 1
   cornCountSlider: {fileID: 657773260}
   faildCountSlider: {fileID: 657773259}
   coldGrowSpeedSlider: {fileID: 1661453984}

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Pan.prefab

@@ -63,7 +63,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3218397595738205000}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1453251556405238011
 MonoBehaviour:
@@ -79,6 +79,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   controller: {fileID: 0}
   thrust: 3
+  deadZone: 0.1
 --- !u!61 &4983801824205239738
 BoxCollider2D:
   m_ObjectHideFlags: 0
@@ -151,7 +152,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1453251557352552632
 Transform:
   m_ObjectHideFlags: 0
@@ -224,10 +225,72 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1453251557352552632}
+  - {fileID: 746482762447314123}
   - {fileID: 1453251556405238013}
   m_Father: {fileID: 1453251556377932393}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7676003050359771459
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 746482762447314123}
+  - component: {fileID: 5865392566938846288}
+  m_Layer: 0
+  m_Name: PanEdge (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &746482762447314123
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7676003050359771459}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.38, y: -0.78, z: 0}
+  m_LocalScale: {x: 102.03828, y: 110.093575, z: 85.63402}
+  m_Children: []
+  m_Father: {fileID: 3218397595738205000}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!68 &5865392566938846288
+EdgeCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7676003050359771459}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 6200000, guid: 440db2e8ae6ea41b792d56600b0532f3, type: 2}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_EdgeRadius: 2.61
+  m_Points:
+  - {x: 0.07831237, y: 0.0019857544}
+  - {x: 0.0508193, y: -0.020667206}
+  - {x: 0.035089638, y: -0.028409138}
+  - {x: 0.012053529, y: -0.034262266}
+  - {x: -0.017523682, y: -0.031982258}
+  - {x: -0.04153408, y: -0.023042984}
+  - {x: -0.060010493, y: -0.009420026}
+  - {x: -0.06249666, y: 0.008998046}
+  - {x: -0.051591836, y: 0.025973067}
+  - {x: -0.027804706, y: 0.042549714}
+  - {x: 0.0025015222, y: 0.04699563}
+  - {x: 0.038333848, y: 0.04032514}
+  - {x: 0.058061335, y: 0.025281195}
+  - {x: 0.06824917, y: 0.0029303213}
 --- !u!1001 &1554886823952308219
 PrefabInstance:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab

@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1324329073609281160}
-  - component: {fileID: 5972257590091015193}
   - component: {fileID: 5499754490129207122}
+  - component: {fileID: 5972257590091015193}
   - component: {fileID: 7195010600253370228}
   - component: {fileID: 8932234855615206969}
   m_Layer: 0
@@ -36,25 +36,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &5972257590091015193
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1324329073609281157}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 999ff4a5e0a8044e3ac6f17aba6db416, 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!114 &5499754490129207122
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -76,6 +57,26 @@ MonoBehaviour:
     type: 3}
   burntMaterial: {fileID: 2100000, guid: bec51957e6eb5467abd3d46dc72f642a, type: 2}
   animator: {fileID: 5972257590091015193}
+  spillProbability: 0.05
+--- !u!95 &5972257590091015193
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1324329073609281157}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 999ff4a5e0a8044e3ac6f17aba6db416, 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!50 &7195010600253370228
 Rigidbody2D:
   serializedVersion: 4
@@ -89,11 +90,11 @@ Rigidbody2D:
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
   m_Mass: 1
-  m_LinearDrag: 3.75
+  m_LinearDrag: 3.8
   m_AngularDrag: 2
   m_GravityScale: 0
   m_Material: {fileID: 6200000, guid: 1e68e56cd6ac4484ba25eb760e0d3057, type: 2}
-  m_Interpolate: 0
+  m_Interpolate: 2
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs

@@ -26,6 +26,8 @@ public class Corn : MonoBehaviour
     [SerializeField] private GameObject effectSpillPopped;
     [SerializeField] private Material burntMaterial;
     [SerializeField] private Animator animator;
+    [Space][Range(0,1)]
+    [SerializeField] private float spillProbability;
 
     private Rigidbody2D rigidbody;
     private float cornPopTime;
@@ -66,7 +68,7 @@ public class Corn : MonoBehaviour
         this.ObserveEveryValueChanged(x => x.rigidbody.velocity.magnitude)
             .Where(x => x >= cornSpillSpeed)
             .ThrottleFirstFrame(30) // 30フレーム間隔開ける
-            .Where(_ => Random.value <  .2f) // 演出を出す確率
+            .Where(_ => Random.value < spillProbability) // 演出を出す確率
             .FirstOrDefault()
             .Subscribe(_ =>
             {

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 126d56890a16475f8bb5bf49970a50c8
-timeCreated: 1626851012

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs

@@ -28,6 +28,9 @@ public class CornManager : MonoBehaviour
     [SerializeField] private float cornBurntRandom = 1f;
     [SerializeField] private float cornSpillSpeed = 50f;
     [SerializeField] private float cornPopSpeed = 20f;
+    [Space]
+    [SerializeField, Range(0,1)] private float screenKoProbability;
+    [SerializeField] private int maxScreenKoCount;
 
     public IReadOnlyReactiveProperty<CornResult> Result => result;
     private readonly ReactiveProperty<CornResult> result = new ReactiveProperty<CornResult>();
@@ -42,6 +45,7 @@ public class CornManager : MonoBehaviour
     private readonly CompositeDisposable compositeDisposable = new CompositeDisposable();
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
+    [Space]
     [SerializeField] private Slider cornCountSlider;
     [SerializeField] private Slider faildCountSlider;
     [SerializeField] private Slider coldGrowSpeedSlider;
@@ -67,10 +71,11 @@ public class CornManager : MonoBehaviour
         // 5フレームごとに2回など演出の回数を制御
         cornSpilledSubject
             .Where(x => x.cond != CornCondition.Seed) // Seedは演出なし
+            .Where(_ => Random.value < screenKoProbability) // 演出を出す確率
             .BatchFrame(5, FrameCountType.EndOfFrame) // 指定フレーム分まとめる
             .Subscribe(x =>
             {
-                foreach (var item in x.RandomChoose(2))
+                foreach (var item in x.RandomChoose(maxScreenKoCount))
                 {
                     SpawnSpilledAnimation(item.cond, item.pos);
                 }

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Pan.cs

@@ -14,6 +14,11 @@ public class Pan : MonoBehaviour
         {
             return;
         }
+        // コーンの壁抜けを抑制
+        if (controller.Velocity.magnitude >= 200f)
+        {
+            return;
+        }
         other.attachedRigidbody.AddForce(controller.Velocity * thrust, ForceMode2D.Impulse);
     }
 }

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

@@ -347,7 +347,7 @@ MeshRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 27
+  m_SortingOrder: 30
 --- !u!1 &282523122
 GameObject:
   m_ObjectHideFlags: 0
@@ -397,6 +397,7 @@ MonoBehaviour:
   cornCounter: {fileID: 242576840}
   harvestedPrefab: {fileID: 2111766585493962378, guid: d52f3514ed7fd461b8ab77a202c122c6,
     type: 3}
+  thrust: 40
 --- !u!4 &371589523 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8524901521850801685, guid: e642499b3643dab4ba05b02e8c6bde1c,
@@ -1058,7 +1059,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 998360038}
+  - component: {fileID: 998360042}
   - component: {fileID: 998360039}
+  - component: {fileID: 998360040}
+  - component: {fileID: 998360041}
   m_Layer: 0
   m_Name: basket
   m_TagString: Untagged
@@ -1118,7 +1122,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 30
+  m_SortingOrder: 20
   m_Sprite: {fileID: 21300000, guid: b4ef5d853aa5e884f9ff3b7e2e0a8ac0, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -1130,6 +1134,68 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!68 &998360040
+EdgeCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 998360037}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 1.87}
+  m_EdgeRadius: 0.37
+  m_Points:
+  - {x: -3.593909, y: -1.0085964}
+  - {x: -3.549603, y: -1.8782773}
+  - {x: -2.936795, y: -2.731175}
+  - {x: -2.100886, y: -3.3311734}
+  - {x: 2.0765946, y: -3.2938066}
+  - {x: 2.977969, y: -2.6759577}
+  - {x: 3.529534, y: -1.7948904}
+  - {x: 3.6742947, y: -0.97043467}
+--- !u!61 &998360041
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 998360037}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0.51748276}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 7.18, y: 2.6}
+    newSize: {x: 7.18, y: 2.6}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 7.122097, y: 3.7546473}
+  m_EdgeRadius: 0
+--- !u!114 &998360042
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 998360037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e66a2dbf7e774065832962016627c6d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!4 &1035142904 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4,
@@ -1422,6 +1488,31 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.94
+      objectReference: {fileID: 0}
+    - target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e642499b3643dab4ba05b02e8c6bde1c, type: 3}
 --- !u!1001 &1466604290
@@ -1817,7 +1908,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2138129848}
   - component: {fileID: 2138129849}
-  - component: {fileID: 2138129850}
+  - component: {fileID: 2138129851}
   m_Layer: 0
   m_Name: machine_a
   m_TagString: Untagged
@@ -1878,7 +1969,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 26
+  m_SortingOrder: 30
   m_Sprite: {fileID: 21300000, guid: d84a9ee1d4e76014aad7de90a383d27d, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -1890,8 +1981,8 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!68 &2138129850
+--- !u!61 &2138129851
-EdgeCollider2D:
+BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1903,15 +1994,19 @@ EdgeCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0, y: 1.1034656}
-  m_EdgeRadius: 0.64
+  m_SpriteTilingProperty:
-  m_Points:
+    border: {x: 0, y: 0, z: 0, w: 0}
-  - {x: -3.931622, y: -1.2346358}
+    pivot: {x: 0.5, y: 0.5}
-  - {x: -3.2924247, y: -2.953443}
+    oldSize: {x: 8.88, y: 6.38}
-  - {x: -1.7156212, y: -3.625627}
+    newSize: {x: 8.88, y: 6.38}
-  - {x: 1.7783345, y: -3.7068028}
+    adaptiveTilingThreshold: 0.5
-  - {x: 3.4502363, y: -2.8666859}
+    drawMode: 0
-  - {x: 3.9558334, y: -1.2588444}
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 8.225426, y: 1.4617157}
+  m_EdgeRadius: 0
 --- !u!1001 &875275074606616260
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2157,5 +2252,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: HarvestedCorn
       objectReference: {fileID: 0}
+    - target: {fileID: 2111766585493962378, guid: d52f3514ed7fd461b8ab77a202c122c6,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d52f3514ed7fd461b8ab77a202c122c6, type: 3}

popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials.meta

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

popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D

@@ -0,0 +1,11 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!62 &6200000
+PhysicsMaterial2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Harvested
+  friction: 0.13
+  bounciness: 0.15

popcorn/Assets/MyGame/Scenes/CornField/PhysicsMaterials/Harvested.physicsMaterial2D.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1f8e4d9f4f89d438f95450ebd031d48b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 6200000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -46,10 +46,10 @@ Rigidbody2D:
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 0
   m_Mass: 1
-  m_LinearDrag: 3.5
+  m_LinearDrag: 0
-  m_AngularDrag: 2
+  m_AngularDrag: 1
   m_GravityScale: 1
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 1f8e4d9f4f89d438f95450ebd031d48b, type: 2}
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0
@@ -69,7 +69,7 @@ CircleCollider2D:
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
   serializedVersion: 2
-  m_Radius: 0.2
+  m_Radius: 0.16
 --- !u!1 &2355518643518159810
 GameObject:
   m_ObjectHideFlags: 0
@@ -139,7 +139,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 31
+  m_SortingOrder: 21
   m_Sprite: {fileID: 21300000, guid: 97ac0328246620745b8881e07f709ce7, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

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

@@ -23,7 +23,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8524901521850801684}
-  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:
@@ -101,7 +101,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 25
+  m_SortingOrder: 21
   m_Sprite: {fileID: 21300000, guid: 1dbb30abe096f134fade3bf0e41796c6, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

popcorn/Assets/MyGame/Scenes/CornField/Scripts/Basket.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+public class Basket : MonoBehaviour
+{
+    private void OnTriggerExit2D(Collider2D other)
+    {
+        Debug.Log("exit");
+        Destroy(other.gameObject, 2f);
+    }
+}

popcorn/Assets/MyGame/Scenes/CornField/Scripts/Basket.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e66a2dbf7e774065832962016627c6d8
+timeCreated: 1627350363

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs

@@ -1,13 +1,16 @@
 using System;
+using System.Collections;
 using System.Linq;
 using TMPro;
 using UniRx;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
 public class CornHarvester : MonoBehaviour
 {
     [SerializeField] private TextMeshPro cornCounter;
     [SerializeField] private GameObject harvestedPrefab;
+    [SerializeField] private float thrust = 100f;
     private float duration = .5f;
     private string counterFormat = "{0}";
     private Coroutine animationCoroutine;
@@ -25,14 +28,20 @@ public class CornHarvester : MonoBehaviour
                 cornCounter.text = string.Format(counterFormat,  (int)Mathf.Lerp(x.Previous, x.Current, lerp));
             });
 
-            for (int i = 0; i < x.Current; i++)
+            StartCoroutine(Harvested(x.Current - x.Previous));
-            {
-                var corn = Instantiate(harvestedPrefab, cornCounter.transform.position, Quaternion.identity);
-                corn.GetComponent<Rigidbody2D>().AddForce(Vector2.down * 20f, ForceMode2D.Impulse);
-            }
         }).AddTo(this);
     }
 
+    private IEnumerator Harvested(int cnt)
+    {
+        for (int i = 0; i < cnt; i++)
+        {
+            var corn = Instantiate(harvestedPrefab, cornCounter.transform.position, Quaternion.identity);
+            corn.GetComponent<Rigidbody2D>().AddForce(new Vector2(Random.Range(-0.3f, 0.3f), -1).normalized * thrust, ForceMode2D.Impulse);
+            yield return null;
+        }
+    }
+
     public void AddCount(int value)
     {
         count.Value += value;

popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 126d56890a16475f8bb5bf49970a50c8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: