From 4eb2eb46f72e450af211c9ca171ccce5b5870e57 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 2 Dec 2022 19:43:26 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=83=AB=E3=83=89=E3=83=9E?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=83=AB=E8=A1=A8=E7=A4=BA=E8=BF=BD=E5=8A=A0=20?=
 =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=97=E7=A7=BB=E5=8B=95=E5=88=B6=E9=99=90?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/WorldMap/Scripts/WorldMap.cs   | 16 ++++++++++++++++
 popcorn/Assets/MyGame/Scripts/Const.cs           |  2 ++
 popcorn/Assets/MyGame/Scripts/HeaderManager.cs   | 11 ++++++++---
 popcorn/Assets/MyGame/Scripts/TutorialManager.cs |  1 +
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
index 4d481d22..6ab3b68b 100644
--- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
+++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/WorldMap.cs
@@ -70,6 +70,22 @@ namespace MyGame.Scenes.WorldMap.Scripts
             {
                 TransitionManager.Instance.LoadScene(GameScenes.Main);
             }).AddTo(this);
+            
+            // チュートリアル
+            if (!globalGameData.FinishedFlags.HasFlag(TutorialFlag.WorldMap))
+            {
+                var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
+                var scripts = scriptList.Where(data => data.id == Const.WorldMapTutorialScriptId).ToList();
+                if (scripts.Count > 0 && UnityEngine.SceneManagement.SceneManager.sceneCount == 1)
+                {
+                    BrotherConversation.ShowDialog(scripts, () =>
+                    {
+                        // 既読処理（必要なら
+                        globalGameData.FinishedFlags |= TutorialFlag.WorldMap;
+                        GameDataManager.SaveGameData();
+                    });
+                }
+            }
 
             foreach (var cityIcon in cityIcons)
             {
diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs
index 16c3a746..c14bd03e 100644
--- a/popcorn/Assets/MyGame/Scripts/Const.cs
+++ b/popcorn/Assets/MyGame/Scripts/Const.cs
@@ -36,6 +36,8 @@ 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 WorldMapTutorialScriptId = 21;
+    public static readonly int WorldTripLimitScriptId = 25;
 
     // tag
     public static readonly string GameDataTag = "GameData";
diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
index eaae021e..38a32b95 100644
--- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs
@@ -17,6 +17,7 @@ public class HeaderManager : MonoBehaviour
 
     private void Start()
     {
+        var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
         var cityGameData = GameDataManager.GetCurrentCityGameData();
         var isOpenMission = false;
         settingButton.OnClickAsObservable().ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ =>
@@ -45,8 +46,13 @@ public class HeaderManager : MonoBehaviour
             // 最新の都市以外は在庫があるとき他の都市に行けない
             if (!GameDataUtils.CheckLatestCity(GameDataManager.GameData.CurrentCityId) && totalStock > 0)
             {
-                // UpdateDialog.ShowDialog();
-                // return;
+                var levelUpScripts = scriptList.Where(data => data.id == Const.WorldTripLimitScriptId).ToList();
+                if (levelUpScripts.Count <= 0) return;
+                BrotherConversation.ShowDialog(levelUpScripts, () =>
+                {
+                    // 既読処理（必要なら
+                });
+                return;
             }
             TransitionManager.Instance.LoadScene(GameScenes.WorldMap);
         }).AddTo(this);
@@ -71,7 +77,6 @@ public class HeaderManager : MonoBehaviour
         // 都市ごとの店舗レベルアップチェック
         var cityShopLevelDataList = SpreadsheetDataManager.Instance.GetBaseDataList<CityShopLevelData>(Const.CityShopLevelDataSheet);
         var currentCityList = cityShopLevelDataList.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId);
-        var scriptList = SpreadsheetDataManager.Instance.GetBaseDataList<BrotherScriptData>(Const.ScriptDataSheet);
         GameDataObserver.Instance.HeartObserver.Subscribe(_ =>
         {
             if (UnityEngine.SceneManagement.SceneManager.sceneCount != 1) return;
diff --git a/popcorn/Assets/MyGame/Scripts/TutorialManager.cs b/popcorn/Assets/MyGame/Scripts/TutorialManager.cs
index 119a3cb6..e6c24889 100644
--- a/popcorn/Assets/MyGame/Scripts/TutorialManager.cs
+++ b/popcorn/Assets/MyGame/Scripts/TutorialManager.cs
@@ -17,6 +17,7 @@ namespace MyGame.Scripts
         AutoCook = 1 << 4,
         ShopCustomize = 1 << 5,
         ScrollGame = 1 << 6,
+        WorldMap = 1 << 7,
     }
     public class TutorialManager : SingletonMonoBehaviour<TutorialManager>
     {