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-08-11 19:27:52 +09:00
parent 272f30bc71 019c55ba05
commit 1cb3a93553
5 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs Normal file
View File

@ -0,0 +1,17 @@
using System.Collections.Generic;
public class PlantLineData
{
public PlantLineType Type;
public CornFieldRank Level;
public PlantLineData()
{
}
public PlantLineData(PlantLineType type, CornFieldRank level)
{
Type = type;
Level = level;
}
}

3
popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: ccbcd3d73ff04c7c98bbf0968da4055b
timeCreated: 1628655852

16
popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs Normal file
View File

@ -0,0 +1,16 @@
public class MaterialData
{
public int Id;
public int Amount;
public MaterialData()
{
}
public MaterialData(int id, int amount)
{
Id = id;
Amount = amount;
}
}

3
popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 9a9e37e2d4534ddf8f3722d5e93291e5
timeCreated: 1628656502

8
popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
View File

@ -16,13 +16,7 @@ public class Market : MonoBehaviour
var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin);
// 在庫数表示
var tmpTanks = new List<StorageTank>(gameData.StorageTanks);
gameData.StorageTanks = new List<StorageTank>
{
new StorageTank {Capacity = 5, Stock = UnityEngine.Random.Range(0, 6)}
};
stockView.SetStock(gameData.StorageTanks);
gameData.StorageTanks = tmpTanks;
// 全レシピ
var allRecipe = RecipeData.GetAllRecipe();
@ -49,7 +43,7 @@ public class Market : MonoBehaviour
GameDataManager.SaveGameData();
// 自動補充 refill
RefillProduct();
// stockView.SetStock(gameData.StorageTanks);
stockView.SetStock(gameData.StorageTanks);
StockFlavorLog();
}).AddTo(this);
}