From 558d3f5e2c2b0a9b6b7c0a415072a14d7fc5563d Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Mon, 13 Dec 2021 15:54:21 +0900
Subject: [PATCH] =?UTF-8?q?=E8=A9=A6=E9=A3=9F=E4=B8=AD=E8=A1=A8=E7=A4=BAUI?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/Scripts/MarketSignBoardView.cs  | 19 ++++++++++++
 .../Scripts/MarketSignBoardView.cs.meta       |  3 ++
 .../MyGame/Scenes/marketing/marketing.unity   | 29 +++++++++++++++----
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs
 create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs.meta

diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs
new file mode 100644
index 00000000..cae8e889
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs
@@ -0,0 +1,19 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace MyGame.Scenes.marketing.Scripts
+{
+    public class MarketSignBoardView : MonoBehaviour
+    {
+        private static readonly string remainTimeFormat = "残り{0:D2}:{1:D2}";
+        [SerializeField] private Text remainTimeText;
+        [SerializeField] private GameObject normalBoardObject;
+        [SerializeField] private GameObject tastingBoardObject;
+        
+        public void SetTime(int seconds)
+        {
+            seconds = Mathf.Max(0, seconds);
+            remainTimeText.text = string.Format(remainTimeFormat, Mathf.Min(seconds / 60, 99), seconds % 60);
+        }
+    }
+}
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs.meta
new file mode 100644
index 00000000..59f81dfb
--- /dev/null
+++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketSignBoardView.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7a19dcec25224a75a8f3635153cef5c9
+timeCreated: 1639378152
\ No newline at end of file
diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
index 48d1b694..c8c418bc 100644
--- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
+++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
@@ -3622,7 +3622,7 @@ PrefabInstance:
     - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 66.25009
+      value: 66.25
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1c993e9707f1a4fada56020be27dde28, type: 3}
@@ -5582,6 +5582,7 @@ MonoBehaviour:
   cartView: {fileID: 2048621276}
   blueView: {fileID: 1506158581}
   rewardButtonView: {fileID: 820175261}
+  signBoardView: {fileID: 0}
   pinkTarget: {fileID: 1749782974}
   coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,
     type: 3}
@@ -6172,7 +6173,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1165998904
 Transform:
   m_ObjectHideFlags: 0
@@ -6720,7 +6721,7 @@ GameObject:
   - component: {fileID: 1265140452}
   - component: {fileID: 1265140451}
   - component: {fileID: 1265140450}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -7057,7 +7058,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1423968762
 Transform:
   m_ObjectHideFlags: 0
@@ -13072,7 +13073,7 @@ GameObject:
   - component: {fileID: 1629640653}
   - component: {fileID: 1629640655}
   - component: {fileID: 1629640654}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -13418,6 +13419,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1732899480}
+  - component: {fileID: 1732899481}
   m_Layer: 0
   m_Name: Signboard
   m_TagString: Untagged
@@ -13441,6 +13443,21 @@ Transform:
   m_Father: {fileID: 1102296790}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1732899481
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1732899479}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a19dcec25224a75a8f3635153cef5c9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  remainTimeText: {fileID: 1629640654}
+  normalBoardObject: {fileID: 1165998903}
+  tastingBoardObject: {fileID: 1423968761}
 --- !u!1 &1749782973
 GameObject:
   m_ObjectHideFlags: 0
@@ -13466,7 +13483,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1749782973}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 4.96, y: -0.26, z: 0}
+  m_LocalPosition: {x: 3.46, y: -0.26, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1189290113}