From 7b4abfd6db18f77ce3d48485748b7dc50b06ea07 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 11 Aug 2021 15:41:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E7=94=A8=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 9a1764e2..7f84349a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -16,13 +16,7 @@ public class Market : MonoBehaviour var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); // 在庫数表示 - var tmpTanks = new List(gameData.StorageTanks); - gameData.StorageTanks = new List - { - 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); } From d7803b982a3c08b6fb5a56c2c010028ee47d6309 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 11 Aug 2021 15:46:39 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=83=96=E7=94=A8?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/CornField/Scripts/PlantLineData.cs | 17 +++++++++++++++++ .../CornField/Scripts/PlantLineData.cs.meta | 3 +++ .../MyGame/Scenes/Main/Scripts/MaterialData.cs | 16 ++++++++++++++++ .../Scenes/Main/Scripts/MaterialData.cs.meta | 3 +++ 4 files changed, 39 insertions(+) create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs new file mode 100644 index 00000000..67c1772a --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs @@ -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; + } +} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs.meta b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs.meta new file mode 100644 index 00000000..968a1e74 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/PlantLineData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ccbcd3d73ff04c7c98bbf0968da4055b +timeCreated: 1628655852 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs new file mode 100644 index 00000000..b84e4d4a --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs @@ -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; + } + +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs.meta new file mode 100644 index 00000000..ae5c70ed --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MaterialData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9a9e37e2d4534ddf8f3722d5e93291e5 +timeCreated: 1628656502 \ No newline at end of file