From fd24f8f8cb498fbc98320908d4324fb4df3f40b4 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 27 Oct 2021 10:01:00 +0900 Subject: [PATCH] =?UTF-8?q?=E8=B2=A9=E5=A3=B2=E3=83=81=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=A2=E3=83=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/MarketManager.cs | 37 +++- .../MyGame/Scenes/marketing/marketing.unity | 182 ++++++++++++++++++ 2 files changed, 215 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index b64d8c2c..d0b20c79 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -20,6 +20,7 @@ public class MarketManager : MonoBehaviour [SerializeField] private Transform pinkTarget; [SerializeField] private Transform coinPrefab; [SerializeField] private Transform rootTransform; + [SerializeField] private TutorialObjectMask walkerMask; private Market market; List productDataList; @@ -32,6 +33,34 @@ public class MarketManager : MonoBehaviour SoundManager.Instance.PlayBGM("bgm_marketing"); var gameData = GameDataManager.GameData; + + if (gameData.isFirstPlay) + { + if (TutorialManager.Instance.Index == 10) + { + rewardButtonView.gameObject.SetActive(false); + TutorialManager.Instance.ShowTutorialConversation(11, () => + { + walkerMask.gameObject.SetActive(true); + // お客さん配置 + var controller = market.SetTutorialCustomer(); + controller.State + .Where(x => x == CustomerState.EatingLeave) + .Delay(TimeSpan.FromSeconds(3f)) + .Take(1) + .Subscribe(_ => + { + // チュートリアル終了 + gameData.isFirstPlay = false; + GameDataManager.SaveGameData(); + walkerMask.gameObject.SetActive(false); + rewardButtonView.gameObject.SetActive(true); + TutorialManager.Instance.ShowTutorialConversation(11); + }).AddTo(controller); + }); + } + } + CoinManager.Instance.ChangeCoin(gameData.Coin); HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart); GameDataObserver.Instance.ShopLevelUpdate @@ -256,7 +285,6 @@ public class MarketManager : MonoBehaviour }).AddTo(customerAnimator); var eventTrigger = customerAnimator.gameObject.AddComponent(); eventTrigger.OnPointerClickAsObservable() - .TakeWhile(_ => controller.State.Value == CustomerState.Walk || controller.State.Value == CustomerState.WalkShop) .Where(_ => market.CurrentShopState.Value != ShopState.Close) .Take(1) .Subscribe(_ => @@ -265,9 +293,10 @@ public class MarketManager : MonoBehaviour { Destroy(target); } - if (controller.State.Value == CustomerState.Leave - || controller.State.Value == CustomerState.EatingLeave - || controller.State.Value == CustomerState.SadLeave) + + if (controller.State.Value != CustomerState.Walk && + controller.State.Value != CustomerState.WalkShop && + controller.State.Value != CustomerState.CenterStop) { return; } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index 394b3e34..ab184776 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -783,6 +783,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 223592692} m_PrefabAsset: {fileID: 0} +--- !u!114 &237651842 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5131953687285211373, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + m_PrefabInstance: {fileID: 713264522} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a8efaaa187d4865a1b4cabfa40ab6e9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &240851456 GameObject: m_ObjectHideFlags: 0 @@ -1607,6 +1619,170 @@ SpriteMask: m_BackSortingOrder: 0 m_IsCustomRangeActive: 0 m_SpriteSortPoint: 0 +--- !u!1001 &713264522 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 714437465} + m_Modifications: + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820480, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820543, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_Name + value: TutorialObjectMask + objectReference: {fileID: 0} + - target: {fileID: 4293843006989820543, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_SizeDelta.y + value: -653.7666 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4293843007976718249, guid: 1c993e9707f1a4fada56020be27dde28, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 58.69995 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1c993e9707f1a4fada56020be27dde28, type: 3} --- !u!1001 &714437464 PrefabInstance: m_ObjectHideFlags: 0 @@ -1777,6 +1953,11 @@ PrefabInstance: propertyPath: m_Name value: Canvas objectReference: {fileID: 0} + - target: {fileID: 3664916832564167475, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_MatchWidthOrHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3664916832564167476, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Camera @@ -2543,6 +2724,7 @@ MonoBehaviour: coinPrefab: {fileID: 8159396421809467538, guid: 9fc8076f17c26ff4d9be53b90a7dad4c, type: 3} rootTransform: {fileID: 714437465} + walkerMask: {fileID: 237651842} --- !u!1001 &1044373331 PrefabInstance: m_ObjectHideFlags: 0