From 077c0468f1668caf3a46224ecda8227b56df052b Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 14 Dec 2021 15:14:25 +0900
Subject: [PATCH] =?UTF-8?q?=E8=B2=A9=E5=A3=B2=E8=A9=A6=E9=A3=9F=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E3=81=AE=E8=A1=A8=E7=A4=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/marketing/Scripts/MarketManager.cs | 11 +++++++----
 .../Scenes/marketing/Scripts/MarketSignBoardView.cs  | 12 ++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
index 8924bc89..d19f2e8e 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs
@@ -226,6 +226,9 @@ public class MarketManager : MonoBehaviour
                 SetShopView(state);
             }).AddTo(this);
 
+        // 試食看板はStart時非表示
+        signBoardView.SetActiveTastingBoard(false);
+        
         // 宣伝ボタン/試食表示切替
         var tastingComplete = new Subject<Unit>().AddTo(this);
         market.CurrentShopState
@@ -244,6 +247,7 @@ public class MarketManager : MonoBehaviour
                     else if (gameData.TastingCount > 0)
                     {
                         rewardButtonView.gameObject.SetActive(false);
+                        // 試食表示
                         signBoardView.SetActiveTastingBoard(true);
                         BrotherPinkView.Instance.StartTasting();
                         BrotherPinkView.Instance.SetTastingCount(gameData.TastingCount);
@@ -257,18 +261,17 @@ public class MarketManager : MonoBehaviour
                             BrotherPinkView.Instance.StopTasting();
                         });
                     }
-                    else
+                    else // 宣伝も試食も未発動
                     {
                         BrotherPinkView.Instance.StopTasting();
                         rewardButtonView.gameObject.SetActive(true);
-                        signBoardView.SetActiveTastingBoard(false);
                     }
                 }
-                else
+                else // 閉店
                 {
                     BrotherPinkView.Instance.StopTasting();
                     rewardButtonView.gameObject.SetActive(false);
-                    signBoardView.SetActiveTastingBoard(false);
+                    signBoardView.CancelTasting();
                 }
             }).AddTo(this);
         // CombineLatest動かすのに必要
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs
index 39576af3..f537b7a9 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs
@@ -7,7 +7,8 @@ namespace MyGame.Scenes.marketing.Scripts
 {
     public class MarketSignBoardView : MonoBehaviour
     {
-        private static readonly string remainTimeFormat = "残り{0:D2}：{1:D2}";
+        private static readonly string RemainTimeFormat = "残り{0:D2}：{1:D2}";
+        private static readonly string TimeUpText = "終了";
         [SerializeField] private Text remainTimeText;
         [SerializeField] private GameObject normalBoardObject;
         [SerializeField] private GameObject tastingBoardObject;
@@ -23,7 +24,7 @@ namespace MyGame.Scenes.marketing.Scripts
         private void SetTime(int seconds)
         {
             seconds = Mathf.Max(0, seconds);
-            remainTimeText.text = string.Format(remainTimeFormat, Mathf.Min(seconds / 60, 99), seconds % 60);
+            remainTimeText.text = string.Format(RemainTimeFormat, Mathf.Min(seconds / 60, 99), seconds % 60);
         }
 
         public void SetTimer(int remaining, Action onInterval = null, Action onComplete = null)
@@ -38,8 +39,15 @@ namespace MyGame.Scenes.marketing.Scripts
                 onInterval?.Invoke();
             }, () =>
             {
+                remainTimeText.text = TimeUpText;
                 onComplete?.Invoke();
             }).AddTo(this);
         }
+
+        public void CancelTasting()
+        {
+            timerDispose?.Dispose();
+            remainTimeText.text = TimeUpText;
+        }
     }
 }
\ No newline at end of file