From 96b9fe0ecb7c4ad762be8f7ab72867965a7bd748 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 9 Feb 2022 13:57:49 +0900
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E9=81=94?=
 =?UTF-8?q?=E6=88=90ShowDialog=E3=81=AB=E5=BC=95=E6=95=B0=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Main/Prefabs/BulkOrder/CanvasAchievement.prefab       | 6 ++++++
 popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs    | 2 +-
 .../MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs   | 8 ++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab
index ea6aa4c6..67ccf4dc 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasAchievement.prefab
@@ -153,6 +153,12 @@ MonoBehaviour:
   messageText: {fileID: 2377818823780007094}
   bulkOrderCharacter: {fileID: 4080359802288886363}
   orderCharacterImage: {fileID: 2377818823009469880}
+  heartIconTransform: {fileID: 2377818824019765601}
+  coinIconTransform: {fileID: 2377818823916755441}
+  heartPrefab: {fileID: 4993368112858175913, guid: 98690cb45240c4c4da24017b44a03e84,
+    type: 3}
+  coinPrefab: {fileID: 6462833990326625811, guid: f41554a7122e9314ea6c22282d4c7be0,
+    type: 3}
 --- !u!1 &2377818823009469882
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
index da6804eb..cf9c5937 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs
@@ -109,7 +109,7 @@ public class BulkOrder : MonoBehaviour
         // 納品
         deliveredButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
         {
-            BulkOrderAchievedView.ShowDialog(() =>
+            BulkOrderAchievedView.ShowDialog((coinPos, heartPos) =>
             {
                 // 獲得
                 var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
index b149613a..0fc04710 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs
@@ -18,6 +18,10 @@ public class BulkOrderAchievedView : MonoBehaviour
     [SerializeField] private Text messageText;
     [SerializeField] private BulkOrderCharacter bulkOrderCharacter;
     [SerializeField] private Image orderCharacterImage;
+    
+    // effect用
+    [SerializeField] private Transform heartIconTransform;
+    [SerializeField] private Transform coinIconTransform;
 
     private void Start()
     {
@@ -35,7 +39,7 @@ public class BulkOrderAchievedView : MonoBehaviour
         }
         closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
         {
-            LocalCacheManager.Load<Action>(CallbackTag, null)?.Invoke();
+            LocalCacheManager.Load<Action<Vector3, Vector3>>(CallbackTag, null)?.Invoke(coinIconTransform.position, heartIconTransform.position);
             LocalCacheManager.Remove(CallbackTag);
             transform.parent.SetLocalScale(0);
             backgroundAnimator.SetTrigger(CloseTrigger);
@@ -46,7 +50,7 @@ public class BulkOrderAchievedView : MonoBehaviour
         }).AddTo(this);
     }
 
-    public static void ShowDialog(Action onComplete = null)
+    public static void ShowDialog(Action<Vector3, Vector3> onComplete = null)
     {
         LocalCacheManager.Save(CallbackTag, onComplete);
         TransitionManager.Instance.LoadSceneAdditive(GameScenes.BulkOrderAchievement);