diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 100bdb3d..5e7d3f7c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -48,6 +48,7 @@ MonoBehaviour: missionButton: {fileID: 7425175309417248097} informationButton: {fileID: 137127164298331678} missionIndicator: {fileID: 1937919369583800779} + customizeButton: {fileID: 2699539194628049746} --- !u!114 &2603354116673325400 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs index 1f59c650..cd0e457e 100644 --- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs @@ -12,6 +12,7 @@ public class HeaderManager : MonoBehaviour [SerializeField] private Button missionButton; [SerializeField] private Button informationButton; [SerializeField] private GameObject missionIndicator; + [SerializeField] private Button customizeButton; private void Start() { @@ -19,7 +20,7 @@ public class HeaderManager : MonoBehaviour settingButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => { TransitionManager.Instance.LoadSceneAdditive(GameScenes.SettingsDialog); - }); + }).AddTo(this); missionButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => { isOpenMission = true; @@ -30,16 +31,20 @@ public class HeaderManager : MonoBehaviour missionIndicator.SetActive(GameDataObserver.Instance.UpdateMissionAchieved.Value); }, active => missionIndicator.SetActive(active)); - }); + }).AddTo(this); informationButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => { TransitionManager.Instance.LoadSceneAdditive(GameScenes.Information); - }); + }).AddTo(this); // mission報酬通知 GameDataObserver.Instance.UpdateMissionAchieved .Where(_ => !isOpenMission).Subscribe(x => { missionIndicator.SetActive(x); }).AddTo(this); + customizeButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.LoadScene(GameScenes.Customize); + }).AddTo(this); } }