From b27b0337df796e5b6f6389c1b764e31bb98456f0 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 27 Jul 2021 10:57:24 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E5=90=90=E3=81=8D?= =?UTF-8?q?=E5=87=BA=E3=81=97=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cooking/Scripts/CornHarvester.cs.meta | 3 --- .../Scripts/CornHarvester.cs | 19 ++++++++++++++----- .../CornField/Scripts/CornHarvester.cs.meta | 11 +++++++++++ 3 files changed, 25 insertions(+), 8 deletions(-) delete mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs.meta rename popcorn/Assets/MyGame/Scenes/{Cooking => CornField}/Scripts/CornHarvester.cs (63%) create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs.meta deleted file mode 100644 index a0f835df..00000000 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 126d56890a16475f8bb5bf49970a50c8 -timeCreated: 1626851012 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs similarity index 63% rename from popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs rename to popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs index 03b99862..c5d55db2 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornHarvester.cs +++ b/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++) - { - var corn = Instantiate(harvestedPrefab, cornCounter.transform.position, Quaternion.identity); - corn.GetComponent().AddForce(Vector2.down * 20f, ForceMode2D.Impulse); - } + StartCoroutine(Harvested(x.Current - x.Previous)); }).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().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; diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs.meta b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornHarvester.cs.meta new file mode 100644 index 00000000..52883a1b --- /dev/null +++ b/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: