diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index e28fb009..0925500c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -606,6 +606,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1870432534} + - component: {fileID: 1870432533} m_Layer: 0 m_Name: Manager m_TagString: Untagged @@ -613,6 +614,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &1870432533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870432532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9b3b578c8a46648248e58adb3ee9caba, type: 3} + m_Name: + m_EditorClassIdentifier: + cookingButton: {fileID: 3664916832445709978} + cornFieldButton: {fileID: 3664916832445709977} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -1187,8 +1202,37 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833780733955, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Name + value: Button_cooking + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} +--- !u!114 &3664916832445709977 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916833637780613, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 3664916832445709976} + 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!114 &3664916832445709978 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916833780733957, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 3664916832445709976} + 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!1001 &3915769149207111994 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts.meta new file mode 100644 index 00000000..b4447b59 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 145b4fb79966b419c9199d704698ce29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs new file mode 100644 index 00000000..0d0e4f2e --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class KitchenManager : MonoBehaviour +{ + [SerializeField] private Button cookingButton; + [SerializeField] private Button cornFieldButton; + + // Start is called before the first frame update + void Start() + { + cookingButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + { + TransitionManager.Instance.LoadScene(GameScenes.Cooking); + }).AddTo(this); + cornFieldButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + { + TransitionManager.Instance.LoadScene(GameScenes.CornField); + }).AddTo(this); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs.meta new file mode 100644 index 00000000..176245ed --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9b3b578c8a46648248e58adb3ee9caba +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: