From c0b46fc055ce414a5121b22b7d31bcb04fcf1ea7 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 16 Jul 2021 14:51:51 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=83=83=E3=82=BF=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=83=8D=E3=83=BC=E3=82=B8=E3=83=A3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 26 -------------- .../Scenes/Main/Prefabs/UI/Footer.prefab | 17 +++++++++ .../Scenes/Main/Scripts/KitchenManager.cs | 12 ------- .../Assets/MyGame/Scripts/FooterManager.cs | 35 +++++++++++++++++++ .../MyGame/Scripts/FooterManager.cs.meta | 3 ++ 5 files changed, 55 insertions(+), 38 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scripts/FooterManager.cs create mode 100644 popcorn/Assets/MyGame/Scripts/FooterManager.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 0925500c..fcefbeb6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -626,8 +626,6 @@ MonoBehaviour: 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 @@ -1209,30 +1207,6 @@ PrefabInstance: 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/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index 0c7febfe..609b04f9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -721,6 +721,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3310671341541575851} + - component: {fileID: 186585979230442293} m_Layer: 5 m_Name: Footer m_TagString: Untagged @@ -752,6 +753,22 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &186585979230442293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310671341541575850} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81bfae5c50ac45de9ed02294b4c64bda, type: 3} + m_Name: + m_EditorClassIdentifier: + kitchenButton: {fileID: 3310671341787608547} + fieldButton: {fileID: 3310671341662576995} + stockButton: {fileID: 3310671341034218318} + saleButton: {fileID: 3310671341763054133} --- !u!1 &3310671341662576997 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 0d0e4f2e..231de8df 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -3,24 +3,12 @@ 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 diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs new file mode 100644 index 00000000..85d4207e --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -0,0 +1,35 @@ +using System; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class FooterManager : MonoBehaviour +{ + [SerializeField] private Button kitchenButton; + [SerializeField] private Button fieldButton; + [SerializeField] private Button stockButton; + [SerializeField] private Button saleButton; + private BoolReactiveProperty shareGate = new BoolReactiveProperty(true); + + private void Start() + { + kitchenButton.BindToOnClick(shareGate, _ => + { + TransitionManager.Instance.LoadScene(GameScenes.Main); + return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); + }).AddTo(this); + fieldButton.BindToOnClick(shareGate, _ => + { + TransitionManager.Instance.LoadScene(GameScenes.CornField); + return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); + }).AddTo(this); + stockButton.BindToOnClick(shareGate, _ => + { + return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); + }).AddTo(this); + saleButton.BindToOnClick(shareGate, _ => + { + return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); + }).AddTo(this); + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs.meta b/popcorn/Assets/MyGame/Scripts/FooterManager.cs.meta new file mode 100644 index 00000000..f9d1c049 --- /dev/null +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 81bfae5c50ac45de9ed02294b4c64bda +timeCreated: 1626413323 \ No newline at end of file