From 445c614dd68fa258ce52e169d0709d4da8f0c71c Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 11 Aug 2021 09:43:12 +0900 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=BA=AB=E8=A1=A8=E7=A4=BA=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 106 ++++++++++++++++++ .../MyGame/Scenes/Main/Prefabs/Meter.prefab | 19 +++- .../Scenes/Main/Scripts/KitchenManager.cs | 24 +++- .../Scenes/Main/Scripts/TankListView.cs | 24 ++++ .../Scenes/Main/Scripts/TankListView.cs.meta | 3 + .../Scenes/Main/Scripts/TankStockView.cs | 23 ++++ .../Scenes/Main/Scripts/TankStockView.cs.meta | 3 + .../MyGame/Scenes/marketing/Scripts/Market.cs | 2 +- 8 files changed, 200 insertions(+), 4 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 7461d1d8..706c1364 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -121,6 +121,30 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &20629752 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 3665723643790057849} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &40183829 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 609410911} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &414580708 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3664916834121473269, guid: caaa748dbeed576499e8cae74d33f689, @@ -357,6 +381,30 @@ Transform: type: 3} m_PrefabInstance: {fileID: 609410911} m_PrefabAsset: {fileID: 0} +--- !u!114 &652597343 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1076949532} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &814288039 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1914907653} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1042957342 PrefabInstance: m_ObjectHideFlags: 0 @@ -699,6 +747,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1187654216} + - component: {fileID: 1187654217} m_Layer: 0 m_Name: StockMeter m_TagString: Untagged @@ -732,6 +781,26 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -1.45} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1187654217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187654215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2128b8291184b39b7956c18a5fb6fb1, type: 3} + m_Name: + m_EditorClassIdentifier: + tankStockViews: + - {fileID: 20629752} + - {fileID: 814288039} + - {fileID: 1896548482} + - {fileID: 1695639488} + - {fileID: 40183829} + - {fileID: 1685784269} + - {fileID: 652597343} --- !u!1001 &1298499617 PrefabInstance: m_ObjectHideFlags: 0 @@ -893,6 +962,30 @@ Camera: type: 3} m_PrefabInstance: {fileID: 9117079082731140882} m_PrefabAsset: {fileID: 0} +--- !u!114 &1685784269 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1298499617} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1695639488 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1153742598} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1796633948 GameObject: m_ObjectHideFlags: 0 @@ -1085,6 +1178,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: cookingButton: {fileID: 414580708} + tankListView: {fileID: 1187654217} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -1117,6 +1211,18 @@ MonoBehaviour: coinPrefab: {fileID: 0} duration: 0.5 rootTransform: {fileID: 0} +--- !u!114 &1896548482 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3056039327928059483, guid: 72166b54c2bb0ff49aa3ae7dc7e78f82, + type: 3} + m_PrefabInstance: {fileID: 1042957342} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1914907653 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab index 65e7d810..3b4c8821 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Meter.prefab @@ -105,7 +105,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2400848238848264989} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.163, z: 0} + m_LocalPosition: {x: 0, y: 0.16, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4798599775605052312} @@ -201,6 +201,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3665723641945798049} + - component: {fileID: 3056039327928059483} m_Layer: 0 m_Name: Meter m_TagString: Untagged @@ -224,6 +225,22 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3056039327928059483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3665723641945798062} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50f3afa8df704ba79774a15424a573e3, type: 3} + m_Name: + m_EditorClassIdentifier: + popcornImage: {fileID: 8901195797687025316} + unreleaseObject: {fileID: 3072131335653526340} + maxPosision: 0.16 + minPosision: -1.01 --- !u!1 &3665723643188271317 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 54f6e8fb..5c08d8d8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -9,6 +9,7 @@ using UnityEngine.UI; public class KitchenManager : MonoBehaviour { [SerializeField] private Button cookingButton; + [SerializeField] private TankListView tankListView; // Start is called before the first frame update void Start() { @@ -25,6 +26,27 @@ public class KitchenManager : MonoBehaviour var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); + SetData(); + + // 在庫表示 + var tmpTanks = new List(gameData.StorageTanks); + gameData.StorageTanks.AddRange(new List + { + new StorageTank {Capacity = 50, Stock = 0}, + new StorageTank {Capacity = 50, Stock = 5}, + new StorageTank {Capacity = 50, Stock = 25}, + new StorageTank {Capacity = 50, Stock = 40}, + new StorageTank {Capacity = 50, Stock = 50}, + }); + tankListView.SetTanksView(gameData.StorageTanks); + gameData.StorageTanks = tmpTanks; + + Market.StockFlavorLog(); + } + + private void SetData() + { + var gameData = GameDataManager.GameData; // 所持レシピ gameData.MyRecipes = new[] { @@ -74,7 +96,5 @@ public class KitchenManager : MonoBehaviour }; } GameDataManager.SaveGameData(); - - Market.StockFlavorLog(); } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs new file mode 100644 index 00000000..b2d48d9d --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs @@ -0,0 +1,24 @@ +using System.Collections.Generic; +using UnityEngine; + +public class TankListView : MonoBehaviour +{ + [SerializeField] private List tankStockViews; + + public void SetTanksView(List tanks) + { + var tankCount = tanks.Count; + var index = 0; + foreach (var tankView in tankStockViews) + { + if (index >= tankCount) + { + tankView.SetTankRelease(false); + continue; + } + tankView.SetTankRelease(true); + tankView.SetStock(tanks[index]); + index++; + } + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta new file mode 100644 index 00000000..f79f9f25 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankListView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b2128b8291184b39b7956c18a5fb6fb1 +timeCreated: 1628640207 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs new file mode 100644 index 00000000..7e4a58cb --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs @@ -0,0 +1,23 @@ +using System; +using UnityEngine; +using Random = UnityEngine.Random; + +public class TankStockView : MonoBehaviour +{ + [SerializeField] private SpriteRenderer popcornImage; + [SerializeField] private GameObject unreleaseObject; + [SerializeField] private float maxPosision = 0.16f; + [SerializeField] private float minPosision = -0.8f; + + public void SetTankRelease(bool released) + { + unreleaseObject.SetActive(!released); + } + + public void SetStock(StorageTank tank) + { + var newPos = popcornImage.transform.localPosition; + newPos.y = Mathf.Lerp(minPosision, maxPosision, (float) tank.Stock / tank.Capacity); + popcornImage.transform.localPosition = newPos; + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta new file mode 100644 index 00000000..1b4dec9f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/TankStockView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 50f3afa8df704ba79774a15424a573e3 +timeCreated: 1628584275 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index dccc8dbd..c0f99ead 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -87,7 +87,7 @@ public class Market : MonoBehaviour { continue; } - shopStockString += $"{data.Name} shop:{shopStockCount} stock:{tank}\n"; + shopStockString += $"{data.Name} shop:{shopStockCount} tank:{tank}\n"; } Debug.Log(shopStockString); }