From ca8423dbc3ace55c5980e3d19cfe76a9266a7a02 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 27 Jun 2022 17:06:33 +0900 Subject: [PATCH] =?UTF-8?q?ScrollGame=E9=96=8B=E6=94=BE=E3=83=90=E3=83=83?= =?UTF-8?q?=E3=82=B8=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/Prefabs/UI/Footer.prefab | 171 +++++++++++++++++- .../Scenes/MiniGame/Scripts/DebugGame.cs | 2 + .../Scenes/MiniGame/Scripts/GameManager.cs | 3 + .../Assets/MyGame/Scripts/FooterManager.cs | 23 ++- .../Assets/MyGame/Scripts/GameDataObserver.cs | 1 + .../Assets/MyGame/Scripts/TutorialManager.cs | 1 + 6 files changed, 191 insertions(+), 10 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index 885b645f..7ab89198 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1914405537612263520} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -316,6 +316,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.93, y: 0.93, z: 0.93} m_Children: + - {fileID: 5291934252676978630} - {fileID: 1737502582177339564} - {fileID: 8603287394766175346} - {fileID: 7686173123905821996} @@ -1585,6 +1586,7 @@ MonoBehaviour: scrollGameLockedButton: {fileID: 4731668520893469935} stockNotifyIcon: {fileID: 2430043917671370164} kitchenNotifyIcon: {fileID: 4699855437215309545} + scrollGameNotifyIcon: {fileID: 4911691721456968275} --- !u!1 &3310671341662576997 GameObject: m_ObjectHideFlags: 0 @@ -3165,7 +3167,7 @@ RectTransform: - {fileID: 2391993222458767569} - {fileID: 7296456547234569109} m_Father: {fileID: 1914405537612263520} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3855,7 +3857,7 @@ RectTransform: m_Children: - {fileID: 8074451558278730812} m_Father: {fileID: 1914405537612263520} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4961,6 +4963,157 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &4150465854398920447 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1914405537612263520} + m_Modifications: + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.x + value: 1.2000002 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.y + value: 1.2000002 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalScale.z + value: 1.2000002 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 71 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 71 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_Name + value: icon_get + objectReference: {fileID: 0} + - target: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} +--- !u!1 &4911691721456968275 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 4150465854398920447} + m_PrefabAsset: {fileID: 0} +--- !u!224 &5291934252676978630 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 4150465854398920447} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6632112567178762520 PrefabInstance: m_ObjectHideFlags: 0 @@ -5100,15 +5253,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} ---- !u!1 &2430043917671370164 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, - type: 3} - m_PrefabInstance: {fileID: 6632112567178762520} - m_PrefabAsset: {fileID: 0} --- !u!224 &3233636912317429793 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, type: 3} m_PrefabInstance: {fileID: 6632112567178762520} m_PrefabAsset: {fileID: 0} +--- !u!1 &2430043917671370164 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e, + type: 3} + m_PrefabInstance: {fileID: 6632112567178762520} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs index 5893e1fa..8a00bb23 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/DebugGame.cs @@ -1,6 +1,7 @@ #if UNITY_EDITOR using System; using System.Collections.Generic; +using MyGame.Scripts; using UniRx; using UniRx.Triggers; using UnityEngine; @@ -25,6 +26,7 @@ namespace MyGame.Scenes.MiniGame.Scripts { GameDataManager.GameData.ScrollGamePlaceScoreList = new List(); GameDataManager.GameData.ScrollGameStageScoreList = new List(); + GameDataManager.GameData.FinishedFlags &= ~TutorialFlag.ScrollGame; }).AddTo(this); resetPlayCountButton.OnClickAsObservable().Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index b75dfcb9..a8d7ea58 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using MyGame.Scripts; using UniRx; using UniRx.Diagnostics; using UniRx.Triggers; @@ -55,6 +56,8 @@ namespace MyGame.Scenes.MiniGame.Scripts var gameData = GameDataManager.GameData; // Playカウントチェック UpdatePlayCount(); + + gameData.FinishedFlags |= TutorialFlag.ScrollGame; var placeList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScrollGamePlaceDataSheet); var stageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScrollGameStageDataSheet); diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 627ee870..bec63763 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -17,6 +17,7 @@ public class FooterManager : MonoBehaviour [SerializeField] private Button scrollGameLockedButton; [SerializeField] private GameObject stockNotifyIcon; [SerializeField] private GameObject kitchenNotifyIcon; + [SerializeField] private GameObject scrollGameNotifyIcon; private void Start() { @@ -50,11 +51,31 @@ public class FooterManager : MonoBehaviour scrollGameButton.gameObject.SetActive(scrollGameAvailable); scrollGameLockedButton.gameObject.SetActive(!scrollGameAvailable); scrollGameLockedButton.OnClickAsObservable() - .Where(_ => !scrollGameAvailable) .ThrottleFirst(TimeSpan.FromSeconds(.2f)) .Subscribe(_ => { ScrollGameLockDialog.ShowDialog(); }).AddTo(this); + + GameDataObserver.Instance.ShopLevelObserver + .DistinctUntilChanged() + .Where(x => x >= Const.ScrollGameAvailableLevel) + .Take(1) + .Subscribe(_ => + { + scrollGameButton.gameObject.SetActive(true); + scrollGameLockedButton.gameObject.SetActive(false); + }).AddTo(this); + + scrollGameNotifyIcon.SetActive(false); + GameDataObserver.Instance.ShopLevelObserver + .DistinctUntilChanged() + .Where(x => x >= Const.ScrollGameAvailableLevel) + .TakeWhile(_ => !GameDataManager.GameData.FinishedFlags.HasFlag(TutorialFlag.ScrollGame)) + .Take(1) + .Subscribe(x => + { + scrollGameNotifyIcon.SetActive(true); + }).AddTo(this); } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs index 924ee5ca..af3c041a 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataObserver.cs @@ -25,6 +25,7 @@ public class GameDataObserver : SingletonMonoBehaviour public IObservable HeartObserver => heartObserver; public IObservable SceneCounter => sceneCounter.DistinctUntilChanged(); + public IObservable ShopLevelObserver => shopLevelObserver.AddTo(this); private void Start() { diff --git a/popcorn/Assets/MyGame/Scripts/TutorialManager.cs b/popcorn/Assets/MyGame/Scripts/TutorialManager.cs index 8a9c76d7..599d31ab 100644 --- a/popcorn/Assets/MyGame/Scripts/TutorialManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TutorialManager.cs @@ -16,6 +16,7 @@ namespace MyGame.Scripts Management = 1 << 3, AutoCook = 1 << 4, ShopCustomize = 1 << 5, + ScrollGame = 1 << 6, } public class TutorialManager : SingletonMonoBehaviour {