ScrollGameガイド表示追加

popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity

@@ -3034,7 +3034,7 @@ MonoBehaviour:
   stageManager: {fileID: 1870432536}
   resultManager: {fileID: 5034752974072861423}
   readyObject: {fileID: 978217474}
-  tutorialPopupObject: {fileID: 0}
+  tutorialPopupObject: {fileID: 7325523898178317160}
   isDebug: 0
 --- !u!4 &1870432534
 Transform:
@@ -4543,6 +4543,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 71a303670f159a94dbe4c0cebc1f6a83, type: 3}
+--- !u!1 &7325523898178317160 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7325523897134744365, guid: 71a303670f159a94dbe4c0cebc1f6a83,
+    type: 3}
+  m_PrefabInstance: {fileID: 7325523898178317159}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7328251774669809636
 PrefabInstance:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/pop_explanation.prefab

@@ -1,5 +1,57 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2545744652985189626
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5888931871824765725}
+  - component: {fileID: 7910408027847081152}
+  m_Layer: 5
+  m_Name: Window
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5888931871824765725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2545744652985189626}
+  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_Children:
+  - {fileID: 7325523897257327758}
+  - {fileID: 7325523896894854295}
+  m_Father: {fileID: 7325523897134744364}
+  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}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7910408027847081152
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2545744652985189626}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59679db3493b47cca37c69f9db8c0b21, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundAnimator: {fileID: 4691976169041255157}
+  closeButton: {fileID: 7325523896894854293}
 --- !u!1 &7325523896894854280
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,8 +83,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 7325523897134744364}
+  m_Father: {fileID: 5888931871824765725}
-  m_RootOrder: 2
+  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}
@@ -163,8 +215,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1354587068333915812}
-  - {fileID: 7325523897257327758}
+  - {fileID: 5888931871824765725}
-  - {fileID: 7325523896894854295}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -198,12 +249,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7325523897257327759}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_Children: []
-  m_Father: {fileID: 7325523897134744364}
+  m_Father: {fileID: 5888931871824765725}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs

@@ -33,6 +33,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private StageManager stageManager;
         [SerializeField] private ResultManager resultManager;
         [SerializeField] private GameObject readyObject;
+        [SerializeField] private GameObject tutorialPopupObject;
 #if UNITY_EDITOR
         [SerializeField] private bool isDebug;
 #endif
@@ -57,7 +58,16 @@ namespace MyGame.Scenes.MiniGame.Scripts
             // Playカウントチェック
             UpdatePlayCount();
 
-            gameData.FinishedFlags |= TutorialFlag.ScrollGame;
+            if (!gameData.FinishedFlags.HasFlag(TutorialFlag.ScrollGame))
+            {
+                tutorialPopupObject.SetActive(true);
+                gameData.FinishedFlags |= TutorialFlag.ScrollGame;
+                GameDataManager.SaveGameData();
+            }
+            else
+            {
+                tutorialPopupObject.SetActive(false);
+            }
 
             var placeList = SpreadsheetDataManager.Instance.GetBaseDataList<ScrollGamePlaceData>(Const.ScrollGamePlaceDataSheet);
             var stageList = SpreadsheetDataManager.Instance.GetBaseDataList<ScrollGameStageData>(Const.ScrollGameStageDataSheet);

popcorn/Assets/MyGame/Scripts/DialogCloser.cs

@@ -0,0 +1,29 @@
+using System;
+using I2.Loc;
+using UniRx;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace MyGame.Scripts
+{
+    public class DialogCloser : MonoBehaviour
+    {
+        private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
+
+        [SerializeField] private Animator backgroundAnimator;
+        [SerializeField] private Button closeButton;
+
+        private void Start()
+        {
+            closeButton.OnClickAsObservable().Take(1).Subscribe(_ =>
+            {
+                transform.SetLocalScale(0);
+                backgroundAnimator.SetTrigger(CloseTrigger);
+                this.CallWaitForSeconds(.25f, () =>
+                {
+                    transform.parent.gameObject.SetActive(false);
+                });
+            }).AddTo(this);
+        }
+    }
+}

popcorn/Assets/MyGame/Scripts/DialogCloser.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 59679db3493b47cca37c69f9db8c0b21
+timeCreated: 1656658015