From ecc12a0053d5d0ff25a494c331f215b940db7dea Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Sep 2022 15:36:59 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=83=AB=E3=83=89=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=81=B8=E3=81=AE=E9=81=B7=E7=A7=BB=E3=82=92?= =?UTF-8?q?=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/Prefabs/UI/Header.prefab | 1 + popcorn/Assets/MyGame/Scripts/HeaderManager.cs | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 6c45b0cd..772a6e3b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -50,6 +50,7 @@ MonoBehaviour: informationButton: {fileID: 137127164298331678} missionIndicator: {fileID: 1937919369583800779} customizeButton: {fileID: 2699539194628049746} + worldMapButton: {fileID: 8411783050349542885} --- !u!114 &2603354116673325400 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs index cd0e457e..e5549926 100644 --- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs @@ -13,6 +13,7 @@ public class HeaderManager : MonoBehaviour [SerializeField] private Button informationButton; [SerializeField] private GameObject missionIndicator; [SerializeField] private Button customizeButton; + [SerializeField] private Button worldMapButton; private void Start() { @@ -36,6 +37,11 @@ public class HeaderManager : MonoBehaviour { TransitionManager.Instance.LoadSceneAdditive(GameScenes.Information); }).AddTo(this); + worldMapButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + { + TransitionManager.Instance.LoadScene(GameScenes.WorldMap); + }).AddTo(this); + // mission報酬通知 GameDataObserver.Instance.UpdateMissionAchieved .Where(_ => !isOpenMission).Subscribe(x =>