From f890ad00fa6038cc6551400bb79bd23ab5944b69 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 30 Sep 2022 15:17:17 +0900 Subject: [PATCH] =?UTF-8?q?=E8=B2=A9=E5=A3=B2=E3=82=B7=E3=83=BC=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=82=A4=E3=83=88=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/MarketManager.cs | 1 + .../Scenes/marketing/Scripts/PartTimerView.cs | 20 +++++++++++++++ .../marketing/Scripts/PartTimerView.cs.meta | 3 +++ .../MyGame/Scenes/marketing/marketing.unity | 25 +++++++++++++++++-- 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 4fca28e2..c1b18aa1 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -17,6 +17,7 @@ public class MarketManager : MonoBehaviour private ShopStockView stockView; [SerializeField] private MarketCartView cartView; [SerializeField] private BrotherBlueView blueView; + [SerializeField] private PartTimerView partTimerView; [SerializeField] private IncreaseCustomerButtonView rewardButtonView; [SerializeField] private VipCustomerButtonView vipCustomerButtonView; [SerializeField] private MarketSignBoardView signBoardView; diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs new file mode 100644 index 00000000..55389662 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs @@ -0,0 +1,20 @@ +using UnityEngine; + +namespace MyGame.Scenes.marketing.Scripts +{ + public class PartTimerView : MonoBehaviour + { + [SerializeField] private Animator partTimerAnimator; + + public void SetActive(bool active) + { + partTimerAnimator.speed = active ? 1f : 0f; + partTimerAnimator.transform.SetLocalScale(active ? 1f : 0f); + } + + public void StartAnimation() + { + partTimerAnimator.Play("customer_Employment_stay_front_Flyer"); + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs.meta new file mode 100644 index 00000000..df2eaeda --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/PartTimerView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 35f4ffaa11e546da866da3271296be04 +timeCreated: 1664507764 \ 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 4e49c762..0eaeb77c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -747,6 +747,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 284617221} m_PrefabAsset: {fileID: 0} +--- !u!95 &284617223 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 3318268871473007409, guid: 00e0cbb85389d424f9f75bbd5db123a8, + type: 3} + m_PrefabInstance: {fileID: 284617221} + m_PrefabAsset: {fileID: 0} --- !u!1 &286834611 GameObject: m_ObjectHideFlags: 0 @@ -2102,7 +2108,7 @@ PrefabInstance: - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -3415,6 +3421,7 @@ MonoBehaviour: closeSign: {fileID: 2022870421} cartView: {fileID: 1119034882} blueView: {fileID: 1506158581} + partTimerView: {fileID: 1930145619} rewardButtonView: {fileID: 820175261} vipCustomerButtonView: {fileID: 714437466} signBoardView: {fileID: 0} @@ -15207,13 +15214,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1930145618} + - component: {fileID: 1930145619} m_Layer: 0 m_Name: Employment m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1930145618 Transform: m_ObjectHideFlags: 0 @@ -15230,6 +15238,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1930145619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1930145617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35f4ffaa11e546da866da3271296be04, type: 3} + m_Name: + m_EditorClassIdentifier: + partTimerAnimator: {fileID: 284617223} --- !u!1 &2017358936 GameObject: m_ObjectHideFlags: 0