diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 2de6f562..b1a6cf7a 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -64,8 +64,23 @@ public class DebugOptionManager : MonoBehaviour { gameData.ShopStock = Enumerable.Repeat(1, 10).ToList(); gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList()); - gameData.StorageTanks[0].FlavorId = 2; - gameData.StorageTanks[0].AddStock(ProductRarity.Normal, 50); + gameData.StorageTanks = new List + { + new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}}, + new StorageTank(){Id = 2, Capacity = 50, FlavorId = 2, Stocks = new List + { + new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, + new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 20}, + }}, + new StorageTank(){Id = 3, Capacity = 50, FlavorId = 1, Stocks = new List + { + new ProductStockData{Rarity = ProductRarity.Copper, Stock = 1}, + new ProductStockData{Rarity = ProductRarity.Silver, Stock = 5}, + new ProductStockData{Rarity = ProductRarity.Gold, Stock = 10}, + new ProductStockData{Rarity = ProductRarity.Rainbow, Stock = 20}, + }}, + new StorageTank(){Id = 4, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}}, + }; }).AddTo(this); refillLittleProductButton.OnClickAsObservable().Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index 30f9bcc7..4e33cb60 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -1438,6 +1438,7 @@ MonoBehaviour: lockedTankNumber: {fileID: 8175998083386752690} price: {fileID: 8175998083146003101} purchaseButton: {fileID: 8175998083657673474} + buttonSubImage: {fileID: 8175998082971778653} --- !u!1 &8175998082772346535 GameObject: m_ObjectHideFlags: 0 @@ -2225,7 +2226,7 @@ MonoBehaviour: m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: 0.1 + m_FadeDuration: 0 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index 226aaec4..1d23fdbe 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -39,24 +39,9 @@ public class ProductManagement : MonoBehaviour 2000, 2500, }; - // タンクデータ読み込み - gameData.StorageTanks = new List - { - new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}}, - new StorageTank(){Id = 2, Capacity = 50, FlavorId = 2, Stocks = new List - { - new ProductStockData{Rarity = ProductRarity.Normal, Stock = 1}, - new ProductStockData{Rarity = ProductRarity.Yellow, Stock = 20}, - }}, - new StorageTank(){Id = 3, Capacity = 50, FlavorId = 1, Stocks = new List - { - new ProductStockData{Rarity = ProductRarity.Copper, Stock = 1}, - new ProductStockData{Rarity = ProductRarity.Silver, Stock = 5}, - new ProductStockData{Rarity = ProductRarity.Gold, Stock = 10}, - new ProductStockData{Rarity = ProductRarity.Rainbow, Stock = 20}, - }}, - new StorageTank(){Id = 4, Capacity = 50, FlavorId = 1, Stocks = new List{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}}, - }; + + // タンク並び替え + gameData.StorageTanks = gameData.StorageTanks.OrderBy(tank => tank.Stock == 0).ToList(); // タンク設定 var tankList = view.SetTanks(priceList); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs index 2192b34d..1fa889b7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs @@ -29,6 +29,7 @@ public class ProductManagementTankView : MonoBehaviour [SerializeField] private Text lockedTankNumber; [SerializeField] private Text price; [SerializeField] private Button purchaseButton; + [SerializeField] private Image buttonSubImage; private int tankNumberInt; private readonly BoolReactiveProperty isEmply = new BoolReactiveProperty(); private readonly BoolReactiveProperty detailButtonActive = new BoolReactiveProperty(); @@ -105,5 +106,6 @@ public class ProductManagementTankView : MonoBehaviour public void SetPurchaseButtonActive(bool active) { purchaseButton.interactable = active; + buttonSubImage.color = active ? Color.white : purchaseButton.colors.disabledColor; } }