コイン追加エフェクト処理追加

popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs

@@ -176,9 +176,10 @@ public class MarketManager : MonoBehaviour
         market.SellObservable.Subscribe(coin =>
         {
             // コイン獲得エフェクト
-            CoinEffect(coin);
+            CoinEffect(coin, pos =>
-            CoinManager.Instance.AddCoinWithEffect(coin, () => { });
+            {
-            
+                CoinManager.Instance.AddCoinWithEffect(coin, pos);
+            });
             blueView.SellAction();
         }).AddTo(this);
 
@@ -269,11 +270,16 @@ public class MarketManager : MonoBehaviour
         }
     }
 
-    private void CoinEffect(int count)
+    private void CoinEffect(int count, Action<Vector3> onComplete = null)
     {
         var effect = Instantiate(coinPrefab, Vector3.zero, Quaternion.identity, rootTransform);
         effect.GetComponentInChildren<TextMeshProUGUI>().text = count.ToString();
-        Destroy(effect.gameObject, 1f);
+        this.CallWaitForSeconds(1f, () =>
+        {
+            onComplete?.Invoke(effect.GetChild(0).position);
+            Destroy(effect.gameObject);
+        });
+        
     }
 
     private void GenerateCustomer(CustomerController controller)

popcorn/Assets/MyGame/Scripts/CoinManager.cs

@@ -42,27 +42,35 @@ public class CoinManager : SingletonMonoBehaviour<CoinManager>
         coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration);
     }
 
-    public void AddCoinWithEffect(int count, Action callback = null)
+    public void AddCoinWithEffect(int count, Vector3 pos, Action onComplete = null)
     {
         ownCoin += count;
-        // 生成枚数決定
+        InstantiateEffect(coinPrefab, count, pos, coinIconTransform.position, () =>
-        // 生成ポジション決め、生成
-        InstantiateEffeect(coinPrefab, count, Vector3.zero, coinIconTransform.position, () =>
         {
             coinCountText.CountUpAnimation(coinTextFormat, ownCoin, duration);
-            callback?.Invoke();
+            onComplete?.Invoke();
         });
     }
 
-    private void InstantiateEffeect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback)
+    private void InstantiateEffect(RectTransform prefab, int count, Vector3 from, Vector3 to, Action callback)
     {
-        // アニメ50フレーム
+        var coinEffect = Instantiate(prefab, from, Quaternion.identity, rootTransform);
-        this.CallWaitForSeconds(1.0f, () => {
+        var animator = coinEffect.GetComponent<Animator>();
-            // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
+        this.CallLerp(1f, f =>
-            VibrationManager.Instance.PlayVibrationOnceWeak();
+        {
-            coinAnimator.SetTrigger(Add);
+            coinEffect.position = Vector3.Lerp(from, to, f * f);
-            SoundManager.Instance.PlaySE("se_coin_get");
+        }, () =>
-            callback.Invoke();
+        {
+            this.CallWaitForSeconds(0f, () => 
+            {
+                // コインが到着したらSEとバイブ再生。コインはずみアニメーションを再生
+                animator.SetTrigger("Effect");
+                Destroy(coinEffect.gameObject, 1f);
+                VibrationManager.Instance.PlayVibrationOnceWeak();
+                // coinAnimator.SetTrigger(Add);
+                SoundManager.Instance.PlaySE("se_coin_get");
+                callback.Invoke();
+            });
         });
     }