From b64077846a33a849b940507d8374d5bf97cc961f Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 27 Oct 2021 16:46:24 +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=E3=81=A7=E3=81=8A=E5=AE=A2?= =?UTF-8?q?=E3=81=95=E3=82=93=E3=82=BF=E3=83=83=E3=83=97=E3=81=A7=E7=9F=A2?= =?UTF-8?q?=E5=8D=B0=E6=B6=88=E3=81=88=E3=82=8B=E5=87=A6=E7=90=86=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Scripts/MarketManager.cs | 10 +++++++++- popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index b3374e95..ad790176 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -44,6 +44,15 @@ public class MarketManager : MonoBehaviour walkerMask.gameObject.SetActive(true); // お客さん配置 var controller = market.SetTutorialCustomer(); + walkerMask.SetTargetArrow(controller.transform); + controller.State + .Where(x => x == CustomerState.Wait) + .Take(1) + .Subscribe(state => { }, () => + { + walkerMask.SetArrowActive(false); + }).AddTo(controller).AddTo(this); + walkerMask.SetTargetArrow(controller.transform); controller.State .Where(x => x == CustomerState.EatingLeave) .Delay(TimeSpan.FromSeconds(3f)) @@ -58,7 +67,6 @@ public class MarketManager : MonoBehaviour rewardButtonView.gameObject.SetActive(true); TutorialManager.Instance.ShowTutorialConversation(12); }).AddTo(controller).AddTo(this); - walkerMask.SetTargetArrow(controller.transform); }); } } diff --git a/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs b/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs index 0cf43dad..989691a2 100644 --- a/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs +++ b/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs @@ -22,6 +22,11 @@ namespace MyGame.Scripts unMaskImage.sprite = sprite; } + public void SetArrowActive(bool active) + { + unmaskArrow.gameObject.SetActive(active); + } + public void SetTargetArrow(Transform target, bool isFlip = false, float offset = 200f) { // unmaskArrow.FitTo(target);