From 0610bfb4d6610d9c725ab849b9d39a5ecab51226 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Thu, 14 Apr 2022 16:10:14 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=AF=E3=83=BC=E3=83=89=E5=8B=95?=
 =?UTF-8?q?=E7=94=BB=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E5=A4=96=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E4=BD=BF=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/MyGame/Scripts/GetRewardDialog.cs  | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs
index 7d9302dc..538fa3f0 100644
--- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs
+++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs
@@ -103,27 +103,35 @@ namespace MyGame.Scripts
             }).AddTo(this);
             okButton.OnClickAsObservable().Take(1).Subscribe(_ =>
             {
-                if (AdManager.Instance.IsLoadedRewardVideo())
+                ShowRewardVideo(GameScenes.WatchMovieCoin, Placement, () =>
                 {
-                    AdManager.Instance.ShowRewardVideo(result =>
-                    {
-                        if (result)
-                        {
-                            GameDataManager.GameData.AddAdCount();
-                            LocalCacheManager.Load<Action>(OkCallbackTag, null)?.Invoke();
-                            LocalCacheManager.Remove(OkCallbackTag);
-                        }
-                        TransitionManager.Instance.UnloadScene(GameScenes.WatchMovieCoin);
-                    }, Placement);
-                }
-                else
-                {
-                    TransitionManager.Instance.LoadSceneAdditive(GameScenes.WatchMovieFailure);
-                    TransitionManager.Instance.UnloadScene(GameScenes.WatchMovieCoin);
-                }
+                    LocalCacheManager.Load<Action>(OkCallbackTag, null)?.Invoke();
+                    LocalCacheManager.Remove(OkCallbackTag);
+                });
             }).AddTo(this);
         }
 
+        public static void ShowRewardVideo(GameScenes unloadScene, string placement, Action successCallback)
+        {
+            if (AdManager.Instance.IsLoadedRewardVideo())
+            {
+                AdManager.Instance.ShowRewardVideo(result =>
+                {
+                    if (result)
+                    {
+                        successCallback?.Invoke();
+                        GameDataManager.GameData.AddAdCount();
+                    }
+                    TransitionManager.Instance.UnloadScene(unloadScene);
+                }, placement);
+            }
+            else
+            {
+                TransitionManager.Instance.LoadSceneAdditive(GameScenes.WatchMovieFailure);
+                TransitionManager.Instance.UnloadScene(unloadScene);
+            }
+        }
+
         private static void ShowDialog(RewardType rewardType, Action okCallback, Action closeCallback)
         {
             LocalCacheManager.Save(OkCallbackTag, okCallback);