diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 625e66b9..67a3d448 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -51,6 +51,7 @@ MonoBehaviour: missionIndicator: {fileID: 1937919369583800779} customizeButton: {fileID: 2699539194628049746} worldMapButton: {fileID: 8411783050349542885} + worldMapLockObject: {fileID: 2166580290414857606} cityIconTarget: {fileID: 8737461130351586685} --- !u!114 &2603354116673325400 MonoBehaviour: @@ -448,7 +449,7 @@ RectTransform: - {fileID: 137127164298331673} - {fileID: 3158404179809041068} - {fileID: 4503951777792434246} - - {fileID: 1295871286156640604} + - {fileID: 2430185935722522149} - {fileID: 2068391326539282533} m_Father: {fileID: 137127163878687691} m_RootOrder: 2 @@ -1311,12 +1312,12 @@ RectTransform: m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1295871286156640604} - m_RootOrder: 0 + m_Father: {fileID: 137127162834349545} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1, y: -13} + m_AnchoredPosition: {x: -82, y: -236.00003} m_SizeDelta: {x: 72, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &795074000638648589 @@ -1676,7 +1677,7 @@ MonoBehaviour: m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_DisabledColor: {r: 0.65882355, g: 0.65882355, b: 0.65882355, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -1711,145 +1712,6 @@ MonoBehaviour: randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 ---- !u!1 &6216373208680471031 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1295871286156640604} - - component: {fileID: 6104739908406093787} - - component: {fileID: 8783829379458380809} - - component: {fileID: 4416511087053241826} - - component: {fileID: 5818444871374557994} - m_Layer: 5 - m_Name: Button_WorldMap_key - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1295871286156640604 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6216373208680471031} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2430185935722522149} - m_Father: {fileID: 137127162834349545} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -83, y: -223} - m_SizeDelta: {x: 122, y: 126} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6104739908406093787 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6216373208680471031} - m_CullTransparentMesh: 0 ---- !u!114 &8783829379458380809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6216373208680471031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.6603774, g: 0.6603774, b: 0.6603774, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04a8e0cae00075a41935cc5ccefa7b6e, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4416511087053241826 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6216373208680471031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8783829379458380809} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &5818444871374557994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6216373208680471031} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} - m_Name: - m_EditorClassIdentifier: - onClickPlaySEFilename: se_ButtonTap - randomPlaySEFilenames: [] - randomPlayVoiceFilenames: [] - vibrationType: 0 --- !u!1 &7295866844401052197 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index d7ff3a4c..65263397 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -36,6 +36,7 @@ public static class Const { public static readonly int ScrollGameDailyPlayMaxCount = 4; public static readonly int ScrollGameDailyResetOffsetHours = 0; // 翌日0時基準 public static readonly int ScrollGameAvailableLevel = 8; + public static readonly int WorldMapAvailableLevel = 20; public static readonly int WorldMapTutorialScriptId = 21; public static readonly int WorldTripLimitScriptId = 25; public static readonly (int cityId,int cityLevel) MaxCityLevel = (2, 2); diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs index c60b3781..f7d6f4a1 100644 --- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using MyGame.Scenes.Main.Scripts; using MyGame.Scripts; using UniRx; using UnityEngine; @@ -13,6 +14,7 @@ public class HeaderManager : MonoBehaviour [SerializeField] private GameObject missionIndicator; [SerializeField] private Button customizeButton; [SerializeField] private Button worldMapButton; + [SerializeField] private GameObject worldMapLockObject; [SerializeField] private Transform cityIconTarget; private void Start() @@ -61,8 +63,16 @@ public class HeaderManager : MonoBehaviour .First(data => data.id == GameDataManager.GameData.CurrentCityId); cityIconTarget.DestroyAllChildrens(); Instantiate(cityData.GetIconPrefab(), cityIconTarget); - - + GameDataObserver.Instance.ShopLevelObserver + .DistinctUntilChanged().Where(x => x >= Const.WorldMapAvailableLevel).Take(1).Select(_ => true) + .StartWith(false) + .Subscribe(available => + { + worldMapLockObject.SetActive(!available); + worldMapButton.enabled = available; + cityIconTarget.SetLocalScale(available ? 1f : 0f); + }).AddTo(this); + // mission報酬通知 GameDataObserver.Instance.UpdateMissionAchieved .Where(_ => !isOpenMission).Subscribe(x =>