diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/Stove.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/Stove.cs new file mode 100644 index 00000000..e48bd01b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/Stove.cs @@ -0,0 +1,10 @@ +using UnityEngine; +using UnityEngine.EventSystems; + +public class Stove : MonoBehaviour, IPointerClickHandler +{ + public void OnPointerClick(PointerEventData eventData) + { + TransitionManager.Instance.LoadScene(GameScenes.Cooking); + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/Stove.cs.meta b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/Stove.cs.meta new file mode 100644 index 00000000..c6e403ad --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/Stove.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b2bb7c46049549e38b1baa055c620a94 +timeCreated: 1626422412 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index fcefbeb6..d8073904 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -121,6 +121,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &414580708 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916834121473269, 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!1 &515787033 GameObject: m_ObjectHideFlags: 0 @@ -279,6 +291,7 @@ GameObject: m_Component: - component: {fileID: 1122085164} - component: {fileID: 1122085165} + - component: {fileID: 1122085167} m_Layer: 0 m_Name: Stove m_TagString: Untagged @@ -350,6 +363,32 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!61 &1122085167 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122085163} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2.56, y: 2.24} + newSize: {x: 2.56, y: 2.24} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.56, y: 2.24} + m_EdgeRadius: 0 --- !u!1001 &1328732174 PrefabInstance: m_ObjectHideFlags: 0 @@ -626,6 +665,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b3b578c8a46648248e58adb3ee9caba, type: 3} m_Name: m_EditorClassIdentifier: + cookingButton: {fileID: 414580708} --- !u!4 &1870432534 Transform: m_ObjectHideFlags: 0 @@ -1205,6 +1245,11 @@ PrefabInstance: propertyPath: m_Name value: Button_cooking objectReference: {fileID: 0} + - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!1001 &3915769149207111994 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 231de8df..5155bb7e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -3,12 +3,15 @@ using System.Collections; using System.Collections.Generic; using UniRx; using UnityEngine; +using UnityEngine.UI; public class KitchenManager : MonoBehaviour { + [SerializeField] private Button cookingButton; // Start is called before the first frame update void Start() { + cookingButton.OnClickAsObservable().Subscribe(_ => TransitionManager.Instance.LoadScene(GameScenes.Cooking)); } // Update is called once per frame