diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index a0bbf16c..38a67b51 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 2646634445844468798} - component: {fileID: 5776310992788139834} - component: {fileID: 1785032438920414220} + - component: {fileID: 8320108874302735811} m_Layer: 0 m_Name: detail m_TagString: Untagged @@ -63,7 +64,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -78,6 +79,49 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8320108874302735811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908060699288711323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1785032438920414220} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2929932626248606813 GameObject: m_ObjectHideFlags: 0 @@ -503,7 +547,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2929932627350163026} - - component: {fileID: 1570337604946174006} - component: {fileID: 5490177795204899762} m_Layer: 0 m_Name: Frame @@ -533,49 +576,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 444, y: 200} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1570337604946174006 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2929932627350163027} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1785032438920414220} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &5490177795204899762 MonoBehaviour: m_ObjectHideFlags: 0 @@ -588,7 +588,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47bc31a2c7d14478bd4ebe3c32e41185, type: 3} m_Name: m_EditorClassIdentifier: - detailButton: {fileID: 1570337604946174006} + detailButton: {fileID: 8320108874302735811} flavorName: {fileID: 2929932626752093611} flavorPrice: {fileID: 2929932627123125673} cornAmountText: {fileID: 6296255899301773980} @@ -1473,12 +1473,6 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2814970099097301159, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} ---- !u!224 &6296255899524172857 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, - type: 3} - m_PrefabInstance: {fileID: 8101979052737494168} - m_PrefabAsset: {fileID: 0} --- !u!114 &6296255899301773980 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2814970099411582468, guid: e2818e79d8fc1f34388aff1b8969d340, @@ -1491,3 +1485,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6296255899524172857 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, + type: 3} + m_PrefabInstance: {fileID: 8101979052737494168} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 757cb41b..0bea2ff8 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -227,7 +227,7 @@ RectTransform: - {fileID: 1487129869} - {fileID: 670639509} m_Father: {fileID: 1160535647} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -828,6 +828,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 670639508} m_PrefabAsset: {fileID: 0} +--- !u!114 &670639510 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2260898471005442078, guid: 434f6174871f2dc4992321e9d579f138, + type: 3} + m_PrefabInstance: {fileID: 670639508} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &679566761 GameObject: m_ObjectHideFlags: 0 @@ -1252,7 +1264,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &858120090 RectTransform: m_ObjectHideFlags: 0 @@ -1471,6 +1483,7 @@ GameObject: m_Component: - component: {fileID: 1001521034} - component: {fileID: 1001521035} + - component: {fileID: 1001521036} m_Layer: 5 m_Name: InnnerObject m_TagString: Untagged @@ -1515,6 +1528,26 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &1001521036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1001521033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79171d1fad4a444cafc287590de884b7, type: 3} + m_Name: + m_EditorClassIdentifier: + cancelButton: {fileID: 843133640} + nextButton: {fileID: 1853630204} + flavorName: {fileID: 707887860} + flavorPrice: {fileID: 498799267} + flavorStock: {fileID: 1109202679} + cornAmountText: {fileID: 4654596182167880407} + flavor1AmountText: {fileID: 5352886969301700758} + flavor2AmountText: {fileID: 1408233927} --- !u!1 &1036314250 GameObject: m_ObjectHideFlags: 0 @@ -1714,6 +1747,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1160535647} + - component: {fileID: 1160535648} m_Layer: 5 m_Name: FryingPanl_Choose m_TagString: Untagged @@ -1733,8 +1767,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1170636684} - - {fileID: 1972550998} - {fileID: 230185243} + - {fileID: 1972550998} - {fileID: 2045825933} - {fileID: 1782089965} m_Father: {fileID: 1001521034} @@ -1745,6 +1779,24 @@ RectTransform: m_AnchoredPosition: {x: -7.6, y: 520} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1160535648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1160535646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2992efc758994825b664d9d47a650b8a, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedPanIcon: {fileID: 2260898471079004356} + prevPanButton: {fileID: 998259991263772436} + nextPanButton: {fileID: 2073894620} + panName: {fileID: 956402762} + panText: {fileID: 2045825934} + panIcon: {fileID: 670639510} --- !u!1 &1170636683 GameObject: m_ObjectHideFlags: 0 @@ -1911,7 +1963,7 @@ PrefabInstance: - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_Name - value: NecessaryMaterial (1) + value: NecessaryMaterial2 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -2026,6 +2078,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1408233925} m_PrefabAsset: {fileID: 0} +--- !u!114 &1408233927 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + m_PrefabInstance: {fileID: 1408233925} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1484296443 GameObject: m_ObjectHideFlags: 0 @@ -2583,7 +2647,7 @@ RectTransform: - {fileID: 1484296444} - {fileID: 956402761} m_Father: {fileID: 1160535647} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2763,22 +2827,22 @@ PrefabInstance: - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, - type: 3} - propertyPath: m_LocalRotation.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} @@ -2798,7 +2862,7 @@ PrefabInstance: - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} @@ -2813,6 +2877,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2073894618} m_PrefabAsset: {fileID: 0} +--- !u!114 &2073894620 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3235806894350595316, guid: a3d75f774aaefd046aebd07db1400975, + type: 3} + m_PrefabInstance: {fileID: 2073894618} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2086551030 GameObject: m_ObjectHideFlags: 0 @@ -3137,6 +3213,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 998259991263772434} m_PrefabAsset: {fileID: 0} +--- !u!114 &998259991263772436 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3235806894350595316, guid: a3d75f774aaefd046aebd07db1400975, + type: 3} + m_PrefabInstance: {fileID: 998259991263772434} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!222 &1888226413670878384 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3264,6 +3352,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 434f6174871f2dc4992321e9d579f138, type: 3} +--- !u!114 &2260898471079004356 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2260898471005442078, guid: 434f6174871f2dc4992321e9d579f138, + type: 3} + m_PrefabInstance: {fileID: 2260898471079004355} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4570586285425884512 GameObject: m_ObjectHideFlags: 0 @@ -3329,7 +3429,7 @@ GameObject: - component: {fileID: 5352886968946593878} - component: {fileID: 5352886968946593877} m_Layer: 0 - m_Name: MaterialFrame_stock + m_Name: CornAmount m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3442,7 +3542,7 @@ PrefabInstance: - target: {fileID: 5352886967997046946, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_Name - value: NecessaryMaterial + value: NecessaryMaterial1 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -3551,6 +3651,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} +--- !u!114 &5352886969301700758 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4654596183118361121, guid: c84cc6844fe59ef4d8e52438b7bffa42, + type: 3} + m_PrefabInstance: {fileID: 5352886969301700757} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &6739113352738409278 RectTransform: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs new file mode 100644 index 00000000..2fdebdc9 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs @@ -0,0 +1,21 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +public class PanSelector : MonoBehaviour +{ + [SerializeField] private Image selectedPanIcon; + [SerializeField] private Button prevPanButton; + [SerializeField] private Button nextPanButton; + + [SerializeField] private Text panName; + [SerializeField] private Text panText; + [SerializeField] private Image panIcon; + + private void Start() + { + // 所持フライパン読み込み + // 設定中のフライパン表示 + // フライパン変更通知 + } +} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs.meta new file mode 100644 index 00000000..62e1a64f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2992efc758994825b664d9d47a650b8a +timeCreated: 1628063824 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs index 3b016dcf..525d81ac 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs @@ -1,12 +1,9 @@ -namespace MyGame.Scenes.recipe.Scripts +public class RecipeData { - public class RecipeData - { - public int RecipeId; - public string Name; - public int Price; - public int CornAmount; - public int Flavor1Amount; - public int Flavor2Amount; - } -} \ No newline at end of file + public int RecipeId; + public string Name; + public int Price; + public int CornAmount; + public int Flavor1Amount; + public int Flavor2Amount; +} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs new file mode 100644 index 00000000..4c6f29cb --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -0,0 +1,46 @@ +using System; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class RecipeDetailView : MonoBehaviour +{ + public static readonly string DetailRecipeTag = "RecipeData"; + + [SerializeField] private Button cancelButton; + [SerializeField] private Button nextButton; + [SerializeField] private Text flavorName; + [SerializeField] private Text flavorPrice; + [SerializeField] private Text flavorStock; + [SerializeField] private Text cornAmountText; + [SerializeField] private Text flavor1AmountText; + [SerializeField] private Text flavor2AmountText; + private static readonly string flavorStockFormat = "所持数 :{0}"; + private static readonly string cornAmountFormat = "{0}/{1}"; + private static readonly string flavorAmountFormat = "{0} / {1}"; + + private void Start() + { + cancelButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.UnloadScene(GameScenes.RecipeChoice); + }).AddTo(this); + nextButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.LoadScene(GameScenes.Cooking); + }).AddTo(this); + var data = LocalCacheManager.Load(DetailRecipeTag); + SetRecipe(data); + } + + public void SetRecipe(RecipeData data) + { + var gameData = GameDataManager.GameData; + flavorStock.text = string.Format(flavorStockFormat, 9999); + flavorName.text = data.Name; + flavorPrice.text = data.Price.ToString(); + cornAmountText.text = string.Format(cornAmountFormat, gameData.cornSeed, data.CornAmount); + flavor1AmountText.text = string.Format(flavorAmountFormat, 999, data.Flavor1Amount); + flavor2AmountText.text = string.Format(flavorAmountFormat, 999, data.Flavor2Amount); + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs.meta b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs.meta new file mode 100644 index 00000000..c8e05808 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 79171d1fad4a444cafc287590de884b7 +timeCreated: 1628062788 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs index cec2bb35..b8af9071 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using MyGame.Scenes.recipe.Scripts; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -26,27 +25,27 @@ public class RecipeSelectDialog : MonoBehaviour RecipeId = 0, Name = "塩コケコーン", Price = 5, - CornAmount = 0, - Flavor1Amount = 0, - Flavor2Amount = 0 + CornAmount = 60, + Flavor1Amount = 1, + Flavor2Amount = 1 }, new RecipeData { RecipeId = 0, Name = "キャラメルコケコーン", Price = 15, - CornAmount = 0, - Flavor1Amount = 0, - Flavor2Amount = 0 + CornAmount = 60, + Flavor1Amount = 1, + Flavor2Amount = 1 }, new RecipeData { RecipeId = 0, Name = "ブラックペッパーコケコーン", Price = 9, - CornAmount = 0, - Flavor1Amount = 0, - Flavor2Amount = 0 + CornAmount = 60, + Flavor1Amount = 1, + Flavor2Amount = 1 }, }; // レシピ一覧生成 @@ -56,7 +55,8 @@ public class RecipeSelectDialog : MonoBehaviour view.SetRecipe(recipeData); view.RecipeClickObservable.Subscribe(_ => { - + LocalCacheManager.Save(RecipeDetailView.DetailRecipeTag, recipeData); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.RecipeChoice); }).AddTo(this); } } diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs index 803ea4b5..857297e4 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs @@ -1,5 +1,4 @@ using System; -using MyGame.Scenes.recipe.Scripts; using UniRx; using UnityEngine; using UnityEngine.UI;