yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-09-16 18:17:48 +09:00
parent 3010b0a89f 465bb5d055
commit 501d9640a7
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
View File

@ -64,8 +64,23 @@ public class DebugOptionManager : MonoBehaviour
{ {
gameData.ShopStock = Enumerable.Repeat(1, 10).ToList(); gameData.ShopStock = Enumerable.Repeat(1, 10).ToList();
gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList()); gameData.ShopStock.AddRange(Enumerable.Repeat(2, 10).ToList());
gameData.StorageTanks[0].FlavorId = 2; gameData.StorageTanks = new List<StorageTank>
gameData.StorageTanks[0].AddStock(ProductRarity.Normal, 50); {
new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List<ProductStockData>{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}},
new StorageTank(){Id = 2, Capacity = 50, FlavorId = 2, Stocks = new List<ProductStockData>
{
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<ProductStockData>
{
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<ProductStockData>{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}},
};
}).AddTo(this); }).AddTo(this);
refillLittleProductButton.OnClickAsObservable().Subscribe(_ => refillLittleProductButton.OnClickAsObservable().Subscribe(_ =>

3
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab
View File

@ -1438,6 +1438,7 @@ MonoBehaviour:
lockedTankNumber: {fileID: 8175998083386752690} lockedTankNumber: {fileID: 8175998083386752690}
price: {fileID: 8175998083146003101} price: {fileID: 8175998083146003101}
purchaseButton: {fileID: 8175998083657673474} purchaseButton: {fileID: 8175998083657673474}
buttonSubImage: {fileID: 8175998082971778653}
--- !u!1 &8175998082772346535 --- !u!1 &8175998082772346535
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2225,7 +2226,7 @@ MonoBehaviour:
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} 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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0
m_SpriteState: m_SpriteState:
m_HighlightedSprite: {fileID: 0} m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0} m_PressedSprite: {fileID: 0}

21
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
View File

@ -39,24 +39,9 @@ public class ProductManagement : MonoBehaviour
2000, 2000,
2500, 2500,
}; };
// タンクデータ読み込み
gameData.StorageTanks = new List<StorageTank> // タンク並び替え
{ gameData.StorageTanks = gameData.StorageTanks.OrderBy(tank => tank.Stock == 0).ToList();
new StorageTank(){Id = 1, Capacity = 50, FlavorId = 1, Stocks = new List<ProductStockData>{new ProductStockData{Rarity = ProductRarity.Normal, Stock = 0}}},
new StorageTank(){Id = 2, Capacity = 50, FlavorId = 2, Stocks = new List<ProductStockData>
{
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<ProductStockData>
{
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<ProductStockData>{new ProductStockData{Rarity = ProductRarity.Gold, Stock = 4}}},
};
// タンク設定 // タンク設定
var tankList = view.SetTanks(priceList); var tankList = view.SetTanks(priceList);

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagementTankView.cs
View File

@ -29,6 +29,7 @@ public class ProductManagementTankView : MonoBehaviour
[SerializeField] private Text lockedTankNumber; [SerializeField] private Text lockedTankNumber;
[SerializeField] private Text price; [SerializeField] private Text price;
[SerializeField] private Button purchaseButton; [SerializeField] private Button purchaseButton;
[SerializeField] private Image buttonSubImage;
private int tankNumberInt; private int tankNumberInt;
private readonly BoolReactiveProperty isEmply = new BoolReactiveProperty(); private readonly BoolReactiveProperty isEmply = new BoolReactiveProperty();
private readonly BoolReactiveProperty detailButtonActive = new BoolReactiveProperty(); private readonly BoolReactiveProperty detailButtonActive = new BoolReactiveProperty();
@ -105,5 +106,6 @@ public class ProductManagementTankView : MonoBehaviour
public void SetPurchaseButtonActive(bool active) public void SetPurchaseButtonActive(bool active)
{ {
purchaseButton.interactable = active; purchaseButton.interactable = active;
buttonSubImage.color = active ? Color.white : purchaseButton.colors.disabledColor;
} }
} }