From 39d2cd0116f3059f9174438e3fb89383ab6110c1 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 3 Feb 2022 15:23:38 +0900 Subject: [PATCH] =?UTF-8?q?Market=E3=82=B7=E3=83=BC=E3=83=B3vip=E5=AE=A3?= =?UTF-8?q?=E4=BC=9D=E3=83=9C=E3=82=BF=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/MarketManager.cs | 10 ++++++++++ .../MyGame/Scenes/marketing/marketing.unity | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 8c5003b1..3587ca73 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 [SerializeField] private MarketCartView cartView; [SerializeField] private BrotherBlueView blueView; [SerializeField] private IncreaseCustomerButtonView rewardButtonView; + [SerializeField] private VipCustomerButtonView vipCustomerButtonView; [SerializeField] private MarketSignBoardView signBoardView; [SerializeField] private Transform pinkTarget; [SerializeField] private Transform coinPrefab; @@ -123,6 +124,15 @@ public class MarketManager : MonoBehaviour resetRefreshTimer.OnNext(Unit.Default); }); }).AddTo(this); + + vipCustomerButtonView.ShowButton(); + vipCustomerButtonView.VipButton.ThrottleFirst(TimeSpan.FromSeconds(.3f)).Subscribe(_ => + { + GetRewardDialog.ShowVipCustomerDialog(() => + { + + }); + }).AddTo(this); // onNextをトリガーに実行 IDisposable timerDisposable = null; diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index ab59e413..8bc3f449 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -4083,6 +4083,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 274 objectReference: {fileID: 0} + - target: {fileID: 7129812585269745309, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_AnchoredPosition.x @@ -4133,6 +4138,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 714437464} m_PrefabAsset: {fileID: 0} +--- !u!114 &714437466 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 512143980313251866, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 714437464} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 817f9d5cab724bb8a22de5e9dbd2f967, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &716489324 GameObject: m_ObjectHideFlags: 0 @@ -5729,6 +5746,7 @@ MonoBehaviour: cartView: {fileID: 2048621276} blueView: {fileID: 1506158581} rewardButtonView: {fileID: 820175261} + vipCustomerButtonView: {fileID: 714437466} signBoardView: {fileID: 1732899481} pinkTarget: {fileID: 1749782974} coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c,