From 91534c927216d362631152161b968a75ea235abb Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 13 Sep 2021 11:20:24 +0900 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E6=B6=88=E8=B2=BB=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=83=86=E3=83=A0=E3=81=AE=E8=B3=BC=E5=85=A5=E3=83=9D=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E6=8C=99=E5=8B=95=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/shopping/Prefabs/PurchaseView.prefab | 3 +++ .../Scenes/shopping/Scripts/ShopItemPurchaseView.cs | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index 882adf81..9b541f06 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -277,6 +277,7 @@ MonoBehaviour: name: {fileID: 9133304336883555433} icon: {fileID: 9133304335605570096} price: {fileID: 9133304336128604254} + text: {fileID: 9133304336181127572} stockCount: {fileID: 9133304336153810480} totalPrice: {fileID: 9133304335494687832} purchaseCount: {fileID: 9133304336756314526} @@ -285,6 +286,8 @@ MonoBehaviour: closeButton: {fileID: 9133304335940276437} purchaseOnButton: {fileID: 9133304335268316946} purchaseOffButton: {fileID: 7845949066005219734} + quantitySelectObject: {fileID: 9133304337054428179} + explanationObject: {fileID: 9133304336181127570} --- !u!1 &9133304335268316944 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs index 54366a58..e757cbc9 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; public class ShopItemPurchaseView : MonoBehaviour { public static readonly string ItemPurchaseTag = "ItemPurcahse"; + private static readonly string redColorString= "fb6346"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); private static readonly int MaxPurchaseCount = 999; @@ -15,6 +16,7 @@ public class ShopItemPurchaseView : MonoBehaviour [SerializeField] private Text name; [SerializeField] private Transform icon; [SerializeField] private Text price; + [SerializeField] private Text text; [SerializeField] private Text stockCount; [SerializeField] private Text totalPrice; [SerializeField] private Text purchaseCount; @@ -23,13 +25,18 @@ public class ShopItemPurchaseView : MonoBehaviour [SerializeField] private Button closeButton; [SerializeField] private Button purchaseOnButton; [SerializeField] private GameObject purchaseOffButton; + [SerializeField] private GameObject quantitySelectObject; + [SerializeField] private GameObject explanationObject; + private Color redColor; private Color defaultColor; private readonly IntReactiveProperty currentCount = new IntReactiveProperty(); private void Start() { currentCount.AddTo(this); defaultColor = totalPrice.color; + ColorUtility.TryParseHtmlString(redColorString, out redColor); + // 表示データを受け取る var data = LocalCacheManager.Load<(ShopData shopData, int stockCount, Action callback)>(ItemPurchaseTag); LocalCacheManager.Remove(ItemPurchaseTag); SetData(data.shopData, data.stockCount); @@ -58,10 +65,12 @@ public class ShopItemPurchaseView : MonoBehaviour { var total = data.shopData.price * x; SetButtonActive(total <= CoinManager.Instance.OwnCoin); - totalPrice.color = total <= CoinManager.Instance.OwnCoin ? defaultColor : Color.red; + totalPrice.color = total <= CoinManager.Instance.OwnCoin ? defaultColor : redColor; totalPrice.text = $"{total}"; purchaseCount.text = $"{x}"; }).AddTo(this); + quantitySelectObject.SetActive(data.shopData.ConsumeType == ShopItemType.Consumable); + explanationObject.SetActive(data.shopData.ConsumeType == ShopItemType.NonConsumable); if (data.shopData.ConsumeType == ShopItemType.Consumable) { addCountButton.OnClickAsObservable().Select(_ => 1) @@ -82,6 +91,7 @@ public class ShopItemPurchaseView : MonoBehaviour name.text = shopData.name; price.text = $"{shopData.price}"; stockCount.text = $"所持数 :{count}"; + text.text = shopData.text; } private void SetButtonActive(bool active)